Merge pull request jbaysolutions#85 from Tinoooo/vue1

added dragIgnoreFrom and resizeIgnoreFrom options to GridItem.vue

Author: gmsa

dist/vue-grid-layout.js

@@ -1,6 +1,6 @@
 {
   "name": "vue-grid-layout",
-  "version": "1.0.2",
+  "version": "1.1.1",
   "description": "A draggable and resizable grid layout, as a Vue component.",
   "keywords": [
     "grid",

dist/vue-grid-layout.js.map

@@ -146,6 +146,16 @@
             i: {
                 required: true
             },
+            dragIgnoreFrom: {
+                type: String,
+                required: false,
+                default: 'a, button'
+            },
+            resizeIgnoreFrom: {
+                type: String,
+                required: false,
+                default: 'a, button'
+            }
         },
         data: function() {
             return {
@@ -182,7 +192,7 @@
             var self = this;
             if (this.isDraggable) {
                 if (this.interactObj == null) {
-                    this.interactObj = interact(this.$els.item);
+                    this.interactObj = interact(this.$els.item, {ignoreFrom: this.dragIgnoreFrom});
                 }
                 this.interactObj
                         .draggable({
@@ -193,7 +203,7 @@
             }
             if (this.isResizable) {
                 if (this.interactObj == null) {
-                    this.interactObj = interact(this.$els.item);
+                    this.interactObj = interact(this.$els.item, {ignoreFrom: this.resizeIgnoreFrom});
                 }
                 this.interactObj
                         .resizable({

dist/vue-grid-layout.min.js

@@ -101,6 +101,9 @@
 
                 self.updateHeight();
                 self.$nextTick(function () {
+                    if(!self.$els.item)
+                        return;
+
                     var erd = elementResizeDetectorMaker({
                         strategy: "scroll" //<- For ultra performance.
                     });
@@ -119,6 +122,8 @@
 
                 self.updateHeight();
                 self.$nextTick(function () {
+                    if(!self.$els.item)
+                        return;
                     var erd = elementResizeDetectorMaker({
                         strategy: "scroll" //<- For ultra performance.
                     });