angular_ui_tree_rails 0.1.0 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76cf8a4bbedd46ed03ef3b9724bae07b201c0a8d
-  data.tar.gz: ad098ab51e5b9a9e19e9fe6995ab458bf98ecfe7
+  metadata.gz: eb384e9399313e761e3f338f16f85a795d406724
+  data.tar.gz: da0f0f3d4690b8ff2a0a4549b61879d0513421a2
 SHA512:
-  metadata.gz: a7dbfa390cc0c239b1aedf956cf065a608389e4fa96a5714a609e8ba4c75939b1f510aa17dee7dbe3118bcaa48d04ba3e1c1ca3b893c4b0c480f79e6c2675f97
-  data.tar.gz: 2ce2cd64c6ef329d77685a7ff735b03567aa84d994f56b345f1e8ef42b553fc32ead8177ba604cec4003ed9c45f66257aeb0cbfc567beaab90d7113dfae302be
+  metadata.gz: cc1352f893c058a7c6b045bb723d1ef8bb4a90726bef010b163227185ba99268ca00c16a3961f8aa9dcbf362807a8be6baaef6ef810f3ed291a8b898de87dc6f
+  data.tar.gz: 4a2cddb7dbd78a5f533772662ce432f52a973dd2ff85beae58abdcef2767ad5fe26350bc6fdf2c85c9e0c6cd4b47c1d65b8d62b417b3b4eb676f27cbc9c1a1f3

data/lib/angular_ui_tree_rails/version.rb

@@ -1,3 +1,3 @@
 module AngularUiTreeRails
-  VERSION = "0.1.0"
+  VERSION = "0.1.5"
 end

data/vendor/assets/javascripts/angular-ui-tree.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular UI Tree v2.1.5
+ * @license Angular UI Tree v2.0.13
  * (c) 2010-2014. https://github.com/JimLiu/angular-ui-tree
  * License: MIT
  */
@@ -48,7 +48,6 @@
           },
 
           setNodeAttribute: function(scope, attrName, val) {
-          	if (!scope.$modelValue) return null;
             var data = this.nodesData[scope.$modelValue.$$hashKey];
             if (!data) {
               data = {};
@@ -58,7 +57,6 @@
           },
 
           getNodeAttribute: function(scope, attrName) {
-          	if (!scope.$modelValue) return null;
             var data = this.nodesData[scope.$modelValue.$$hashKey];
             if (data) {
               return data[attrName];
@@ -305,7 +303,6 @@
         $scope.$callbacks = null;
 
         $scope.dragEnabled = true;
-        $scope.emptyPlaceHolderEnabled = true;
         $scope.maxDepth = 0;
         $scope.dragDelay = 0;
 
@@ -322,8 +319,7 @@
         };
 
         $scope.resetEmptyElement = function() {
-          if ($scope.$nodesScope.$modelValue.length === 0 &&
-            $scope.emptyPlaceHolderEnabled) {
+          if ($scope.$nodesScope.$modelValue.length === 0) {
             $element.append($scope.$emptyElm);
           } else {
             $scope.$emptyElm.remove();
@@ -358,8 +354,8 @@
 
   angular.module('ui.tree')
 
-    .controller('TreeNodesController', ['$scope', '$element', 'treeConfig',
-      function ($scope, $element, treeConfig) {
+    .controller('TreeNodesController', ['$scope', '$element', '$timeout', 'treeConfig',
+      function ($scope, $element, $timeout, treeConfig) {
         this.scope = $scope;
 
         $scope.$element = $element;
@@ -373,12 +369,12 @@
         $scope.maxDepth = 0;
 
         $scope.initSubNode = function(subNode) {
-          if(!subNode.$modelValue) return null;
-          $scope.$nodesMap[subNode.$modelValue.$$hashKey] = subNode;
+          $timeout(function() {
+            $scope.$nodesMap[subNode.$modelValue.$$hashKey] = subNode;
+          });
         };
 
         $scope.destroySubNode = function(subNode) {
-          if(!subNode.$modelValue) return null;
           $scope.$nodesMap[subNode.$modelValue.$$hashKey] = null;
         };
 
@@ -386,10 +382,6 @@
           return $scope.$treeScope.$callbacks.accept(sourceNode, $scope, destIndex);
         };
 
-        $scope.beforeDrag = function(sourceNode) {
-          return $scope.$treeScope.$callbacks.beforeDrag(sourceNode);
-        };
-
         $scope.isParent = function(node) {
           return node.$parentNodesScope == $scope;
         };
@@ -536,15 +528,7 @@
         };
 
         $scope.accept = function(sourceNode, destIndex) {
-          return $scope.$childNodesScope &&
-                  $scope.$childNodesScope.$modelValue &&
-                  $scope.$childNodesScope.accept(sourceNode, destIndex);
-        };
-
-        $scope.removeNode = function(){
-          var node = $scope.remove();
-          $scope.$callbacks.removed(node);
-          return node;
+          return $scope.$childNodesScope && $scope.$childNodesScope.accept(sourceNode, destIndex);
         };
 
         $scope.remove = function() {
@@ -626,8 +610,7 @@
         controller: 'TreeController',
         link: function(scope, element, attrs) {
           var callbacks = {
-            accept: null,
-            beforeDrag: null
+            accept: null
           };
 
           var config = {};
@@ -647,27 +630,24 @@
             }
           }, true);
 
-          scope.$watch(attrs.dragEnabled, function(val) {
-            if((typeof val) == "boolean") {
-              scope.dragEnabled = val;
+          attrs.$observe('dragEnabled', function(val) {
+            var de = scope.$eval(val);
+            if((typeof de) == "boolean") {
+              scope.dragEnabled = de;
             }
           });
 
-          scope.$watch(attrs.emptyPlaceHolderEnabled, function(val) {
-            if((typeof val) == "boolean") {
-              scope.emptyPlaceHolderEnabled = val;
+          attrs.$observe('maxDepth', function(val) {
+            var md = scope.$eval(val);
+            if((typeof md) == "number") {
+              scope.maxDepth = md;
             }
           });
 
-          scope.$watch(attrs.maxDepth, function(val) {
-            if((typeof val) == "number") {
-              scope.maxDepth = val;
-            }
-          });
-
-          scope.$watch(attrs.dragDelay, function(val) {
-            if((typeof val) == "number") {
-              scope.dragDelay = val;
+          attrs.$observe('dragDelay', function(val) {
+            var dd = scope.$eval(val);
+            if((typeof dd) == "number") {
+              scope.dragDelay = dd;
             }
           });
 
@@ -682,14 +662,6 @@
             return true;
           };
 
-          callbacks.beforeDrag = function(sourceNodeScope) {
-            return true;
-          };
-
-          callbacks.removed = function(node){
-          
-          };
-
           callbacks.dropped = function(event) {
 
           };
@@ -707,10 +679,6 @@
 
           };
 
-          callbacks.beforeDrop = function(event) {
-
-          };
-
           scope.$watch(attrs.uiTree, function(newVal, oldVal){
             angular.forEach(newVal, function(value, key){
               if (callbacks[key]) {
@@ -770,9 +738,10 @@
             };
           }
 
-          scope.$watch(attrs.maxDepth, function(val) {
-            if((typeof val) == "number") {
-              scope.maxDepth = val;
+          attrs.$observe('maxDepth', function(val) {
+            var md = scope.$eval(val);
+            if((typeof md) == "number") {
+              scope.maxDepth = md;
             }
           });
 
@@ -810,10 +779,10 @@
             scope.init(controllersArr);
 
             scope.collapsed = !!$uiTreeHelper.getNodeAttribute(scope, 'collapsed');
-
-            scope.$watch(attrs.collapsed, function(val) {
-              if((typeof val) == "boolean") {
-                scope.collapsed = val;
+            attrs.$observe('collapsed', function(val) {
+              var collapsed = scope.$eval(val);
+              if((typeof collapsed) == "boolean") {
+                scope.collapsed = collapsed;
               }
             });
 
@@ -828,8 +797,6 @@
             var placeElm, hiddenPlaceElm, dragElm;
             var treeScope = null;
             var elements; // As a parameter for callbacks
-            var dragDelaying = true;
-            var dragStarted = false;
             var dragTimer = null;
             var body = document.body,
                 html = document.documentElement,
@@ -860,14 +827,6 @@
                 return;
               }
 
-              var eventElmTagName = eventElm.prop('tagName').toLowerCase();
-              if (eventElmTagName == 'input' ||
-                eventElmTagName == 'textarea' ||
-                eventElmTagName == 'button' ||
-                eventElmTagName == 'select') { // if it's a input or button, ignore it
-                return;
-              }
-
               // check if it or it's parents has a 'data-nodrag' attribute
               while (eventElm && eventElm[0] && eventElm[0] != element) {
                 if ($uiTreeHelper.nodrag(eventElm)) { // if the node mark as `nodrag`, DONOT drag it.
@@ -876,10 +835,6 @@
                 eventElm = eventElm.parent();
               }
 
-              if (!scope.beforeDrag(scope)){
-                return;
-              }
-
               e.uiTreeDragging = true; // stop event bubbling
               if (e.originalEvent) {
                 e.originalEvent.uiTreeDragging = true;
@@ -912,13 +867,6 @@
               dragElm.css('width', $uiTreeHelper.width(scope.$element) + 'px');
               dragElm.css('z-index', 9999);
 
-              // Prevents cursor to change rapidly in Opera 12.16 and IE when dragging an element
-              var hStyle = (scope.$element[0].querySelector('.angular-ui-tree-handle') || scope.$element[0]).currentStyle;
-              if (hStyle) {
-                document.body.setAttribute('ui-tree-cursor', $document.find('body').css('cursor') || '');
-                $document.find('body').css({'cursor': hStyle.cursor + '!important'});
-              }
-
               scope.$element.after(placeElm);
               scope.$element.after(hiddenPlaceElm);
               dragElm.append(scope.$element);
@@ -931,6 +879,9 @@
                 placeholder: placeElm,
                 dragging: dragElm
               };
+              scope.$apply(function() {
+                scope.$callbacks.dragStart(dragInfo.eventArgs(elements, pos));
+              });
 
               angular.element($document).bind('touchend', dragEndEvent);
               angular.element($document).bind('touchcancel', dragEndEvent);
@@ -938,33 +889,17 @@
               angular.element($document).bind('mouseup', dragEndEvent);
               angular.element($document).bind('mousemove', dragMoveEvent);
               angular.element($document).bind('mouseleave', dragCancelEvent);
-
               document_height = Math.max(body.scrollHeight, body.offsetHeight, html.clientHeight, html.scrollHeight, html.offsetHeight);
               document_width = Math.max(body.scrollWidth, body.offsetWidth, html.clientWidth, html.scrollWidth, html.offsetWidth);
             };
 
             var dragMove = function(e) {
-              if (!dragStarted) {
-                if (!dragDelaying) {
-                  dragStarted = true;
-                  scope.$apply(function() {
-                    scope.$callbacks.dragStart(dragInfo.eventArgs(elements, pos));
-                  });
-                }
-                return;
-              }
-
               var eventObj = $uiTreeHelper.eventObj(e);
               var prev, leftElmPos, topElmPos;
 
               if (dragElm) {
                 e.preventDefault();
-
-                if ($window.getSelection) {
-                  $window.getSelection().removeAllRanges();
-                } else if ($window.document.selection) {
-                  $window.document.selection.empty();
-                }
+                $window.getSelection().removeAllRanges();
 
                 leftElmPos = eventObj.pageX - pos.offsetX;
                 topElmPos = eventObj.pageY - pos.offsetY;
@@ -1051,12 +986,8 @@
                 // Select the drag target. Because IE does not support CSS 'pointer-events: none', it will always
                 // pick the drag element itself as the target. To prevent this, we hide the drag element while
                 // selecting the target.
-                var displayElm;
                 if (angular.isFunction(dragElm.hide)) {
                   dragElm.hide();
-                }else{
-                  displayElm = dragElm[0].style.display;
-                  dragElm[0].style.display = "none";
                 }
 
                 // when using elementFromPoint() inside an iframe, you have to call
@@ -1066,8 +997,6 @@
                 var targetElm = angular.element($window.document.elementFromPoint(targetX, targetY));
                 if (angular.isFunction(dragElm.show)) {
                   dragElm.show();
-                }else{
-                  dragElm[0].style.display = displayElm;
                 }
 
                 // move vertical
@@ -1135,9 +1064,6 @@
               e.preventDefault();
 
               if (dragElm) {
-                scope.$treeScope.$apply(function() {
-                  scope.$callbacks.beforeDrop(dragInfo.eventArgs(elements, pos));
-                });
                 // roll back elements changed
                 hiddenPlaceElm.replaceWith(scope.$element);
                 placeElm.remove();
@@ -1160,12 +1086,6 @@
 
               }
 
-              // Restore cursor in Opera 12.16 and IE
-              var oldCur = document.body.getAttribute('ui-tree-cursor');
-              if (oldCur !== null) {
-                $document.find('body').css({'cursor': oldCur});
-                document.body.removeAttribute('ui-tree-cursor');
-              }
 
               angular.element($document).unbind('touchend', dragEndEvent); // Mobile
               angular.element($document).unbind('touchcancel', dragEndEvent); // Mobile
@@ -1195,13 +1115,11 @@
             };
 
             var bindDrag = function() {
-              element.bind('touchstart mousedown', function (e) {
-                dragDelaying = true;
-                dragStarted = false;
-                dragStartEvent(e);
-                dragTimer = $timeout(function(){dragDelaying = false;}, scope.dragDelay);
+              element.bind('touchstart', dragStartEvent);
+              element.bind('mousedown', function (e) {
+                dragTimer = $timeout(function(){dragStartEvent(e);}, scope.dragDelay);
               });
-              element.bind('touchend touchcancel mouseup',function(){$timeout.cancel(dragTimer);});
+              element.bind('mouseup',function(){$timeout.cancel(dragTimer);});
             };
             bindDrag();
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: angular_ui_tree_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.5
 platform: ruby
 authors:
 - Taylor Mitchell