Merge branch 'master' of https://github.com/dsmorse/gridster.js

updates to make ruby on rails gem work. see pull Request #14 & #15
dsmorse · May 31, 2015 · aa598a5 · aa598a5
2 parents 8997809 + 278afda
commit aa598a5
Show file tree

Hide file tree

Showing 11 changed files with 26 additions and 13 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
   "name": "gridster",
   "homepage": "dsmorse.github.io/gridster.js/",
-  "version": "0.6.9",
+  "version": "0.6.9.2",
   "dependencies": {
     "jquery": "^2.1.3"
   },

diff --git a/dist/jquery.gridster.css b/dist/jquery.gridster.css
@@ -1,5 +1,5 @@
-/*! gridster.js - v0.6.9 - 2015-05-27
-* http://gridster.net/
+/*! gridster.js - v0.6.9.2 - 2015-05-31
+* https://dsmorse.github.io/gridster.js/
 * Copyright (c) 2015 ducksboard; Licensed MIT */
 
 .gridster {

diff --git a/dist/jquery.gridster.js b/dist/jquery.gridster.js
@@ -1,5 +1,5 @@
-/*! gridster.js - v0.6.9 - 2015-05-27
-* http://gridster.net/
+/*! gridster.js - v0.6.9.2 - 2015-05-31
+* https://dsmorse.github.io/gridster.js/
 * Copyright (c) 2015 ducksboard; Licensed MIT */
 
 ;(function(root, factory) {

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,5 +1,5 @@
-/*! gridster.js - v0.6.9 - 2015-05-27
-* http://gridster.net/
+/*! gridster.js - v0.6.9.2 - 2015-05-31
+* https://dsmorse.github.io/gridster.js/
 * Copyright (c) 2015 ducksboard; Licensed MIT */
 
 ;(function(root, factory) {

diff --git a/dist/jquery.gridster.with-extras.min.js b/dist/jquery.gridster.with-extras.min.js
diff --git a/lib/gridster.js-rails.rb b/lib/gridster.js-rails.rb
@@ -0,0 +1,7 @@
+require "bootstrap-typeahead-rails/version"
+
+module Gridster
+  module Rails
+    require "gridster.js-rails/engine"
+  end
+end
diff --git a/lib/gridster.js-rails/engine.rb b/lib/gridster.js-rails/engine.rb
@@ -0,0 +1,6 @@
+module Gridster
+  module Rails
+    class Engine < ::Rails::Engine
+    end
+  end
+end
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.6.9.1"
+    VERSION = "0.6.9.2"
   end
 end
diff --git a/package.json b/package.json
@@ -2,8 +2,8 @@
   "name": "gridster",
   "title": "gridster.js",
   "description": "a drag-and-drop multi-column jQuery grid plugin",
-  "version": "0.6.9",
-  "homepage": "dsmorse.github.io/gridster.js/",
+  "version": "0.6.9.2",
+  "homepage": "https://dsmorse.github.io/gridster.js/",
   "author": {
     "name": "ducksboard"
   },