Merge pull request #130 from kbroderick/master

Address #129 -- README instructions for Gemfile
dsmorse · May 28, 2019 · d3ea15f · d3ea15f
2 parents 7cf095d + 41fa954
commit d3ea15f
Show file tree

Hide file tree

Showing 14 changed files with 28 additions and 24 deletions.
diff --git a/README.md b/README.md
@@ -59,15 +59,19 @@ and run bundle install.
 Add this line to app/assets/stylesheets/application.css
 
 ``` css
- *= require jquery.gridster
+ *= require jquery.dsmorse-gridster.min
 ```
+Note that the non-minified versions is `jquery.gridster`, should that be preferred.
+
 
 Add this line to app/assets/javascripts/application.js
 
 ``` javascript
-//= require jquery.gridster
+//= require jquery.dsmorse-gridster.min
 ```
 
+Note that `jquery.dsmorse-gridster`, `jquery.dsmorse-gridster.with-extras`, and `jquery.dsmorse-gridster.with-extras.min` are also available if you want a non-minified version or gridster with extras.
+
 ## Contributing to this project
 
 Anyone and everyone is welcome to contribute. Please take a moment to review the guidelines for contributing.
@@ -84,4 +88,4 @@ Distributed under the MIT license.
 ## Whodunit
 
 Gridster is built by [Ducksboard](http://ducksboard.com/) with the help of all
-these [wonderful people](https://github.com/ducksboard/gridster.js/graphs/contributors).
+these [wonderful people](https://github.com/dsmorse/gridster.js/graphs/contributors).
diff --git a/dist/jquery.collision.js b/dist/jquery.collision.js
diff --git a/dist/jquery.coords.js b/dist/jquery.coords.js
diff --git a/dist/jquery.draggable.js b/dist/jquery.draggable.js
diff --git a/dist/jquery.gridster.js → dist/jquery.dsmorse-gridster.js b/dist/jquery.gridster.js → dist/jquery.dsmorse-gridster.js
@@ -1,6 +1,6 @@
-/*! gridster.js - v0.7.0 - 2017-03-27
+/*! gridster.js - v0.8.0 - 2019-01-10
 * https://dsmorse.github.io/gridster.js/
-* Copyright (c) 2017 ducksboard; Licensed MIT */
+* Copyright (c) 2019 ducksboard; Licensed MIT */
 
 ;(function(root, factory) {
 	'use strict';
@@ -2275,7 +2275,7 @@
 			container_width: this.container_width,
 			move_element: false,
 			resize: true,
-			limit: { width: this.options.max_cols !== Infinity || this.limit.width, height: this.options.max_rows !== Infinity || this.limit.height },
+			limit: { width: this.options.max_cols !== Infinity || this.options.limit.width, height: this.options.max_rows !== Infinity || this.options.limit.height },
 			scroll_container: this.options.scroll_container,
 			start: $.proxy(this.on_start_resize, this),
 			stop: $.proxy(function (event, ui) {
@@ -3265,9 +3265,7 @@
 	 */
 	fn.is_empty = function (col, row) {
 		if (typeof this.gridmap[col] !== 'undefined') {
-			if (typeof this.gridmap[col][row] !== 'undefined' &&
-					this.gridmap[col][row] === false
-			) {
+			if (!this.gridmap[col][row]) {
 				return true;
 			}
 			return false;
@@ -5031,7 +5029,7 @@
 	};
 
 	fn.get_num_widgets = function () {
-		return this.$widgets.size();
+		return this.$widgets.length;
 	};
 
 	/**

diff --git a/dist/jquery.gridster.min.css → dist/jquery.dsmorse-gridster.min.css b/dist/jquery.gridster.min.css → dist/jquery.dsmorse-gridster.min.css
diff --git a/dist/jquery.dsmorse-gridster.min.js b/dist/jquery.dsmorse-gridster.min.js
diff --git a/dist/jquery.gridster.with-extras.js → dist/jquery.dsmorse-gridster.with-extras.js b/dist/jquery.gridster.with-extras.js → dist/jquery.dsmorse-gridster.with-extras.js
@@ -1,6 +1,6 @@
-/*! gridster.js - v0.7.0 - 2017-03-27
+/*! gridster.js - v0.8.0 - 2019-01-10
 * https://dsmorse.github.io/gridster.js/
-* Copyright (c) 2017 ducksboard; Licensed MIT */
+* Copyright (c) 2019 ducksboard; Licensed MIT */
 
 ;(function(root, factory) {
 	'use strict';
@@ -2275,7 +2275,7 @@
 			container_width: this.container_width,
 			move_element: false,
 			resize: true,
-			limit: { width: this.options.max_cols !== Infinity || this.limit.width, height: this.options.max_rows !== Infinity || this.limit.height },
+			limit: { width: this.options.max_cols !== Infinity || this.options.limit.width, height: this.options.max_rows !== Infinity || this.options.limit.height },
 			scroll_container: this.options.scroll_container,
 			start: $.proxy(this.on_start_resize, this),
 			stop: $.proxy(function (event, ui) {
@@ -3265,9 +3265,7 @@
 	 */
 	fn.is_empty = function (col, row) {
 		if (typeof this.gridmap[col] !== 'undefined') {
-			if (typeof this.gridmap[col][row] !== 'undefined' &&
-					this.gridmap[col][row] === false
-			) {
+			if (!this.gridmap[col][row]) {
 				return true;
 			}
 			return false;
@@ -5031,7 +5029,7 @@
 	};
 
 	fn.get_num_widgets = function () {
-		return this.$widgets.size();
+		return this.$widgets.length;
 	};
 
 	/**

diff --git a/dist/jquery.dsmorse-gridster.with-extras.min.js b/dist/jquery.dsmorse-gridster.with-extras.min.js
diff --git a/dist/jquery.gridster.min.js b/dist/jquery.gridster.min.js
diff --git a/dist/jquery.gridster.with-extras.min.js b/dist/jquery.gridster.with-extras.min.js
diff --git a/dist/utils.js b/dist/utils.js
diff --git a/lib/gridster.js-rails/version.rb b/lib/gridster.js-rails/version.rb
@@ -1,5 +1,5 @@
 module Gridster
   module Rails
-    VERSION = "0.7.0"
+    VERSION = "0.8.0"
   end
 end
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "dsmorse-gridster",
   "title": "gridster.js",
   "description": "a drag-and-drop multi-column jQuery grid plugin",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "homepage": "https://dsmorse.github.io/gridster.js/",
   "author": {
     "name": "ducksboard"