inline_forms 3.0.43 → 3.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1643aeb3e3000ef29a76cb7f78a0f7c5aeacbe8c
-  data.tar.gz: 2570fcde652f3a8535449a2cfc0d96863ac9f0c3
+  metadata.gz: 43961eaf9fb1309ecddeb9746df143c64896d5db
+  data.tar.gz: 2ef9957432d56f235c59b17a9a0be7b7fdcd6c67
 SHA512:
-  metadata.gz: 9df7a7e563ecd85629ecbb93fd3742e65b1cc3d1415e7dce763da7035c870e79260a75ae674e5010b4bbd9a223f5e2157d510441b4b5608a8b134071665dae35
-  data.tar.gz: a41413f393b6ae675f2a26ac9535c190ebca4d3c720066d9eb1eaba31600baac22091737cc495cb7758046d8041b51dd2fcf9d8933c1573f86ddb6ac6702b3a8
+  metadata.gz: 44313596241694f9f859a0317989e95e7609e597c6fdbfee878439386c2108a248957a3644437afa29bb0bb35bcda87e912a23ea86446778518b3fb07b80e4a8
+  data.tar.gz: 1e81648269722214a7c2e1b75e4d9669a16e69a33aac872725ed67bd6feeb76d1fe394d004e5b45e794f2beaa143d8ae9dd534f922937bdf1b6784da81179736

data/bin/inline_forms_installer_core.rb

@@ -571,9 +571,9 @@ run 'git commit -a -m " * Initial"'
 # example
 if ENV['install_example'] == 'true'
   say "\nInstalling example application..."
-  run 'bundle exec rails g inline_forms Photo name:string caption:string image:image_field description:text apartment:belongs_to _presentation:\'#{name}\'' # FIXME temporary changed because ckeditor is playing dirty
+  run 'bundle exec rails g inline_forms Photo name:string caption:string image:image_field description:ckeditor apartment:belongs_to _presentation:\'#{name}\'' # FIXME temporary changed because ckeditor is playing dirty
   run 'bundle exec rails generate uploader Image'
-  run 'bundle exec rails g inline_forms Apartment name:string title:string description:text photos:has_many photos:associated _enabled:yes _presentation:\'#{name}\'' # FIXME temporary changed because ckeditor is playing dirty
+  run 'bundle exec rails g inline_forms Apartment name:string title:string description:ckeditor photos:has_many photos:associated _enabled:yes _presentation:\'#{name}\'' # FIXME temporary changed because ckeditor is playing dirty
   run 'bundle exec rake db:migrate'
   say '-Adding example test'
   create_file "spec/models/#{app_name}_example.rb", <<-END_EXAMPLE_TEST.strip_heredoc

data/lib/app/helpers/form_elements/ckeditor.rb

@@ -5,7 +5,7 @@ def ckeditor_show(object, attribute)
     link_to_inline_edit object,
       attribute,
       '<div class="ckeditor_area">'.html_safe +
-      ckckeditor_tag(
+      cktext_area_tag(
       attribute,
       object[attribute],
       :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
@@ -20,17 +20,19 @@ def ckeditor_show(object, attribute)
       image_tag(  'glass_plate.gif',
                   :class => "glass_plate",
                   :title => '' ) +
+      "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe +
       '</div>'.html_safe
 end
 
 def ckeditor_edit(object, attribute)
-    ckckeditor_tag( attribute,
+    cktext_area_tag( attribute,
                     object[attribute],
-                    :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
+                    :id => "textarea_rw_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
                     :ckeditor => {  :width => '100%',
                                     :height => '200px'
                                   }
-                  )
+                  ) +
+    "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe
 end
 
 def ckeditor_update(object, attribute)

data/lib/app/helpers/form_elements/text_area.rb

@@ -2,7 +2,7 @@
 InlineForms::SPECIAL_COLUMN_TYPES[:text_area]=:text
 
 def text_area_show(object, attribute)
-  if defined? Ckeditor 
+  if defined? Ckeditor
     link_to_inline_edit object,
       attribute,
       '<div class="ckeditor_area">'.html_safe +
@@ -21,6 +21,7 @@ def text_area_show(object, attribute)
       image_tag(  'glass_plate.gif',
       :class => "glass_plate",
       :title => '' ) +
+      "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe +
       '</div>'.html_safe
   else
     link_to_inline_edit object, attribute, object[attribute]
@@ -35,7 +36,9 @@ def text_area_edit(object, attribute)
       :id => "textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}",
       :ckeditor => {  :width => '100%',
                       :height => '200px'
-                    }
+                    } +
+      "<script>delete CKEDITOR.instances['textarea_#{object.class.name.underscore}_#{object.id}_#{attribute.to_s}']</script>".html_safe 
+
     )
   else
     text_area_tag attribute, object[attribute], :class => 'attribute_text_area'

data/lib/inline_forms/version.rb

@@ -1,4 +1,4 @@
 # -*- encoding : utf-8 -*-
 module InlineForms
-  VERSION = "3.0.43"
+  VERSION = "3.0.44"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inline_forms
 version: !ruby/object:Gem::Version
-  version: 3.0.43
+  version: 3.0.44
 platform: ruby
 authors:
 - Ace Suares