active_scaffold 3.0.12 → 3.0.21

data/README

@@ -2,7 +2,7 @@
 ** For all documentation see the project website: http://github.com/vhochstein/active_scaffold/wiki **
 ******************************************************************************************************
 
-ActiveScaffold plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), Ed Moss, Tim Harper and Sergio Cambra (sergio@entrecables.com)
+ActiveScaffold Gem/Plugin by Scott Rutherford (scott@caronsoftware.com), Richard White (rrwhite@gmail.com), Lance Ivy (lance@cainlevy.net), Ed Moss, Tim Harper and Sergio Cambra (sergio@entrecables.com)
 
 Uses DhtmlHistory by Brad Neuberg (bkn3@columbia.edu)
 http://codinginparadise.org
@@ -18,30 +18,32 @@ http://code.google.com/p/recordselect/
 
 == Version Information
 
-Please note the following list of Active Scaffold branches and Rails versions. Master will not work with Rails < 2.2
+Please note the following list of Active Scaffold branches and Rails versions. Master will not work with Rails < 3.1
 
-Active Scaffold master currently supports rails-2.3.5, but incompatible changes can be introduced, if you want an stable version, use rails-2.3
-Rails 2.3.*: Active Scaffold rails-2.3
+Active Scaffold master currently supports rails-3.1, but incompatible changes can be introduced, if you want an stable version, use rails-3.0
+Rails 3.0.*: Active Scaffold rails-3.0
+Rails 2.3.*: Active Scaffold rails-2.3 and v2.4
 Rails 2.2.*: Active Scaffold rails-2.2
 Rails 2.1.*: Active Scaffold rails-2.1
 Rails < 2.1: Active Scaffold 1-1-stable (no guarantees)
 
-Since Rails 2.3, render_component plugin is needed for nested and embbeded scaffolds. It works with rails-2.3 branch from ewildgoose repository:
+Since Rails 2.3, render_component plugin is needed for nested and embedded scaffolds. It works with rails-2.3 branch from ewildgoose repository:
 script/plugin install git://github.com/ewildgoose/render_component.git -r rails-2.3
 
-== Rails 3.0 compatible fork of activesaffold by Volker Hochstein:
-
 Since Rails 3.0 render_component is not used for nesting, but is optional for embedded scaffolds.
 Since Rails 3.0, https://github.com/rails/verification.git is also needed.
 
 If you want to install as plugins under vendor/plugins, install these versions:
   rails plugin install git://github.com/vhochstein/render_component.git
   rails plugin install git://github.com/rails/verification.git
-  rails plugin install git://github.com/vhochstein/active_scaffold.git
+  rails plugin install git://github.com/activescaffold/active_scaffold.git -r 'rails-3.0'
 
 If you want to use the gem, add to your Gemfile:
   gem "active_scaffold"
 
+In case you would like to use most recent commit:
+  gem 'active_scaffold', :git => 'git://github.com/activescaffold/active_scaffold.git', :branch => 'rails-3.0'
+
 == Pick your own javascript framework
 
 The Rails 3.0 version uses unobtrusive Javascript, so you are free to pick your javascript framework.
@@ -50,14 +52,22 @@ Out of the box Prototype or JQuery are supported:
 Prototype 1.7 (default js framework)
 rails.js in git://github.com/vhochstein/prototype-ujs.git
 
-JQuery 1.4.1
-rails.js in git://github.com/vhochstein/jquery-ujs.git
+JQuery 1.4.1, 1.4.2
+https://github.com/vhochstein/jquery-ujs/raw/jquery1_4_2/src/rails.js
+
+JQuery > 1.4.2
+https://github.com/vhochstein/jquery-ujs/raw/master/src/rails.js
 
 To configure the javascript framework when installed under vendor/plugins/
-uncomment last line in ...plugins/active_scaffold/environment.rb in order to use jquery instead of prototype
+uncomment last line in config/initializers/active_scaffold.rb in order to use jquery instead of prototype.
+That file is created when you install ActiveScaffold as a plugin.
 
 To configure the javascript framework when installed as a gem:
 Add a config/initializers/active_scaffold.rb containing:
 ActiveScaffold.js_framework = :jquery # :prototype is the default
 
+== Rails 3.1 compatible branch: 
+under construction
+
+
 Released under the MIT license (included)

data/frontends/default/javascripts/jquery/active_scaffold.js

@@ -34,7 +34,14 @@ $(document).ready(function() {
       } else {
         // hack: jquery requires if you request for javascript that javascript
         // is coming back, however rails has a different mantra
-        if (action_link.position) event.data_type = 'rails';
+        if (action_link.position) {
+          if (parseFloat($.fn.jquery) >= 1.5) {
+            event.data_type = 'text';
+          } else {
+            event.data_type = 'rails';
+          }
+        }
+        
         if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','visible');
         action_link.disable();
       }
@@ -50,7 +57,7 @@ $(document).ready(function() {
       } else {
         action_link.enable();
       }
-      return true;
+      $(this).trigger('as:action_success', action_link);
     }
     return true;
   });
@@ -128,65 +135,7 @@ $(document).ready(function() {
     return true;
   });
   $('span.in_place_editor_field').live('click', function(event) {
-    var span = $(this);
-    span.data(); // jquery 1.4.2 workaround
-    if (typeof(span.data('editInPlace')) === 'undefined') {
-      var options = {show_buttons: true,
-                     hover_class: 'hover',
-                     element_id: 'editor_id',
-                     ajax_data_type: "script",
-                     update_value: 'value'},
-          csrf_param = $('meta[name=csrf-param]').first(),
-          csrf_token = $('meta[name=csrf-token]').first(),
-          my_parent = span.parent(),
-          column_heading = null;
-      
-      if (my_parent.is('td')) {
-        var column_no = my_parent.prevAll('td').length;
-        column_heading = my_parent.closest('.active-scaffold').find('th:eq(' + column_no + ')');
-      } else if (my_parent.is('th')) {
-        column_heading = my_parent;
-      }
-        
-      var render_url = column_heading.attr('data-ie_render_url'),
-          mode = column_heading.attr('data-ie_mode'),
-          record_id = span.attr('data-ie_id');
-          
-      ActiveScaffold.read_inplace_edit_heading_attributes(column_heading, options);
-      
-      if (span.attr('data-ie_url')) { 
-        options.url = span.attr('data-ie_url').replace(/__id__/, record_id);
-      } else { 
-        options.url = column_heading.attr('data-ie_url').replace(/__id__/, record_id);
-      }
-      
-      if (csrf_param) options['params'] = csrf_param.attr('content') + '=' + csrf_token.attr('content');
-
-      if (span.closest('div.active-scaffold').attr('data-eid')) {
-        if (options['params'].length > 0) {
-          options['params'] += ";";
-        }
-        options['params'] += ("eid=" + span.closest('div.active-scaffold').attr('data-eid'));
-      }
-
-      if (mode === 'clone') {
-        options.clone_id_suffix = record_id;
-        options.clone_selector = '#' + column_heading.attr('id') + ' .as_inplace_pattern';
-        options.field_type = 'clone';
-      }
-      
-      if (render_url) {
-        var plural = false;
-        if (column_heading.attr('data-ie_plural')) plural = true;
-        options.field_type = 'remote';
-        options.editor_url = render_url.replace(/__id__/, record_id) 
-      }
-      if (mode === 'inline_checkbox') {
-        ActiveScaffold.process_checkbox_inplace_edit(span.find('input:checkbox'), options);
-      } else {
-        ActiveScaffold.create_inplace_editor(span, options);
-      }
-    }
+    ActiveScaffold.in_place_editor_field_clicked($(this));
   });
   $('a.as_paginate').live('ajax:before',function(event) {
     var as_paginate = $(this);
@@ -204,34 +153,15 @@ $(document).ready(function() {
     $(this).prevAll('img.loading-indicator').css('visibility','hidden');
     return true;
   });
-  $('input[type=button].as_add_existing').live('ajax:before', function(event) {
+  $('input[type=button].as_add_existing, input[type=button].as_replace_existing').live('ajax:before', function(event) {
     var url = $(this).attr('href').replace('--ID--', $(this).prev().val());
     event.data_url = url;
     return true;
   });
   $('input.update_form, select.update_form').live('change', function(event) {
-      var element = $(this);
-      var as_form = element.closest('form.as_form');
-      $.ajax({
-        url: element.attr('data-update_url'),
-        data: {value: element.val()},
-        beforeSend: function(event) {
-          element.nextAll('img.loading-indicator').css('visibility','visible');
-          $('input[type=submit]', as_form).attr('disabled', 'disabled');
-          $("input:enabled,select:enabled", as_form).attr('disabled', 'disabled');
-        },
-        complete: function(event) {
-          element.nextAll('img.loading-indicator').css('visibility','hidden');
-          $('input[type=submit]', as_form).attr('disabled', '');
-          $("input:disabled,select:disabled", as_form).attr('disabled', '');
-        },
-        error: function (xhr, status, error) {
-          var as_div = element.closest("div.active-scaffold");
-          if (as_div) {
-            ActiveScaffold.report_500_response(as_div)
-          }
-        }
-      });
+    var element = $(this);
+    var value = element.is("input:checkbox") ? element.is(":checked") : element.val();
+    ActiveScaffold.update_column(element, element.attr('data-update_url'), element.attr('data-update_send_form'), element.attr('id'), value);
     return true;
   });
   
@@ -255,10 +185,27 @@ $(document).ready(function() {
   });
 
   $('a[data-popup]').live('click', function(e) {
-      window.open($(this).attr('href'));
-      e.preventDefault();
-   });
-  
+    window.open($(this).attr('href'));
+    e.preventDefault();
+  });
+
+  $('.hover_click').live("click", function(event) {
+    var element = $(this);
+    var ul_element = element.children('ul').first();
+    if (ul_element.is(':visible')) {
+      element.find('ul').hide();
+    } else {
+      ul_element.show();
+    }
+    return false;
+  });
+  $('.hover_click a.as_action').live('click', function(event) {
+    var element = $(this).closest('.hover_click');
+    if (element) {
+      element.find('ul').hide();
+    }
+    return true;
+  });
 });
 
 /* Simple Inheritance
@@ -504,7 +451,7 @@ var ActiveScaffold = {
     var loading_indicator = $('#' + as_form.attr('id').replace(/-form$/, '-loading-indicator'));
     if (loading_indicator) loading_indicator.css('visibility','visible');
     $('input[type=submit]', as_form).attr('disabled', 'disabled');
-    $("input:enabled,select:enabled", as_form).attr('disabled', 'disabled');
+    $("input:enabled,select:enabled,textarea:enabled", as_form).attr('disabled', 'disabled');
   },
   
   enable_form: function(as_form) {
@@ -513,7 +460,7 @@ var ActiveScaffold = {
     var loading_indicator = $('#' + as_form.attr('id').replace(/-form$/, '-loading-indicator'));
     if (loading_indicator) loading_indicator.css('visibility','hidden');
     $('input[type=submit]', as_form).attr('disabled', '');
-    $("input:disabled,select:disabled", as_form).attr('disabled', '');
+    $("input:disabled,select:disabled,textarea:disabled", as_form).attr('disabled', '');
   },  
   
   focus_first_element_of_form: function(form_element) {
@@ -562,6 +509,16 @@ var ActiveScaffold = {
     this.reload_if_empty(tbody, page_reload_url);
   },
 
+  delete_subform_record: function(record) {
+    if (typeof(record) == 'string') record = '#' + record;
+    record = $(record);
+    var errors = record.prev();
+    if (errors.hasClass('association-record-errors')) {
+      this.replace_html(errors, '');
+    }
+    this.remove(record);
+  },
+
   report_500_response: function(active_scaffold_id) {
     server_error = $(active_scaffold_id).find('td.messages-container p.server-error');
     if (!$(server_error).is(':visible')) {
@@ -616,7 +573,7 @@ var ActiveScaffold = {
   },
   
   highlight: function(element) {
-    if (typeof(element) == 'string') element = '#' + element;
+    if (typeof(element) == 'string') element = $('#' + element);
     if (typeof(element.effect) == 'function') {
       element.effect("highlight", {}, 3000);
     }
@@ -644,7 +601,7 @@ var ActiveScaffold = {
         element.append(content);
       }
     } else {
-      var current = $('#' + element.attr('id') + ' tr.association-record')
+      var current = $('#' + element.attr('id') + ' .association-record')
       if (current[0]) {
         this.replace(current[0], content);
       } else {
@@ -653,13 +610,21 @@ var ActiveScaffold = {
     }
   },
   
-  render_form_field: function(element, content, options) {
-    if (typeof(element) == 'string') element = '#' + element;
-    var element = $(element);
-    if (options.is_subform == false) {
-      this.replace(element.closest('dl'), content);
-    } else {
-      this.replace_html(element, content);
+  render_form_field: function(source, content, options) {
+    if (typeof(source) == 'string') source = '#' + source;
+    var source = $(source);
+    var element = source.closest('.association-record');
+    if (element.length == 0) {
+      element = source.closest('ol.form');
+    }
+    element = element.find('.' + options.field_class + ":first");
+
+    if (element) {
+      if (options.is_subform == false) {
+        this.replace(element.closest('dl'), content);
+      } else {
+        this.replace_html(element, content);
+      }
     }
   },
   
@@ -685,6 +650,128 @@ var ActiveScaffold = {
         ActiveScaffold.report_500_response(active_scaffold_id)
       }
     });
+  },
+
+  // element is tbody id
+  mark_records: function(element, options) {
+    if (typeof(element) == 'string') element = '#' + element;
+    var element = $(element);
+    var mark_checkboxes = $('#' + element.attr('id') + ' > tr.record td.marked-column input[type="checkbox"]');
+    mark_checkboxes.each(function (index) {
+      var item = $(this);
+     if(options.checked === true) {
+       item.attr('checked', 'checked');
+     } else {
+       item.removeAttr('checked');
+     }
+     item.attr('value', ('' + !options.checked));
+    });
+    if(options.include_mark_all === true) {
+      var mark_all_checkbox = element.prev('thead').find('th.marked-column_heading span input[type="checkbox"]');
+      if(options.checked === true) {
+        mark_all_checkbox.attr('checked', 'checked');
+      } else {
+        mark_all_checkbox.removeAttr('checked');
+      }
+      mark_all_checkbox.attr('value', ('' + !options.checked));
+    }
+  },
+
+  in_place_editor_field_clicked: function(span) {
+    span.data(); // jquery 1.4.2 workaround
+    if (typeof(span.data('editInPlace')) === 'undefined') {
+      var options = {show_buttons: true,
+                     hover_class: 'hover',
+                     element_id: 'editor_id',
+                     ajax_data_type: "script",
+                     update_value: 'value'},
+          csrf_param = $('meta[name=csrf-param]').first(),
+          csrf_token = $('meta[name=csrf-token]').first(),
+          my_parent = span.parent(),
+          column_heading = null;
+
+      if(!(my_parent.is('td') || my_parent.is('th'))){
+          my_parent = span.parents('td').eq(0);
+      }
+
+      if (my_parent.is('td')) {
+        var column_no = my_parent.prevAll('td').length;
+        column_heading = my_parent.closest('.active-scaffold').find('th:eq(' + column_no + ')');
+      } else if (my_parent.is('th')) {
+        column_heading = my_parent;
+      }
+
+      var render_url = column_heading.attr('data-ie_render_url'),
+          mode = column_heading.attr('data-ie_mode'),
+          record_id = span.attr('data-ie_id');
+
+      ActiveScaffold.read_inplace_edit_heading_attributes(column_heading, options);
+
+      if (span.attr('data-ie_url')) {
+        options.url = span.attr('data-ie_url').replace(/__id__/, record_id);
+      } else {
+        options.url = column_heading.attr('data-ie_url').replace(/__id__/, record_id);
+      }
+
+      if (csrf_param) options['params'] = csrf_param.attr('content') + '=' + csrf_token.attr('content');
+
+      if (span.closest('div.active-scaffold').attr('data-eid')) {
+        if (options['params'].length > 0) {
+          options['params'] += "&";
+        }
+        options['params'] += ("eid=" + span.closest('div.active-scaffold').attr('data-eid'));
+      }
+
+      if (mode === 'clone') {
+        options.clone_id_suffix = record_id;
+        options.clone_selector = '#' + column_heading.attr('id') + ' .as_inplace_pattern';
+        options.field_type = 'clone';
+      }
+
+      if (render_url) {
+        var plural = false;
+        if (column_heading.attr('data-ie_plural')) plural = true;
+        options.field_type = 'remote';
+        options.editor_url = render_url.replace(/__id__/, record_id)
+      }
+      if (mode === 'inline_checkbox') {
+        ActiveScaffold.process_checkbox_inplace_edit(span.find('input:checkbox'), options);
+      } else {
+        ActiveScaffold.create_inplace_editor(span, options);
+      }
+    }
+  },
+  
+  update_column: function(element, url, send_form, source_id, val) {
+    var as_form = element.closest('form.as_form');
+    var params = null;
+
+    if (send_form) {
+      params = as_form.serialize();
+      params += '&' + $.param({"source_id": source_id});
+    } else {
+      params = {value: val};
+      params.source_id = source_id;
+    }
+
+    $.ajax({
+      url: url,
+      data: params,
+      beforeSend: function(event) {
+        element.nextAll('img.loading-indicator').css('visibility','visible');
+        ActiveScaffold.disable_form(as_form);
+      },
+      complete: function(event) {
+        element.nextAll('img.loading-indicator').css('visibility','hidden');
+        ActiveScaffold.enable_form(as_form);
+      },
+      error: function (xhr, status, error) {
+        var as_div = element.closest("div.active-scaffold");
+        if (as_div) {
+          ActiveScaffold.report_500_response(as_div);
+        }
+      }
+    });
   }
 }
 
@@ -784,6 +871,7 @@ ActiveScaffold.ActionLink.Abstract = Class.extend({
     this.loading_indicator = loading_indicator;
     this.hide_target = false;
     this.position = this.tag.attr('data-position');
+    this.action = this.tag.attr('data-action');
 		
     this.tag.data('action_link', this);
     return this;