Skip to content

Commit

Permalink
Merge js
Browse files Browse the repository at this point in the history
  • Loading branch information
shortcutme committed Feb 7, 2020
1 parent 95bf4ec commit a3546d5
Showing 1 changed file with 21 additions and 5 deletions.
26 changes: 21 additions & 5 deletions plugins/Sidebar/media/all.js
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@

}).call(this);


/* ---- Console.coffee ---- */


Expand Down Expand Up @@ -330,7 +331,7 @@
if (this.filter === "") {
this.read_size = 32 * 1024;
} else {
this.read_size = 1024 * 1024;
this.read_size = 5 * 1024 * 1024;
}
return this.loadConsoleText();
};
Expand Down Expand Up @@ -436,6 +437,7 @@

}).call(this);


/* ---- RateLimit.coffee ---- */


Expand Down Expand Up @@ -464,6 +466,7 @@

}).call(this);


/* ---- Scrollable.js ---- */


Expand Down Expand Up @@ -601,9 +604,9 @@ window.initScrollable = function () {
this.globe = null;
this.preload_html = null;
this.original_set_site_info = this.wrapper.setSiteInfo;
if (false) {
if (window.top.location.hash === "#ZeroNet:OpenSidebar") {
this.startDrag();
this.moved();
this.moved("x");
this.fixbutton_targetx = this.fixbutton_initx - this.width;
this.stopDrag();
}
Expand Down Expand Up @@ -811,9 +814,9 @@ window.initScrollable = function () {
return false;
};
})(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) {
_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) {
return false;
}
Expand Down Expand Up @@ -1013,6 +1016,18 @@ window.initScrollable = function () {
return false;
};
})(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) {
return function() {
_this.wrapper.ws.cmd("dbReload", [], function() {
Expand Down Expand Up @@ -1345,6 +1360,7 @@ window.initScrollable = function () {

}).call(this);


/* ---- morphdom.js ---- */


Expand Down

0 comments on commit a3546d5

Please sign in to comment.