[Fmsystem-commits] [16008] update jqTree from upstream

[sigurdne]

Revision: 16008
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16008
Author:   sigurdne
Date:     2016-11-21 14:44:02 +0000 (Mon, 21 Nov 2016)
Log Message:
-----------
update jqTree from upstream

Modified Paths:
--------------
    trunk/phpgwapi/js/jquery/jqTree/lib/drag_and_drop_handler.js
    trunk/phpgwapi/js/jquery/jqTree/lib/node.js
    trunk/phpgwapi/js/jquery/jqTree/lib/save_state_handler.js
    trunk/phpgwapi/js/jquery/jqTree/lib/select_node_handler.js
    trunk/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js
    trunk/phpgwapi/js/jquery/jqTree/lib/version.js
    trunk/phpgwapi/js/jquery/jqTree/tree.jquery.js

Modified: trunk/phpgwapi/js/jquery/jqTree/lib/drag_and_drop_handler.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/lib/drag_and_drop_handler.js        
2016-11-18 15:26:00 UTC (rev 16007)
+++ trunk/phpgwapi/js/jquery/jqTree/lib/drag_and_drop_handler.js        
2016-11-21 14:44:02 UTC (rev 16008)
@@ -1,9 +1,11 @@
-var $, DragAndDropHandler, DragElement, HitAreasGenerator, Position, 
VisibleNodeIterator, node_module,
+var $, DragAndDropHandler, DragElement, HitAreasGenerator, Position, 
VisibleNodeIterator, node_module, util,
   extend = function(child, parent) { for (var key in parent) { if 
(hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { 
this.constructor = child; } ctor.prototype = parent.prototype; child.prototype 
= new ctor(); child.__super__ = parent.prototype; return child; },
   hasProp = {}.hasOwnProperty;
 
 node_module = require('./node');
 
+util = require('./util');
+
 Position = node_module.Position;
 
 $ = jQuery;
@@ -38,10 +40,16 @@
   };
 
   DragAndDropHandler.prototype.mouseStart = function(position_info) {
-    var offset;
+    var node, node_name, offset;
     this.refresh();
     offset = $(position_info.target).offset();
-    this.drag_element = new DragElement(this.current_item.node, 
position_info.page_x - offset.left, position_info.page_y - offset.top, 
this.tree_widget.element);
+    node = this.current_item.node;
+    if (this.tree_widget.options.autoEscape) {
+      node_name = util.html_escape(node.name);
+    } else {
+      node_name = node.name;
+    }
+    this.drag_element = new DragElement(node_name, position_info.page_x - 
offset.left, position_info.page_y - offset.top, this.tree_widget.element);
     this.is_dragging = true;
     this.current_item.$element.addClass('jqtree-moving');
     return true;
@@ -79,7 +87,7 @@
   };
 
   DragAndDropHandler.prototype.mustCaptureElement = function($element) {
-    return !$element.is('input,select');
+    return !$element.is('input,select,textarea');
   };
 
   DragAndDropHandler.prototype.canMoveToArea = function(area) {
@@ -451,10 +459,10 @@
 })(VisibleNodeIterator);
 
 DragElement = (function() {
-  function DragElement(node, offset_x, offset_y, $tree) {
+  function DragElement(node_name, offset_x, offset_y, $tree) {
     this.offset_x = offset_x;
     this.offset_y = offset_y;
-    this.$element = $("<span class=\"jqtree-title jqtree-dragging\">" + 
node.name + "</span>");
+    this.$element = $("<span class=\"jqtree-title jqtree-dragging\">" + 
node_name + "</span>");
     this.$element.css("position", "absolute");
     $tree.append(this.$element);
   }

Modified: trunk/phpgwapi/js/jquery/jqTree/lib/node.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/lib/node.js 2016-11-18 15:26:00 UTC (rev 
16007)
+++ trunk/phpgwapi/js/jquery/jqTree/lib/node.js 2016-11-21 14:44:02 UTC (rev 
16008)
@@ -325,10 +325,16 @@
   };
 
   Node.prototype.getNodeByName = function(name) {
+    return this.getNodeByCallback(function(node) {
+      return node.name === name;
+    });
+  };
+
+  Node.prototype.getNodeByCallback = function(callback) {
     var result;
     result = null;
     this.iterate(function(node) {
-      if (node.name === name) {
+      if (callback(node)) {
         result = node;
         return false;
       } else {

Modified: trunk/phpgwapi/js/jquery/jqTree/lib/save_state_handler.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/lib/save_state_handler.js   2016-11-18 
15:26:00 UTC (rev 16007)
+++ trunk/phpgwapi/js/jquery/jqTree/lib/save_state_handler.js   2016-11-21 
14:44:02 UTC (rev 16008)
@@ -200,7 +200,7 @@
   SaveStateHandler.prototype.supportsLocalStorage = function() {
     var testSupport;
     testSupport = function() {
-      var error, error1, key;
+      var error, key;
       if (typeof localStorage === "undefined" || localStorage === null) {
         return false;
       } else {

Modified: trunk/phpgwapi/js/jquery/jqTree/lib/select_node_handler.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/lib/select_node_handler.js  2016-11-18 
15:26:00 UTC (rev 16007)
+++ trunk/phpgwapi/js/jquery/jqTree/lib/select_node_handler.js  2016-11-21 
14:44:02 UTC (rev 16008)
@@ -55,8 +55,14 @@
   };
 
   SelectNodeHandler.prototype.isNodeSelected = function(node) {
-    if (node.id) {
-      return this.selected_nodes[node.id];
+    if (!node) {
+      return false;
+    } else if (node.id) {
+      if (this.selected_nodes[node.id]) {
+        return true;
+      } else {
+        return false;
+      }
     } else if (this.selected_single_node) {
       return this.selected_single_node.element === node.element;
     } else {

Modified: trunk/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js  2016-11-18 15:26:00 UTC 
(rev 16007)
+++ trunk/phpgwapi/js/jquery/jqTree/lib/tree.jquery.js  2016-11-21 14:44:02 UTC 
(rev 16008)
@@ -1,10 +1,10 @@
-var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer, 
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler, 
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler, 
SelectNodeHandler, SimpleWidget, __version__, node_module, ref, ref1, 
util_module,
+var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer, 
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler, 
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler, 
SelectNodeHandler, SimpleWidget, __version__, drag_and_drop_handler, 
node_module, ref, util_module,
   extend = function(child, parent) { for (var key in parent) { if 
(hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { 
this.constructor = child; } ctor.prototype = parent.prototype; child.prototype 
= new ctor(); child.__super__ = parent.prototype; return child; },
   hasProp = {}.hasOwnProperty;
 
 __version__ = require('./version');
 
-ref = require('./drag_and_drop_handler'), DragAndDropHandler = 
ref.DragAndDropHandler, DragElement = ref.DragElement, HitAreasGenerator = 
ref.HitAreasGenerator;
+drag_and_drop_handler = require('./drag_and_drop_handler');
 
 ElementsRenderer = require('./elements_renderer');
 
@@ -28,8 +28,10 @@
 
 util_module = require('./util');
 
-ref1 = require('./node_element'), BorderDropHint = ref1.BorderDropHint, 
FolderElement = ref1.FolderElement, GhostDropHint = ref1.GhostDropHint, 
NodeElement = ref1.NodeElement;
+ref = require('./node_element'), BorderDropHint = ref.BorderDropHint, 
FolderElement = ref.FolderElement, GhostDropHint = ref.GhostDropHint, 
NodeElement = ref.NodeElement;
 
+DragAndDropHandler = drag_and_drop_handler.DragAndDropHandler, DragElement = 
drag_and_drop_handler.DragElement, HitAreasGenerator = 
drag_and_drop_handler.HitAreasGenerator;
+
 $ = jQuery;
 
 JqTreeWidget = (function(superClass) {
@@ -366,14 +368,24 @@
     return this.tree.getNodesByProperty(key, value);
   };
 
+  JqTreeWidget.prototype.getNodeByHtmlElement = function(element) {
+    return this._getNode($(element));
+  };
+
+  JqTreeWidget.prototype.getNodeByCallback = function(callback) {
+    return this.tree.getNodeByCallback(callback);
+  };
+
   JqTreeWidget.prototype.openNode = function(node, slide) {
     if (slide == null) {
       slide = null;
     }
-    if (slide === null) {
-      slide = this.options.slide;
+    if (node) {
+      if (slide === null) {
+        slide = this.options.slide;
+      }
+      this._openNode(node, slide);
     }
-    this._openNode(node, slide);
     return this.element;
   };
 
@@ -505,9 +517,11 @@
     if (id_is_changed) {
       this.tree.addNodeToIndex(node);
     }
-    if (typeof data === 'object' && data.children && data.children.length) {
+    if (typeof data === 'object' && data.children) {
       node.removeChildren();
-      node.loadFromData(data.children);
+      if (data.children.length) {
+        node.loadFromData(data.children);
+      }
     }
     this.renderer.renderFromNode(node);
     this._selectCurrentNode();
@@ -639,10 +653,16 @@
   };
 
   JqTreeWidget.prototype._initData = function() {
+    var data_url;
     if (this.options.data) {
       return this._loadData(this.options.data);
     } else {
-      return this._loadDataFromUrl(this._getDataUrlInfo());
+      data_url = this._getDataUrlInfo();
+      if (data_url) {
+        return this._loadDataFromUrl();
+      } else {
+        return this._loadData([]);
+      }
     }
   };
 
@@ -714,7 +734,7 @@
   };
 
   JqTreeWidget.prototype._setInitialState = function() {
-    var autoOpenNodes, is_restored, must_load_on_demand, ref2, restoreState;
+    var autoOpenNodes, is_restored, must_load_on_demand, ref1, restoreState;
     restoreState = (function(_this) {
       return function() {
         var must_load_on_demand, state;
@@ -753,7 +773,7 @@
         return must_load_on_demand;
       };
     })(this);
-    ref2 = restoreState(), is_restored = ref2[0], must_load_on_demand = 
ref2[1];
+    ref1 = restoreState(), is_restored = ref1[0], must_load_on_demand = 
ref1[1];
     if (!is_restored) {
       must_load_on_demand = autoOpenNodes();
     }
@@ -1052,7 +1072,8 @@
   var modules;
   modules = {
     'node': node_module,
-    'util': util_module
+    'util': util_module,
+    'drag_and_drop_handler': drag_and_drop_handler
   };
   return modules[name];
 };

Modified: trunk/phpgwapi/js/jquery/jqTree/lib/version.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/lib/version.js      2016-11-18 15:26:00 UTC 
(rev 16007)
+++ trunk/phpgwapi/js/jquery/jqTree/lib/version.js      2016-11-21 14:44:02 UTC 
(rev 16008)
@@ -1 +1 @@
-module.exports = '1.3.3';
+module.exports = '1.3.6';

Modified: trunk/phpgwapi/js/jquery/jqTree/tree.jquery.js
===================================================================
--- trunk/phpgwapi/js/jquery/jqTree/tree.jquery.js      2016-11-18 15:26:00 UTC 
(rev 16007)
+++ trunk/phpgwapi/js/jquery/jqTree/tree.jquery.js      2016-11-21 14:44:02 UTC 
(rev 16008)
@@ -1,5 +1,5 @@
 /*
-JqTree 1.3.3
+JqTree 1.3.6
 
 Copyright 2015 Marco Braak
 
@@ -16,12 +16,14 @@
 limitations under the License.
 */
 (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof 
require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);var 
f=new Error("Cannot find module '"+o+"'");throw f.code="MODULE_NOT_FOUND",f}var 
l=n[o]={exports:{}};t[o][0].call(l.exports,function(e){var n=t[o][1][e];return 
s(n?n:e)},l,l.exports,e,t,n,r)}return n[o].exports}var i=typeof 
require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return 
s})({1:[function(require,module,exports){
-var $, DragAndDropHandler, DragElement, HitAreasGenerator, Position, 
VisibleNodeIterator, node_module,
+var $, DragAndDropHandler, DragElement, HitAreasGenerator, Position, 
VisibleNodeIterator, node_module, util,
   extend = function(child, parent) { for (var key in parent) { if 
(hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { 
this.constructor = child; } ctor.prototype = parent.prototype; child.prototype 
= new ctor(); child.__super__ = parent.prototype; return child; },
   hasProp = {}.hasOwnProperty;
 
 node_module = require('./node');
 
+util = require('./util');
+
 Position = node_module.Position;
 
 $ = jQuery;
@@ -56,10 +58,16 @@
   };
 
   DragAndDropHandler.prototype.mouseStart = function(position_info) {
-    var offset;
+    var node, node_name, offset;
     this.refresh();
     offset = $(position_info.target).offset();
-    this.drag_element = new DragElement(this.current_item.node, 
position_info.page_x - offset.left, position_info.page_y - offset.top, 
this.tree_widget.element);
+    node = this.current_item.node;
+    if (this.tree_widget.options.autoEscape) {
+      node_name = util.html_escape(node.name);
+    } else {
+      node_name = node.name;
+    }
+    this.drag_element = new DragElement(node_name, position_info.page_x - 
offset.left, position_info.page_y - offset.top, this.tree_widget.element);
     this.is_dragging = true;
     this.current_item.$element.addClass('jqtree-moving');
     return true;
@@ -97,7 +105,7 @@
   };
 
   DragAndDropHandler.prototype.mustCaptureElement = function($element) {
-    return !$element.is('input,select');
+    return !$element.is('input,select,textarea');
   };
 
   DragAndDropHandler.prototype.canMoveToArea = function(area) {
@@ -469,10 +477,10 @@
 })(VisibleNodeIterator);
 
 DragElement = (function() {
-  function DragElement(node, offset_x, offset_y, $tree) {
+  function DragElement(node_name, offset_x, offset_y, $tree) {
     this.offset_x = offset_x;
     this.offset_y = offset_y;
-    this.$element = $("<span class=\"jqtree-title jqtree-dragging\">" + 
node.name + "</span>");
+    this.$element = $("<span class=\"jqtree-title jqtree-dragging\">" + 
node_name + "</span>");
     this.$element.css("position", "absolute");
     $tree.append(this.$element);
   }
@@ -498,7 +506,7 @@
   HitAreasGenerator: HitAreasGenerator
 };
 
-},{"./node":5}],2:[function(require,module,exports){
+},{"./node":5,"./util":12}],2:[function(require,module,exports){
 var $, ElementsRenderer, NodeElement, html_escape, node_element, util;
 
 node_element = require('./node_element');
@@ -1363,10 +1371,16 @@
   };
 
   Node.prototype.getNodeByName = function(name) {
+    return this.getNodeByCallback(function(node) {
+      return node.name === name;
+    });
+  };
+
+  Node.prototype.getNodeByCallback = function(callback) {
     var result;
     result = null;
     this.iterate(function(node) {
-      if (node.name === name) {
+      if (callback(node)) {
         result = node;
         return false;
       } else {
@@ -2050,7 +2064,7 @@
   SaveStateHandler.prototype.supportsLocalStorage = function() {
     var testSupport;
     testSupport = function() {
-      var error, error1, key;
+      var error, key;
       if (typeof localStorage === "undefined" || localStorage === null) {
         return false;
       } else {
@@ -2285,8 +2299,14 @@
   };
 
   SelectNodeHandler.prototype.isNodeSelected = function(node) {
-    if (node.id) {
-      return this.selected_nodes[node.id];
+    if (!node) {
+      return false;
+    } else if (node.id) {
+      if (this.selected_nodes[node.id]) {
+        return true;
+      } else {
+        return false;
+      }
     } else if (this.selected_single_node) {
       return this.selected_single_node.element === node.element;
     } else {
@@ -2462,13 +2482,13 @@
 module.exports = SimpleWidget;
 
 },{}],11:[function(require,module,exports){
-var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer, 
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler, 
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler, 
SelectNodeHandler, SimpleWidget, __version__, node_module, ref, ref1, 
util_module,
+var $, BorderDropHint, DragAndDropHandler, DragElement, ElementsRenderer, 
FolderElement, GhostDropHint, HitAreasGenerator, JqTreeWidget, KeyHandler, 
MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler, 
SelectNodeHandler, SimpleWidget, __version__, drag_and_drop_handler, 
node_module, ref, util_module,
   extend = function(child, parent) { for (var key in parent) { if 
(hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { 
this.constructor = child; } ctor.prototype = parent.prototype; child.prototype 
= new ctor(); child.__super__ = parent.prototype; return child; },
   hasProp = {}.hasOwnProperty;
 
 __version__ = require('./version');
 
-ref = require('./drag_and_drop_handler'), DragAndDropHandler = 
ref.DragAndDropHandler, DragElement = ref.DragElement, HitAreasGenerator = 
ref.HitAreasGenerator;
+drag_and_drop_handler = require('./drag_and_drop_handler');
 
 ElementsRenderer = require('./elements_renderer');
 
@@ -2492,8 +2512,10 @@
 
 util_module = require('./util');
 
-ref1 = require('./node_element'), BorderDropHint = ref1.BorderDropHint, 
FolderElement = ref1.FolderElement, GhostDropHint = ref1.GhostDropHint, 
NodeElement = ref1.NodeElement;
+ref = require('./node_element'), BorderDropHint = ref.BorderDropHint, 
FolderElement = ref.FolderElement, GhostDropHint = ref.GhostDropHint, 
NodeElement = ref.NodeElement;
 
+DragAndDropHandler = drag_and_drop_handler.DragAndDropHandler, DragElement = 
drag_and_drop_handler.DragElement, HitAreasGenerator = 
drag_and_drop_handler.HitAreasGenerator;
+
 $ = jQuery;
 
 JqTreeWidget = (function(superClass) {
@@ -2830,14 +2852,24 @@
     return this.tree.getNodesByProperty(key, value);
   };
 
+  JqTreeWidget.prototype.getNodeByHtmlElement = function(element) {
+    return this._getNode($(element));
+  };
+
+  JqTreeWidget.prototype.getNodeByCallback = function(callback) {
+    return this.tree.getNodeByCallback(callback);
+  };
+
   JqTreeWidget.prototype.openNode = function(node, slide) {
     if (slide == null) {
       slide = null;
     }
-    if (slide === null) {
-      slide = this.options.slide;
+    if (node) {
+      if (slide === null) {
+        slide = this.options.slide;
+      }
+      this._openNode(node, slide);
     }
-    this._openNode(node, slide);
     return this.element;
   };
 
@@ -2969,9 +3001,11 @@
     if (id_is_changed) {
       this.tree.addNodeToIndex(node);
     }
-    if (typeof data === 'object' && data.children && data.children.length) {
+    if (typeof data === 'object' && data.children) {
       node.removeChildren();
-      node.loadFromData(data.children);
+      if (data.children.length) {
+        node.loadFromData(data.children);
+      }
     }
     this.renderer.renderFromNode(node);
     this._selectCurrentNode();
@@ -3103,10 +3137,16 @@
   };
 
   JqTreeWidget.prototype._initData = function() {
+    var data_url;
     if (this.options.data) {
       return this._loadData(this.options.data);
     } else {
-      return this._loadDataFromUrl(this._getDataUrlInfo());
+      data_url = this._getDataUrlInfo();
+      if (data_url) {
+        return this._loadDataFromUrl();
+      } else {
+        return this._loadData([]);
+      }
     }
   };
 
@@ -3178,7 +3218,7 @@
   };
 
   JqTreeWidget.prototype._setInitialState = function() {
-    var autoOpenNodes, is_restored, must_load_on_demand, ref2, restoreState;
+    var autoOpenNodes, is_restored, must_load_on_demand, ref1, restoreState;
     restoreState = (function(_this) {
       return function() {
         var must_load_on_demand, state;
@@ -3217,7 +3257,7 @@
         return must_load_on_demand;
       };
     })(this);
-    ref2 = restoreState(), is_restored = ref2[0], must_load_on_demand = 
ref2[1];
+    ref1 = restoreState(), is_restored = ref1[0], must_load_on_demand = 
ref1[1];
     if (!is_restored) {
       must_load_on_demand = autoOpenNodes();
     }
@@ -3516,7 +3556,8 @@
   var modules;
   modules = {
     'node': node_module,
-    'util': util_module
+    'util': util_module,
+    'drag_and_drop_handler': drag_and_drop_handler
   };
   return modules[name];
 };
@@ -3570,6 +3611,6 @@
 };
 
 },{}],13:[function(require,module,exports){
-module.exports = '1.3.3';
+module.exports = '1.3.6';
 
 },{}]},{},[11]);