caboose-cms 0.9.63 → 0.9.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7d8d3813a766f7029297bb4f08ee73dac892e4e8
-  data.tar.gz: efa67048c5b4d6de6d255f69fb64252da1fa40e4
+  metadata.gz: c05e137cd6e27972d585cb2a92b3da5d0a953d4c
+  data.tar.gz: 1f84a4eb9232ef323d070bf225e4b8c571451364
 SHA512:
-  metadata.gz: e36b85117b20a2909c007d969c7bb3819f2fa81c5313274fb941909149ba3ef64c5409b6a94c7ce27d2bbc4504530389729721881c716fb5f6c6befbf112c281
-  data.tar.gz: 2a15256ba40389fb2fd52dfe0d11fbce6463c53a79b4711a6254b705eb87231bd6eb88f948002f05734db9451ac58197b415fa81fc3d744b34a229f50be4c0b5
+  metadata.gz: 00effcc5fc52ef32a1d7990a807276ab3162e4a4ba5e85b61a3fde70e0d9df7d40758048a58c7762f581be201e268caf36c17b05f9cdbfc568f17eceb3407071
+  data.tar.gz: c2fe489c22d2efd3f369491c3d8bfa275918d1cbe72504ada8f97d80ff582abaada41fa5b9c4bbc805a2ba3859de65573571a9e2d934d08e8867b21356008635

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

@@ -206,32 +206,32 @@ BlockContentController.prototype = {
   {
     var that = this;      
     if (this.selected_block_ids.indexOf(block_id) == -1)
-        this.selected_block_ids.push(block_id);
+      this.selected_block_ids.push(block_id);
     var other_count = this.selected_block_ids.length - 1;
-
     if (!confirm)
     {
       var message = "Are you sure you want to delete this block";      
       if (other_count > 0)
         message += " and the " + other_count + " other selected block" + (other_count == 1 ? '' : 's');
       message += "?<br />";
-      
       var p = $('<p/>')
         .addClass('caboose_note delete')
         .append(message)
         .append($('<input/>').attr('type', 'button').val('Yes').click(function(e) { e.preventDefault(); e.stopPropagation(); that.delete_block(block_id, true); })).append(" ")
-        .append($('<input/>').attr('type', 'button').val('No').click(function(e) {  e.preventDefault(); e.stopPropagation(); }));
+        .append($('<input/>').attr('type', 'button').val('No').click(function(e) { e.preventDefault(); e.stopPropagation(); that.render_block(block_id); }));
       $('#block_' + block_id).attr('onclick','').unbind('click');
       $('#block_' + block_id).empty().append(p);
       return;
     }
-    for (var i in this.selected_block_ids) {
-      var bid = this.selected_block_ids[i];
-      $('#block_' + bid).remove();
-      that.delete_block_save(bid);
+    else {
+      for (var i in this.selected_block_ids) {
+        var bid = this.selected_block_ids[i];
+        $('#block_' + bid).remove();
+        that.delete_block_save(bid);
+      }
+      that.selected_block_ids = [];
+      that.add_dropzones();
     }
-    that.selected_block_ids = [];
-    that.add_dropzones();
   },
 
   delete_block_save: function(block_id) {
@@ -366,8 +366,7 @@ BlockContentController.prototype = {
         });
       }
 
-      if ( $(v).parents('.content_wrapper').length > 0 )
-        that.add_handles_to_block(bid);
+      that.add_handles_to_block(bid);
 
     });
 
@@ -378,23 +377,21 @@ BlockContentController.prototype = {
     var el = $('#block_' + block_id);
     if ( el.attr('id').indexOf('_value') >= 0 || el.children('.drag_handle').length > 0 )
       return true;
-    $('#block_' + block_id + ' *').attr('onclick', '').unbind('click');
-      el
-        .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_drag'      ).addClass('drag_handle'      ).append($('<span/>').addClass('ui-icon ui-icon-arrow-4'    )).click(function(e) { e.preventDefault(); e.stopPropagation();  }))
+    if ( el.parents('.content_body').length > 0 ) {
+      $('#block_' + block_id + ' *').attr('onclick', '').unbind('click');
+      el.prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_drag'      ).addClass('drag_handle'      ).append($('<span/>').addClass('ui-icon ui-icon-arrow-4'    )).click(function(e) { e.preventDefault(); e.stopPropagation();  }))
         .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_select'    ).addClass('select_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-check'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.select_block(block_id);    }))
         .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_duplicate' ).addClass('duplicate_handle' ).append($('<span/>').addClass('ui-icon ui-icon-copy'       )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.duplicate_block(block_id); }))
         .prepend($('<a/>').attr('id', 'handle_block_' + block_id + '_delete'    ).addClass('delete_handle'    ).append($('<span/>').addClass('ui-icon ui-icon-close'      )).click(function(e) { e.preventDefault(); e.stopPropagation(); that.delete_block(block_id);    }));
+      el.mouseover(function(el) { $('#block_' + block_id).addClass(   'block_over'); });
+      el.mouseout(function(el)  { $('#block_' + block_id).removeClass('block_over'); });
+    }
     el.attr('onclick','').unbind('click');
     el.click(function(e) {      
       e.preventDefault();
       e.stopPropagation();      
       that.edit_block(block_id);
     });
-    var show_mouseover = true;
-    if (show_mouseover) {
-      el.mouseover(function(el) { $('#block_' + block_id).addClass(   'block_over'); });
-      el.mouseout(function(el)  { $('#block_' + block_id).removeClass('block_over'); }); 
-    }
   },
   
   /*****************************************************************************

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.63'
+  VERSION = '0.9.64'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.63
+  version: 0.9.64
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-02 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg