Merge pull request angular-ui-tree#460 from angular-ui-tree/fix-empty-placeholder

Fix empty placeholder

Author: Niels Dequeker

source/controllers/treeCtrl.js

@@ -33,7 +33,7 @@
         };
 
         this.resetEmptyElement = function () {
-          if ($scope.$nodesScope.$modelValue.length === 0 &&
+          if ((!$scope.$nodesScope.$modelValue || $scope.$nodesScope.$modelValue.length === 0) &&
             $scope.emptyPlaceholderEnabled) {
             $element.append($scope.$emptyElm);
           } else {

source/directives/uiTree.js

@@ -42,6 +42,7 @@
             scope.$watch(attrs.emptyPlaceholderEnabled, function (val) {
               if ((typeof val) == 'boolean') {
                 scope.emptyPlaceholderEnabled = val;
+                ctrl.resetEmptyElement();
               }
             });
 

source/directives/uiTree.spec.js

@@ -46,11 +46,19 @@
 
       var element = createElement('<div ui-tree empty-placeholder-enabled="enableEmptyPlaceholder"><div ui-tree-nodes="" ng-model="items"></div></div>');
       expect(element.scope().emptyPlaceholderEnabled).toEqual(true);
+      expect(element.scope().$emptyElm.parent()).toEqual(element);
 
       $scope.enableEmptyPlaceholder = false;
       $scope.$digest();
 
       expect(element.scope().emptyPlaceholderEnabled).toEqual(false);
+      expect(element.scope().$emptyElm.parent()).toNotEqual(element);
+    });
+
+    it('should hide the empty placeholder when ui-tree, ui-tree-nodes and empty-placeholder-enabled="false" are on the same element', function () {
+      var element = createElement('<div ui-tree empty-placeholder-enabled="false" ui-tree-nodes="" ng-model="items"></div>');
+      expect(element.scope().emptyPlaceholderEnabled).toEqual(false);
+      expect(element.scope().$emptyElm.parent()).toNotEqual(element);
     });
 
     it('should allow enabling / disabling dropping nodes', function () {