Merge js
This commit is contained in:
parent
95bf4ecb42
commit
a3546d56b0
1 changed files with 21 additions and 5 deletions
|
@ -55,6 +55,7 @@
|
||||||
|
|
||||||
}).call(this);
|
}).call(this);
|
||||||
|
|
||||||
|
|
||||||
/* ---- Console.coffee ---- */
|
/* ---- Console.coffee ---- */
|
||||||
|
|
||||||
|
|
||||||
|
@ -330,7 +331,7 @@
|
||||||
if (this.filter === "") {
|
if (this.filter === "") {
|
||||||
this.read_size = 32 * 1024;
|
this.read_size = 32 * 1024;
|
||||||
} else {
|
} else {
|
||||||
this.read_size = 1024 * 1024;
|
this.read_size = 5 * 1024 * 1024;
|
||||||
}
|
}
|
||||||
return this.loadConsoleText();
|
return this.loadConsoleText();
|
||||||
};
|
};
|
||||||
|
@ -436,6 +437,7 @@
|
||||||
|
|
||||||
}).call(this);
|
}).call(this);
|
||||||
|
|
||||||
|
|
||||||
/* ---- RateLimit.coffee ---- */
|
/* ---- RateLimit.coffee ---- */
|
||||||
|
|
||||||
|
|
||||||
|
@ -464,6 +466,7 @@
|
||||||
|
|
||||||
}).call(this);
|
}).call(this);
|
||||||
|
|
||||||
|
|
||||||
/* ---- Scrollable.js ---- */
|
/* ---- Scrollable.js ---- */
|
||||||
|
|
||||||
|
|
||||||
|
@ -601,9 +604,9 @@ window.initScrollable = function () {
|
||||||
this.globe = null;
|
this.globe = null;
|
||||||
this.preload_html = null;
|
this.preload_html = null;
|
||||||
this.original_set_site_info = this.wrapper.setSiteInfo;
|
this.original_set_site_info = this.wrapper.setSiteInfo;
|
||||||
if (false) {
|
if (window.top.location.hash === "#ZeroNet:OpenSidebar") {
|
||||||
this.startDrag();
|
this.startDrag();
|
||||||
this.moved();
|
this.moved("x");
|
||||||
this.fixbutton_targetx = this.fixbutton_initx - this.width;
|
this.fixbutton_targetx = this.fixbutton_initx - this.width;
|
||||||
this.stopDrag();
|
this.stopDrag();
|
||||||
}
|
}
|
||||||
|
@ -811,9 +814,9 @@ window.initScrollable = function () {
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
})(this));
|
})(this));
|
||||||
return this.tag.find("#privatekey-forgot").off("click, touchend").on("click touchend", (function(_this) {
|
return this.tag.find("#privatekey-forget").off("click, touchend").on("click touchend", (function(_this) {
|
||||||
return function(e) {
|
return function(e) {
|
||||||
_this.wrapper.displayConfirm("Remove saved private key for this site?", "Forgot", function(res) {
|
_this.wrapper.displayConfirm("Remove saved private key for this site?", "Forget", function(res) {
|
||||||
if (!res) {
|
if (!res) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -1013,6 +1016,18 @@ window.initScrollable = function () {
|
||||||
return false;
|
return false;
|
||||||
};
|
};
|
||||||
})(this));
|
})(this));
|
||||||
|
this.tag.find("#button-autodownload_previous").off("click touchend").on("click touchend", (function(_this) {
|
||||||
|
return function() {
|
||||||
|
_this.wrapper.ws.cmd("siteUpdate", {
|
||||||
|
"address": _this.wrapper.site_info.address,
|
||||||
|
"check_files": true
|
||||||
|
}, function() {
|
||||||
|
return _this.wrapper.notifications.add("done-download_optional", "done", "Optional files downloaded", 5000);
|
||||||
|
});
|
||||||
|
_this.wrapper.notifications.add("start-download_optional", "info", "Optional files download started", 5000);
|
||||||
|
return false;
|
||||||
|
};
|
||||||
|
})(this));
|
||||||
this.tag.find("#button-dbreload").off("click touchend").on("click touchend", (function(_this) {
|
this.tag.find("#button-dbreload").off("click touchend").on("click touchend", (function(_this) {
|
||||||
return function() {
|
return function() {
|
||||||
_this.wrapper.ws.cmd("dbReload", [], function() {
|
_this.wrapper.ws.cmd("dbReload", [], function() {
|
||||||
|
@ -1345,6 +1360,7 @@ window.initScrollable = function () {
|
||||||
|
|
||||||
}).call(this);
|
}).call(this);
|
||||||
|
|
||||||
|
|
||||||
/* ---- morphdom.js ---- */
|
/* ---- morphdom.js ---- */
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue