best_in_place 1.1.0 → 1.1.1

data/lib/assets/javascripts/best_in_place.js

@@ -42,12 +42,12 @@ BestInPlaceEditor.prototype = {
       to_display = this.element.html();
     }
 
-    var elem = this.isNil ? "" : 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);
-    this.element.trigger(jQuery.Event("best_in_place:activate"));
     this.activateForm();
+    this.element.trigger(jQuery.Event("best_in_place:activate"));
   },
 
   abort : function() {
@@ -178,8 +178,9 @@ BestInPlaceEditor.prototype = {
       var tmp = document.createElement("DIV");
       tmp.innerHTML = s;
       s = tmp.textContent || tmp.innerText;
+      s = s.replace(/"/g, '"');
     }
-   return jQuery.trim(s).replace(/"/g, '"');
+   return jQuery.trim(s);
   },
 
   /* Generate the data sent in the POST request */

data/lib/best_in_place/version.rb

@@ -1,3 +1,3 @@
 module BestInPlace
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/spec/integration/js_spec.rb

@@ -41,6 +41,18 @@ describe "JS behaviour", :js => true do
       end
     end
 
+    it "should render the default '-' string when there is an error and if the intial string is '-'" do
+      @user.money = nil
+      @user.save!
+      visit user_path(@user)
+
+      bip_text @user, :money, "abcd"
+
+      within("#money") do
+        page.should have_content("-")
+      end
+    end
+
     it "should render the passed nil value if the field is empty" do
       @user.last_name = ""
       @user.save :validate => false
@@ -585,4 +597,17 @@ describe "JS behaviour", :js => true do
       text.should == "A last name \"with double quotes\""
     end
   end
+
+  it "should allow me to set texts with quotes with sanitize => false" do
+    @user.save!
+
+    retry_on_timeout do
+      visit double_init_user_path(@user)
+
+      bip_area @user, :description, "A <a href=\"http://google.es\">link in this text</a> not sanitized."
+      visit double_init_user_path(@user)
+
+      page.should have_link("link in this text", :href => "http://google.es")
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: best_in_place
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-14 00:00:00.000000000 Z
+date: 2012-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77792460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,15 +21,10 @@ dependencies:
         version: '3.1'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.1'
+  version_requirements: *77792460
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77792250 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,15 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *77792250
 - !ruby/object:Gem::Dependency
   name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77791980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -53,15 +43,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.8.0
+  version_requirements: *77791980
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77791730 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -69,15 +54,10 @@ dependencies:
         version: 1.5.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.0
+  version_requirements: *77791730
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &77791500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -85,12 +65,7 @@ dependencies:
         version: 1.0.1
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.1
+  version_requirements: *77791500
 description: BestInPlace is a jQuery script and a Rails 3 helper that provide the
   method best_in_place to display any object field easily editable for the user by
   just clicking on it. It supports input data, text data, boolean data and custom
@@ -224,30 +199,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3850247748831605605
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -3850247748831605605
 requirements: []
 rubyforge_project: best_in_place
-rubygems_version: 1.8.19
+rubygems_version: 1.8.15
 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:
-- 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
+test_files: []