Skip to content

Commit 64ebf73

Browse files
authored
Merge branch 'master' into master
2 parents ff11464 + f9cdc33 commit 64ebf73

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"fluid",
1313
"responsive"
1414
],
15-
"main": "dist/vue-grid-layout.js",
15+
"main": "dist/vue-grid-layout.min.js",
1616
"scripts": {
1717
"dev": "cross-env NODE_ENV=development webpack-dev-server --open --inline --hot",
1818
"build": "cross-env NODE_ENV=production webpack --progress --hide-modules",

src/GridItem.vue

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@
268268
document.getElementsByTagName("html")[0].getAttribute("dir");
269269
this.rtl = (direction == "rtl");
270270
},
271-
beforeDestroy: function () {
271+
beforeDestroy: function(){
272+
var self = this;
272273
//Remove listeners
273274
this.eventBus.$off('updateWidth', self.updateWidthHandler);
274275
this.eventBus.$off('compact', self.compactHandler);
@@ -325,7 +326,7 @@
325326
resizable: function () {
326327
var self = this;
327328
if (this.interactObj == null) {
328-
this.interactObj = interact(this.$refs.item, {ignoreFrom: resizeIgnoreFrom});
329+
this.interactObj = interact(this.$refs.item, {ignoreFrom: this.resizeIgnoreFrom});
329330
}
330331
if (this.resizable) {
331332
this.interactObj

0 commit comments

Comments
 (0)