x-editable-rails 1.5.3 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 749654c2631947399d2e759d6eae397a31da4f47
-  data.tar.gz: 0c4ac3d4b3b2bb21aff16b65e1655d9fe5d3b0f1
+  metadata.gz: 147a7545378c08302b0aa3078eefb5b34f8cfb36
+  data.tar.gz: f93643c63b673cb323982194ca905a0eec38a90c
 SHA512:
-  metadata.gz: 9d53f30f5c112a0cac95819fc15c135869d02d9f608ee1ae01438c1bca210ca324ec861b18c45bd1e9c5d4c87b752864180e40d6c849a5266a46fe4723477b6e
-  data.tar.gz: ed081d33f6683905d7743fdcb92196f8b00bb2ce44fc9fc7f0fdd30552cfde3276d7dd42e58f2184ec77df4b43f2282d9e9161d9e658999f0629757a05a2bef5
+  metadata.gz: 09d634d226d06a25c1ba9a13977da472744b42674969f0172fc2a14e38b20182551c15737fc996b32c92c65d0a5e3f7ddcfd04da311e31ec0243590f15bb3c9e
+  data.tar.gz: 0b3a64951964c9f5451ac7f5deb3954a4852657151f541eca258f9cde0b1a924295bd767d3da2e771ffd717248f4531bd0d3c6a17ccf58c85775df0376fa4a9e

data/README.md

@@ -120,7 +120,7 @@ classes = { "Active" => "label-success", "Disabled" => "label-default" }
 editable @model, :enabled, source: source, classes: classes, class: "label"
 ```
 
-* **nested** - Name of a nested attributes (such as [gobalize](https://github.com/globalize/globalize)'s `translations`)
+* **nested** - Name of a nested attributes (such as [globalize](https://github.com/globalize/globalize)'s `translations`)
 * **nid** - ID of the nested attribute
 
 ```ruby

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

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

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

@@ -1,3 +1,5 @@
+require 'base64'
+
 module X
   module Editable
     module Rails
@@ -16,63 +18,69 @@ module X
         #       - enumerable shorthand ['Yes', 'No', 'Maybe'] becomes { 'Yes' => 'Yes', 'No' => 'No', 'Maybe' => 'Maybe' }
         #     classes: a Hash of classes to add based on the value (same format and shorthands as source)
         #   value: override the object's value
-        #   
+        #
         def editable(object, method, options = {})
           options = Configuration.method_options_for(object, method).deep_merge(options).with_indifferent_access
           # merge data attributes for backwards-compatibility
           options.merge! options.delete(:data){ Hash.new }
-          
+
           url     = options.delete(:url){ polymorphic_path(object) }
           object  = object.last if object.kind_of?(Array)
           value   = options.delete(:value){ object.send(method) }
           source  = options[:source] ? format_source(options.delete(:source), value) : default_source_for(value)
           classes = format_source(options.delete(:classes), value)
           error   = options.delete(:e)
-          
+          html_options = options.delete(:html){ Hash.new }
+
           if xeditable?(object)
-            model   = object.class.name.split('::').last.underscore
+            model   = object.model_name.to_s.underscore
             nid     = options.delete(:nid)
             nested  = options.delete(:nested)
             title   = options.delete(:title) do
               klass = nested ? object.class.const_get(nested.to_s.singularize.capitalize) : object.class
               klass.human_attribute_name(method)
             end
-            
+
             output_value = output_value_for(value)
             css_list = options.delete(:class).to_s.split(/\s+/).unshift('editable')
             css_list << classes[output_value] if classes
-            
+            type = options.delete(:type){ default_type_for(value) }
             css   = css_list.compact.uniq.join(' ')
             tag   = options.delete(:tag){ 'span' }
             placeholder = options.delete(:placeholder){ title }
-            
+
             # any remaining options become data attributes
             data  = {
-              type:   options.delete(:type){ default_type_for(value) }, 
-              model:  model, 
-              name:   method, 
-              value:  output_value, 
-              placeholder: placeholder, 
-              classes: classes, 
-              source: source, 
-              url:    url, 
-              nested: nested, 
+              type:   type,
+              model:  model,
+              name:   method,
+              value:  ( type == 'wysihtml5' ? Base64.encode64(output_value) : output_value ), 
+              placeholder: placeholder,
+              classes: classes,
+              source: source,
+              url:    url,
+              nested: nested,
               nid:    nid
             }.merge(options)
-            
+
             data.reject!{|_, value| value.nil?}
-            
-            content_tag tag, class: css, title: title, data: data do
-              safe_join(source_values_for(value.try(:html_safe), source), tag(:br)) unless %w(select checklist).include? data[:type]
+
+            html_options.update({
+              class: css,
+              title: title,
+              data: data
+            })
+
+            content_tag tag, html_options do
+              safe_join(source_values_for(value, source), tag(:br)) unless %w(select checklist).include? data[:type]
             end
           else
-            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
-        
+
         private
-        
+
         def output_value_for(value)
           value = case value
           when TrueClass
@@ -86,22 +94,22 @@ module X
           else
             value.to_s
           end
-          
+
           value
         end
-        
+
         def source_values_for(value, source = nil)
           source ||= default_source_for value
-          
+
           values = Array.wrap(value)
-          
+
           if source && ( source.first.is_a?(String) || source.kind_of?(Hash) )
             values.map{|item| source[output_value_for item]}
           else
             values
           end
         end
-        
+
         def default_type_for(value)
           case value
           when TrueClass, FalseClass
@@ -112,14 +120,14 @@ module X
             'text'
           end
         end
-        
+
         def default_source_for(value)
           case value
           when TrueClass, FalseClass
             { '1' => 'Yes', '0' => 'No' }
           end
         end
-        
+
         # helper method that take some shorthand source definitions and reformats them
         def format_source(source, value)
           formatted_source = case value
@@ -134,10 +142,10 @@ module X
                 source
               end
             end
-          
+
           formatted_source || source
         end
-        
+
       end
     end
   end

data/vendor/assets/javascripts/editable/inputs-ext/wysihtml5-editable.js

@@ -72,9 +72,12 @@ $(function(){
             
             return deferred.promise();
         },
+
+        valueIsEncoded: true,
        
         value2html: function(value, element) {
             $(element).html(value);
+            this.valueIsEncoded = false;
         },
 
         html2value: function(html) {
@@ -82,8 +85,13 @@ $(function(){
         },
         
         value2input: function(value) {
+            value = (this.valueIsEncoded ? this.base65decode(value) : value);
             this.$input.data("wysihtml5").editor.setValue(value, true);
-        }, 
+        },
+
+        base65decode: function(value) {
+            return decodeURIComponent( escape( atob( value.replace(/\s/g, ''))));
+        },
 
         activate: function() {
             this.$input.data("wysihtml5").editor.focus();

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

@@ -1,4 +1,4 @@
-jQuery ($) ->
+unless EditableForm
   EditableForm = $.fn.editableform.Constructor
   EditableForm.prototype.saveWithUrlHook = (value) ->
     originalUrl   = @options.url
@@ -6,46 +6,46 @@ jQuery ($) ->
     nestedName    = @options.nested
     nestedId      = @options.nid
     nestedLocale  = @options.locale
-    
+
     @options.url = (params) =>
       if typeof originalUrl == 'function'
         originalUrl.call(@options.scope, params)
       else if originalUrl? && @options.send != 'never'
         myName = params.name
         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
           params.value.push("")
-        
+
         obj = {}
-        
+
         if nestedName
           nested          = {}
           nested[myName]  = myValue
           nested['id']    = nestedId
-          
+
           if nestedLocale
             nested['locale'] = nestedLocale
-          
+
           obj[nestedName + '_attributes'] = nested
         else
           obj[myName] = myValue
-          
+
         params[model] = obj
-        
+
         delete params.name
         delete params.value
         delete params.pk
-        
+
         $.ajax($.extend({
           url:      originalUrl
           data:     params
           type:     'PUT'
           dataType: 'json'
         }, @options.ajaxOptions))
-    
+
     @saveWithoutUrlHook(value)
-    
+
   EditableForm.prototype.saveWithoutUrlHook = EditableForm.prototype.save
   EditableForm.prototype.save = EditableForm.prototype.saveWithUrlHook

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: x-editable-rails
 version: !ruby/object:Gem::Version
-  version: 1.5.3
+  version: 1.5.4
 platform: ruby
 authors:
 - Jiri Kolarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2015-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -86,7 +86,7 @@ files:
 - vendor/assets/stylesheets/editable/bootstrap-editable.scss
 - vendor/assets/stylesheets/editable/bootstrap2-editable.scss
 - vendor/assets/stylesheets/editable/inputs-ext/address.css
-- vendor/assets/stylesheets/editable/inputs-ext/bootstrap-typehead.css
+- vendor/assets/stylesheets/editable/inputs-ext/bootstrap-typeahead.css
 - vendor/assets/stylesheets/editable/inputs-ext/bootstrap-wysihtml5.css
 - vendor/assets/stylesheets/editable/inputs-ext/wysiwyg-color.css
 - vendor/assets/stylesheets/editable/jquery-editable.scss
@@ -112,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: X-editable for Rails