caboose-cms 0.4.22 → 0.4.23

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YTIwZjM2MzAxM2FjZjBlOTEwZDI2YTRiMjk3N2Q0OTkwYzFmYjRmZA==
+    ZGEwMWNmOGQ5MmU3ZjE2MWY0ZjgxODBkZDg3Mjk2MzhjMGIzYWQ4Mg==
   data.tar.gz: !binary |-
-    YTE4ODBjNzY4Mzk1YTFiOTkwZGFmMTUzMTQ0MjVlMjE2MTQ0NDQ4Yw==
+    MTJiYmM1NjQ2ZWJmMGYzODdlZTYxYTM3ODE5YTI4NWM5ZmM5MWM3OA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ODM5NzJiMjk3NzE5ZDVkMWYyNGRjZjE0YjMyODYzYzc0NDI2ZGFiOWUwOGZi
-    OTk3ODc1NzJiZDgwNTJmYzhiMWQxNjY3YWZiNTU4MGZhNDVhYTMyYTk2Yjlj
-    ZGNiYmI1N2M1OGQzYTY5OTY2MzcxMzI2OGUwODZhNjdlMTJlM2I=
+    ZGEyYWQ0NDBkOTFjZGU0NGI0N2NjYjM0ZDdlYWQ1OTNmNGM0MGJhZmZkNGM2
+    MGMyMjYxZTZlZTY3ZGI2MTNiYjZkOWNlNWQ5YmQ1NGUzYjAyZjVhMzkzMDRi
+    Y2M0YjJiMTc1MGVmNmFhN2QxMGJkZjFhMDRiMmMyNzQyNGE1NGY=
   data.tar.gz: !binary |-
-    NzVkZjBiYjVhOGY0MWFiZGE3MWNkZjg4NjcwYWQ5ZTA4YjU0ZTE2OGRjNjQw
-    NDFiMzBkMTlkN2VlNzVmNWY1ZGM0NjJjN2YzNDkwYzI1NjMzZDNhOWE0ZmI2
-    YTQ1N2YzZDg0NjkxOWJiYTBiZTA0MWVlYzQyZjY0MDhiYmVkN2U=
+    OWE2N2EzMzA3ODdlODU2MWJjYzllMmE3NGY2ZWM2ZjlkNjRmZmE2MWZhMDNm
+    MmRiMzQ5MmNjNjg4ZmE5ZmM5MWM0NTc5YjZiNTY3YjMwMGYxNDgwOTFjMjU2
+    NDFhYmU3MTFiZGQzODU5MWFhMDFhZTcwOTYyNDk1YzIyODc5YWU=

data/app/controllers/caboose/blocks_controller.rb

@@ -133,7 +133,13 @@ module Caboose
       @page = Page.find(params[:page_id])
       @block = Block.find(params[:id])
       @block.create_children
-      @modal = true      
+      @modal = true
+
+      @cdn_domain = Rails.application.config.action_controller.asset_host
+      if @cdn_domain.starts_with?('//')
+        protocol = request.protocol.gsub('//', '')
+        @cdn_domain = "#{protocol}#{Rails.application.config.action_controller.asset_host}"
+      end        
                     
       #render "caboose/blocks/admin_edit_#{@block.block_type}", :layout => 'caboose/modal'
       render :layout => 'caboose/modal'

data/app/views/caboose/blocks/admin_edit.html.erb

@@ -101,7 +101,7 @@ $(document).ready(function() {
 <% if @block.block_type.field_type == 'richtext' %>
   <%= tinymce_assets %>
   <script type='textjavascript'>
-  document.domain = "<%= Rails.application.config.action_controller.asset_host %>";
+  document.domain = "<%= raw @cdn_domain %>";
   </script>
   <%= tinymce :caboose, width: '800px', height:'300px' %>
 <% end %>

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.22'
+  VERSION = '0.4.23'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.22
+  version: 0.4.23
 platform: ruby
 authors:
 - William Barry