jqtree-rails 0.1.4.3 → 0.1.5.0

data/build

@@ -0,0 +1,3 @@
+cp jqTree/jqtree-circle.png vendor/assets/images
+cp jqTree/tree.jquery.js vendor/assets/javascripts
+cp jqTree/jqtree.css vendor/assets/stylesheets

data/lib/jqtree/rails/version.rb

@@ -1,6 +1,6 @@
 module JqTree
   module Rails
-    VERSION = "0.1.4.3"
-    JQTREE_VERSION = "0.14"
+    VERSION = "0.1.5.0"
+    JQTREE_VERSION = "0.15"
   end
 end

data/vendor/assets/javascripts/tree.jquery.js

@@ -1,7 +1,7 @@
-// Generated by CoffeeScript 1.4.0
+// Generated by CoffeeScript 1.6.1
 
 /*
-Copyright 2012 Marco Braak
+Copyright 2013 Marco Braak
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ limitations under the License.
 
 
 (function() {
-  var $, BorderDropHint, DragAndDropHandler, DragElement, FolderElement, GhostDropHint, JqTreeWidget, MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler, SelectNodeHandler, SimpleWidget, TRIANGLE_DOWN, TRIANGLE_RIGHT, Tree, html_escape, indexOf, json_escapable, json_meta, json_quote, json_str,
+  var $, BorderDropHint, DragAndDropHandler, DragElement, FolderElement, GhostDropHint, JqTreeWidget, MouseWidget, Node, NodeElement, Position, SaveStateHandler, ScrollHandler, SelectNodeHandler, SimpleWidget, TRIANGLE_DOWN, TRIANGLE_RIGHT, html_escape, indexOf, json_escapable, json_meta, json_quote, json_str, _indexOf,
     __slice = [].slice,
     __hasProp = {}.hasOwnProperty,
     __extends = 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; };
@@ -230,12 +230,16 @@ limitations under the License.
       return null;
     };
 
+    MouseWidget.prototype.setMouseDelay = function(mouse_delay) {
+      return this.mouse_delay = mouse_delay;
+    };
+
     return MouseWidget;
 
   })(SimpleWidget);
 
   /*
-  Copyright 2012 Marco Braak
+  Copyright 2013 Marco Braak
   
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -255,23 +259,29 @@ limitations under the License.
 
   $ = this.jQuery;
 
-  indexOf = function(array, item) {
+  _indexOf = function(array, item) {
     var i, value, _i, _len;
+    for (i = _i = 0, _len = array.length; _i < _len; i = ++_i) {
+      value = array[i];
+      if (value === item) {
+        return i;
+      }
+    }
+    return -1;
+  };
+
+  indexOf = function(array, item) {
     if (array.indexOf) {
       return array.indexOf(item);
     } else {
-      for (i = _i = 0, _len = array.length; _i < _len; i = ++_i) {
-        value = array[i];
-        if (value === item) {
-          return i;
-        }
-      }
-      return -1;
+      return _indexOf(array, item);
     }
   };
 
   this.Tree.indexOf = indexOf;
 
+  this.Tree._indexOf = _indexOf;
+
   if (!((this.JSON != null) && (this.JSON.stringify != null) && typeof this.JSON.stringify === 'function')) {
     json_escapable = /[\\\"\x00-\x1f\x7f-\x9f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
     json_meta = {
@@ -333,7 +343,7 @@ limitations under the License.
           return (partial.length === 0 ? '{}' : '{' + partial.join(',') + '}');
       }
     };
-    if (!(this.JSON != null)) {
+    if (this.JSON == null) {
       this.JSON = {};
     }
     this.JSON.stringify = function(value) {
@@ -376,10 +386,21 @@ limitations under the License.
 
   Node = (function() {
 
-    function Node(o) {
+    function Node(o, is_root, node_class) {
+      if (is_root == null) {
+        is_root = false;
+      }
+      if (node_class == null) {
+        node_class = Node;
+      }
       this.setData(o);
       this.children = [];
       this.parent = null;
+      if (is_root) {
+        this.id_mapping = {};
+        this.tree = this;
+        this.node_class = node_class;
+      }
     }
 
     Node.prototype.setData = function(o) {
@@ -413,7 +434,7 @@ limitations under the License.
         var child, node, _i, _len;
         for (_i = 0, _len = children_data.length; _i < _len; _i++) {
           child = children_data[_i];
-          node = new Node('');
+          node = new _this.tree.node_class('');
           node.initFromData(child);
           _this.addChild(node);
         }
@@ -424,30 +445,30 @@ limitations under the License.
     };
 
     /*
-        Create tree from data.
+    Create tree from data.
     
-        Structure of data is:
-        [
-            {
-                label: 'node1',
-                children: [
-                    { label: 'child1' },
-                    { label: 'child2' }
-                ]
-            },
-            {
-                label: 'node2'
-            }
-        ]
+    Structure of data is:
+    [
+        {
+            label: 'node1',
+            children: [
+                { label: 'child1' },
+                { label: 'child2' }
+            ]
+        },
+        {
+            label: 'node2'
+        }
+    ]
     */
 
 
     Node.prototype.loadFromData = function(data) {
       var node, o, _i, _len;
-      this.children = [];
+      this.removeChildren();
       for (_i = 0, _len = data.length; _i < _len; _i++) {
         o = data[_i];
-        node = new Node(o);
+        node = new this.tree.node_class(o);
         this.addChild(node);
         if (typeof o === 'object' && o.children) {
           node.loadFromData(o.children);
@@ -457,11 +478,11 @@ limitations under the License.
     };
 
     /*
-        Add child.
+    Add child.
     
-        tree.addChild(
-            new Node('child1')
-        );
+    tree.addChild(
+        new Node('child1')
+    );
     */
 
 
@@ -471,12 +492,12 @@ limitations under the License.
     };
 
     /*
-        Add child at position. Index starts at 0.
+    Add child at position. Index starts at 0.
     
-        tree.addChildAtPosition(
-            new Node('abc'),
-            1
-        );
+    tree.addChildAtPosition(
+        new Node('abc'),
+        1
+    );
     */
 
 
@@ -492,26 +513,26 @@ limitations under the License.
     };
 
     /*
-        Remove child.
+    Remove child. This also removes the children of the node.
     
-        tree.removeChild(tree.children[0]);
+    tree.removeChild(tree.children[0]);
     */
 
 
     Node.prototype.removeChild = function(node) {
-      var _this = this;
-      node.iterate(function(child) {
-        _this.tree.removeNodeFromIndex(child);
-        return true;
-      });
+      node.removeChildren();
+      return this._removeChild(node);
+    };
+
+    Node.prototype._removeChild = function(node) {
       this.children.splice(this.getChildIndex(node), 1);
       return this.tree.removeNodeFromIndex(node);
     };
 
     /*
-        Get child index.
+    Get child index.
     
-        var index = getChildIndex(node);
+    var index = getChildIndex(node);
     */
 
 
@@ -520,11 +541,11 @@ limitations under the License.
     };
 
     /*
-        Does the tree have children?
+    Does the tree have children?
     
-        if (tree.hasChildren()) {
-            //
-        }
+    if (tree.hasChildren()) {
+        //
+    }
     */
 
 
@@ -537,20 +558,20 @@ limitations under the License.
     };
 
     /*
-        Iterate over all the nodes in the tree.
+    Iterate over all the nodes in the tree.
     
-        Calls callback with (node, level).
+    Calls callback with (node, level).
     
-        The callback must return true to continue the iteration on current node.
+    The callback must return true to continue the iteration on current node.
     
-        tree.iterate(
-            function(node, level) {
-               console.log(node.name);
+    tree.iterate(
+        function(node, level) {
+           console.log(node.name);
     
-               // stop iteration after level 2
-               return (level <= 2);
-            }
-        );
+           // stop iteration after level 2
+           return (level <= 2);
+        }
+    );
     */
 
 
@@ -576,12 +597,12 @@ limitations under the License.
     };
 
     /*
-        Move node relative to another node.
+    Move node relative to another node.
     
-        Argument position: Position.BEFORE, Position.AFTER or Position.Inside
+    Argument position: Position.BEFORE, Position.AFTER or Position.Inside
     
-        // move node1 after node2
-        tree.moveNode(node1, node2, Position.AFTER);
+    // move node1 after node2
+    tree.moveNode(node1, node2, Position.AFTER);
     */
 
 
@@ -589,7 +610,7 @@ limitations under the License.
       if (moved_node.isParentOf(target_node)) {
         return;
       }
-      moved_node.parent.removeChild(moved_node);
+      moved_node.parent._removeChild(moved_node);
       if (position === Position.AFTER) {
         return target_node.parent.addChildAtPosition(moved_node, target_node.parent.getChildIndex(target_node) + 1);
       } else if (position === Position.BEFORE) {
@@ -600,7 +621,7 @@ limitations under the License.
     };
 
     /*
-        Get the tree as data.
+    Get the tree as data.
     */
 
 
@@ -648,7 +669,7 @@ limitations under the License.
       if (!this.parent) {
         return null;
       } else {
-        node = new Node(node_info);
+        node = new this.tree.node_class(node_info);
         child_index = this.parent.getChildIndex(this);
         this.parent.addChildAtPosition(node, child_index + 1);
         return node;
@@ -660,9 +681,10 @@ limitations under the License.
       if (!this.parent) {
         return null;
       } else {
-        node = new Node(node_info);
+        node = new this.tree.node_class(node_info);
         child_index = this.parent.getChildIndex(this);
-        return this.parent.addChildAtPosition(node, child_index);
+        this.parent.addChildAtPosition(node, child_index);
+        return node;
       }
     };
 
@@ -671,7 +693,7 @@ limitations under the License.
       if (!this.parent) {
         return null;
       } else {
-        new_parent = new Node(node_info);
+        new_parent = new this.tree.node_class(node_info);
         new_parent._setParent(this.tree);
         original_parent = this.parent;
         _ref = original_parent.children;
@@ -694,14 +716,14 @@ limitations under the License.
 
     Node.prototype.append = function(node_info) {
       var node;
-      node = new Node(node_info);
+      node = new this.tree.node_class(node_info);
       this.addChild(node);
       return node;
     };
 
     Node.prototype.prepend = function(node_info) {
       var node;
-      node = new Node(node_info);
+      node = new this.tree.node_class(node_info);
       this.addChildAtPosition(node, 0);
       return node;
     };
@@ -718,41 +740,45 @@ limitations under the License.
       return false;
     };
 
-    return Node;
-
-  })();
-
-  Tree = (function(_super) {
-
-    __extends(Tree, _super);
-
-    function Tree(o) {
-      Tree.__super__.constructor.call(this, o, null, true);
-      this.id_mapping = {};
-      this.tree = this;
-    }
+    Node.prototype.getLevel = function() {
+      var level, node;
+      level = 0;
+      node = this;
+      while (node.parent) {
+        level += 1;
+        node = node.parent;
+      }
+      return level;
+    };
 
-    Tree.prototype.getNodeById = function(node_id) {
+    Node.prototype.getNodeById = function(node_id) {
       return this.id_mapping[node_id];
     };
 
-    Tree.prototype.addNodeToIndex = function(node) {
+    Node.prototype.addNodeToIndex = function(node) {
       if (node.id) {
         return this.id_mapping[node.id] = node;
       }
     };
 
-    Tree.prototype.removeNodeFromIndex = function(node) {
+    Node.prototype.removeNodeFromIndex = function(node) {
       if (node.id) {
         return delete this.id_mapping[node.id];
       }
     };
 
-    return Tree;
+    Node.prototype.removeChildren = function() {
+      var _this = this;
+      this.iterate(function(child) {
+        _this.tree.removeNodeFromIndex(child);
+        return true;
+      });
+      return this.children = [];
+    };
 
-  })(Node);
+    return Node;
 
-  this.Tree.Tree = Tree;
+  })();
 
   this.Tree.Node = Node;
 
@@ -780,9 +806,11 @@ limitations under the License.
       onIsMoveHandle: null,
       onCanMove: null,
       onCanMoveTo: null,
+      onLoadFailed: null,
       autoEscape: true,
       dataUrl: null,
-      slide: true
+      slide: true,
+      nodeClass: Node
     };
 
     JqTreeWidget.prototype.toggle = function(node, slide) {
@@ -813,24 +841,42 @@ limitations under the License.
     };
 
     JqTreeWidget.prototype.loadData = function(data, parent_node) {
-      return this._loadData(data, parent_node);
+      this._loadData(data, parent_node);
+      if (!parent_node) {
+        return this.selected_node = null;
+      }
+    };
+
+    JqTreeWidget.prototype.loadDataFromUrl = function(url, parent_node, on_finished) {
+      if ($.type(url) !== 'string') {
+        parent_node = url;
+        on_finished = parent_node;
+        url = null;
+        on_finished = null;
+      }
+      this._loadDataFromUrl(url, parent_node, on_finished);
+      if (!parent_node) {
+        return this.selected_node = null;
+      }
     };
 
-    JqTreeWidget.prototype.loadDataFromUrl = function(url_info, parent_node, on_finished) {
-      var $li, addLoadingClass, parseUrlInfo, removeLoadingClass,
+    JqTreeWidget.prototype._loadDataFromUrl = function(url_info, parent_node, on_finished) {
+      var $el, addLoadingClass, parseUrlInfo, removeLoadingClass,
         _this = this;
-      $li = null;
+      $el = null;
       addLoadingClass = function() {
         var folder_element;
-        if (parent_node) {
+        if (!parent_node) {
+          $el = _this.element;
+        } else {
           folder_element = new FolderElement(parent_node, _this);
-          $li = folder_element.getLi();
-          return $li.addClass('jqtree-loading');
+          $el = folder_element.getLi();
         }
+        return $el.addClass('jqtree-loading');
       };
       removeLoadingClass = function() {
-        if ($li) {
-          return $li.removeClass('loading');
+        if ($el) {
+          return $el.removeClass('jqtree-loading');
         }
       };
       parseUrlInfo = function() {
@@ -844,6 +890,9 @@ limitations under the License.
         }
       };
       addLoadingClass();
+      if (!url_info) {
+        url_info = this._getDataUrlInfo(parent_node);
+      }
       parseUrlInfo();
       return $.ajax({
         url: url_info.url,
@@ -860,29 +909,31 @@ limitations under the License.
           }
           removeLoadingClass();
           _this._loadData(data, parent_node);
-          if (on_finished) {
+          if (on_finished && $.isFunction(on_finished)) {
             return on_finished();
           }
+        },
+        error: function(response) {
+          removeLoadingClass();
+          if (_this.options.onLoadFailed) {
+            return _this.options.onLoadFailed(response);
+          }
         }
       });
     };
 
     JqTreeWidget.prototype._loadData = function(data, parent_node) {
-      var child, subtree, _i, _len, _ref;
       this._triggerEvent('tree.load_data', {
         tree_data: data
       });
       if (!parent_node) {
-        this._initTree(data);
+        this._initTree(data, false, this.options.nodeClass);
       } else {
-        subtree = new Node('');
-        subtree._setParent(parent_node.tree);
-        subtree.loadFromData(data);
-        _ref = subtree.children;
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          child = _ref[_i];
-          parent_node.addChild(child);
+        if (this.selected_node && parent_node.isParentOf(this.selected_node)) {
+          this.selected_node = null;
         }
+        parent_node.loadFromData(data);
+        parent_node.load_on_demand = false;
         this._refreshElements(parent_node.parent);
       }
       if (this.is_dragging) {
@@ -938,8 +989,7 @@ limitations under the License.
       if (slide == null) {
         slide = true;
       }
-      node.load_on_demand = false;
-      return this.loadDataFromUrl(this._getDataUrlInfo(node), node, function() {
+      return this._loadDataFromUrl(null, node, function() {
         return _this._openNode(node, slide, on_finished);
       });
     };
@@ -994,7 +1044,7 @@ limitations under the License.
           return true;
         } else {
           result = true;
-          iterate(function(child) {
+          _this.tree.iterate(function(child) {
             if (node === child) {
               result = true;
               return false;
@@ -1080,9 +1130,9 @@ limitations under the License.
 
     JqTreeWidget.prototype._initData = function() {
       if (this.options.data) {
-        return this.loadData(this.options.data);
+        return this._loadData(this.options.data);
       } else {
-        return this.loadDataFromUrl(this._getDataUrlInfo());
+        return this._loadDataFromUrl(this._getDataUrlInfo());
       }
     };
 
@@ -1108,11 +1158,10 @@ limitations under the License.
     };
 
     JqTreeWidget.prototype._initTree = function(data) {
-      this.tree = new Tree();
+      this.tree = new this.options.nodeClass(null, true, this.options.nodeClass);
       this.tree.loadFromData(data);
       this._openNodes();
       this._refreshElements();
-      this.select_node_handler.selectCurrentNode();
       return this._triggerEvent('tree.init');
     };
 
@@ -1131,7 +1180,9 @@ limitations under the License.
         max_level = parseInt(this.options.autoOpen);
       }
       return this.tree.iterate(function(node, level) {
-        node.is_open = true;
+        if (node.hasChildren()) {
+          node.is_open = true;
+        }
         return level !== max_level;
       });
     };
@@ -1171,9 +1222,14 @@ limitations under the License.
         return $li;
       };
       createNodeLi = function(node) {
-        var escaped_name;
+        var class_string, escaped_name, li_classes;
+        li_classes = ['jqtree_common'];
+        if (node === _this.selected_node) {
+          li_classes.push('jqtree-selected');
+        }
+        class_string = li_classes.join(' ');
         escaped_name = escapeIfNecessary(node.name);
-        return $("<li class=\"jqtree_common\"><div><span class=\"jqtree-title jqtree_common\">" + escaped_name + "</span></div></li>");
+        return $("<li class=\"" + class_string + "\"><div class=\"jqtree-element jqtree_common\"><span class=\"jqtree-title jqtree_common\">" + escaped_name + "</span></div></li>");
       };
       createFolderLi = function(node) {
         var button_char, button_classes, escaped_name, folder_classes, getButtonClasses, getFolderClasses;
@@ -1191,6 +1247,9 @@ limitations under the License.
           if (!node.is_open) {
             classes.push('jqtree-closed');
           }
+          if (node === _this.selected_node) {
+            classes.push('jqtree-selected');
+          }
           return classes.join(' ');
         };
         button_classes = getButtonClasses();
@@ -1201,7 +1260,7 @@ limitations under the License.
         } else {
           button_char = TRIANGLE_RIGHT;
         }
-        return $("<li class=\"jqtree_common " + folder_classes + "\"><div><a class=\"jqtree_common " + button_classes + "\">" + button_char + "</a><span class=\"jqtree_common jqtree-title\">" + escaped_name + "</span></div></li>");
+        return $("<li class=\"jqtree_common " + folder_classes + "\"><div class=\"jqtree-element jqtree_common\"><a class=\"jqtree_common " + button_classes + "\">" + button_char + "</a><span class=\"jqtree_common jqtree-title\">" + escaped_name + "</span></div></li>");
       };
       doCreateDomElements = function($element, children, is_root_node, is_open) {
         var $li, $ul, child, _i, _len;
@@ -1235,28 +1294,28 @@ limitations under the License.
     };
 
     JqTreeWidget.prototype._click = function(e) {
-      var $button, $target, $title, node;
+      var $button, $el, $target, node;
       if (e.ctrlKey) {
         return;
       }
       $target = $(e.target);
-      $title = $target.closest('.jqtree-title');
-      if ($title.length) {
-        node = this._getNode($title);
+      $button = $target.closest('.jqtree-toggler');
+      if ($button.length) {
+        node = this._getNode($button);
         if (node) {
-          this._triggerEvent('tree.click', {
-            node: node
-          });
-          return this.selectNode(node);
+          this.toggle(node, this.options.slide);
+          e.preventDefault();
+          return e.stopPropagation();
         }
       } else {
-        $button = $target.closest('.jqtree-toggler');
-        if ($button.length) {
-          node = this._getNode($button);
+        $el = $target.closest('.jqtree-element');
+        if ($el.length) {
+          node = this._getNode($el);
           if (node) {
-            this.toggle(node, this.options.slide);
-            e.preventDefault();
-            return e.stopPropagation();
+            this._triggerEvent('tree.click', {
+              node: node
+            });
+            return this.select_node_handler.selectNode(node, true);
           }
         }
       }
@@ -1292,7 +1351,7 @@ limitations under the License.
 
     JqTreeWidget.prototype._contextmenu = function(e) {
       var $div, node;
-      $div = $(e.target).closest('ul.jqtree-tree div');
+      $div = $(e.target).closest('ul.jqtree-tree .jqtree-element');
       if ($div.length) {
         node = this._getNode($div);
         if (node) {
@@ -1340,9 +1399,9 @@ limitations under the License.
       }
     };
 
-    JqTreeWidget.prototype._mouseStop = function() {
+    JqTreeWidget.prototype._mouseStop = function(e) {
       if (this.options.dragAndDrop) {
-        return this.dnd_handler.mouseStop();
+        return this.dnd_handler.mouseStop(e);
       } else {
         return false;
       }
@@ -1416,7 +1475,7 @@ limitations under the License.
 
     function BorderDropHint($element) {
       var $div, width;
-      $div = $element.children('div');
+      $div = $element.children('.jqtree-element');
       width = $element.width() - 4;
       this.$hint = $('<span class="jqtree-border"></span>');
       $div.append(this.$hint);
@@ -1451,7 +1510,7 @@ limitations under the License.
     };
 
     NodeElement.prototype.getSpan = function() {
-      return this.$element.children('div').find('span.jqtree-title');
+      return this.$element.children('.jqtree-element').find('span.jqtree-title');
     };
 
     NodeElement.prototype.getLi = function() {
@@ -1542,7 +1601,7 @@ limitations under the License.
     };
 
     FolderElement.prototype.getButton = function() {
-      return this.$element.children('div').find('a.jqtree-toggler');
+      return this.$element.children('.jqtree-element').find('a.jqtree-toggler');
     };
 
     FolderElement.prototype.addDropHint = function(position) {
@@ -1594,6 +1653,7 @@ limitations under the License.
       } else if (typeof localStorage !== "undefined" && localStorage !== null) {
         return localStorage.setItem(this.getCookieName(), this.getState());
       } else if ($.cookie) {
+        $.cookie.raw = true;
         return $.cookie(this.getCookieName(), this.getState(), {
           path: '/'
         });
@@ -1617,9 +1677,8 @@ limitations under the License.
       } else if (typeof localStorage !== "undefined" && localStorage !== null) {
         return localStorage.getItem(this.getCookieName());
       } else if ($.cookie) {
-        return $.cookie(this.getCookieName(), {
-          path: '/'
-        });
+        $.cookie.raw = true;
+        return $.cookie(this.getCookieName());
       } else {
         return null;
       }
@@ -1682,29 +1741,54 @@ limitations under the License.
       this.tree_widget = tree_widget;
     }
 
-    SelectNodeHandler.prototype.selectNode = function(node) {
-      var canSelect, parent,
+    SelectNodeHandler.prototype.selectNode = function(node, must_toggle) {
+      var canSelect, mustToggle, node_element, parent, previous_node,
         _this = this;
+      if (must_toggle == null) {
+        must_toggle = false;
+      }
       canSelect = function() {
         if (!_this.tree_widget.options.onCanSelectNode) {
           return true;
         }
         return _this.tree_widget.options.onCanSelectNode(node);
       };
+      mustToggle = function(previous_node, node) {
+        if (must_toggle && previous_node && node) {
+          if (node.id) {
+            return node.id === previous_node.id;
+          } else {
+            return node.element === previous_node.element;
+          }
+        } else {
+          return false;
+        }
+      };
       if (canSelect()) {
         if (this.tree_widget.selected_node) {
-          this.tree_widget._getNodeElementForNode(this.tree_widget.selected_node).deselect();
+          previous_node = this.tree_widget.selected_node;
+          this.tree_widget._getNodeElementForNode(previous_node).deselect();
           this.tree_widget.selected_node = null;
+        } else {
+          previous_node = null;
         }
         if (node) {
-          this.tree_widget._getNodeElementForNode(node).select();
-          this.tree_widget.selected_node = node;
-          this.tree_widget._triggerEvent('tree.select', {
-            node: node
-          });
-          parent = this.tree_widget.selected_node.parent;
-          if (!parent.is_open) {
-            this.tree_widget.openNode(parent, false);
+          node_element = this.tree_widget._getNodeElementForNode(node);
+          if (mustToggle(previous_node, node)) {
+            node_element.deselect();
+            this.tree_widget._triggerEvent('tree.select', {
+              node: null
+            });
+          } else {
+            node_element.select();
+            this.tree_widget.selected_node = node;
+            this.tree_widget._triggerEvent('tree.select', {
+              node: node
+            });
+            parent = this.tree_widget.selected_node.parent;
+            if (!parent.is_open) {
+              this.tree_widget.openNode(parent, false);
+            }
           }
         }
         if (this.tree_widget.options.saveState) {
@@ -1777,17 +1861,15 @@ limitations under the License.
         this.removeDropHint();
         this.removeHover();
         this.stopOpenFolderTimer();
-      } else {
-        if (this.hovered_area !== area) {
-          this.hovered_area = area;
-          this.updateDropHint();
-        }
+      } else if (this.hovered_area !== area) {
+        this.hovered_area = area;
+        this.updateDropHint();
       }
       return true;
     };
 
-    DragAndDropHandler.prototype.mouseStop = function() {
-      this.moveItem();
+    DragAndDropHandler.prototype.mouseStop = function(e) {
+      this.moveItem(e);
       this.clear();
       this.removeHover();
       this.removeDropHint();
@@ -2029,7 +2111,7 @@ limitations under the License.
       }
     };
 
-    DragAndDropHandler.prototype.moveItem = function() {
+    DragAndDropHandler.prototype.moveItem = function(original_event) {
       var doMove, event, moved_node, position, previous_parent, target_node,
         _this = this;
       if (this.hovered_area && this.hovered_area.position !== Position.NONE) {
@@ -2051,7 +2133,8 @@ limitations under the License.
             target_node: target_node,
             position: Position.getName(position),
             previous_parent: previous_parent,
-            do_move: doMove
+            do_move: doMove,
+            original_event: original_event
           }
         });
         if (!event.isDefaultPrevented()) {

data/vendor/assets/stylesheets/jqtree.css

@@ -20,6 +20,7 @@ ul.jqtree-tree li.jqtree-closed > ul.jqtree_common {
 
 ul.jqtree-tree li.jqtree_common {
     clear: both;
+    list-style-type: none;
 }
 ul.jqtree-tree .jqtree-toggler {
     display: block;
@@ -38,7 +39,7 @@ ul.jqtree-tree .jqtree-toggler:hover {
     color: #000;
 }
 
-ul.jqtree-tree div {
+ul.jqtree-tree .jqtree-element {
     cursor: pointer;
 }
 
@@ -117,14 +118,14 @@ ul.jqtree-tree span.jqtree-border {
     margin: 0;
 }
 
-ul.jqtree-tree div {
+ul.jqtree-tree .jqtree-element {
     width: 100%; /* todo: why is this in here? */
     *width: auto; /* ie7 fix; issue 41 */
     position: relative;
 }
 
-ul.jqtree-tree li.jqtree-selected > div,
-ul.jqtree-tree li.jqtree-selected > div:hover {
+ul.jqtree-tree li.jqtree-selected > .jqtree-element,
+ul.jqtree-tree li.jqtree-selected > .jqtree-element:hover {
     background-color: #97BDD6;
     background: -webkit-gradient(linear, left top, left bottom, from(#BEE0F5), to(#89AFCA));
     background: -moz-linear-gradient(top, #BEE0F5, #89AFCA);
@@ -133,6 +134,6 @@ ul.jqtree-tree li.jqtree-selected > div:hover {
     text-shadow: 0 1px 0 rgba(255, 255, 255, 0.7);
 }
 
-ul.jqtree-tree .jqtree-moving > div .jqtree-title {
+ul.jqtree-tree .jqtree-moving > .jqtree-element .jqtree-title {
     outline: dashed 1px #0000ff;
 }

metadata

@@ -2,7 +2,7 @@
 name: jqtree-rails
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.1.4.3
+  version: 0.1.5.0
 platform: ruby
 authors:
 - Ryan Scott Lewis
@@ -10,9 +10,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-21 00:00:00.000000000 Z
+date: 2013-03-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -22,9 +23,8 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '5.0'
     none: false
-  name: railties
   type: :runtime
-  prerelease: false
+  name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
@@ -35,15 +35,15 @@ dependencies:
         version: '5.0'
     none: false
 - !ruby/object:Gem::Dependency
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.14'
     none: false
-  name: thor
   type: :runtime
-  prerelease: false
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -65,6 +65,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- build
 - jqtree-rails.gemspec
 - lib/generators/jqtree/install/install_generator.rb
 - lib/jqtree-rails.rb
@@ -94,7 +95,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: Use jqTree with Rails 3