dashing-rails 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c4f2ac2b83de93b59cde2a8a721ff3c1da134ff
-  data.tar.gz: f5fcc3a0285c077218d15c4142e4389649b65ddf
+  metadata.gz: 8dfddde01d385b4094caeb1dfa91d57eb3661695
+  data.tar.gz: f7afc786e36b73efdd1cd121818fe3dc3fb3f7dc
 SHA512:
-  metadata.gz: 88dc2c0fd8d2763013d8055edc89801283a0bbfb9ab8a694f026d253a49f077db7afb46cfe7bbfbb2ad1e95029928c6a728005f3369d199da5289dfe7930ae5b
-  data.tar.gz: 393ec5fc545d3a31a3feb0b84444847abe82ee9605af6cac7f0482b93e53882d2d5c10b049e9b794121e1cbc458946c2e8adcd08fb26c284ae65d6e6052f2792
+  metadata.gz: ec6a9a63a1191a23eea315b6e22b6eb4b58045c9f5d6d8f2de73340f0c49deb1eefcdc53b6e0f3fa2351c04f61c020b556d8f85e608f43cfcdf0577c2742450b
+  data.tar.gz: e4146726fc36bc5e96d4cf2251d9d811387ea41e1ddffed1d9932375ca2d8be24c706618492b863ad9433fe07581fb38dd9430102119ccad6ff8ffa5fc659123

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 2.6.1
+
+* Revert gridster dashing to a newer version
+
 ## 2.6.0
 
 * Upgrade assets based on [Dashing](https://github.com/Shopify/dashing) repo

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dashing-rails (2.6.0)
+    dashing-rails (2.6.1)
       coffee-script (>= 2.0)
       connection_pool (~> 2.2)
       jquery-rails (>= 3.0)

data/lib/assets/javascripts/dashing.gridster.coffee

@@ -6,10 +6,26 @@ Dashing.gridsterLayout = (positions) ->
   Dashing.customGridsterLayout = true
   positions = positions.replace(/^"|"$/g, '')
   positions = $.parseJSON(positions)
-  widgets = $("[data-row^=]")
+  widgets = $("[data-row]")
+  maxRow = 1
+  maxCol = 1
+  numColumns = Dashing.numColumns || 1
   for widget, index in widgets
-    $(widget).attr('data-row', positions[index].row)
-    $(widget).attr('data-col', positions[index].col)
+    if positions? and index < positions.length
+      $(widget).attr('data-row', positions[index].row)
+      $(widget).attr('data-col', positions[index].col)
+      if positions[index].row > maxRow
+        maxRow = positions[index].row
+        maxCol = positions[index].col + 1
+      else if positions[index].row == maxRow and positions[index].col >= maxCol
+        maxCol = positions[index].col + 1
+    else
+      if maxCol > numColumns
+        maxRow += 1
+        maxCol = 1
+      $(widget).attr('data-row', maxRow)
+      $(widget).attr('data-col', maxCol)
+      maxCol += 1
 
 Dashing.getWidgetPositions = ->
   $(".gridster ul:first").gridster().data('gridster').serialize()
@@ -24,7 +40,9 @@ Dashing.showGridsterInstructions = ->
       <script type='text/javascript'>\n
       $(function() {\n
       \ \ Dashing.gridsterLayout('#{JSON.stringify(Dashing.currentWidgetPositions)}')\n
-      });\n</script>")
+      });\n
+      </script>
+    ")
 
 $ ->
   $('#save-gridster').leanModal()

data/lib/dashing/version.rb

@@ -1,3 +1,3 @@
 module Dashing
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dashing-rails
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Pierre-Louis Gottfrois