caboose-cms 0.9.144 → 0.9.145

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad36e3ab078cfe4288197c147f011cd96206417e
-  data.tar.gz: 2f69c0326c4a6d12220aa33627f95111227dd6a1
+  metadata.gz: 55cb184a821973700cd89357414e3d46ed3ab96a
+  data.tar.gz: b4e45dc08475443d1b8c62be375981495e1a736f
 SHA512:
-  metadata.gz: a1038f36116c32ee019d71fd2ebf648e108344758ba24de2224196288bd535fd5afbeff9723f797cc90efe2812fe7ef108a514aebbd9405cb146cfaebc7b313a
-  data.tar.gz: a5f0124896a57daf5d6862cf55b3040dd0697cc3d0cb39756d8176837d8dc084972090b79bc704526214f4a3f713f996e7a28fbffa9b93777ebb44bfb876c207
+  metadata.gz: 00b61c390aa03888a8b085ec4e1230e7a8abeeaed3c9f5145629fe9597858a577caac232a015bb486cef0d57aa87a07d62a10860d8a43acfd9f06d0da328de38
+  data.tar.gz: 80c084b1391e454eacfc421bea033f85a793f15210edb56602babd994707421164903b3e6755b6320459d7d2a19e14b89ca4c75bed06ce972f83a3941f8e50e7

data/app/assets/stylesheets/caboose/admin_block_edit_image.css.scss

@@ -216,14 +216,14 @@
   background: #141516; 
   color: #f7f7f7 !important;
   text-align: center; 
-  padding: 1px 15px 0 15px;
+  padding: 1px 15px 2px 15px;
   height: auto;
   display: inline-block;
   margin: 0 auto;
   font-family: "Roboto", Arial;
   font-weight: 300;
   font-size: 15px;
-  line-height: 32px;
+  line-height: 30px;
   cursor: pointer;
   border: 1px solid #fff;
   -webkit-border-radius: 5px;

data/app/controllers/caboose/blocks_controller.rb

@@ -514,24 +514,13 @@ module Caboose
     def admin_update_value
       return unless user_is_allowed('pages', 'edit')
       resp = StdClass.new({'attributes' => {}})
+      val = params[:value]
       b = Block.find(params[:id])
-      # if b.block_type_id == 309 # Richtext
-      b.new_value = params[:value]
-      b.status = 'edited' if b.status == 'published'
-      # if b.page
-      #   b.page.status = 'edited'
-      #   b.page.save
-      # elsif b.post
-      #   b.post.status = 'edited'
-      #   b.post.save
-      # end
-
-      # elsif b.block_type_id == 1 # Heading
-      #   b1 = b.child('heading_text')
-      #   b1.value = params[:value]
-      #   b1.save
-      # end
-      resp.success = b.save
+      if b
+        b.new_value = val.blank? ? 'EMPTY' : val.gsub(/<span><span contenteditable="false"([A-z0-9;\-\(\),><#&\/\.\?↵ =":]*)<\/span><\/span>/,'').gsub('<span></span>','').gsub('<span style=""></span>','')
+        b.status = 'edited' if b.status == 'published'
+        resp.success = b.save
+      end
       render :json => resp
     end
     

data/app/views/caboose/posts/admin_index.html.erb

@@ -22,6 +22,7 @@ $(document).ready(function() {
     allow_bulk_delete:   false ,
     allow_duplicate:     false ,
     allow_advanced_edit: true ,
+    after_add: 'redirect',
     fields: [
       { show: true , bulk_edit: false , name: 'title'        , nice_name: 'Title'        , sort: 'title'        , type: 'text'     , value: function(p) { return p.title                                     }, width: 300, editable: false },
       { show: true , bulk_edit: false , name: 'published'    , nice_name: 'Published'    , sort: 'published'    , type: 'checkbox' , value: function(p) { return p.published ? 'Yes' : 'No'                  }, width: 100, editable: false },

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.9.144'
+  VERSION = '0.9.145'
 end

metadata

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