From b05d4e3d9ff2803b28dd68d807b57500f8c3078f Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Sun, 28 Feb 2021 21:50:05 +0300 Subject: speed up plugin updating a bit, fix some phpstan warnings --- js/PrefHelpers.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'js/PrefHelpers.js') diff --git a/js/PrefHelpers.js b/js/PrefHelpers.js index 5450bd98c..d2f74d421 100644 --- a/js/PrefHelpers.js +++ b/js/PrefHelpers.js @@ -1,7 +1,7 @@ 'use strict'; /* eslint-disable no-new */ -/* global __, dijit, dojo, Tables, xhrPost, Notify, xhr, App, fox */ +/* global __, dijit, dojo, Tables, Notify, xhr, App, fox */ const Helpers = { AppPasswords: { @@ -327,6 +327,7 @@ const Helpers = { const dialog = new fox.SingleUseDialog({ title: __("Plugin Updater"), need_refresh: false, + plugins_to_update: [], onHide: function() { if (this.need_refresh) { Helpers.Prefs.refresh(); @@ -335,10 +336,12 @@ const Helpers = { performUpdate: function() { const container = dialog.domNode.querySelector(".update-results"); + console.log('updating', dialog.plugins_to_update); + container.innerHTML = `
  • ${__("Updating, please wait...")}
  • `; let enable_update_btn = false; - xhr.json("backend.php", {op: "pref-prefs", method: "updateLocalPlugins", name: name}, (reply) => { + xhr.json("backend.php", {op: "pref-prefs", method: "updateLocalPlugins", plugins: dialog.plugins_to_update.join(",")}, (reply) => { if (!reply) { container.innerHTML = `
  • ${__("Operation failed: check event log.")}
  • `; @@ -392,9 +395,13 @@ const Helpers = { } else { container.innerHTML = ""; + dialog.plugins_to_update = []; + reply.forEach((p) => { - if (p.rv.s == 0) + if (p.rv.s == 0) { enable_update_btn = true; + dialog.plugins_to_update.push(p.plugin); + } container.innerHTML += ` -- cgit v1.2.3