x-editable-rails 1.5.2 → 1.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e352ff3dcc969209a5c9b65a35127e955142837
-  data.tar.gz: ef8631474e4dbba90608bcce1e1bce97b7e98434
+  metadata.gz: 749654c2631947399d2e759d6eae397a31da4f47
+  data.tar.gz: 0c4ac3d4b3b2bb21aff16b65e1655d9fe5d3b0f1
 SHA512:
-  metadata.gz: cb07971933f4e9f7b3433eb98b08173717b83ec2a59aadbb55c65c1e3a5eb4f9eeb04e13b2bbfaf4a4f4bf2739a2c1cba2351b45a42ee6a8d584af2b41daa475
-  data.tar.gz: 66074f6e7cdf8079347e8a88a6726b7471e94894573e6b36eebbbbb732cfd4728e8b0e3bef9b3c1ca0b979baa0a85d24b9798b4c4bc2161799c72ed86b751084
+  metadata.gz: 9d53f30f5c112a0cac95819fc15c135869d02d9f608ee1ae01438c1bca210ca324ec861b18c45bd1e9c5d4c87b752864180e40d6c849a5266a46fe4723477b6e
+  data.tar.gz: ed081d33f6683905d7743fdcb92196f8b00bb2ce44fc9fc7f0fdd30552cfde3276d7dd42e58f2184ec77df4b43f2282d9e9161d9e658999f0629757a05a2bef5

data/lib/x-editable-rails/version.rb

@@ -1,7 +1,7 @@
 module X
   module Editable
     module Rails
-      VERSION = "1.5.2"
+      VERSION = "1.5.3"
     end
   end
 end

data/lib/x-editable-rails/view_helpers.rb

@@ -63,11 +63,11 @@ module X
             data.reject!{|_, value| value.nil?}
             
             content_tag tag, class: css, title: title, data: data do
-              source_values_for(value, source).join('<br/>').html_safe
+              safe_join(source_values_for(value.try(:html_safe), source), tag(:br)) unless %w(select checklist).include? data[:type]
             end
           else
-            # create a friendly value using the source to display a default value (if no error message given)
-            error || source_values_for(value, source).join('<br/>').html_safe
+            value = value.try(:html_safe) unless value.kind_of?(TrueClass) or value.kind_of?(FalseClass)
+            error || safe_join(source_values_for(value, source), tag(:br))
           end
         end
         
@@ -87,7 +87,7 @@ module X
             value.to_s
           end
           
-          value.html_safe
+          value
         end
         
         def source_values_for(value, source = nil)
@@ -95,7 +95,7 @@ module X
           
           values = Array.wrap(value)
           
-          if source && source.first.is_a?(String)
+          if source && ( source.first.is_a?(String) || source.kind_of?(Hash) )
             values.map{|item| source[output_value_for item]}
           else
             values

data/vendor/assets/javascripts/editable/rails/editable_form.js.coffee

@@ -12,11 +12,7 @@ jQuery ($) ->
         originalUrl.call(@options.scope, params)
       else if originalUrl? && @options.send != 'never'
         myName = params.name
-        
-        if typeof params.value == 'string'
-          myValue = params.value.replace(/(\r\n|\n|\r)/gm,"<br/>")
-        else
-          myValue = params.value
+        myValue = params.value
         
         # if there are no values in a list, add a blank value so Rails knows all values were removed
         if Object.prototype.toString.call(params.value) == '[object Array]' && params.value.length == 0
@@ -52,4 +48,4 @@ jQuery ($) ->
     @saveWithoutUrlHook(value)
     
   EditableForm.prototype.saveWithoutUrlHook = EditableForm.prototype.save
-  EditableForm.prototype.save = EditableForm.prototype.saveWithUrlHook
+  EditableForm.prototype.save = EditableForm.prototype.saveWithUrlHook

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: x-editable-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.2
+  version: 1.5.3
 platform: ruby
 authors:
 - Jiri Kolarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-20 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: X-editable for Rails
@@ -59,12 +59,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE.txt
+- README.md
 - lib/generators/x_editable_rails/install_generator.rb
 - lib/generators/x_editable_rails/templates/x-editable.yml
+- lib/x-editable-rails.rb
 - lib/x-editable-rails/configuration.rb
 - lib/x-editable-rails/version.rb
 - lib/x-editable-rails/view_helpers.rb
-- lib/x-editable-rails.rb
 - vendor/assets/images/editable/clear.png
 - vendor/assets/images/editable/loading.gif
 - vendor/assets/javascripts/editable/bootstrap-editable.js
@@ -77,10 +79,10 @@ files:
 - vendor/assets/javascripts/editable/inputs-ext/wysihtml5.js
 - vendor/assets/javascripts/editable/jquery-editable-poshytip.js
 - vendor/assets/javascripts/editable/jqueryui-editable.js
+- vendor/assets/javascripts/editable/rails.js.coffee
 - vendor/assets/javascripts/editable/rails/data_classes.js.coffee
 - vendor/assets/javascripts/editable/rails/editable_form.js.coffee
 - vendor/assets/javascripts/editable/rails/error_handling.js.coffee
-- vendor/assets/javascripts/editable/rails.js.coffee
 - vendor/assets/stylesheets/editable/bootstrap-editable.scss
 - vendor/assets/stylesheets/editable/bootstrap2-editable.scss
 - vendor/assets/stylesheets/editable/inputs-ext/address.css
@@ -89,8 +91,6 @@ files:
 - vendor/assets/stylesheets/editable/inputs-ext/wysiwyg-color.css
 - vendor/assets/stylesheets/editable/jquery-editable.scss
 - vendor/assets/stylesheets/editable/jqueryui-editable.scss
-- LICENSE.txt
-- README.md
 homepage: https://github.com/werein/x-editable-rails
 licenses:
 - MIT
@@ -102,17 +102,17 @@ require_paths:
 - vendor
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: X-editable for Rails