caboose-cms 0.5.34 → 0.5.35

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTUyNTVlMGUwODZmNWZhZWI3MzY4NDFkMGU2Y2QzOTQ3OGNkZWJiYw==
+    YThkN2U0ZjAxNTAzNzQxNjliZmYzNTc1OTEyZTdhNDE4ZTg1M2EzNA==
   data.tar.gz: !binary |-
-    YjNiNjhiMzgxYmQyMGY1MTU1ZTM4MmNhZWExMDA2NjUxOWFlZWNhMw==
+    NmZiNDU3NTNhYjk0MGFjOTUwZjJkZjQyMGY2OTdkZDRlOGM3NTU0OQ==
 SHA512:
   metadata.gz: !binary |-
-    MjJlMjcwNjZiY2QxMjYyYjgxZTNjODBiNjJmNWZkZmI5ODE4Nzc3NWZlMWQ3
-    ZTM2ZDI1YWIwNDE4ZDhjYjI4N2U5ZmU3ZWM1MzVmZjZmZTA4NzIxN2M3YTgx
-    YWJlOTc0MWRiMWFhNTg0YjU3MTczYTlmMmJjYmY2MGI2ODcxYjg=
+    MzcxZTVlMWNkZjNkYjUxODU0MTExZmY2NzVmYTJlZmNlNzVhMThhZjdlNmM5
+    MDFkMzE2YzhiMjI3YTAyNjA2YzhkMWIxMjk5MTM5ZTZkYzc2Y2Q3Yjk3MTMy
+    YzNmNmJiNzI0NGYwNmVmYzc0YTI5MmU4ZThkNzdhMjJmOWNlNjQ=
   data.tar.gz: !binary |-
-    ZmFiNDhiYzAxYmUwOTMzODFhNGMxYWVhMzFkNDZmNTE0MDllMmFmZDcxNWE2
-    YWY4Mjc1MDY5OGEwNzhlNzllY2IwNjZiZjYwZDFlNjExYWMzNmI3OTA1YjJi
-    M2FhNTMzOTM1OGYzMjE1OTYyOGFhN2UxOTUyMWMwMjg3ZDZlMWM=
+    ODlhY2U4Yjc4Y2JkN2YyYWQ4OGJlYTg4ODc1NWNhNjc1NGQ0YzBjOWMyYWFj
+    OTBjNzQxOWE1YjBjNzEyNjUzZmEwNzRiN2EzYzk0NmU5OTQ1MmM2ODYyMGE3
+    NzBkNTFhNTA0MTg3YWQxYjNjMTRmZjQyM2I5YzY1NGE4NThlN2E=

data/app/assets/javascripts/caboose/admin_page_edit_content.js

@@ -137,9 +137,8 @@ PageContentController.prototype = {
     $.ajax({
       url: '/admin/pages/' + this.page_id + '/blocks/' + block_id + '/move-up',
       type: 'put',      
-      success: function(resp) {
-        that.stop_loadify();
-        if (resp.success) that.render_blocks();      
+      success: function(resp) {        
+        if (resp.success) that.render_blocks(function() { that.stop_loadify(); });      
       }
     });    
   },
@@ -151,9 +150,8 @@ PageContentController.prototype = {
     $.ajax({
       url: '/admin/pages/' + this.page_id + '/blocks/' + block_id + '/move-down',
       type: 'put',      
-      success: function(resp) {
-        that.stop_loadify();
-        if (resp.success) that.render_blocks();      
+      success: function(resp) {        
+        if (resp.success) that.render_blocks(function() { that.stop_loadify(); });      
       }
     });    
   },
@@ -187,12 +185,13 @@ PageContentController.prototype = {
   Block Rendering
   *****************************************************************************/
   
-  render_blocks: function() {
+  render_blocks: function(before_render) {
     $('.sortable').sortable('destroy');
     var that = this;                
     $.ajax({
       url: '/admin/pages/' + this.page_id + '/blocks/render-second-level',
       success: function(blocks) {
+        if (before_render) before_render();
         $(blocks).each(function(i, b) {
           $('#block_' + b.id).replaceWith(b.html);                              
         });

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.5.34'
+  VERSION = '0.5.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.5.34
+  version: 0.5.35
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-13 00:00:00.000000000 Z
+date: 2014-11-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg