bug fix

sanyam-j · May 24, 2015 · e6d548f · e6d548f
1 parent b8395c6
commit e6d548f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 39 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,28 +1,30 @@
+var srcFiles = [
+    'src/core.js',
+    'src/directives/dndDraggable.js',
+    'src/directives/dndDroppable.js',
+    'src/directives/dndRotatable.js',
+    'src/directives/dndResizable.js',
+    'src/directives/dndSortable.js',
+    'src/directives/dndSelectable.js',
+    'src/directives/dndRect.js',
+    'src/directives/dndModel.js',
+    'src/directives/dndLassoArea.js',
+    'src/directives/dndFittext.js',
+    'src/directives/dndKeyModel.js',
+    'src/directives/dndContainment.js',
+    'src/services/dndKey.js',
+    'src/services/dndLasso.js',
+    'src/services/EventEmitter.js'
+];
+
 module.exports = function (grunt) {
     grunt.initConfig({
         concat: {
             options: {
                 separator: ';\n\n',
             },
             dist: {
-                src: [
-                    'src/core.js',
-                    'src/directives/dndDraggable.js',
-                    'src/directives/dndDroppable.js',
-                    'src/directives/dndRotatable.js',
-                    'src/directives/dndResizable.js',
-                    'src/directives/dndSortable.js',
-                    'src/directives/dndSelectable.js',
-                    'src/directives/dndRect.js',
-                    'src/directives/dndModel.js',
-                    'src/directives/dndLassoArea.js',
-                    'src/directives/dndFittext.js',
-                    'src/directives/dndKeyModel.js',
-                    'src/directives/dndContainment.js',
-                    'src/services/dndKey.js',
-                    'src/services/dndLasso.js',
-                    'src/services/EventEmitter.js'
-                ],
+                src: srcFiles,
                 dest: 'dist/angular-dnd.js',
             },
         },
@@ -45,24 +47,7 @@ module.exports = function (grunt) {
             }
         },
         watch: {
-            files: [
-                'src/core.js',
-                'src/directives/dndDraggable.js',
-                'src/directives/dndDroppable.js',
-                'src/directives/dndRotatable.js',
-                'src/directives/dndResizable.js',
-                'src/directives/dndSortable.js',
-                'src/directives/dndSelectable.js',
-                'src/directives/dndRect.js',
-                'src/directives/dndModel.js',
-                'src/directives/dndLassoArea.js',
-                'src/directives/dndFittext.js',
-                'src/directives/dndKeyModel.js',
-                'src/directives/dndContainer.js',
-                'src/services/dndKey.js',
-                'src/services/dndLasso.js',
-                'src/services/EventEmitter.js'
-            ],
+            files: srcFiles,
             tasks: [
                 "concat",
                 "wrap",

diff --git a/dist/angular-dnd.js b/dist/angular-dnd.js
@@ -3129,7 +3129,7 @@ module.directive('dndContainment', ['$parse', function($parse){
         this.get = function () {
             var selector = getterSelector($scope);
 
-            return selector ? $element.dndClosest().eq(0) : $element.parent();
+            return selector ? $element.dndClosest(selector).eq(0) : $element.parent();
         }
     }
 

diff --git a/dist/angular-dnd.min.js b/dist/angular-dnd.min.js
diff --git a/src/directives/dndContainment.js b/src/directives/dndContainment.js
@@ -7,7 +7,7 @@ module.directive('dndContainment', ['$parse', function($parse){
         this.get = function () {
             var selector = getterSelector($scope);
 
-            return selector ? $element.dndClosest().eq(0) : $element.parent();
+            return selector ? $element.dndClosest(selector).eq(0) : $element.parent();
         }
     }