active_scaffold_vho 3.1.5 → 3.1.6

data/.gitignore

@@ -15,6 +15,7 @@ doc
 pkg
 
 nbproject
+.idea
 
 # Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
 #

data/Gemfile.lock

@@ -1,38 +1,38 @@
 PATH
   remote: .
   specs:
-    active_scaffold_vho (3.1.5)
+    active_scaffold_vho (3.1.6)
       kaminari
       rails (>= 3.1.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.2.8)
-      actionpack (= 3.2.8)
+    actionmailer (3.2.11)
+      actionpack (= 3.2.11)
       mail (~> 2.4.4)
-    actionpack (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    actionpack (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       journey (~> 1.0.4)
       rack (~> 1.4.0)
       rack-cache (~> 1.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.1.3)
-    activemodel (3.2.8)
-      activesupport (= 3.2.8)
+      sprockets (~> 2.2.1)
+    activemodel (3.2.11)
+      activesupport (= 3.2.11)
       builder (~> 3.0.0)
-    activerecord (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
+    activerecord (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
-    activeresource (3.2.8)
-      activemodel (= 3.2.8)
-      activesupport (= 3.2.8)
-    activesupport (3.2.8)
+    activeresource (3.2.11)
+      activemodel (= 3.2.11)
+      activesupport (= 3.2.11)
+    activesupport (3.2.11)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     arel (3.0.2)
@@ -41,7 +41,7 @@ GEM
     hike (1.2.1)
     i18n (0.6.1)
     journey (1.0.4)
-    json (1.7.5)
+    json (1.7.6)
     kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
@@ -50,45 +50,46 @@ GEM
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
     mime-types (1.19)
-    multi_json (1.3.7)
+    multi_json (1.5.0)
     polyglot (0.3.3)
-    rack (1.4.1)
+    rack (1.4.4)
     rack-cache (1.2)
       rack (>= 0.4)
     rack-ssl (1.3.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
-    rails (3.2.8)
-      actionmailer (= 3.2.8)
-      actionpack (= 3.2.8)
-      activerecord (= 3.2.8)
-      activeresource (= 3.2.8)
-      activesupport (= 3.2.8)
+    rails (3.2.11)
+      actionmailer (= 3.2.11)
+      actionpack (= 3.2.11)
+      activerecord (= 3.2.11)
+      activeresource (= 3.2.11)
+      activesupport (= 3.2.11)
       bundler (~> 1.0)
-      railties (= 3.2.8)
-    railties (3.2.8)
-      actionpack (= 3.2.8)
-      activesupport (= 3.2.8)
+      railties (= 3.2.11)
+    railties (3.2.11)
+      actionpack (= 3.2.11)
+      activesupport (= 3.2.11)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
       thor (>= 0.14.6, < 2.0)
-    rake (0.9.2.2)
+    rake (10.0.3)
     rcov (0.9.9)
     rdoc (3.12)
       json (~> 1.4)
     shoulda (2.11.3)
-    sprockets (2.1.3)
+    sprockets (2.2.2)
       hike (~> 1.2)
+      multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    thor (0.16.0)
+    thor (0.17.0)
     tilt (1.3.3)
     treetop (1.4.12)
       polyglot
       polyglot (>= 0.3.1)
-    tzinfo (0.3.34)
+    tzinfo (0.3.35)
 
 PLATFORMS
   ruby

data/app/assets/javascripts/jquery/active_scaffold.js

@@ -1,5 +1,5 @@
 $(document).ready(function() {
-  $('form.as_form').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'form.as_form', function(event) {
     var as_form = $(this).closest("form");
     $(this).find('.association-record-new').each(function(index) {
         var record_action = 'empty';
@@ -11,7 +11,7 @@ $(document).ready(function() {
     });
     return true;
   });
-  $('form.as_form').live('ajax:loading', function(event) {
+  $(document).on('ajax:beforeSend', 'form.as_form', function(event) {
     var as_form = $(this).closest("form");
     if (as_form && as_form.attr('data-loading') == 'true') {
       ActiveScaffold.disable_form(as_form);
@@ -19,26 +19,26 @@ $(document).ready(function() {
     return true;
   });
   
-  $('form.as_form').live('ajax:complete', function(event) {
+  $(document).on('ajax:complete', 'form.as_form', function(event) {
     var as_form = $(this).closest("form");
     if (as_form && as_form.attr('data-loading') == 'true') {
       ActiveScaffold.enable_form(as_form);
     }
   });
-  $('form.as_form').live('ajax:error', function(event, xhr, status, error) {
+  $(document).on('ajax:error', 'form.as_form', function(event, xhr, status, error) {
     var as_div = $(this).closest("div.active-scaffold");
     if (as_div) {
       ActiveScaffold.report_500_response(as_div)
     }
   });
-  $('form.as_form.as_remote_upload').live('submit', function(event) {
+  $(document).on('submit', 'form.as_form.as_remote_upload', function(event) {
     var as_form = $(this).closest("form");
     if (as_form && as_form.attr('data-loading') == 'true') {
       setTimeout("ActiveScaffold.disable_form('" + as_form.attr('id') + "')", 10);
     }
     return true;
   });
-  $('a.as_action').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'a.as_action', function(event) {
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link) {
       if (action_link.is_disabled()) {
@@ -61,7 +61,7 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_action').live('ajax:beforeSend', function(event, xhr, settings) {
+  $(document).on('ajax:beforeSend', 'a.as_action', function(event, xhr, settings) {
     xhr.setRequestHeader('accept', '*/*;q=0.5, ' + settings.accepts.script);
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link && action_link.position) {
@@ -70,7 +70,7 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_action').live('ajax:success', function(event, response) {
+  $(document).on('ajax:success', 'a.as_action', function(event, response) {
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link) {
       if (action_link.position) {
@@ -83,14 +83,14 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_action').live('ajax:complete', function(event) {
+  $(document).on('ajax:complete', 'a.as_action', function(event) {
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link) {
       if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');  
     }
     return true;
   });
-  $('a.as_action').live('ajax:error', function(event, xhr, status, error) {
+  $(document).on('ajax:error', 'a.as_action', function(event, xhr, status, error) {
     var action_link = ActiveScaffold.ActionLink.get($(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id());
@@ -98,7 +98,7 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_cancel').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'a.as_cancel', function(event) {
     var as_cancel = $(this);
     var action_link = ActiveScaffold.find_action_link(as_cancel);  
     
@@ -108,7 +108,7 @@ $(document).ready(function() {
       if (refresh_data === 'true' && action_link.refresh_url) {
         event.data_url = action_link.refresh_url;
         as_cancel.attr('href', action_link.refresh_url);
-        if (action_link.position) event.data_type = 'html' 
+        if (action_link.position) event.data_type = 'rails';
       } else if (refresh_data === 'false' || typeof(cancel_url) == 'undefined' || cancel_url.length == 0) {
         action_link.close();
         return false;
@@ -116,18 +116,18 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_cancel').live('ajax:beforeSend', function(event, xhr, settings) {
+  $(document).on('ajax:beforeSend', 'a.as_cancel', function(event, xhr, settings) {
     var as_cancel = $(this);
     var action_link = ActiveScaffold.find_action_link($(this));
     var refresh_data = as_cancel.attr('data-refresh');
 
     if (action_link && action_link.position && refresh_data === 'true' && action_link.refresh_url) {
-      settings.dataType = 'html';
-      settings.dataTypes = ['html'];
+      settings.dataType = 'text';
+      settings.dataTypes = ['text'];
     }
     return true;
   });
-  $('a.as_cancel').live('ajax:success', function(event, response) {
+  $(document).on('ajax:success', 'a.as_cancel', function(event, response) {
     var action_link = ActiveScaffold.find_action_link($(this));
 
     if (action_link) {
@@ -139,26 +139,26 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('a.as_cancel').live('ajax:error', function(event, xhr, status, error) {
+  $(document).on('ajax:error', 'a.as_cancel', function(event, xhr, status, error) {
     var action_link = ActiveScaffold.find_action_link($(this));
     if (action_link) {
       ActiveScaffold.report_500_response(action_link.scaffold_id());
     }
     return true;
   });
-  $('a.as_sort').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'a.as_sort', function(event) {
     var as_sort = $(this);
     var history_controller_id = as_sort.attr('data-page-history');
     if (history_controller_id) addActiveScaffoldPageToHistory(as_sort.attr('href'), history_controller_id);
     as_sort.closest('th').addClass('loading');
     return true;
   });
-  $('a.as_sort').live('ajax:error', function(event, xhr, status, error) {
+  $(document).on('ajax:error', 'a.as_sort', function(event, xhr, status, error) {
     var as_scaffold = $(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  $('div.active-scaffold-footer .pagination a').live('ajax:before',function(event) {
+  $(document).on('ajax:before', 'div.active-scaffold-footer .pagination a', function(event) {
     var as_paginate = $(this);
     var loading_indicator = as_paginate.closest('.pagination').find('img.loading-indicator').first();
     var history_controller_id = as_paginate.attr('data-page-history');
@@ -173,16 +173,16 @@ $(document).ready(function() {
     loading_indicator.css('visibility','visible');
     return true;
   });
-  $('div.active-scaffold-footer .pagination a').live('ajax:error', function(event, xhr, status, error) {
+  $(document).on('ajax:error', 'div.active-scaffold-footer .pagination a', function(event, xhr, status, error) {
     var as_scaffold = $(this).closest('.active-scaffold');
     ActiveScaffold.report_500_response(as_scaffold);
     return true;
   });
-  $('div.active-scaffold-footer .pagination a').live('ajax:complete', function(event) {
+  $(document).on('ajax:complete', 'div.active-scaffold-footer .pagination a', function(event) {
     $(this).prevAll('img.loading-indicator').css('visibility','hidden');
     return true;
   });
-  $('a.as_add_existing').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'a.as_add_existing', function(event) {
     var selected_id = $(this).prev().val();
     if (selected_id) {
       var url = $(this).attr('href').replace('--ID--', $(this).prev().val());
@@ -194,14 +194,14 @@ $(document).ready(function() {
     }
     
   });
-  $('a.as_destroy_existing').live('click', function(event) {
+  $(document).on('click', 'a.as_destroy_existing', function(event) {
     var associated_record = $(this).closest('tr.association-record');
     ActiveScaffold.delete_subform_record(associated_record);
     event.stopPropagation();
     return false;
   });
 
-  $('input.update_form, textarea.update_form, select.update_form').live('change', function(event) {
+  $(document).on('change', 'input.update_form, textarea.update_form, select.update_form', function(event) {
       var element = $(this);
       var as_form = element.closest('form.as_form');
       var params = null;
@@ -242,12 +242,12 @@ $(document).ready(function() {
     return true;
   });
   
-  $('select.as_search_range_option').live('change', function(event) {
+  $(document).on('change', 'select.as_search_range_option', function(event) {
     ActiveScaffold[$(this).val() == 'BETWEEN' ? 'show' : 'hide']($(this).parent().find('.as_search_range_between'));
     return true;
   });
   
-  $('select.as_search_range_option').live('change', function(event) {
+  $(document).on('change', 'select.as_search_range_option', function(event) {
     var element = $(this);
     ActiveScaffold[!(element.val() == 'PAST' || element.val() == 'FUTURE' || element.val() == 'RANGE') ? 'show' : 'hide'](element.attr('id').replace(/_opt/, '_numeric'));
     ActiveScaffold[(element.val() == 'PAST' || element.val() == 'FUTURE') ? 'show' : 'hide'](element.attr('id').replace(/_opt/, '_trend'));
@@ -255,18 +255,18 @@ $(document).ready(function() {
     return true;
   });
 
-  $('select.as_update_date_operator').live('change', function(event) {
+  $(document).on('change', 'select.as_update_date_operator', function(event) {
     ActiveScaffold[$(this).val() == 'REPLACE' ? 'show' : 'hide']($(this).next());
     ActiveScaffold[$(this).val() == 'REPLACE' ? 'hide' : 'show']($(this).next().next());
     return true;
   });
 
-  $('a[data-popup]').live('click', function(e) {
+  $(document).on('click', 'a[data-popup]', function(e) {
     window.open($(this).attr('href'));
     e.preventDefault();
   });
 
-  $('.hover_click').live("click", function(event) {
+  $(document).on("click", '.hover_click', function(event) {
     var element = $(this);
     var ul_element = element.children('ul').first();
     if (ul_element.is(':visible')) {
@@ -276,19 +276,19 @@ $(document).ready(function() {
     }
     return false;
   });
-  $('.hover_click a.as_action').live('click', function(event) {
+  $(document).on('click', '.hover_click a.as_action', function(event) {
     var element = $(this).closest('.hover_click');
     if (element) {
       element.find('ul').hide();
     }
     return true;
   });
-  $('form.as_form').live('as:form_loaded', function(event) {
+  $(document).on('as:form_loaded', 'form.as_form', function(event) {
     var as_form = $(this).closest("form");
     ActiveScaffold.focus_first_element_of_form(as_form);
     return true;
   });
-  $('li.horizontal-sub-form').live('as:form_element_loaded', function(event) {
+  $(document).on('as:form_element_loaded', 'li.horizontal-sub-form', function(event) {
     $(this).find('a.as_associated_form_link').each(function(index) {
         ActiveScaffold.show($(this));
         //Show select Box for add_existing as well
@@ -298,7 +298,7 @@ $(document).ready(function() {
     })
     return true;
   });
-  $('li.sub-form').live('as:form_element_loaded', function(event) {
+  $(document).on('as:form_element_loaded', 'li.sub-form', function(event) {
     $(this).find('.association-record-new').each(function(index) {
         $(this).find('input, textarea, select').each(function(index) {
           $(this).data('value_was', $(this).val());
@@ -306,17 +306,17 @@ $(document).ready(function() {
     })
     return true;
   });
-  $('span.mark_heading, span.in_place_editor_field[data-ie_mode="inline_checkbox"]').live('click', function(event) {
+  $(document).on('click', 'span.mark_heading, span.in_place_editor_field[data-ie_mode="inline_checkbox"]', function(event) {
     ActiveScaffold.process_checkbox_inplace_edit($(this).find('input:checkbox'), ActiveScaffold.inplace_edit_options($(this)));
     return true;
   });
-  $('tr.record').live('as:list_row_loaded', function(event) {
+  $(document).on('as:list_row_loaded', 'tr.record', function(event) {
     $(this).closest("tr").find('td > span.in_place_editor_field[data-ie_mode!="inline_checkbox"]').each(function(index) {
       ActiveScaffold.create_inplace_editor($(this));
     });
     return true;
   });
-  $('tr.inline-adapter-autoopen').live('as:list_row_loaded', function(event) {
+  $(document).on('as:list_row_loaded', 'tr.inline-adapter-autoopen', function(event) {
     var actionlink_controllers = $(event.target).attr('data-actionlink-controllers');
     if(actionlink_controllers) {
       actionlink_controllers = actionlink_controllers.split('::');
@@ -334,12 +334,12 @@ $(document).ready(function() {
     }
     return true;
   });
-  $('form.as_form').live('ajax:before', function(event) {
+  $(document).on('ajax:before', 'form.as_form', function(event) {
     var as_form = $(this).closest("form");
     $(this).trigger('as:form_submit');
     return true;
   });
-  $('form.as_form[data-remote!="true"]').live('submit', function(event) {
+  $(document).on('submit', 'form.as_form[data-remote!="true"]', function(event) {
     var as_form = $(this).closest("form");
     $(this).trigger('as:form_submit');
     return true;
@@ -553,11 +553,12 @@ var ActiveScaffold = {
     if (typeof(element) == 'string') element = '#' + element; 
     element = $(element);
     var new_element = null;
+    var new_fragment = $(html);
     if((typeof(disable_event_trigger) == 'boolean') && disable_event_trigger == true) {
-      new_element = $(html).replaceAll(element);
+      new_element = new_fragment.replaceAll(element).first();
     } else {
       ActiveScaffold.trigger_unload_events(element.find('[data-as_load]').andSelf());
-      new_element = $(html).replaceAll(element);
+      new_element = new_fragment.replaceAll(element).first();
       ActiveScaffold.trigger_load_events(new_element.find('[data-as_load]').andSelf());
     }
     return new_element;
@@ -597,8 +598,8 @@ var ActiveScaffold = {
     as_form = $(as_form)
     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,textarea:enabled", as_form).attr('disabled', 'disabled');
+    $('input[type=submit]', as_form).prop('disabled', true);
+    $("input:enabled,select:enabled,textarea:enabled", as_form).prop('disabled', true);
   },
   
   enable_form: function(as_form) {
@@ -606,13 +607,16 @@ var ActiveScaffold = {
     as_form = $(as_form)
     var loading_indicator = $('#' + as_form.attr('id').replace(/-form$/, '-loading-indicator'));
     if (loading_indicator) loading_indicator.css('visibility','hidden');
-    $('input[type=submit]', as_form).removeAttr('disabled');
-    $("input:disabled,select:disabled,textarea:disabled", as_form).removeAttr('disabled');
+    $('input[type=submit]', as_form).prop('disabled', false);
+    $("input:disabled,select:disabled,textarea:disabled", as_form).prop('disabled', false);
   },  
   
   focus_first_element_of_form: function(form_element) {
-    if (typeof(form_element) == 'string') form_element = '#' + form_element;
-    $(form_element + ":first *:input[type!=hidden]:first").focus();
+    if (typeof(form_element) == 'string') {
+      form_element = '#' + form_element;
+      form_element = $(form_element);
+    }
+    form_element.find("input[type!=hidden]:first").focus();
   },
     
   create_record_row: function(active_scaffold_id, html, options) {
@@ -699,10 +703,10 @@ var ActiveScaffold = {
       data: options['params'],
       dataType: options.ajax_data_type,
       after: function(request){
-        checkbox.attr('disabled', 'disabled');
+        checkbox.prop('disabled', true);
       },
       complete: function(request){
-        checkbox.removeAttr('disabled');
+        checkbox.prop('disabled', false);
       }
     });
   },
@@ -724,7 +728,7 @@ var ActiveScaffold = {
   highlight: function(element) {
     if (typeof(element) == 'string') element = $('#' + element);
     if (typeof(element.effect) == 'function') {
-      element.effect("highlight", {}, 3000);
+      element.effect("highlight", {}, 1000);
     }
   },
   
@@ -1172,12 +1176,12 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
 
     if (this.position == 'after') {
       this.target.after(this.wrap_with_adapter_html(content, should_refresh_data));
-      ActiveScaffold.trigger_load_events(this.target.next().find('[data-as_load]'));
+      ActiveScaffold.trigger_load_events(this.target.next().find('.records').first().find('> [data-as_load]'));
       this.set_adapter(this.target.next());
     }
     else if (this.position == 'before') {
       this.target.before(this.wrap_with_adapter_html(content, should_refresh_data));
-      ActiveScaffold.trigger_load_events(this.target.prev().find('[data-as_load]'));
+      ActiveScaffold.trigger_load_events(this.target.prev().find('.records').first().find('> [data-as_load]'));
       this.set_adapter(this.target.prev());
     }
     else {
@@ -1212,14 +1216,17 @@ ActiveScaffold.ActionLink.Record = ActiveScaffold.ActionLink.Abstract.extend({
   
   set_opened: function() {
     var should_refresh_data = (typeof(this.refresh_ur)== 'undefined');
+    var new_adapter = null;
     if (this.position == 'after') {
-      var new_adapter = ActiveScaffold.replace(this.target.next(), this.wrap_with_adapter_html(this.target.next().children(':first-child').html(), should_refresh_data), true);
-      this.set_adapter(new_adapter);
+      new_adapter = this.target.next();
+    } else if (this.position == 'before') {
+      new_adapter = this.target.prev();
     }
-    else if (this.position == 'before') {
-      var new_adapter = ActiveScaffold.replace(this.target.prev(), this.wrap_with_adapter_html(this.target.prev().children(':first-child').html(), should_refresh_data), true);
-      this.set_adapter(new_adapter);
+    if (!new_adapter.hasClass('as_adapter')) {
+      new_adapter = ActiveScaffold.replace(new_adapter, this.wrap_with_adapter_html(new_adapter.children(':first-child').html(), should_refresh_data), true);
+      ActiveScaffold.trigger_load_events(new_adapter.find('.records').first().find('> [data-as_load]'));
     }
+    this.set_adapter(new_adapter);
     this.disable();
   }
 });

data/app/assets/javascripts/jquery/date_picker_bridge.js.erb

@@ -2,7 +2,7 @@
 <%= ActiveScaffold::Bridges::DatePickerBridge.localization %>
 
 $(document).ready(function() {
-  $('form.as_form, form.inplace_form').live('as:form_loaded', function(event) {
+  $(document).on('as:form_loaded', 'form.as_form, form.inplace_form', function(event) {
     var as_form = $(this).closest("form");
     as_form.find('input.datetime_picker').each(function(index) {
       var date_picker = $(this);
@@ -19,7 +19,7 @@ $(document).ready(function() {
     });
     return true;
   });
-  $('form.as_form, form.inplace_form').live('as:form_unloaded', function(event) {
+  $(document).on('as:form_unloaded', 'form.as_form, form.inplace_form', function(event) {
     var as_form = $(this).closest("form");
     as_form.find('input.datetime_picker').each(function(index) {
       var date_picker = $(this);