Changeset 3815:267811f4aafb for admin/js/common.js

Timestamp:

08/22/18 11:57:07 (7 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Avoid uninstanciable options for the expandContent utility

File:

• admin/js/common.js (modified) (1 diff)

admin/js/common.js

@@ -164 +164 @@
 (function($) {
   $.expandContent = function(opts) {
-    var defaults = {};
-    $.expandContent.options = $.extend({}, defaults, opts);
     if (opts == undefined || opts.callback == undefined || !$.isFunction(opts.callback)) {
       return;
     }
     if (opts.line != undefined) {
-      multipleExpander(opts.line, opts.lines);
+      multipleExpander(opts.line, opts.lines, opts.callback);
     }
     opts.lines.each(function() {
-      singleExpander(this);
-    });
-  };
-  var singleExpander = function singleExpander(line) {
+      singleExpander(this, opts.callback);
+    });
+  };
+  var singleExpander = function singleExpander(line, callback) {
     $('<input class="details-cmd" type="submit" value="' + dotclear.img_plus_txt + '" aria-label="' + dotclear.img_plus_alt + '"/>').click(function(e) {
       toggleArrow(this);
-      $.expandContent.options.callback.call(this, line);
+      callback(line);
       e.preventDefault();
     }).prependTo($(line).children().get(0)); // first td
   };
-  var multipleExpander = function multipleExpander(line, lines) {
+  var multipleExpander = function multipleExpander(line, lines, callback) {
     $('<input class="details-cmd" type="submit" value="' + dotclear.img_plus_txt + '" aria-label="' + dotclear.img_plus_alt + '"/>').click(function(e) {
-      var that = this;
       var action = toggleArrow(this);
       lines.each(function() {
         toggleArrow(this.firstChild.firstChild, action);
-        $.expandContent.options.callback.call(that, this, action);
+        callback(this, action);
       });
       e.preventDefault();