best_in_place 2.0.1 → 2.0.2

data/lib/assets/javascripts/best_in_place.js

@@ -46,7 +46,7 @@ BestInPlaceEditor.prototype = {
       }
     }
 
-    var elem = this.isNil ? "-" : this.sanitize ? this.element.text() : this.element.html();
+    var elem = this.isNil ? "-" : this.element.html();
     this.oldValue = elem;
     this.display_value = to_display;
     jQuery(this.activator).unbind("click", this.clickHandler);
@@ -55,8 +55,8 @@ BestInPlaceEditor.prototype = {
   },
 
   abort : function() {
-    if (this.isNil) this.element.text(this.nil);
-    else            this.element.text(this.oldValue);
+    if (this.isNil) this.element.html(this.nil);
+    else            this.element.html(this.oldValue);
     jQuery(this.activator).bind('click', {editor: this}, this.clickHandler);
     this.element.trigger(jQuery.Event("best_in_place:abort"));
     this.element.trigger(jQuery.Event("best_in_place:deactivate"));
@@ -101,7 +101,11 @@ BestInPlaceEditor.prototype = {
     } else if (this.formType == "checkbox") {
       editor.element.html(this.getValue() ? this.values[1] : this.values[0]);
     } else {
-      editor.element.text(this.getValue() !== "" ? this.getValue() : this.nil);
+      if (this.getValue() !== "") {
+        editor.element.text(this.getValue());
+      } else {
+        editor.element.html(this.nil);
+      }
     }
     editor.element.trigger(jQuery.Event("best_in_place:update"));
   },
@@ -184,7 +188,7 @@ BestInPlaceEditor.prototype = {
     if (this.element.text() === "")
     {
       this.isNil = true;
-      this.element.text(this.nil);
+      this.element.html(this.nil);
     }
   },
 
@@ -225,7 +229,7 @@ BestInPlaceEditor.prototype = {
     if (response !== null && response.hasOwnProperty("display_as")) {
       this.element.attr("data-original-content", this.element.text());
       this.original_content = this.element.text();
-      this.element.text(response["display_as"]);
+      this.element.html(response["display_as"]);
     }
     this.element.trigger(jQuery.Event("ajax:success"), data);
 
@@ -240,7 +244,7 @@ BestInPlaceEditor.prototype = {
   },
 
   loadErrorCallback : function(request, error) {
-    this.element.text(this.oldValue);
+    this.element.html(this.oldValue);
 
     this.element.trigger(jQuery.Event("best_in_place:error"), [request, error])
     this.element.trigger(jQuery.Event("ajax:error"));
@@ -273,11 +277,11 @@ BestInPlaceEditor.prototype = {
 BestInPlaceEditor.forms = {
   "input" : {
     activateForm : function() {
-      var output = $(document.createElement('form'))
+      var output = jQuery(document.createElement('form'))
                    .addClass('form_in_place')
                    .attr('action', 'javascript:void(0);')
                    .attr('style', 'display:inline');
-      var input_elt = $(document.createElement('input'))
+      var input_elt = jQuery(document.createElement('input'))
                       .attr('type', 'text')
                       .attr('name', this.attributeName)
                       .val(this.display_value);
@@ -287,14 +291,14 @@ BestInPlaceEditor.forms = {
       output.append(input_elt);
       if(this.okButton) {
         output.append(
-          $(document.createElement('input'))
+          jQuery(document.createElement('input'))
           .attr('type', 'submit')
           .attr('value', this.okButton)
         )
       }
       if(this.cancelButton) {
         output.append(
-          $(document.createElement('input'))
+          jQuery(document.createElement('input'))
           .attr('type', 'button')
           .attr('value', this.cancelButton)
         )
@@ -361,11 +365,11 @@ BestInPlaceEditor.forms = {
   "date" : {
     activateForm : function() {
       var that      = this,
-          output    = $(document.createElement('form'))
+          output    = jQuery(document.createElement('form'))
                       .addClass('form_in_place')
                       .attr('action', 'javascript:void(0);')
                       .attr('style', 'display:inline'),
-          input_elt = $(document.createElement('input'))
+          input_elt = jQuery(document.createElement('input'))
                       .attr('type', 'text')
                       .attr('name', this.attributeName)
                       .attr('value', this.sanitizeValue(this.display_value));
@@ -406,16 +410,16 @@ BestInPlaceEditor.forms = {
 
   "select" : {
     activateForm : function() {
-      var output     = $(document.createElement('form'))
+      var output     = jQuery(document.createElement('form'))
                        .attr('action', 'javascript:void(0)')
                        .attr('style', 'display:inline');
           selected   = '',
           oldValue   = this.oldValue,
-          select_elt = $(document.createElement('select')),
+          select_elt = jQuery(document.createElement('select')),
           currentCollectionValue = this.collectionValue;
 
       jQuery.each(this.values, function (index, value) {
-        var option_elt = $(document.createElement('option'))
+        var option_elt = jQuery(document.createElement('option'))
                          // .attr('value', value[0])
                          .val(value[0])
                          .html(value[1]);
@@ -469,21 +473,21 @@ BestInPlaceEditor.forms = {
       height = this.element.css('height');
 
       // construct form
-      var output   = $(document.createElement('form'))
+      var output   = jQuery(document.createElement('form'))
                      .attr('action', 'javascript:void(0)')
                      .attr('style', 'display:inline')
-                     .append($(document.createElement('textarea'))
+                     .append(jQuery(document.createElement('textarea'))
                              .val(this.sanitizeValue(this.display_value)));
       if(this.okButton) {
         output.append(
-          $(document.createElement('input'))
+          jQuery(document.createElement('input'))
           .attr('type', 'submit')
           .attr('value', this.okButton)
         );
       }
       if(this.cancelButton) {
         output.append(
-          $(document.createElement('input'))
+          jQuery(document.createElement('input'))
           .attr('type', 'button')
           .attr('value', this.cancelButton)
         )

data/lib/assets/javascripts/best_in_place.purr.js

@@ -1,6 +1,6 @@
 //= require jquery.purr
 
-$(document).on('best_in_place:error', function(event, request, error) {
+jQuery(document).on('best_in_place:error', function(event, request, error) {
     // Display all error messages from server side validation
     jQuery.each(jQuery.parseJSON(request.responseText), function(index, value) {
       if( typeof(value) == "object") {value = index + " " + value.toString(); }

data/lib/assets/javascripts/jquery.purr.js

@@ -21,12 +21,12 @@
                             default: false
  */
 
-(function($) {
+(function(jQuery) {
 
-  $.purr = function(notice, options)
+  jQuery.purr = function(notice, options)
   {
     // Convert notice to a jQuery object
-    notice = $(notice);
+    notice = jQuery(notice);
 
     // Add a class to denote the notice as not sticky
     notice.addClass('purr');
@@ -41,10 +41,10 @@
     }
 
     // Convert cont to a jQuery object
-    cont = $(cont);
+    cont = jQuery(cont);
 
     // Add the container to the page
-    $('body').append(cont);
+    jQuery('body').append(cont);
 
     notify();
 
@@ -52,7 +52,7 @@
     {
       // Set up the close button
       var close = document.createElement('a');
-      $(close).attr({
+      jQuery(close).attr({
           className: 'close',
           href: '#close'
           }).appendTo(notice).click(function() {
@@ -61,7 +61,7 @@
           });
 
       // If ESC is pressed remove notice
-      $(document).keyup(function(e) {
+      jQuery(document).keyup(function(e) {
         if (e.keyCode == 27) {
           removeNotice();
         }
@@ -141,7 +141,7 @@
     };
   };
 
-  $.fn.purr = function(options)
+  jQuery.fn.purr = function(options)
   {
     options = options || {};
     options.fadeInSpeed = options.fadeInSpeed || 500;
@@ -152,10 +152,10 @@
 
     this.each(function()
       {
-        new $.purr( this, options );
+        new jQuery.purr( this, options );
       }
     );
 
     return this;
   };
-})( jQuery );
+})( jQuery );

data/lib/best_in_place/helper.rb

@@ -48,7 +48,7 @@ module BestInPlace
       out << " data-activator='#{opts[:activator]}'" unless opts[:activator].blank?
       out << " data-ok-button='#{opts[:ok_button]}'" unless opts[:ok_button].blank?
       out << " data-cancel-button='#{opts[:cancel_button]}'" unless opts[:cancel_button].blank?
-      out << " data-nil='#{opts[:nil]}'" unless opts[:nil].blank?
+      out << " data-nil='#{attribute_escape(opts[:nil])}'" unless opts[:nil].blank?
       out << " data-use-confirm='#{opts[:use_confirm]}'" unless opts[:use_confirm].nil?
       out << " data-type='#{opts[:type]}'"
       out << " data-inner-class='#{opts[:inner_class]}'" if opts[:inner_class]

data/lib/best_in_place/version.rb

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

data/spec/integration/js_spec.rb

@@ -65,6 +65,28 @@ describe "JS behaviour", :js => true do
         page.should have_content("Nothing to show")
       end
     end
+
+    it "should render html content for nil option" do
+      @user.favorite_color = ""
+      @user.save!
+      visit user_path(@user)
+      within("#favorite_color") do
+        page.should have_xpath("//span[@class='nil']")
+      end
+    end
+
+    it "should render html content for nil option after edit" do
+      @user.favorite_color = "Blue"
+      @user.save!
+      visit user_path(@user)
+
+      bip_text @user, :favorite_color, ""
+
+      within("#favorite_color") do
+        page.should have_xpath("//span[@class='nil']")
+      end
+    end
+
   end
 
   it "should be able to update last but one item in list" do
@@ -648,6 +670,43 @@ describe "JS behaviour", :js => true do
       within("#alt_money") { page.should have_content("€58.00") }
     end
 
+    it "should keep link after edit with display_with :link_to" do
+      @user.save!
+      visit users_path
+      within("tr#user_#{@user.id} > .name > span") do
+        page.should have_content("Lucia")
+        page.should have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
+      end
+      id = BestInPlace::Utils.build_best_in_place_id @user, :name
+      page.execute_script <<-JS
+        jQuery("#edit_#{@user.id}").click();
+        jQuery("##{id} input[name='name']").val('Maria Lucia');
+        jQuery("##{id} form").submit();
+      JS
+      within("tr#user_#{@user.id} > .name > span") do
+        page.should have_content("Maria Lucia")
+        page.should have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
+      end
+    end
+
+    it "should keep link after aborting edit with display_with :link_to" do
+      @user.save!
+      visit users_path
+      within("tr#user_#{@user.id} > .name > span") do
+        page.should have_content("Lucia")
+        page.should have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
+      end
+      id = BestInPlace::Utils.build_best_in_place_id @user, :name
+      page.execute_script <<-JS
+        jQuery("#edit_#{@user.id}").click();
+        jQuery("##{id} input[name='name']").blur();
+      JS
+      within("tr#user_#{@user.id} > .name > span") do
+        page.should have_content("Lucia")
+        page.should have_xpath("//a[contains(@href,'#{user_path(@user)}')]")
+      end
+    end
+
     describe "display_with using a lambda" do
 
 
@@ -873,6 +932,7 @@ describe "JS behaviour", :js => true do
 
     bip_select @user, :country, "France"
 
+    sleep 1 # Increase if browser is slow
     id = BestInPlace::Utils.build_best_in_place_id @user, :country
     page.execute_script <<-JS
       $("##{id}").click();

data/test_app/app/assets/stylesheets/scaffold.css

@@ -54,3 +54,7 @@ div.field, div.actions {
   font-size: 12px;
   list-style: square;
 }
+
+span.nil {
+  color: #999;
+}

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

@@ -63,6 +63,7 @@
       <td id="favorite_color">
         <%- opts = { :ok_button => 'Do it!', :cancel_button => 'Nope' } %>
         <%- opts.delete(:ok_button) if params[:suppress_ok_button] %>
+        <%- opts[:nil] = "<span class='nil'>Click to add your favorite color</span>" %>
         <%= best_in_place @user, :favorite_color, opts %>
       </td>
     </tr>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: best_in_place
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-16 00:00:00.000000000 Z
+date: 2012-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails