rails_kindeditor 0.4.7 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3851f658444ef5cfa536213a825b41f3109b0948
-  data.tar.gz: 141f31b1dabbaa8419b7eb8dd5d6b9593acbf04d
+  metadata.gz: 1646a9cc4af470cf7ff498125e965fccf45c09a6
+  data.tar.gz: 1598b87d18c480a7808c4be83a5e1ca6f60b573b
 SHA512:
-  metadata.gz: 3b556f25d5d5bf6c6b89090e4c3693b3b7b51745aaac74f1b3a8934b8136fe5c18ba26c90707b34ffaa78ce5a94853695c7ab544277921717a2667c284a7e536
-  data.tar.gz: 18cd4eb2c47a4e5717482ad6f0d08a04adc3fcfdad4693f497fa0e1c5d02c16ad115b839be55c4324de5c3f7e322b1352ad31c07581177828a1ac4dcd5e66868
+  metadata.gz: 478d1d2302dc65481cd4d09cbbc1772de6473b53f94c2072965d04c987f38d339b6a783268d172ccf9447cf29f36b0df341da2b1a440928ca947e259bb010be8
+  data.tar.gz: 608345c25a88ad695f677cb282b56faecb17b34fd34a1b9ea231090d957166877470a7faeb6c47304755c21a024963f4e39e758443100a3dd219aba5949ad4c7

data/README.md

@@ -22,17 +22,17 @@ rails_kindeditor will helps your rails app integrate with kindeditor, includes i
 ### Run install generator:
 
 ```bash
-  rails generate rails_kindeditor:install
+  rails g rails_kindeditor:install
 ```
 notice: rails_kindeditor needs applications.js in your project.
 
-### Rails4 in production mode
+### Production mode
 
-In Rails 4.0, precompiling assets no longer automatically copies non-JS/CSS assets from vendor/assets and lib/assets. see https://github.com/rails/rails/pull/7968
-In Rails 4.0's production mode, please run 'rake kindeditor:assets', this method just copy kindeditor into public folder.
+Precompiling assets no longer automatically copies non-JS/CSS assets from vendor/assets and lib/assets. see https://github.com/rails/rails/pull/7968
+please run 'rails kindeditor:assets', this method just copy kindeditor into public folder.
 
 ```bash
-  rake kindeditor:assets
+  rails kindeditor:assets
 ```
 
 ### Usage:
@@ -66,56 +66,32 @@ additionally, rails_kindeditor provides one "simple_mode" parameter for render s
 
 That's all.
 
-### Work with turbolinks
+### Work with Turbolinks5
 
-rails_kindeditor will not load the scripts under the turbolinks, there's two way to solve this problem:
-
-1.use "'data-no-turbolink' => true" when we need to load kindeditor，this will shut down the turbolinks in this page
-
-```ruby
-  <%= link_to 'Edit', edit_article_path(article), 'data-no-turbolink' => true %>
-```
-
-2.load kindeditor manually, but you should specify the parameters again, include the textarea's id.
+Create a file app/assets/javascripts/load_kindeditor.coffee
 
 ```coffeescript
   # coffeescript code
-  $(document).on 'page:load', ->
-    if $('#article_content').length > 0
-      KindEditor.create '#article_content', "width":"100%", "height":300, "allowFileManager":true, "uploadJson":"/kindeditor/upload", "fileManagerJson":"/kindeditor/filemanager"
+  $(document).on 'turbolinks:before-cache', ->
+    KindEditor.remove('.rails_kindeditor')
+
+  $(document).on 'turbolinks:load', ->
+    $('.rails_kindeditor').each ->
+      KindEditor.create "##{$(this).attr('id')}", "allowFileManager": true, "uploadJson": $(this).data('upload'), "fileManagerJson": $(this).data('filemanager'), "width": '100%', "height": '300'
 ```
 
 simple mode
 ```coffeescript
   # coffeescript code
-  $(document).on 'page:load', ->
-    if $('#article_content').length > 0
-      KindEditor.create '#article_content',
-                      "width":"100%",
-                      "height":300,
-                      "allowFileManager":true,
-                      "uploadJson":"/kindeditor/upload",
-                      "fileManagerJson":"/kindeditor/filemanager",
-                      "items":["fontname","fontsize","|","forecolor","hilitecolor","bold","italic","underline","removeformat","|","justifyleft","justifycenter","justifyright","insertorderedlist","insertunorderedlist","|","emoticons","image","link"]
-```
+  $(document).on 'turbolinks:before-cache', ->
+    KindEditor.remove('.rails_kindeditor')
 
-When you need to specify the owner_id：
-
-```ruby
-f.kindeditor :content, owner: @article
+  $(document).on 'turbolinks:load', ->
+    $('.rails_kindeditor').each ->
+      KindEditor.create "##{$(this).attr('id')}", "allowFileManager": true, "uploadJson": $(this).data('upload'), "fileManagerJson": $(this).data('filemanager'), "width": '100%', "height": '300', "items":["fontname","fontsize","|","forecolor","hilitecolor","bold","italic","underline","removeformat","|","justifyleft","justifycenter","justifyright","insertorderedlist","insertunorderedlist","|","emoticons","image","link"]
 ```
 
-```coffeescript
-  # coffeescript code
-  $(document).on 'page:load', ->
-    if $('#article_content').length > 0
-      KindEditor.create '#article_content',
-                        "width" : "100%",
-                        "height" : 300,
-                        "allowFileManager" : true,
-                        "uploadJson" : $('#article_content').data('upload'),
-                        "fileManagerJson" : $('#article_content').data('filemanager')
-```
+Make sure the file is loaded from your app/assets/javascripts/application.js
 
 ### Include javascript files at bottom ? Not in the head tag ? How can I load kindeditor correctly ?
 
@@ -125,7 +101,7 @@ For some reasons, you includes javascript files at bottom in your template, rail
   <%= f.kindeditor :content, :window_onload => true %>
 ```
 
-Warning: Kindeditor will load after all the objects loaded.
+Warning: Kindeditor will be load when the others have been loaded.
 
 ## SimpleForm and Formtastic integration
 
@@ -286,17 +262,17 @@ rails_kindeditor可以帮助你的rails程序集成kindeditor,包括了图片和
 ### 安装Kindeditor，运行下面的代码：
 
 ```bash
-  rails generate rails_kindeditor:install
+  rails g rails_kindeditor:install
 ```
 注意： 在你的工程中需要有application.js文件。
 
-### Rails4 in production mode
+### Production mode
 
-从Rails 4.0开始, precompiling assets不再自动从vendor/assets和lib/assets拷贝非JS/CSS文件. 参见 https://github.com/rails/rails/pull/7968
-如果要使用Rails 4.0的生产模式，请运行'rake kindeditor:assets', 此方法可将kindeditor自动拷贝到你的public/assets目录.
+Precompiling assets不再自动从vendor/assets和lib/assets拷贝非JS/CSS文件. 参见 https://github.com/rails/rails/pull/7968
+如果要使用生产模式，请运行'rails kindeditor:assets', 此方法可将kindeditor自动拷贝到你的public/assets目录.
 
 ```bash
-  rake kindeditor:assets
+  rails kindeditor:assets
 ```
 
 ### 使用方法:
@@ -328,58 +304,32 @@ rails_kindeditor可以帮助你的rails程序集成kindeditor,包括了图片和
      
 完毕！
 
-### 如何在turbolinks下使用
-
-rails_kindeditor在turbolinks下不会正常加载，只有当页面刷新时才正常。turbolinks的机制就是这样的，页面根本没刷新，这和pjax是一样的，所以kindeditor没加载很正常。
+### 如何在Turbolinks5下使用
 
-有两个办法可以解决：
-
-1.在需要加载kindeditor的链接加入 'data-no-turbolink' => true ，此时相当在这个页面于关闭turbolinks。
-
-```ruby
-  <%= link_to 'Edit', edit_article_path(article), 'data-no-turbolink' => true %>
-```
-
-2.在turbolinks载入完毕后手动加载kindeditor，不过所有参数都要设置，而且需要知道并设定textarea的id。
+创建如下文件 app/assets/javascripts/load_kindeditor.coffee
 
 ```coffeescript
   # coffeescript code
-  $(document).on 'page:load', ->
-    if $('#article_content').length > 0
-      KindEditor.create '#article_content', "width":"100%", "height":300, "allowFileManager":true, "uploadJson":"/kindeditor/upload", "fileManagerJson":"/kindeditor/filemanager"
+  $(document).on 'turbolinks:before-cache', ->
+    KindEditor.remove('.rails_kindeditor')
+
+  $(document).on 'turbolinks:load', ->
+    $('.rails_kindeditor').each ->
+      KindEditor.create "##{$(this).attr('id')}", "allowFileManager": true, "uploadJson": $(this).data('upload'), "fileManagerJson": $(this).data('filemanager'), "width": '100%', "height": '300'
 ```
 
-simple模式也需要手动设定
+简单编辑模式
 ```coffeescript
   # coffeescript code
-  $(document).on 'page:load', ->
-    if $('#article_content').length > 0
-      KindEditor.create '#article_content',
-                      "width":"100%",
-                      "height":300,
-                      "allowFileManager":true,
-                      "uploadJson":"/kindeditor/upload",
-                      "fileManagerJson":"/kindeditor/filemanager",
-                      "items":["fontname","fontsize","|","forecolor","hilitecolor","bold","italic","underline","removeformat","|","justifyleft","justifycenter","justifyright","insertorderedlist","insertunorderedlist","|","emoticons","image","link"]
-```
-
-需要指定owner_id的方法：
+  $(document).on 'turbolinks:before-cache', ->
+    KindEditor.remove('.rails_kindeditor')
 
-```ruby
-f.kindeditor :content, owner: @article
+  $(document).on 'turbolinks:load', ->
+    $('.rails_kindeditor').each ->
+      KindEditor.create "##{$(this).attr('id')}", "allowFileManager": true, "uploadJson": $(this).data('upload'), "fileManagerJson": $(this).data('filemanager'), "width": '100%', "height": '300', "items":["fontname","fontsize","|","forecolor","hilitecolor","bold","italic","underline","removeformat","|","justifyleft","justifycenter","justifyright","insertorderedlist","insertunorderedlist","|","emoticons","image","link"]
 ```
 
-```coffeescript
-  # coffeescript code
-  $(document).on 'page:load', ->
-    if $('#article_content').length > 0
-      KindEditor.create '#article_content',
-                        "width" : "100%",
-                        "height" : 300,
-                        "allowFileManager" : true,
-                        "uploadJson" : $('#article_content').data('upload'),
-                        "fileManagerJson" : $('#article_content').data('filemanager')
-```
+请确保以上文件被app/assets/javascripts/application.js正确加载
 
 ### 把javascript放在模板最下方，不放在head里面，如何正确加载kindeditor？
 

data/app/uploaders/kindeditor/asset_uploader.rb

@@ -1,7 +1,5 @@
 # encoding: utf-8
 
-require 'carrierwave/processing/mime_types'
-
 class Kindeditor::AssetUploader < CarrierWave::Uploader::Base
   
   EXT_NAMES = {:image => RailsKindeditor.upload_image_ext,

data/lib/rails_kindeditor/helper.rb

@@ -3,6 +3,7 @@ module RailsKindeditor
     def kindeditor_tag(name, content = nil, options = {})
       id = sanitize_to_id(name)
       input_html = { :id => id }.merge(options.delete(:input_html) || {})
+      input_html[:class] = "#{input_html[:class]} rails_kindeditor"
       output = ActiveSupport::SafeBuffer.new
       output << text_area_tag(name, content, input_html)
       output << javascript_tag(js_replace(id, options))
@@ -18,6 +19,7 @@ module RailsKindeditor
     
     def merge_assets_info(options)
       owner = options.delete(:owner)
+      options[:class] = "#{options[:class]} rails_kindeditor"
       if Kindeditor::AssetUploader.save_upload_info? && (!owner.nil?) && (!owner.id.nil?)
         begin
           owner_id = owner.id

data/lib/rails_kindeditor/simple_form.rb

@@ -1,7 +1,7 @@
 module RailsKindeditor
   module SimpleForm
     class KindeditorInput < ::SimpleForm::Inputs::Base
-      def input
+      def input(wrapper_options)
         @builder.kindeditor(attribute_name, input_html_options)
       end
     end

data/lib/rails_kindeditor/version.rb

@@ -1,4 +1,4 @@
 module RailsKindeditor
-  VERSION = "0.4.7"
+  VERSION = "0.5.0"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_kindeditor
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.5.0
 platform: ruby
 authors:
 - Macrow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-26 00:00:00.000000000 Z
+date: 2016-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: carrierwave
@@ -304,7 +304,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rails_kindeditor
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Kindeditor for Ruby on Rails