best_in_place 2.0.2 → 2.0.3

data/lib/assets/javascripts/best_in_place.js

@@ -185,7 +185,7 @@ BestInPlaceEditor.prototype = {
   },
 
   initNil: function() {
-    if (this.element.text() === "")
+    if (this.element.html() === "")
     {
       this.isNil = true;
       this.element.html(this.nil);
@@ -225,19 +225,24 @@ BestInPlaceEditor.prototype = {
   // Handlers ////////////////////////////////////////////////////////////////
 
   loadSuccessCallback : function(data) {
-    var response = jQuery.parseJSON(jQuery.trim(data));
-    if (response !== null && response.hasOwnProperty("display_as")) {
-      this.element.attr("data-original-content", this.element.text());
-      this.original_content = this.element.text();
-      this.element.html(response["display_as"]);
+    data = $.trim(data);
+
+    if(data && data!=""){
+      var response = jQuery.parseJSON(jQuery.trim(data));
+      if (response !== null && response.hasOwnProperty("display_as")) {
+        this.element.attr("data-original-content", this.element.text());
+        this.original_content = this.element.text();
+        this.element.html(response["display_as"]);
+      }
+      this.element.trigger(jQuery.Event("best_in_place:success"), data);
+      this.element.trigger(jQuery.Event("ajax:success"), data);
     }
-    this.element.trigger(jQuery.Event("ajax:success"), data);
 
     // Binding back after being clicked
     jQuery(this.activator).bind('click', {editor: this}, this.clickHandler);
     this.element.trigger(jQuery.Event("best_in_place:deactivate"));
 
-    if (this.collectionValue !== null) {
+    if (this.collectionValue !== null && this.formType == "select") {
       this.collectionValue = this.previousCollectionValue;
       this.previousCollectionValue = null;
     }
@@ -246,8 +251,8 @@ BestInPlaceEditor.prototype = {
   loadErrorCallback : function(request, error) {
     this.element.html(this.oldValue);
 
-    this.element.trigger(jQuery.Event("best_in_place:error"), [request, error])
-    this.element.trigger(jQuery.Event("ajax:error"));
+    this.element.trigger(jQuery.Event("best_in_place:error"), [request, error]);
+    this.element.trigger(jQuery.Event("ajax:error"), request, error);
 
     // Binding back after being clicked
     jQuery(this.activator).bind('click', {editor: this}, this.clickHandler);
@@ -261,9 +266,12 @@ BestInPlaceEditor.prototype = {
 
   setHtmlAttributes : function() {
     var formField = this.element.find(this.formType);
-    var attrs = jQuery.parseJSON(this.html_attrs);
-    for(var key in attrs){
-      formField.attr(key, attrs[key]);
+
+    if(this.html_attrs){
+      var attrs = jQuery.parseJSON(this.html_attrs);
+      for(var key in attrs){
+        formField.attr(key, attrs[key]);
+      }
     }
   }
 };
@@ -454,15 +462,13 @@ BestInPlaceEditor.forms = {
 
   "checkbox" : {
     activateForm : function() {
-      var newValue = Boolean(this.oldValue.toLowerCase() != this.values[1].toLowerCase());
-      var output = newValue ? this.values[1] : this.values[0];
-      this.element.html(output);
+      this.collectionValue = !this.getValue();
       this.setHtmlAttributes();
       this.update();
     },
 
     getValue : function() {
-      return Boolean(this.element.html().toLowerCase() == this.values[1].toLowerCase());
+      return this.collectionValue;
     }
   },
 
@@ -595,6 +601,8 @@ jQuery.fn.best_in_place = function() {
 */
 
 (function(jQuery){
+  if (typeof jQuery.fn.elastic !== 'undefined') return;
+
   jQuery.fn.extend({
     elastic: function() {
       //  We will create a div clone of the textarea
@@ -702,7 +710,7 @@ jQuery.fn.best_in_place = function() {
         });
 
         // And this line is to catch the browser paste event
-        $textarea.live('input paste',function(e){ setTimeout( update, 250); });
+        $textarea.on("input paste", function(e){ setTimeout( update, 250); });
 
         // Run update once when elastic is initialized
         update();

data/lib/best_in_place/helper.rb

@@ -25,11 +25,11 @@ module BestInPlace
         collection = opts[:collection].to_json
       end
       if opts[:type] == :checkbox
-        fieldValue = !!real_object.send(field)
+        value = !!real_object.send(field)
         if opts[:collection].blank? || opts[:collection].size != 2
           opts[:collection] = ["No", "Yes"]
         end
-        display_value = fieldValue ? opts[:collection][1] : opts[:collection][0]
+        display_value = value ? opts[:collection][1] : opts[:collection][0]
         collection = opts[:collection].to_json
       end
       classes = ["best_in_place"]

data/lib/best_in_place/version.rb

@@ -1,3 +1,3 @@
 module BestInPlace
-  VERSION = "2.0.2"
+  VERSION = "2.0.3"
 end

data/spec/integration/js_spec.rb

@@ -267,6 +267,22 @@ describe "JS behaviour", :js => true do
     end
   end
 
+  it "should be able to use bip_bool to change a boolean value using an image" do
+    @user.save!
+    visit user_path(@user)
+
+    within("#receive_email_image") do
+      page.should have_xpath("//img[contains(@src,'no.png')]")
+    end
+
+    bip_bool @user, :receive_email
+
+    visit user_path(@user)
+    within("#receive_email_image") do
+      page.should have_xpath("//img[contains(@src,'yes.png')]")
+    end
+  end
+
   it "should correctly use an OK submit button when so configured for an input" do
     @user.save!
     visit user_path(@user)

data/test_app/app/views/users/show.html.erb

@@ -58,6 +58,12 @@
         <%= best_in_place @user, :receive_email, :type => :checkbox, :collection => ["No thanks", "Yes of course"] %>
       </td>
     </tr>
+    <tr>
+      <td>Receive newsletter (image)?</td>
+      <td id="receive_email_image">
+        <%= best_in_place @user, :receive_email, :type => :checkbox, :collection => [image_tag('no.png'), image_tag('yes.png')] %>
+      </td>
+    </tr>
     <tr>
       <td>Favorite color</td>
       <td id="favorite_color">

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: best_in_place
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-28 00:00:00.000000000 Z
+date: 2013-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -132,6 +132,7 @@ files:
 - test_app/Gemfile
 - test_app/README
 - test_app/Rakefile
+- test_app/app/assets/images/no.png
 - test_app/app/assets/images/red_pen.png
 - test_app/app/assets/images/ui-bg_diagonals-thick_18_b81900_40x40.png
 - test_app/app/assets/images/ui-bg_diagonals-thick_20_666666_40x40.png
@@ -147,6 +148,7 @@ files:
 - test_app/app/assets/images/ui-icons_ef8c08_256x240.png
 - test_app/app/assets/images/ui-icons_ffd27a_256x240.png
 - test_app/app/assets/images/ui-icons_ffffff_256x240.png
+- test_app/app/assets/images/yes.png
 - test_app/app/assets/javascripts/application.js
 - test_app/app/assets/stylesheets/.gitkeep
 - test_app/app/assets/stylesheets/jquery-ui-1.8.16.custom.css.erb
@@ -228,12 +230,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1762438104594404996
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -1762438104594404996
 requirements: []
 rubyforge_project: best_in_place
 rubygems_version: 1.8.24
@@ -241,4 +249,11 @@ signing_key:
 specification_version: 3
 summary: It makes any field in place editable by clicking on it, it works for inputs,
   textareas, select dropdowns and checkboxes
-test_files: []
+test_files:
+- spec/helpers/best_in_place_spec.rb
+- spec/integration/double_init_spec.rb
+- spec/integration/js_spec.rb
+- spec/integration/live_spec.rb
+- spec/integration/text_area_spec.rb
+- spec/spec_helper.rb
+- spec/support/retry_on_timeout.rb