on_the_spot 0.0.10 → 0.0.11

data/README.markdown

@@ -67,6 +67,7 @@ The `on_the_spot_edit` also accepts options:
 * `:data`: for select, the lookup-data, should be in an array of id-value pairs. E.g. `[[1, 'ok'], [2, 'not ok'], [3, 'not decided']]`.
 * `:loadurl`: for select, an url that will return the data in JSON format (use instead of `:data`)
 * `:url`: URL to post to if you don't want to use the standard routes
+* `:selected`: Text selected by default on edit (boolean, default is false)
 
 
 For the texts: if a text is not specified, the default is taken from the `on_the_spot.en.yml` (or your current language).

data/Rakefile

@@ -21,8 +21,12 @@ rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
+
 RSpec::Core::RakeTask.new(:spec)
 
+task :default => :spec
+
+
 desc  "Run all specs with rcov"
 RSpec::Core::RakeTask.new("test_cov") do |t|
   t.rcov = true

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/generators/on_the_spot/install/templates/on_the_spot.js

@@ -6,52 +6,56 @@ $(document).ready(function() {
     $(".on_the_spot_editing").mouseout(function() {
         $(this).css('background-color', 'inherit');
     });
-    $('.on_the_spot_editing').each(function(n){
-        var el           = $(this),
-            auth_token   = el.attr('data-auth'),
-            data_url     = el.attr('data-url'),
-            ok_text      = el.attr('data-ok') || 'OK',
-            cancel_text  = el.attr('data-cancel') || 'Cancel',
-            tooltip_text = el.attr('data-tooltip') || 'Click to edit ...',
-            edit_type    = el.attr('data-edittype'),
-            select_data  = el.attr('data-select'),
-            rows         = el.attr('data-rows'),
-            columns      = el.attr('data-columns'),
-            load_url     = el.attr('data-loadurl');
+    $('.on_the_spot_editing').each(initializeOnTheSpot);
 
-        var options = {
-            tooltip: tooltip_text,
-            placeholder: tooltip_text,
-            cancel: cancel_text,
-            submit: ok_text,
-            onerror: function (settings, original, xhr) {
-                original.reset();
-                //just show the error-msg for now
-                alert(xhr.responseText);
-            },
-            submitdata: {
-              authenticity_token: auth_token,
-              _method: 'put'
-            }
-        };
-        if (edit_type != null) {
-            options.type = edit_type;
+});
+
+function initializeOnTheSpot(n){
+    var el           = $(this),
+        auth_token   = el.attr('data-auth'),
+        data_url     = el.attr('data-url'),
+        ok_text      = el.attr('data-ok') || 'OK',
+        cancel_text  = el.attr('data-cancel') || 'Cancel',
+        tooltip_text = el.attr('data-tooltip') || 'Click to edit ...',
+        edit_type    = el.attr('data-edittype'),
+        select_data  = el.attr('data-select'),
+        rows         = el.attr('data-rows'),
+        columns      = el.attr('data-columns'),
+        load_url     = el.attr('data-loadurl'),
+        selected     = el.attr('data-selected');
+
+    var options = {
+        tooltip: tooltip_text,
+        placeholder: tooltip_text,
+        cancel: cancel_text,
+        submit: ok_text,
+        select: selected,
+        onerror: function (settings, original, xhr) {
+            original.reset();
+            //just show the error-msg for now
+            alert(xhr.responseText);
+        },
+        submitdata: {
+          authenticity_token: auth_token,
+          _method: 'put'
         }
-        if (edit_type == 'select') {
-            if (select_data != null) {
-                options.data = select_data;
-                options.submitdata['select_array'] = select_data;
-            }
-            if (load_url != null) {
-                options.loadurl = load_url;
-            }
+    };
+    if (edit_type != null) {
+        options.type = edit_type;
+    }
+    if (edit_type == 'select') {
+        if (select_data != null) {
+            options.data = select_data;
+            options.submitdata['select_array'] = select_data;
         }
-        else if (edit_type == 'textarea') {
-            options.rows = rows;
-            options.cols = columns;
+        if (load_url != null) {
+            options.loadurl = load_url;
         }
+    }
+    else if (edit_type == 'textarea') {
+        options.rows = rows;
+        options.cols = columns;
+    }
 
-        el.editable(data_url, options)
-    })
-
-});
+    el.editable(data_url, options)
+}

data/lib/on_the_spot/on_the_spot_helpers.rb

@@ -17,6 +17,7 @@ module OnTheSpot
     #   display_text : either overrule the normal display-value, or needed when using loadurl
     #   data         : (for select) an array of options in the form [id, value]
     #   url          : (optional) URL to post to if you don't want to use the standard routes
+    #   selected     : (optional) boolean, text selected on edit
     def on_the_spot_edit(object, field, options={})
       #!!! to do: translate options to data-fields
       # Possible fields:
@@ -63,7 +64,8 @@ module OnTheSpot
       html_options[:'data-cancel']      = options[:cancel_text]
       html_options[:'data-tooltip']     = options[:tooltip]
       html_options[:'data-auth']        = form_authenticity_token if defined? form_authenticity_token
-
+      html_options[:'data-selected']    = options[:selected]
+        
       content_tag("span", html_options) do
         if options[:display_text]
           options[:display_text]

data/on_the_spot.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{on_the_spot}
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nathan Van der Auwera"]
-  s.date = %q{2011-05-08}
+  s.date = %q{2011-05-29}
   s.description = %q{Unobtrusive in place editing, using jEditable; only works in Rails 3}
   s.email = %q{nathan@dixis.com}
   s.extra_rdoc_files = [

data/spec/on_the_spot_spec.rb

@@ -56,6 +56,11 @@ describe "OnTheSpot" do
           @result = @tester.on_the_spot_edit @dummy, :content
           @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-ok=\"ok\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
         end
+        
+        it "should make the correct html for an edit-field with text selected on click" do
+          @result = @tester.on_the_spot_edit @dummy, :content, :selected => true
+          @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-ok=\"ok\" data-selected=\"true\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
+        end
 
         it "should make the correct html for an edit-field and overrule display-text" do
           @result = @tester.on_the_spot_edit @dummy, :content, :display_text => 'jediknight'
@@ -66,6 +71,11 @@ describe "OnTheSpot" do
           @result = @tester.on_the_spot_edit @dummy, :content, :type => :textarea
           @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-columns=\"40\" data-edittype=\"textarea\" data-ok=\"ok\" data-rows=\"5\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
         end
+        
+        it "should make the correct html for a text-area with text selected on click" do
+          @result = @tester.on_the_spot_edit @dummy, :content, :type => :textarea, :selected => true
+          @result.should == "<span class=\"on_the_spot_editing\" data-cancel=\"cancel\" data-columns=\"40\" data-edittype=\"textarea\" data-ok=\"ok\" data-rows=\"5\" data-selected=\"true\" data-tooltip=\"tooltip\" data-url=\"/bla\" id=\"r_spec/mocks/mock__content__123\">test</span>"
+        end
 
         it "should make the correct html for a select-box" do
           @result = @tester.on_the_spot_edit @dummy, :content, :type => :select, :data => [['test', 'This a test'], ['prod', 'Pure Production'], ['QA', 'Quality Assurance']]

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 10
-  version: 0.0.10
+  - 11
+  version: 0.0.11
 platform: ruby
 authors: 
 - Nathan Van der Auwera
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-08 00:00:00 +02:00
+date: 2011-05-29 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency