Item15175: fixed multiple jquery.loader on the same page

foswiki · Jan 17, 2023 · e356e7b · e356e7b
1 parent 12654ee
commit e356e7b
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/LOADER.pm b/JQueryPlugin/lib/Foswiki/Plugins/JQueryPlugin/LOADER.pm
@@ -30,7 +30,7 @@ sub new {
 __END__
 Foswiki - The Free and Open Source Wiki, http://foswiki.org/
 
-Copyright (C) 2011-2022 Foswiki Contributors. Foswiki Contributors
+Copyright (C) 2011-2023 Foswiki Contributors. Foswiki Contributors
 are listed in the AUTHORS file in the root of this distribution.
 NOTE: Please extend that file, not this notice.
 

diff --git a/JQueryPlugin/pub/System/JQueryPlugin/plugins/loader/jquery.loader.uncompressed.js b/JQueryPlugin/pub/System/JQueryPlugin/plugins/loader/jquery.loader.uncompressed.js
@@ -1,7 +1,7 @@
 /*
- * jQuery Loader plugin 4.60
+ * jQuery Loader plugin 4.70
  *
- * Copyright (c) 2011-2022 Foswiki Contributors http://foswiki.org
+ * Copyright (c) 2011-2023 Foswiki Contributors http://foswiki.org
  *
  * Dual licensed under the MIT and GPL licenses:
  *   http://www.opensource.org/licenses/mit-license.php
@@ -78,8 +78,8 @@
     var self = this;
 
     // add refresh listener
-    self.elem.on("refresh.jqloader", function(ev, opts) {
-      $.extend(self.opts, opts);
+    self.elem.on("refresh.jqloader", function(ev, params) {
+      self.opts.params = $.extend({}, self.opts.params, params);
       self.loadAfter(0);
       ev.stopPropagation();
     });