wysiwyg_rails_simple_form 0.0.2 → 0.0.3

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 06884a598d011c35466395d7dc3a8d5b0f50c4a4
4
- data.tar.gz: 458491b093aa153e07e84808c1403c4e2c37ceef
3
+ metadata.gz: ec95b4dd4a1732631a70915635ae1529b06bb4fb
4
+ data.tar.gz: 6170030dfb328386c97555b39c73d3a335926ce8
5
5
  SHA512:
6
- metadata.gz: 2e6061fd5aad024dbd6643dba8c0a3b6719aa1d02095317531c1e51cb00ebd4277ee2f27aa554d42bee0e31d023f6805de0c1bc1cb39aa47dc2b46467e5be586
7
- data.tar.gz: 8dae968ba2c22d5d823794b86dbe854e56379b08f6aceb25bba64915c91e2298059f8b36827344a5b896a6ff227a791db8e750b18f03c71e98f426727deb55ac
6
+ metadata.gz: 8261d97992501d707d1bf4269e062c0cb3b41a7298824c6abb305adf1fefb9cf97c8751072586a250209e7ebc0e8b7e0bd54c0cda43d1da0d4280f1b93e4e6db
7
+ data.tar.gz: bc01e5a7fc2a1d6bd029ce73845f79ec74ee6aecc35b0d5640d9289cc717c35403dc822787d7eaa77d4ea81c3d548f58a9999472de7de6374076d6655fe55330
data/README.md CHANGED
@@ -30,7 +30,7 @@ You can customize editor through a hash `wrsf_options` or edit initializer file
30
30
 
31
31
  ## Contributing
32
32
 
33
- 1. Fork it ( https://github.com/[my-github-username]/wysiwyg_rails_simple_form/fork )
33
+ 1. Fork it ( https://github.com/nexoff/wysiwyg_rails_simple_form/fork )
34
34
  2. Create your feature branch (`git checkout -b my-new-feature`)
35
35
  3. Commit your changes (`git commit -am 'Add some feature'`)
36
36
  4. Push to the branch (`git push origin my-new-feature`)
@@ -4,17 +4,11 @@ class WrsfInput < SimpleForm::Inputs::Base
4
4
 
5
5
  def input(wrapper_options)
6
6
  merged_input_options = merge_wrapper_options(input_html_options, wrapper_options)
7
- merged_wrsf_options = merge_wrsf_options options[:wrsf_options], WysiwygRailsSimpleForm.options
7
+ merged_wrsf_options = WysiwygRailsSimpleForm.options.deep_merge(options[:wrsf_options] || {} )
8
8
 
9
9
  @builder.text_area(attribute_name, merged_input_options) +
10
10
  template.content_tag(:script, type: 'text/javascript') do
11
11
  "$('textarea##{input_class}').editable(#{merged_wrsf_options.to_json});".html_safe
12
12
  end
13
13
  end
14
-
15
- private
16
-
17
- def merge_wrsf_options input_wrsf_options, wrsf_options
18
- input_wrsf_options.present? ? wrsf_options.merge(input_wrsf_options) : wrsf_options
19
- end
20
14
  end
@@ -1,3 +1,3 @@
1
1
  module WysiwygRailsSimpleForm
2
- VERSION = "0.0.2"
2
+ VERSION = "0.0.3"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: wysiwyg_rails_simple_form
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.2
4
+ version: 0.0.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Andrei Pauliukevich
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2015-02-26 00:00:00.000000000 Z
11
+ date: 2015-02-27 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler