caboose-cms 0.9.136 → 0.9.137

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e7aab172d514a078354712d2e901138f20b37e30
-  data.tar.gz: 59818bc8e34f7045526d6ab0ed20567082ab3984
+  metadata.gz: 3cbefac74a3129d8da10bd3c9e6a7b7b42744292
+  data.tar.gz: f899356389647067fbab2e3920c6ddf7f16476a4
 SHA512:
-  metadata.gz: 6e18ed335191fda464d69ba666773bdb601bed75c770401fc2426f25cf04f4fe508fc2d604b1e3205be52f22d51e120223896abb1bc8c508669a44b7a3ac3f92
-  data.tar.gz: f0e09160bc323b8b892dec0ab85ed57e1b98de5e93d3aac83a482935b95852bd6309af565af7b486d3e2656eda4c15147d67d88c09eb605171a2123a34f7db81
+  metadata.gz: 7ab3bb6a373b4a87a032c524f4b5bb0a20b02d46789c12ab37ef96f7073548874c723aedc6a9209ca0a9449ee3b1420c23890bc7c3d3f2e7c18ef49b96e87b8f
+  data.tar.gz: 77cd58c747d7ef0e03a711e733d5cbefeb493c2257206df440ae0f22161f646ac6ce8065c93540d459242c921e33d8e0afa4389c22cb972e5990b62b672e7c88

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

@@ -48,27 +48,48 @@ BlockContentController.prototype = {
     $.each(that.inline_classes, function(k1, c) {
       $.each($('.' + c), function(k2, b) {
        // var el = $(b).find('.value').first();
-        if ( !$(b).hasClass('cke_editable') ) {
+        if ( !$(b).hasClass('cke_editable') && $(b).closest("#the_modal").length == 0 ) {
+  
           $(b).attr('contenteditable','true');
           var target_id = $(b).data('rtid');
-     //     var block_id = $(b).attr('id').replace('block_','');
           var editor = CKEDITOR.inline( $(b).attr('id') );
 
+          var is_saved = true;
+
           editor.on('change', function(ev) {
             that.is_modified();
             $(b).css('background-color','#ffffd0').css('color','black');
+            is_saved = false;
           });
 
           editor.on('blur', function(ev) {
-            var html = $(b).html();
-            $.ajax({
-              url: that.base_url() + '/' + target_id + '/value',
-              type: 'put',
-              data: { value: html },
-              success: function(resp) { 
-                $(b).css('background-color','').css('color','');
-              }
-            });
+            if ( !is_saved ) {
+              var html = $(b).html();
+              $.ajax({
+                url: that.base_url() + '/' + target_id + '/value',
+                type: 'put',
+                data: { value: html },
+                success: function(resp) { 
+                  $(b).css('background-color','').css('color','');
+                  is_saved = true;
+                }
+              });
+            }
+          });
+
+          $(b).on('mouseleave', function(ev) {
+            if ( !is_saved ) {
+              var html = $(b).html();
+              $.ajax({
+                url: that.base_url() + '/' + target_id + '/value',
+                type: 'put',
+                data: { value: html },
+                success: function(resp) { 
+                  $(b).css('background-color','').css('color','');
+                  is_saved = true;
+                }
+              });
+            }
           });
 
         }

data/app/assets/javascripts/caboose/block_modal_controllers/richtext_modal_controller.js

@@ -9,7 +9,7 @@ var RichtextModalController = BlockModalController.extend({
   assets_to_include: function()
   {
     return [
-      '//cdn.tinymce.com/4/tinymce.min.js'
+      '//cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.13/tinymce.min.js'
       //'//tinymce.cachefly.net/4.0/tinymce.min.js',
       //'caboose/tinymce_init.js'
     ]
@@ -48,7 +48,7 @@ var RichtextModalController = BlockModalController.extend({
           nice_name: 'Content',
           type: 'richtext',
           value: that.block.value,
-          width: 800,
+          width: 798,
           height: 300,
           fixed_placeholder: false,
           after_update: function() {            
@@ -74,7 +74,7 @@ var RichtextModalController = BlockModalController.extend({
     {
       tinymce.init({
         selector: 'textarea.tinymce',
-        width: '800px',
+        width: '798px',
         height: '300px',
         convert_urls: false,
         plugins: 'advlist autolink lists link image charmap print preview hr anchor pagebreak searchreplace wordcount visualblocks visualchars code fullscreen insertdatetime media nonbreaking table contextmenu directionality emoticons template paste textcolor caboose',

data/app/assets/stylesheets/caboose/admin_edit_page_content_dragdrop.scss

@@ -80,6 +80,11 @@
     top: 0;
   }
 }
+#the_modal {
+  #modal_controls {
+    margin-top: 10px;
+  }
+}
 
 #cboxTopLeft, #cboxTopRight, #cboxBottomLeft, #cboxBottomRight, #cboxMiddleLeft, #cboxMiddleRight, #cboxTopCenter, #cboxBottomCenter, #cboxClose {
   background: #fff !important;
@@ -125,9 +130,9 @@
 .richtext-block {
   z-index: 6;
 }
-#colorbox, #cboxOverlay, #cboxWrapper {
-  z-index: 10000000;
-}
+// #colorbox, #cboxOverlay, #cboxWrapper {
+//   z-index: 10000000;
+// }
 
 body > .ui-draggable-dragging {
   width: 95px;
@@ -290,7 +295,7 @@ body > .container, body > .mm-page > .container {
   &.published {
     background-color: #353535;
     #m-unpub { display: none; }
-    a[href*="revert"], a[href*="publish"] {
+    a[href*="revert"], a[href*="publish"], a[href*="preview"] {
       display: none;
     }
   }

data/app/helpers/caboose/application_helper.rb

@@ -2,7 +2,7 @@ module Caboose
   module ApplicationHelper
     def caboose_tinymce
       return "
-<script src='https://cdn.tinymce.com/4/tinymce.min.js'></script>
+<script src='https://cdnjs.cloudflare.com/ajax/libs/tinymce/4.7.13/tinymce.min.js'></script>
 <script type='text/javascript'>
 //<![CDATA[
 tinyMCE.init({

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.136'
+  VERSION = '0.9.137'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.9.136
+  version: 0.9.137
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-22 00:00:00.000000000 Z
+date: 2018-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pg