x-editable-rails 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f39c1375f2107089642f9db987497129da954a8
-  data.tar.gz: 8327e2d422935b22a68e3abb880e62c7a64684ad
+  metadata.gz: e753707909ca94abaf54db4a9e66512d610d5cfc
+  data.tar.gz: 923bc056c6ef1c9b3bbcac97cf935e6139b6027f
 SHA512:
-  metadata.gz: 8443ec604c47018fac79f45674e3314a8d0579a9aadb8d4c7505d65147f645fb6b3919de927945753b4edf56837541ec9c52829628b29f3a672558b35fbe6cbc
-  data.tar.gz: 421750f2132b0eebeac8cbd5530de78826abad6e4744f284176d2fdbba84d91997f5f060d2dcf41394db79ab4388d75d0f11ade1d5272d86a57431964d3a0873
+  metadata.gz: 5d897bb0d03c8848b4406c846dd26241961549e1c061c846eb90358be7747ab9f962a681710389245151375bca2295e21dec73250a9b2a8e90e954b2804e4967
+  data.tar.gz: 7af741f2362298821b2f83089f87246eeaf902c2020a29fef65ac33330c498cad1ba3a154c6ce5ffcea99823a4ef64f1180a9d99e23665ae1180eefe28aa53da

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

@@ -1,7 +1,7 @@
 module X
   module Editable
     module Rails
-      VERSION = "1.2.0"
+      VERSION = "1.2.1"
     end
   end
 end

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

@@ -9,8 +9,17 @@ module X
             model = object.class.to_s.downcase
             model_param = model.gsub('::', '_')
             model_name = model.gsub('::', '/')
-            content_tag :a, href: "#", class: "editable", data: { type: 'text', model: model_param, name: method, url: data_url, 
-              nested: (options[:nested] if options[:nested]), nid: (options[:nid] if options[:nid]), 'original-title' => t("activerecord.attributes.#{model_name}#{"/#{options[:nested].singularize}" if options[:nested]}.#{method}") } do
+            klass = options[:nested] ? object.class.const_get(options[:nested].singularize.capitalize) : object.class
+            content_tag :a, href: "#", class: "editable",
+            data: { 
+              type: 'text', 
+              model: model_param, 
+              name: method, 
+              url: data_url, 
+              nested: (options[:nested] if options[:nested]), 
+              nid: (options[:nid] if options[:nid]), 
+              :'original-title' => klass.human_attribute_name(method)
+            } do
                 object.send(method) 
             end
           else

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

@@ -1,34 +1,37 @@
 jQuery ($) ->
   EditableForm = $.fn.editableform.Constructor
   EditableForm.prototype.saveWithUrlHook = (value) ->
-    url = @options.url
+    originalUrl = @options.url
     model = @options.model
     nestedName = @options.nested
     nestedId =  @options.nid
     nestedLocale = @options.locale
     @options.url = (params) =>
-      myName = params.name
-      myValue = params.value.replace(/(\r\n|\n|\r)/gm,"<br/>")
-      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     : url
-      data    : params
-      type    : 'PUT'
-      dataType: 'json'
-      }, @options.ajaxOptions))
+      if typeof originalUrl == 'function'
+        originalUrl.call(@options.scope, params)
+      else if originalUrl? && @options.send != 'never'
+        myName = params.name
+        myValue = params.value.replace(/(\r\n|\n|\r)/gm,"<br/>")
+        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.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Jiri Kolarik
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-22 00:00:00.000000000 Z
+date: 2013-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler