Skip to content

Commit 9be49f6

Browse files
shortcutmeshortcutme
committed
Firefox margin fix, New security tests
1 parent 196ece5 commit 9be49f6

File tree

5 files changed

+182
-97
lines changed

5 files changed

+182
-97
lines changed

‎content.json‎

Lines changed: 66 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -1,65 +1,69 @@
11
{
2-
"address": "1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr",
3-
"description": "This site",
4-
"domain": "ZeroNetwork.bit",
5-
"files": {
6-
"css/all.css": {
7-
"sha512": "c2f0e9d43f3fd5d379ad27d4c4a982f803dfc0bef6e71767ced924bd699bb794",
8-
"size": 82213
9-
},
10-
"favicon.ico": {
11-
"sha512": "4b16ceb40191f83af1286438e4b069ab613736a199d5c5cc32a44cd60051ca13",
12-
"size": 1150
13-
},
14-
"font/Roboto-Light.woff": {
15-
"sha512": "de3320e07959009e1301ef718bb0ea6761da9eac1f536245dccb1da4abf26b97",
16-
"size": 17564
17-
},
18-
"font/Roboto-Medium.woff": {
19-
"sha512": "ddaaa5ca7e11cde24b1f0f993e6cf5f9da8de0664af4cbbba46a5f2f1a0a3b18",
20-
"size": 18140
21-
},
22-
"font/TextMeOne-Regular.woff": {
23-
"sha512": "3ea7911d55424dcbb3be9939cd44f5cc92a90df869b5e9df019cbc8969f4f31e",
24-
"size": 13868
25-
},
26-
"img/loading.gif": {
27-
"sha512": "8a42b98962faea74618113166886be488c09dad10ca47fe97005edc5fb40cc00",
28-
"size": 723
29-
},
30-
"index.html": {
31-
"sha512": "25838b4420f34b85f1345c0e2e6c6b4c7e04eb43da41e04a1f45fd5dd3c51c8f",
32-
"size": 2721
33-
},
34-
"js/all.js": {
35-
"sha512": "c2ce2f397edd71049dc903004d06e8a224b066bb7b4b476693913ca60dfa5f5f",
36-
"size": 127281
37-
},
38-
"test/jquery.min.js": {
39-
"sha512": "eda31b5c7d371d4b3acced51fa92f27a417515317cf437aae09a47c3acc8a36b",
40-
"size": 84320
41-
},
42-
"test/render.html": {
43-
"sha512": "e09686abadfee90ca4b0b95a77021271157003da95abb0933b80b627bbb3860f",
44-
"size": 2626
45-
},
46-
"test/security.html": {
47-
"sha512": "a641685276ad0757bcffc0850ca2b98a900df9849f786b4d751a166241e9e858",
48-
"size": 1016
49-
},
50-
"test/stats.js": {
51-
"sha512": "a304ab798b9bbd1581f8aac90ea0b3b12a6ae2e9c7dd64846cd40ce0bbd099b3",
52-
"size": 3560
53-
}
2+
"address": "1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr",
3+
"description": "This site",
4+
"domain": "ZeroNetwork.bit",
5+
"files": {
6+
"css/all.css": {
7+
"sha512": "3ce05c1b154841b3c05f8793a140870eba2dfd7bc3e80fedfeec1eee279ee614",
8+
"size": 82381
549
},
55-
"ignore": "(js|css)/(?!all.(js|css))",
56-
"modified": 1438340221.598,
57-
"sign": [
58-
20991987358288928781472656342405888760101201405479282008342268910869438205152,
59-
82268914458815954583133595366093255563736271222992953956067279905568705779077
60-
],
61-
"signers_sign": null,
62-
"signs_required": 1,
63-
"title": "ZeroHello",
64-
"zeronet_version": "0.3.1"
10+
"favicon.ico": {
11+
"sha512": "4b16ceb40191f83af1286438e4b069ab613736a199d5c5cc32a44cd60051ca13",
12+
"size": 1150
13+
},
14+
"font/Roboto-Light.woff": {
15+
"sha512": "de3320e07959009e1301ef718bb0ea6761da9eac1f536245dccb1da4abf26b97",
16+
"size": 17564
17+
},
18+
"font/Roboto-Medium.woff": {
19+
"sha512": "ddaaa5ca7e11cde24b1f0f993e6cf5f9da8de0664af4cbbba46a5f2f1a0a3b18",
20+
"size": 18140
21+
},
22+
"font/TextMeOne-Regular.woff": {
23+
"sha512": "3ea7911d55424dcbb3be9939cd44f5cc92a90df869b5e9df019cbc8969f4f31e",
24+
"size": 13868
25+
},
26+
"img/loading.gif": {
27+
"sha512": "8a42b98962faea74618113166886be488c09dad10ca47fe97005edc5fb40cc00",
28+
"size": 723
29+
},
30+
"index.html": {
31+
"sha512": "95e530bcd77f1907bb44e4eb092a3c9e862df2667a9448669ab7a09615a5e68c",
32+
"size": 2427
33+
},
34+
"js/all.js": {
35+
"sha512": "e0d361fd45962a66f9627ab7e2348459a5c549d4b831019d69d6d4d841b80578",
36+
"size": 127842
37+
},
38+
"test/jquery.min.js": {
39+
"sha512": "eda31b5c7d371d4b3acced51fa92f27a417515317cf437aae09a47c3acc8a36b",
40+
"size": 84320
41+
},
42+
"test/render.html": {
43+
"sha512": "e09686abadfee90ca4b0b95a77021271157003da95abb0933b80b627bbb3860f",
44+
"size": 2626
45+
},
46+
"test/security.html": {
47+
"sha512": "ad0072ffad0626928b2093f2e76c3c92804e199086889b15e715078655579e5f",
48+
"size": 3322
49+
},
50+
"test/stats.js": {
51+
"sha512": "a304ab798b9bbd1581f8aac90ea0b3b12a6ae2e9c7dd64846cd40ce0bbd099b3",
52+
"size": 3560
53+
},
54+
"test/worker.js": {
55+
"sha512": "d6d4a1ca6da7dba9407d49696006203c1490c6950be7dae33186b232a2354737",
56+
"size": 170
57+
}
58+
},
59+
"ignore": "(js|css)/(?!all.(js|css))",
60+
"modified": 1446157245.305,
61+
"sign": [
62+
58598948272987971672880641261474506496946239807757113975467309956147036565622,
63+
37550783650406805114966245531828209064490731924026470826633990362051429177611
64+
],
65+
"signers_sign": null,
66+
"signs_required": 1,
67+
"title": "ZeroHello",
68+
"zeronet_version": "0.3.2"
6569
}

‎css/ZeroHello.css‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,8 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
9898
}
9999

100100
.site-container .hamburger {
101-
margin-left: -60px; position: relative; top: 30px; z-index: 1; transition: all 0.3s; padding: 14px 28px 0px 10px;
102-
text-decoration: none; color: white; font-size: 29px; line-height: 18px; opacity: 0;
101+
margin-left: -60px; position: relative; top: 30px; z-index: 1; transition: all 0.3s; padding: 14px 25px 0px 10px;
102+
text-decoration: none; color: white; font-size: 29px; line-height: 18px; opacity: 0; margin-right: 5px;
103103
}
104104
.site-container .hamburger:hover { opacity: 1 !important }
105105
.site-container .hamburger.menu-active { opacity: 1 !important }
@@ -115,7 +115,7 @@ ul, li { margin: 0px; padding: 0px; list-style-type: none }
115115
.site-small .title.long { font-size: 30px }
116116
.site-small .action { bottom: 15px; right: 15px }
117117
.site-small .bottom { bottom: 4px }
118-
.site-small .hamburger { margin-left: -55px; top: 25px; padding: 14px 23px 0px 10px }
118+
.site-small .hamburger { margin-left: -53px; top: 25px; padding: 14px 23px 0px 10px }
119119

120120

121121
/* Site events */

‎css/all.css‎

Lines changed: 4 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎js/all.js‎

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,12 @@
3030
@sort (a, b) ->
3131
[av, bv] = [a[key], b[key]]
3232
[av, bv] = [av.toLowerCase(), bv.toLowerCase()] if options.lower
33-
cmp av, bv
34-
*/
33+
cmp av, bv */
3534

3635
}).call(this);
3736

3837

38+
3939
/* ---- data/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/js/lib/ZeroFrame.coffee ---- */
4040

4141

@@ -150,6 +150,7 @@
150150
}).call(this);
151151

152152

153+
153154
/* ---- data/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/js/lib/identicon.js ---- */
154155

155156

@@ -344,6 +345,7 @@ jQuery.fx.step.scale = function(fx) {
344345
}).call(this);
345346

346347

348+
347349
/* ---- data/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/js/lib/jquery.easing.1.3.js ---- */
348350

349351

@@ -773,12 +775,12 @@ jQuery.extend( jQuery.easing,
773775
(function() {
774776
var Menu, SiteMenu,
775777
__slice = [].slice,
776-
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
777-
__hasProp = {}.hasOwnProperty;
778+
__hasProp = {}.hasOwnProperty,
779+
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
778780

779781
Menu = (function() {
780-
function Menu(_at_button) {
781-
this.button = _at_button;
782+
function Menu(button) {
783+
this.button = button;
782784
this.elem = $(".menu.template").clone().removeClass("template");
783785
this.elem.appendTo("body");
784786
}
@@ -891,14 +893,15 @@ jQuery.extend( jQuery.easing,
891893
}).call(this);
892894

893895

896+
894897
/* ---- data/1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr/js/ZeroHello.coffee ---- */
895898

896899

897900
(function() {
898901
var ZeroHello,
899902
__bind = function(fn, me){ return function(){ return fn.apply(me, arguments); }; },
900-
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
901903
__hasProp = {}.hasOwnProperty,
904+
__extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
902905
__indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
903906

904907
ZeroHello = (function(_super) {
@@ -916,9 +919,11 @@ jQuery.extend( jQuery.easing,
916919
this.is_proxy_request = document.location.host === "zero" || document.location.pathname === "/";
917920
this.cmd("wrapperGetLocalStorage", [], (function(_this) {
918921
return function(res) {
919-
if (res == null) {
922+
if (res != null) {
923+
res;
924+
} else {
920925
res = {};
921-
}
926+
};
922927
return _this.local_storage = res;
923928
};
924929
})(this));
@@ -967,11 +972,11 @@ jQuery.extend( jQuery.easing,
967972
if (secs < 60) {
968973
back = "Just now";
969974
} else if (secs < 60 * 60) {
970-
back = (Math.round(secs / 60)) + " minutes ago";
975+
back = "" + (Math.round(secs / 60)) + " minutes ago";
971976
} else if (secs < 60 * 60 * 24) {
972-
back = (Math.round(secs / 60 / 60)) + " hours ago";
977+
back = "" + (Math.round(secs / 60 / 60)) + " hours ago";
973978
} else if (secs < 60 * 60 * 24 * 3) {
974-
back = (Math.round(secs / 60 / 60 / 24)) + " days ago";
979+
back = "" + (Math.round(secs / 60 / 60 / 24)) + " days ago";
975980
} else {
976981
back = "on " + this.formatDate(time);
977982
}
@@ -1076,7 +1081,7 @@ jQuery.extend( jQuery.easing,
10761081
error = "Update failed";
10771082
}
10781083
} else if (site.tasks === 0 && site.bad_files > 0 && ((_ref5 = site.event) != null ? _ref5[0] : void 0) !== "file_done") {
1079-
error = site.bad_files + " file update failed";
1084+
error = "" + site.bad_files + " file update failed";
10801085
}
10811086
if (error) {
10821087
$(".notify", elem).text(error).removeClass("success").addClassLater("visible");

0 commit comments

Comments
 (0)