caboose-cms 0.4.26 → 0.4.27

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MGU1ZTE0OTgyYmZkNGVjNTAwYWE1N2IzZmZkMTM1ZmQxYjRmOGNlOA==
+    MTQ2MmI4MWMyNDc4OGY1ZDQzNzllZDkwMjhhYWQ1YmJjYzkyMWEyNw==
   data.tar.gz: !binary |-
-    YWFlMTY4NTc0Yjg3YjQ1ZGY5ZjcyMDBiNzE2NThhYjEzNTk1MjBiMA==
+    NjEyZjdkMzNlOWIyYjRhMTUyZThhZDc4MWM1ODFkZTEzOWQ3MjNmZQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NmRiZGQxNGIzY2IxM2YxYWI1ZWQ2MzQ1MDc1M2ZmMzFhYjZjNDVmYzU3Y2M2
-    NTlhZWM0NjdiYTlmNThiZDY3ODcwOTBkNWI2NjcxZGYwNjM5M2IzMDBhYzk3
-    MDc5MGE5NzBjODJmNGZhOTNjYzczYjI1MGZhZTZlMDQyM2MwNzg=
+    OTA0ODBjMWYwMTdiYjFmYTdiMDJiY2RkZTBkMDI1YTU4ZTMyZTQxZTUyNTc5
+    M2RlMzIwODk1OTk5OGEzMjg4NjU5OTE3YWYzZmU1MmQ1Yzk5Nzg1Y2MwMjk2
+    NTVjNWI0YjM0ZDY5NmYyYzRmYmY5YmYxZmU5ZDNhNmU1YzlhZWM=
   data.tar.gz: !binary |-
-    ODY1NzI0ZWE2MmI4MGI3OGQ2NjBkM2Q1MDkwMzc2MWFlMGQ5ZGVhODdmMzQw
-    ODRjNzZkYzJjYWYyZjQzMDFjZTBjNjEyZjVjNGY2YjIzMDVjYTBhYTQ4M2Fi
-    MWY0YjczZWUzNzkxM2VlMGNlY2QwNjRiMDdjMjUxYzIxZmVkNDU=
+    MWRlMTcwZjczZDJlNDY1NWVmMTQzYTJlODdlYzZkNDRiNTc1NDBlYTE2YzVk
+    N2JmYjZkNzlkNmQ5MzA3OTVhZjJjNzc4ZGE4M2ZiOWYwNTYwMGZhNmI1MDY5
+    YjRkNTQ1ODA3NTEwYTI0MzAyZGJkODE3YzFjZDA2NGZlMDcxOTU=

data/app/controllers/caboose/blocks_controller.rb

@@ -135,12 +135,10 @@ module Caboose
       @block.create_children
       @modal = true
 
-      Caboose.log(Rails.application.config.action_controller)
-      @cdn_domain = Rails.application.config.action_controller.asset_host
-      if @cdn_domain.starts_with?('//')
-        @cdn_domain = @cdn_domain.gsub('//', '')                
-      end        
-                    
+      @document_domain = request.host
+      @document_domain.gsub('http://', '')
+      @document_domain.gsub('https://', '')
+                                  
       #render "caboose/blocks/admin_edit_#{@block.block_type}", :layout => 'caboose/modal'
       render :layout => 'caboose/modal'
     end

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

@@ -99,7 +99,10 @@ $(document).ready(function() {
 
 </script>
 <% if @block.block_type.field_type == 'richtext' %>
-  <script src="/assets/tinymce.js" type="text/javascript"></script>  
+  <script src="/assets/tinymce.js" type="text/javascript"></script>
+  <script type='text/javascript'>
+  document.domain = "<%= raw @document_domain %>";
+  </script>  
   <%= tinymce :caboose, width: '800px', height:'300px' %>
 <% end %>
 

data/lib/caboose/version.rb

@@ -1,3 +1,3 @@
 module Caboose
-  VERSION = '0.4.26'
+  VERSION = '0.4.27'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caboose-cms
 version: !ruby/object:Gem::Version
-  version: 0.4.26
+  version: 0.4.27
 platform: ruby
 authors:
 - William Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails