Merge remote-tracking branch 'bfarka/gridster.js/fix-trailing-comma'

* bfarka/gridster.js/fix-trailing-comma:
  fix issue #469
This commit is contained in:
David Morse
2015-04-07 20:03:36 -06:00
3 changed files with 4 additions and 4 deletions
+1 -1
View File
@@ -539,7 +539,7 @@
this.pointer_events = {
start: this.nsEvent('touchstart') + ' ' + this.nsEvent('mousedown'),
move: this.nsEvent('touchmove') + ' ' + this.nsEvent('mousemove'),
end: this.nsEvent('touchend') + ' ' + this.nsEvent('mouseup'),
end: this.nsEvent('touchend') + ' ' + this.nsEvent('mouseup')
};
this.$container.on(this.nsEvent('selectstart'),
+1 -1
View File
@@ -539,7 +539,7 @@
this.pointer_events = {
start: this.nsEvent('touchstart') + ' ' + this.nsEvent('mousedown'),
move: this.nsEvent('touchmove') + ' ' + this.nsEvent('mousemove'),
end: this.nsEvent('touchend') + ' ' + this.nsEvent('mouseup'),
end: this.nsEvent('touchend') + ' ' + this.nsEvent('mouseup')
};
this.$container.on(this.nsEvent('selectstart'),
+2 -2
View File
@@ -44,7 +44,7 @@
var idCounter = 0;
var uniqId = function() {
return ++idCounter + '';
}
};
/**
* Basic drag implementation for DOM elements inside a container.
@@ -110,7 +110,7 @@
this.pointer_events = {
start: this.nsEvent('touchstart') + ' ' + this.nsEvent('mousedown'),
move: this.nsEvent('touchmove') + ' ' + this.nsEvent('mousemove'),
end: this.nsEvent('touchend') + ' ' + this.nsEvent('mouseup'),
end: this.nsEvent('touchend') + ' ' + this.nsEvent('mouseup')
};
this.$container.on(this.nsEvent('selectstart'),