Recommitting 0.5.8 stuff

iQmetrix · Aug 25, 2016 · f678223 · f678223
1 parent 3140374
commit f678223
Show file tree

Hide file tree

Showing 11 changed files with 70 additions and 45 deletions.
diff --git a/.bower.json b/.bower.json
@@ -0,0 +1,14 @@
+{
+  "name": "gridster.js",
+  "homepage": "https://github.com/iQmetrix/gridster.js",
+  "version": "0.5.8",
+  "_release": "0.5.8",
+  "_resolution": {
+    "type": "version",
+    "tag": "v0.5.8",
+    "commit": "bd9c95f946df2aa38c325f0c6d87af7ec52de763"
+  },
+  "_source": "[email protected]:iQmetrix/gridster.js.git",
+  "_target": "0.5.8",
+  "_originalSource": "[email protected]:iQmetrix/gridster.js.git"
+}
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+<a name="v0.5.8"></a>
+### v0.5.8 (2015-04-16)
+jquery.draggable now takes a "window" option that specifies the scrollable div in the application if it's not "window"
+
+<a name="v0.5.7"></a>
+### v0.5.7 (2015-01-09)
+losen up column calculation logic, to achieve some small screen responsiveness
+
 <a name="v0.5.6"></a>
 ### v0.5.6 (2014-09-25)
 

diff --git a/dist/jquery.gridster.css b/dist/jquery.gridster.css
@@ -1,6 +1,6 @@
-/*! gridster.js - v0.5.6 - 2014-09-25
+/*! gridster.js - v0.6.0 - 2015-04-16
 * http://gridster.net/
-* Copyright (c) 2014 ducksboard; Licensed MIT */
+* Copyright (c) 2015 ducksboard; Licensed MIT */
 
 .gridster {
     position:relative;

diff --git a/dist/jquery.gridster.js b/dist/jquery.gridster.js
@@ -1,6 +1,6 @@
-/*! gridster.js - v0.5.6 - 2014-09-25
+/*! gridster.js - v0.6.0 - 2015-04-16
 * http://gridster.net/
-* Copyright (c) 2014 ducksboard; Licensed MIT */
+* Copyright (c) 2015 ducksboard; Licensed MIT */
 
 ;(function(root, factory) {
 
@@ -455,7 +455,7 @@
         // stop : function(e) {}
     };
 
-    var $window = $(window);
+    var $window;
     var dir_map = { x : 'left', y : 'top' };
     var isTouch = !!('ontouchstart' in window);
 
@@ -466,7 +466,7 @@
     var idCounter = 0;
     var uniqId = function() {
         return ++idCounter + '';
-    }
+    };
 
     /**
     * Basic drag implementation for DOM elements inside a container.
@@ -500,6 +500,7 @@
     function Draggable(el, options) {
       this.options = $.extend({}, defaults, options);
       this.$document = $(document);
+      $window = options.window || $(window);
       this.$container = $(el);
       this.$dragitems = $(this.options.items, this.$container);
       this.is_dragging = false;
@@ -520,7 +521,7 @@
         this.disabled = false;
         this.events();
 
-        $(window).bind(this.nsEvent('resize'),
+        $window.bind(this.nsEvent('resize'),
             throttle($.proxy(this.calculate_dimensions, this), 200));
     };
 
@@ -578,9 +579,9 @@
         var diff_y = Math.round(mouse_actual_pos.top - this.mouse_init_pos.top);
 
         var left = Math.round(this.el_init_offset.left +
-            diff_x - this.baseX + $(window).scrollLeft() - this.win_offset_x);
+            diff_x - this.baseX + $window.scrollLeft() - this.win_offset_x);
         var top = Math.round(this.el_init_offset.top +
-            diff_y - this.baseY + $(window).scrollTop() - this.win_offset_y);
+            diff_y - this.baseY + $window.scrollTop() - this.win_offset_y);
 
         if (this.options.limit) {
             if (left > this.player_max_left) {
@@ -598,8 +599,8 @@
             pointer: {
                 left: mouse_actual_pos.left,
                 top: mouse_actual_pos.top,
-                diff_left: diff_x + ($(window).scrollLeft() - this.win_offset_x),
-                diff_top: diff_y + ($(window).scrollTop() - this.win_offset_y)
+                diff_left: diff_x + ($window.scrollLeft() - this.win_offset_x),
+                diff_top: diff_y + ($window.scrollTop() - this.win_offset_y)
             }
         };
     };
@@ -747,8 +748,8 @@
             this.helper = false;
         }
 
-        this.win_offset_y = $(window).scrollTop();
-        this.win_offset_x = $(window).scrollLeft();
+        this.win_offset_y = $window.scrollTop();
+        this.win_offset_x = $window.scrollLeft();
         this.scroll_offset_y = 0;
         this.scroll_offset_x = 0;
         this.el_init_offset = this.$player.offset();
@@ -827,7 +828,7 @@
 
         this.$container.off(this.ns);
         this.$document.off(this.ns);
-        $(window).off(this.ns);
+        $window.off(this.ns);
 
         $.removeData(this.$container, 'drag');
     };
@@ -3926,7 +3927,7 @@
 
         this.cols = Math.max(min_cols, cols, this.options.min_cols);
 
-        if (max_cols !== Infinity && max_cols >= min_cols && max_cols < this.cols) {
+        if (max_cols !== Infinity) {
             this.cols = max_cols;
         }
 

diff --git a/dist/jquery.gridster.min.css b/dist/jquery.gridster.min.css
diff --git a/dist/jquery.gridster.min.js b/dist/jquery.gridster.min.js
diff --git a/dist/jquery.gridster.with-extras.js b/dist/jquery.gridster.with-extras.js
@@ -1,6 +1,6 @@
-/*! gridster.js - v0.5.6 - 2014-09-25
+/*! gridster.js - v0.6.0 - 2015-04-16
 * http://gridster.net/
-* Copyright (c) 2014 ducksboard; Licensed MIT */
+* Copyright (c) 2015 ducksboard; Licensed MIT */
 
 ;(function(root, factory) {
 
@@ -455,7 +455,7 @@
         // stop : function(e) {}
     };
 
-    var $window = $(window);
+    var $window;
     var dir_map = { x : 'left', y : 'top' };
     var isTouch = !!('ontouchstart' in window);
 
@@ -466,7 +466,7 @@
     var idCounter = 0;
     var uniqId = function() {
         return ++idCounter + '';
-    }
+    };
 
     /**
     * Basic drag implementation for DOM elements inside a container.
@@ -500,6 +500,7 @@
     function Draggable(el, options) {
       this.options = $.extend({}, defaults, options);
       this.$document = $(document);
+      $window = options.window || $(window);
       this.$container = $(el);
       this.$dragitems = $(this.options.items, this.$container);
       this.is_dragging = false;
@@ -520,7 +521,7 @@
         this.disabled = false;
         this.events();
 
-        $(window).bind(this.nsEvent('resize'),
+        $window.bind(this.nsEvent('resize'),
             throttle($.proxy(this.calculate_dimensions, this), 200));
     };
 
@@ -578,9 +579,9 @@
         var diff_y = Math.round(mouse_actual_pos.top - this.mouse_init_pos.top);
 
         var left = Math.round(this.el_init_offset.left +
-            diff_x - this.baseX + $(window).scrollLeft() - this.win_offset_x);
+            diff_x - this.baseX + $window.scrollLeft() - this.win_offset_x);
         var top = Math.round(this.el_init_offset.top +
-            diff_y - this.baseY + $(window).scrollTop() - this.win_offset_y);
+            diff_y - this.baseY + $window.scrollTop() - this.win_offset_y);
 
         if (this.options.limit) {
             if (left > this.player_max_left) {
@@ -598,8 +599,8 @@
             pointer: {
                 left: mouse_actual_pos.left,
                 top: mouse_actual_pos.top,
-                diff_left: diff_x + ($(window).scrollLeft() - this.win_offset_x),
-                diff_top: diff_y + ($(window).scrollTop() - this.win_offset_y)
+                diff_left: diff_x + ($window.scrollLeft() - this.win_offset_x),
+                diff_top: diff_y + ($window.scrollTop() - this.win_offset_y)
             }
         };
     };
@@ -747,8 +748,8 @@
             this.helper = false;
         }
 
-        this.win_offset_y = $(window).scrollTop();
-        this.win_offset_x = $(window).scrollLeft();
+        this.win_offset_y = $window.scrollTop();
+        this.win_offset_x = $window.scrollLeft();
         this.scroll_offset_y = 0;
         this.scroll_offset_x = 0;
         this.el_init_offset = this.$player.offset();
@@ -827,7 +828,7 @@
 
         this.$container.off(this.ns);
         this.$document.off(this.ns);
-        $(window).off(this.ns);
+        $window.off(this.ns);
 
         $.removeData(this.$container, 'drag');
     };
@@ -3926,7 +3927,7 @@
 
         this.cols = Math.max(min_cols, cols, this.options.min_cols);
 
-        if (max_cols !== Infinity && max_cols >= min_cols && max_cols < this.cols) {
+        if (max_cols !== Infinity) {
             this.cols = max_cols;
         }
 

diff --git a/dist/jquery.gridster.with-extras.min.js b/dist/jquery.gridster.with-extras.min.js
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "gridster",
   "title": "gridster.js",
   "description": "a drag-and-drop multi-column jQuery grid plugin",
-  "version": "0.5.6",
+  "version": "0.5.8",
   "homepage": "http://gridster.net/",
   "author": {
     "name": "ducksboard",

diff --git a/src/jquery.draggable.js b/src/jquery.draggable.js
@@ -33,7 +33,7 @@
         // stop : function(e) {}
     };
 
-    var $window = $(window);
+    var $window;
     var dir_map = { x : 'left', y : 'top' };
     var isTouch = !!('ontouchstart' in window);
 
@@ -44,7 +44,7 @@
     var idCounter = 0;
     var uniqId = function() {
         return ++idCounter + '';
-    }
+    };
 
     /**
     * Basic drag implementation for DOM elements inside a container.
@@ -78,6 +78,7 @@
     function Draggable(el, options) {
       this.options = $.extend({}, defaults, options);
       this.$document = $(document);
+      $window = options.window || $(window);
       this.$container = $(el);
       this.$dragitems = $(this.options.items, this.$container);
       this.is_dragging = false;
@@ -98,7 +99,7 @@
         this.disabled = false;
         this.events();
 
-        $(window).bind(this.nsEvent('resize'),
+        $window.bind(this.nsEvent('resize'),
             throttle($.proxy(this.calculate_dimensions, this), 200));
     };
 
@@ -156,9 +157,9 @@
         var diff_y = Math.round(mouse_actual_pos.top - this.mouse_init_pos.top);
 
         var left = Math.round(this.el_init_offset.left +
-            diff_x - this.baseX + $(window).scrollLeft() - this.win_offset_x);
+            diff_x - this.baseX + $window.scrollLeft() - this.win_offset_x);
         var top = Math.round(this.el_init_offset.top +
-            diff_y - this.baseY + $(window).scrollTop() - this.win_offset_y);
+            diff_y - this.baseY + $window.scrollTop() - this.win_offset_y);
 
         if (this.options.limit) {
             if (left > this.player_max_left) {
@@ -176,8 +177,8 @@
             pointer: {
                 left: mouse_actual_pos.left,
                 top: mouse_actual_pos.top,
-                diff_left: diff_x + ($(window).scrollLeft() - this.win_offset_x),
-                diff_top: diff_y + ($(window).scrollTop() - this.win_offset_y)
+                diff_left: diff_x + ($window.scrollLeft() - this.win_offset_x),
+                diff_top: diff_y + ($window.scrollTop() - this.win_offset_y)
             }
         };
     };
@@ -325,8 +326,8 @@
             this.helper = false;
         }
 
-        this.win_offset_y = $(window).scrollTop();
-        this.win_offset_x = $(window).scrollLeft();
+        this.win_offset_y = $window.scrollTop();
+        this.win_offset_x = $window.scrollLeft();
         this.scroll_offset_y = 0;
         this.scroll_offset_x = 0;
         this.el_init_offset = this.$player.offset();
@@ -405,7 +406,7 @@
 
         this.$container.off(this.ns);
         this.$document.off(this.ns);
-        $(window).off(this.ns);
+        $window.off(this.ns);
 
         $.removeData(this.$container, 'drag');
     };

diff --git a/src/jquery.gridster.js b/src/jquery.gridster.js
@@ -3079,7 +3079,7 @@
 
         this.cols = Math.max(min_cols, cols, this.options.min_cols);
 
-        if (max_cols !== Infinity && max_cols >= min_cols && max_cols < this.cols) {
+        if (max_cols !== Infinity) {
             this.cols = max_cols;
         }