morrigan_editor_rails 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 28c557fa7abb8e9b9738e8ba0b3fcbd17a5a2449
-  data.tar.gz: 1d251a7cd3d9a816622aa132409af79843c24399
+  metadata.gz: e77a871ee08b5b615a9ee6a93654072eadb6a5bd
+  data.tar.gz: 28d6aa8496536e32a5080249e37f9e98f7823bf9
 SHA512:
-  metadata.gz: 55d60b1c3f517a08919ba6e5e2cdc1b3af94f2a8f3b694d740e3020c167d71f52d651d84637679e40b868786be7a092312ee4f850639ef91506dbec983ac698c
-  data.tar.gz: 2818457f46ddbd704637406a9d8c54387f45bbf661cbe4201877ad9035c2a1b8d7145078ab90f9e7f72ae8fc1960c255126bf507739b27608ba17b6ecca2e01a
+  metadata.gz: 80c2c27ebe3c9534f52de079ca084210ee9fd6bc92ff6d37483d490624ed3333773bf95f924a24b7a5ed5e9c6fab33df00bb2606b78a7b4fc0eb3ab9df90bb89
+  data.tar.gz: bad5e6b1ac3616dd9f4f1e2c66e7fc174ef4fb8bad7c9f894333e50abb2ee9d5221816f09e345826be5fee7205a5dea234cbcb06473139e29a093b005c1f43ea

data/app/assets/javascripts/morrigan_editor_rails/main.js.erb

@@ -1,10 +1,11 @@
+<% environment.context_class.instance_eval { include MorriganEditorRails::ApplicationHelper } %>
 $(function () {
     $('[morrigan-editor="true"]').each(function () {
         var container = $(this);
         var width = container.attr('editor-width');
         var height = container.attr('editor-height');
         container.morrigan_editor({
-            iframeStyles: "<%= asset_path('morrigan_editor_rails/iframe.css') %>",
+            iframeStyles: "<%= iframe_stylesheet %>",
             imageUpload: 'morrigan_editor_rails/editor_images',
             width: width,
             height: height

data/app/assets/stylesheets/morrigan_editor_rails/morrigan-jquery-editor.css

@@ -44,6 +44,8 @@
     float: left;
     margin: 0 2px 0 0;
     line-height: 24px;
+    color: inherit;
+    text-decoration: none;
 }
 
 .morrigan-editor .mrge-toolbox .mrge-action {

data/app/helpers/morrigan_editor_rails/application_helper.rb

@@ -1,4 +1,11 @@
 module MorriganEditorRails
   module ApplicationHelper
+    def iframe_stylesheet
+      if ::MorriganEditorRails::Engine::config.respond_to?('iframe_css_file_name')
+        ActionController::Base.helpers.asset_path(::MorriganEditorRails::Engine::config.iframe_css_file_name)
+      else
+        ActionController::Base.helpers.asset_path('morrigan_editor_rails/iframe.css')
+      end
+    end
   end
 end

data/lib/morrigan_editor_rails/version.rb

@@ -1,3 +1,3 @@
 module MorriganEditorRails
-  VERSION = "0.0.1"
+  VERSION = '0.0.3'
 end

data/test/dummy/{public/assets/morrigan_editor_rails/iframe-93d4936ce81b8a587abd68279b479b59.css → app/assets/stylesheets/editor_iframe.css}

@@ -87,3 +87,7 @@ h3 {
 ul, ol {
     list-style-position: inside;
 }
+
+p {
+    font-size: 20px;
+}

data/test/dummy/config/environments/development.rb

@@ -26,6 +26,9 @@ Rails.application.configure do
   # This option may cause significant delays in view rendering with a large
   # number of complex assets.
   config.assets.debug = true
+  config.assets.configure do |env|
+    env.cache = ActiveSupport::Cache.lookup_store(:null_store)
+  end
 
   # Adds additional error checking when serving assets at runtime.
   # Checks for improperly declared sprockets dependencies.

data/test/dummy/config/initializers/assets.rb

@@ -5,4 +5,4 @@ Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-# Rails.application.config.assets.precompile += %w( search.js )
+Rails.application.config.assets.precompile += %w( editor_iframe.css )

data/test/dummy/config/initializers/morrigan_editor_rails.rb

@@ -0,0 +1,5 @@
+module MorriganEditorRails
+  class Engine < Rails::Engine
+    config.iframe_css_file_name = 'editor_iframe.css'
+  end
+end