oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

version 0.2.0, new lib for bitcoin ecc, dont display or track notify errors, dont reload again within 1 sec, null peer ip fix, signingmoved to ContentManager, content.json include support, content.json multisig ready, content.json proper bitcoincore compatible signing, content.json include permissions, multithreaded publish, publish timeout 60s, no exception on invalid bitcoin address, testcase for new lib, bip32 based persite privatekey generation, multiuser ready, simple json database query command, websocket api fileGet, wrapper loading title stuck bugfix

Browse source
This commit is contained in:
HelloZeroNet 2015-02-09 02:09:02 +01:00
parent cfe2cfaf09
commit 639b9f4961
44 changed files with 4061 additions and 293 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/Ui/media/Wrapper.coffee
View file

@ -25,8 +25,9 @@ class Wrapper
window.onload = @onLoad # On iframe loaded
$(window).on "hashchange", => # On hash change
@log "Hashchange", window.location.hash
src = $("#inner-iframe").attr("src").replace(/#.*/, "")+window.location.hash
$("#inner-iframe").attr("src", src)
if window.location.hash
src = $("#inner-iframe").attr("src").replace(/#.*/, "")+window.location.hash
$("#inner-iframe").attr("src", src)
@
@ -97,7 +98,8 @@ class Wrapper
input = $("<input type='#{type}' class='input button-#{type}'/>") # Add input
input.on "keyup", (e) => # Send on enter
if e.keyCode == 13
@sendInner {"cmd": "response", "to": message.id, "result": input.val()} # Response to confirm
button.trigger "click" # Response to confirm
body.append(input)
button = $("<a href='##{caption}' class='button button-#{caption}'>#{caption}</a>") # Add confirm button
@ -149,6 +151,9 @@ class Wrapper
if window.location.hash then $("#inner-iframe")[0].src += window.location.hash # Hash tag
if @ws.ws.readyState == 1 and not @site_info # Ws opened
@reloadSiteInfo()
else if @site_info
window.document.title = @site_info.content.title+" - ZeroNet"
@log "Setting title to", window.document.title
# Send message to innerframe

1
src/Ui/media/Wrapper.css
View file

@ -47,6 +47,7 @@ a { color: black }
.notification .close { position: absolute; top: 0px; right: 0px; font-size: 19px; line-height: 13px; color: #DDD; padding: 7px; text-decoration: none }
.notification .close:hover { color: black }
.notification .close:active, .notification .close:focus { color: #AF3BFF }
.body-white .notification { box-shadow: 0px 1px 9px rgba(0,0,0,0.1) }
/* Notification types */
.notification-ask .notification-icon { background-color: #f39c12; }

1
src/Ui/media/all.css
View file

@ -52,6 +52,7 @@ a { color: black }
.notification .close { position: absolute; top: 0px; right: 0px; font-size: 19px; line-height: 13px; color: #DDD; padding: 7px; text-decoration: none }
.notification .close:hover { color: black }
.notification .close:active, .notification .close:focus { color: #AF3BFF }
.body-white .notification { -webkit-box-shadow: 0px 1px 9px rgba(0,0,0,0.1) ; -moz-box-shadow: 0px 1px 9px rgba(0,0,0,0.1) ; -o-box-shadow: 0px 1px 9px rgba(0,0,0,0.1) ; -ms-box-shadow: 0px 1px 9px rgba(0,0,0,0.1) ; box-shadow: 0px 1px 9px rgba(0,0,0,0.1) }
/* Notification types */
.notification-ask .notification-icon { background-color: #f39c12; }

15
src/Ui/media/all.js
View file

@ -748,8 +748,10 @@ jQuery.extend( jQuery.easing,
return function() {
var src;
_this.log("Hashchange", window.location.hash);
src = $("#inner-iframe").attr("src").replace(/#.*/, "") + window.location.hash;
return $("#inner-iframe").attr("src", src);
if (window.location.hash) {
src = $("#inner-iframe").attr("src").replace(/#.*/, "") + window.location.hash;
return $("#inner-iframe").attr("src", src);
}
};
})(this));
this;
@ -840,11 +842,7 @@ jQuery.extend( jQuery.easing,
input.on("keyup", (function(_this) {
return function(e) {
if (e.keyCode === 13) {
return _this.sendInner({
"cmd": "response",
"to": message.id,
"result": input.val()
});
return button.trigger("click");
}
};
})(this));
@ -923,6 +921,9 @@ jQuery.extend( jQuery.easing,
}
if (this.ws.ws.readyState === 1 && !this.site_info) {
return this.reloadSiteInfo();
} else if (this.site_info) {
window.document.title = this.site_info.content.title + " - ZeroNet";
return this.log("Setting title to", window.document.title);
}
};