active_scaffold 3.3.3 → 3.4.0

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

@@ -1,25 +1,23 @@
 <%# encoding: utf-8 %>
 <%= ActiveScaffold::Bridges[:date_picker].localization %>
-jQuery(function($) {
-  Object.getPrototypeOf($.datepicker)._attachDatepicker_without_inlineSettings = Object.getPrototypeOf($.datepicker)._attachDatepicker;
-  $.extend(Object.getPrototypeOf($.datepicker), {
-    _attachDatepicker: function(target, settings) {
-      var inlineSettings = {}, $target = $(target);
-      for (var attrName in this._defaults) {
-        if(this._defaults.hasOwnProperty(attrName)){
-          var attrValue = $target.data(attrName.toLowerCase());
-          if (attrValue) {
-            try {
-              inlineSettings[attrName] = eval(attrValue);
-            } catch (err) {
-              inlineSettings[attrName] = attrValue;
-            }
+Object.getPrototypeOf(jQuery.datepicker)._attachDatepicker_without_inlineSettings = Object.getPrototypeOf(jQuery.datepicker)._attachDatepicker;
+jQuery.extend(Object.getPrototypeOf(jQuery.datepicker), {
+  _attachDatepicker: function(target, settings) {
+    var inlineSettings = {}, $target = jQuery(target);
+    for (var attrName in this._defaults) {
+      if(this._defaults.hasOwnProperty(attrName)){
+        var attrValue = $target.data(attrName.toLowerCase());
+        if (attrValue) {
+          try {
+            inlineSettings[attrName] = eval(attrValue);
+          } catch (err) {
+            inlineSettings[attrName] = attrValue;
           }
         }
       }
-      this._attachDatepicker_without_inlineSettings(target, $.extend({}, settings || {}, inlineSettings));
     }
-  });
+    this._attachDatepicker_without_inlineSettings(target, jQuery.extend({}, settings || {}, inlineSettings));
+  }
 });
 jQuery(document).on("focus", "input.date_picker", function(){
   var date_picker = jQuery(this);

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

@@ -1,26 +1,33 @@
-jQuery.fn.draggable_lists = function() {
-  this.addClass('draggable-list');
-  var list_selected = jQuery(this.get(0).cloneNode(false)).addClass('selected');
-  list_selected.attr('id', list_selected.attr('id') + '_selected').insertAfter(this);
-  this.find('input:checkbox').each(function(index, item) {
-    var li = jQuery(item).closest('li').addClass('draggable-item');
-    li.children('label').removeAttr('for');
-    if (jQuery(item).is(':checked')) li.appendTo(list_selected);
-    li.draggable({appendTo: 'body', helper: 'clone'});
-  });
-  jQuery([this, list_selected]).droppable({
-    hoverClass: 'hover',
-    accept: function(draggable) {
-      var parent_id = draggable.parent().attr('id'), id = jQuery(this).attr('id'),
-        requested_id = jQuery(this).hasClass('selected') ? id.replace('_selected', '') : id + '_selected';
-      return parent_id == requested_id;
-    },
-    drop: function(event, ui) {
-      jQuery(this).append(ui.draggable);
-      var input = jQuery('input:checkbox', ui.draggable);
-      input.prop('checked', jQuery(this).hasClass('selected'));
-      ui.draggable.css({left: '0px', top: '0px'});
-    }
-  });
-  return this;
-};
+(function() {
+  function enableDraggableLists(element) {
+    if (element.hasClass('draggable-list')) return;
+    element.addClass('draggable-list');
+    var list_selected = jQuery(element.get(0).cloneNode(false)).addClass('selected');
+    list_selected.attr('id', list_selected.attr('id') + '_selected').insertAfter(element);
+    element.find('input:checkbox').each(function(index, item) {
+      var li = jQuery(item).closest('li').addClass('draggable-item');
+      li.children('label').removeAttr('for');
+      if (jQuery(item).is(':checked')) li.appendTo(list_selected);
+      li.draggable({appendTo: 'body', helper: 'clone'});
+    });
+    jQuery([element, list_selected]).droppable({
+      hoverClass: 'hover',
+      accept: function(draggable) {
+        var parent_id = draggable.parent().attr('id'), id = jQuery(this).attr('id'),
+          requested_id = jQuery(this).hasClass('selected') ? id.replace('_selected', '') : id + '_selected';
+        return parent_id == requested_id;
+      },
+      drop: function(event, ui) {
+        jQuery(this).append(ui.draggable);
+        var input = jQuery('input:checkbox', ui.draggable);
+        input.prop('checked', jQuery(this).hasClass('selected'));
+        input.trigger('change');
+        ui.draggable.css({left: '0px', top: '0px'});
+      }
+    });
+    return element;
+  };
+  jQuery.fn.draggableLists = function() {
+    this.each(function() { enableDraggableLists(jQuery(this)); });
+  };
+})();

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

@@ -314,7 +314,7 @@ $.extend(InlineEditor.prototype, {
 
 		var editorNode = patternNodes.editNode.clone();
 		var clonedNodes = null;
-		if (editorNode.attr('id')) editorNode.attr('id', editorNode.attr('id') + this.settings.clone_id_suffix);
+		if (editorNode.data('id')) editorNode.attr('id', editorNode.data('id') + this.settings.clone_id_suffix);
 		editorNode.attr('name', 'inplace_value');
 		editorNode.addClass('editor_field');
 		this.setValue(editorNode, this.originalValue);
@@ -323,8 +323,8 @@ $.extend(InlineEditor.prototype, {
 		if (patternNodes.additionalNodes) {
 			patternNodes.additionalNodes.each(function (index, node) {
 				var patternNode = $(node).clone();
-				if (patternNode.attr('id')) {
-					patternNode.attr('id', patternNode.attr('id') + this.settings.clone_id_suffix);
+				if (patternNode.data('id')) {
+					patternNode.attr('id', patternNode.data('id') + this.settings.clone_id_suffix);
 				}
 				clonedNodes = clonedNodes.after(patternNode);
 			});

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

@@ -43,6 +43,9 @@ document.observe("dom:loaded", function() {
       return false;
     }
   });
+  document.on('ajax:complete', 'form.live', function(event) {
+    ActiveScaffold.focus_first_element_of_form(event.findElement('form'));
+  });
   document.on('ajax:failure', 'form.as_form', function(event) {
     var as_div = event.findElement('div.active-scaffold');
     if (as_div) {
@@ -77,7 +80,10 @@ document.observe("dom:loaded", function() {
         action_link.insert(event.memo.request.transport.responseText);
         if (action_link.hide_target) action_link.target.hide();
       } else {
-        //event.memo.request.evalResponse(); // (clyfe) prototype evals the response by itself checking headers, this would eval twice
+        if (action_link.tag.hasClassName('toggle')) {
+          action_link.tag.up('.action_group,.actions').select('.toggle.active').invoke('removeClassName', 'active');
+          action_link.tag.addClassName('active');
+        }
         action_link.enable();
       }
       event.stop();
@@ -115,7 +121,7 @@ document.observe("dom:loaded", function() {
     return true;
   });
   document.on('ajax:success', 'a.as_cancel', function(event) {
-    var action_link = ActiveScaffold.find_action_link(event.findElement());
+    var link = event.findElement(), action_link = ActiveScaffold.find_action_link(link);
     if (action_link) {
       if (action_link.position) {
         action_link.close();
@@ -123,6 +129,7 @@ document.observe("dom:loaded", function() {
         event.memo.request.evalResponse(); 
       }
     }
+    if (link.hasClassName('reset')) link.up('form').reset();
     return true;
   });
   document.on('ajax:failure', 'a.as_cancel', function(event) {
@@ -252,11 +259,31 @@ document.observe("dom:loaded", function() {
       return true;
     } else return false;
   });
-  document.on('change', 'input.update_form, textarea.update_form, select.update_form', function(event) {
+  document.on('change', 'input.update_form, textarea.update_form, select.update_form, .checkbox-list.update_form input:checkbox', function(event) {
     var element = event.findElement();
-    ActiveScaffold.update_column(element, element.readAttribute('data-update_url'), element.hasAttribute('data-update_send_form'), element.readAttribute('id'), element.getValue());
+    var form_element = element.up('.checkbox-list');
+    var value, additional_params;
+    if (form_element.match(".checkbox-list")) {
+      value = Form.Element.getValue(form_element.up());
+      additional_params = element.readAttribute('checked') ? {'_added': element.readAttribute('value')} : {'_removed': element.readAttribute('value')};
+    } else {
+      value = element.getValue();
+      form_element = element;
+    }
+    ActiveScaffold.update_column(element, form_element.readAttribute('data-update_url'), form_element.hasAttribute('data-update_send_form'), element.readAttribute('id'), value);
     return true;
   });
+  document.on('click', 'a.refresh-link', function(event) {
+    event.stop();
+    var element = event.findElement();
+    var form_element = element.previous();
+    var value;
+    if (form_element.match(".checkbox-list")) {
+      value = Form.Element.getValue(form_element);
+      form_element = form_element.up().select("input:checkbox"); // parent is needed for draggable-list, checked list may be empty
+    } else value = form_element.getValue();
+    ActiveScaffold.update_column(form_element, element.readAttribute('href'), element.hasAttribute('data-update_send_form'), form_element.readAttribute('id'), value);
+  });
   document.on('recordselect:change', 'input.recordselect.update_form', function(event) {
     var element = event.findElement();
     ActiveScaffold.update_column(element, element.readAttribute('data-update_url'), element.hasAttribute('data-update_send_form'), element.readAttribute('id'), element.memo.id);
@@ -383,20 +410,24 @@ var ActiveScaffold = {
   update_row: function(row, html) {
     row = $(row);
     var new_row = this.replace(row, html)
-    if (row.hasClassName('even-record')) new_row.addClassName('even-record');
-    ActiveScaffold.highlight(new_row);
+    if (new_row) {
+      if (row.hasClassName('even-record')) new_row.addClassName('even-record');
+      ActiveScaffold.highlight(new_row);
+    }
   },
   
   replace: function(element, html) {
     element = $(element)
-    Element.replace(element, html);
-    element = $(element.readAttribute('id'));
+    if (element) {
+      Element.replace(element, html);
+      element = $(element.readAttribute('id'));
+    }
     return element;
   },
     
   replace_html: function(element, html) {
     element = $(element);
-    element.update(html);
+    if (element) element.update(html);
     return element;
   },
   
@@ -540,6 +571,11 @@ var ActiveScaffold = {
     link = $(link);
     link.next('ul').remove();
     link.up('td').addClassName('action_group dyn');
+    if (link.up('td.actions')) link.up('td').addClassName('action_group dyn');
+    else {
+      if (link.up().hasClassName('actions')) link.wrap('div');
+      link.up().addClassName('action_group dyn');
+    }
     link.insert({after: html});
   },
   
@@ -595,7 +631,7 @@ var ActiveScaffold = {
     var toggler = toggable.previous();
     var initial_label = (options.default_visible === true) ? options.hide_label : options.show_label;
     
-    toggler.insert(' (<a class="visibility-toggle" href="#">' + initial_label + '</a>)');
+    toggler.insert(' <a class="visibility-toggle" href="#">' + initial_label + '</a>');
     toggler.firstDescendant().observe('click', function(event) {
       var element = event.element();
       event.stop();
@@ -623,11 +659,14 @@ var ActiveScaffold = {
   
   render_form_field: function(source, content, options) {
     var source = $(source);
-    var element = source.up('.association-record');
+    var element = source.up('.association-record'), selector = '';
     if (typeof(element) === 'undefined') {
       element = source.up('ol.form');
+      selector = 'li';
     }
-    element = element.down('.' + options.field_class);
+    // find without entering new subforms
+    selector = options.is_subform ? '' : selector + ':not(.sub-form) ';
+    element = element.down(selector + '.' + options.field_class);
 
     if (element) {
       if (options.is_subform == false) {
@@ -675,7 +714,7 @@ var ActiveScaffold = {
     }
   },
 
-  update_column: function(element, url, send_form, source_id, val) {
+  update_column: function(element, url, send_form, source_id, val, additional_params) {
     if (!element) element = $(source_id);
     
     var as_form = element.up('form.as_form');
@@ -690,6 +729,7 @@ var ActiveScaffold = {
         params = Form.serializeElements(base.getElementsBySelector('input, textarea, select'), true);
       else params = as_form.serialize(true);
       params['_method'] = '';
+      if (additional_params) params = Object.extend(params, additional_params);
     } else {
         params = {value: val};
     }
@@ -936,7 +976,7 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
 ActiveScaffold.Actions.Record = Class.create(ActiveScaffold.Actions.Abstract, {
   instantiate_link: function(link) {
     var l = new ActiveScaffold.ActionLink.Record(link, this.target, this.loading_indicator);
-    if (this.target.hasAttribute('data-refresh') && !this.target.readAttribute('data-refresh').blank()) l.refresh_url = this.target.readAttribute('data-refresh');
+    if (this.target.hasAttribute('data-refresh') && !this.target.readAttribute('data-refresh').blank()) l.refresh_url = this.target.up('.records').readAttribute('data-refresh-record').replace('--ID--', this.target.readAttribute('data-refresh'));
     
     if (l.position) {
       l.url = l.url.append_params({adapter: '_list_inline_adapter'});
@@ -977,6 +1017,7 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
       return false;
     }
     this.adapter.down('.inline-adapter-cell').writeAttribute('colspan', colspan);
+    ActiveScaffold.focus_first_element_of_form(this.adapter);
     ActiveScaffold.highlight(this.adapter.down('td').down());
   },
 
@@ -1045,8 +1086,9 @@ ActiveScaffold.ActionLink.Table = Class.create(ActiveScaffold.ActionLink.Abstrac
     else {
       throw 'Unknown position "' + this.position + '"'
     }
+    ActiveScaffold.focus_first_element_of_form(this.adapter);
     ActiveScaffold.highlight(this.adapter.down('td').down());
-  },
+  }
 });
 
 if (Ajax.InPlaceEditor) {
@@ -1091,8 +1133,8 @@ ActiveScaffold.InPlaceEditor = Class.create(Ajax.InPlaceEditor, {
       return;
     }
 
-    var fld = patternNodes.editNode.cloneNode(true);
-    if (fld.id.length > 0) fld.id += this.options.nodeIdSuffix;
+    var fld = $(patternNodes.editNode.cloneNode(true));
+    if (fld.readAttribute("data-id").length > 0) fld.id = fld.readAttribute("data-id") + this.options.nodeIdSuffix;
     fld.name = this.options.paramName;
     fld.className = 'editor_field';
     this.setValue(fld, this._controls.editor.value);
@@ -1103,9 +1145,9 @@ ActiveScaffold.InPlaceEditor = Class.create(Ajax.InPlaceEditor, {
     this._form.appendChild(this._controls.editor);
 
     $A(patternNodes.additionalNodes).each(function(node) {
-      var patternNode = node.cloneNode(true);
+      var patternNode = $(node.cloneNode(true));
       if (patternNode.id.length > 0) {
-        patternNode.id = patternNode.id + this.options.nodeIdSuffix;
+        patternNode.id = patternNode.readAttribute("data-id") + this.options.nodeIdSuffix;
       }
       this._form.appendChild(patternNode);
     }.bind(this));

data/app/assets/stylesheets/active_scaffold_colors.css.scss

@@ -78,6 +78,7 @@ $input_focus_bg: #ffc !default;
 
 $draggable_list_bg: #FFFF88 !default;
 $draggable_list_selected_bg: #7FCF00 !default;
+$draggable_list_disabled_bg: $disabled_color !default;
 $checkbox_list_bg: #fff !default;
 
 $subform_color: #999 !default;
@@ -371,6 +372,9 @@ background-color: $draggable_list_bg;
 .active-scaffold .draggable-list.selected {
 background-color: $draggable_list_selected_bg;
 }
+.active-scaffold .ui-droppable-disabled, .active-scaffold .ui-droppable-disabled.selected {
+background-color: $draggable_list_disabled_bg;
+}
 
 
 /* Form :: Association Sub-Forms

data/app/assets/stylesheets/active_scaffold_images.css.scss

@@ -38,3 +38,6 @@ background-image: image-url('active_scaffold/cross.png');
 .as_touch a.inline-adapter-close {
 background-image: image-url('active_scaffold/close_touch.png');
 }
+.active-scaffold .refresh-link {
+background-image: image-url('active_scaffold/refresh.png');
+}

data/app/assets/stylesheets/active_scaffold_layout.css

@@ -79,6 +79,7 @@ padding: 5px 5px;
 margin-left: 0px;
 }
 
+.active-scaffold .active-scaffold .active-scaffold-header div.actions .action_group > a,
 .active-scaffold .active-scaffold .active-scaffold-header div.actions > a {
 padding: 1px 5px;
 }
@@ -256,7 +257,7 @@ padding: 0;
 position: absolute;
 line-height: 200%;
 display: none;
-width: 150px;
+min-width: 150px;
 right: 0px;
 z-index: 2;
 }
@@ -715,6 +716,15 @@ padding: 1px;
 border: solid 1px;
 }
 
+.active-scaffold .refresh-link {
+display: inline-block;
+width: 25px;
+text-indent: 26px;
+overflow: hidden;
+background-position: 5px 50%;
+background-repeat: no-repeat;
+}
+
 .active-scaffold .checkbox-list {
 padding-left: 0px;
 }
@@ -727,6 +737,11 @@ display: inline;
 .active-scaffold .checkbox-list li label {
 padding: 0 0 0 2px;
 }
+.active-scaffold .checkbox-list + .refresh-link {
+float: left;
+}
+
+.active-scaffold .draggable-lists + .loading-indicator { float: left; }
 
 .active-scaffold .draggable-list {
 float: left;
@@ -749,6 +764,12 @@ display: block;
 li.draggable-item {
   list-style: none;
 }
+li.draggable-item, li.draggable-item label {
+  cursor: move;
+}
+li.ui-draggable-disabled, li.ui-draggable-disabled label {
+  cursor: default;
+}
 li.draggable-item input,
 .active-scaffold .draggable-list input {
 display: none;
@@ -788,7 +809,7 @@ padding: 0 5px 0 1px;
 background: none;
 }
 
-.active-scaffold .horizontal-sub-form td dt label {
+.active-scaffold .horizontal-sub-form td > dl > dt label {
 display: none;
 }
 

data/app/views/active_scaffold_overrides/_add_existing_form.html.erb

@@ -17,7 +17,7 @@ options = {:id => element_form_id(:action => :add_existing),
   <% end -%>
 
   <label for="<%= "record_#{active_scaffold_config.model}" %>"><%= active_scaffold_add_existing_label %></label>
-  <%= active_scaffold_add_existing_input(:name => 'associated_id', :url_options => url_options) %>
+  <%= active_scaffold_add_existing_input(:name => 'associated_id', :url_options => url_options, :object => @record) %>
 
   <p class="form-footer">
     <%= submit_tag as_(:add), :class => "submit" %>
@@ -26,5 +26,3 @@ options = {:id => element_form_id(:action => :add_existing),
   </p>
 
 </form>
-<%= javascript_tag("ActiveScaffold.focus_first_element_of_form('#{element_form_id(:action => :add_existing)}');") %>
-

data/app/views/active_scaffold_overrides/_base_form.html.erb

@@ -14,10 +14,13 @@
    method ||= :post
    cancel_link = true if cancel_link.nil?
    submit_text ||= form_action
-   body_partial ||= 'form' %>
+   apply_text ||= :"#{form_action}_apply"
+   body_partial ||= 'form'
+   form_id = element_form_id(:action => form_action, :id => @record.try(:id))
+%>
 <%=
 options = {:onsubmit => onsubmit,
-           :id => element_form_id(:action => form_action),
+           :id => form_id,
            :multipart => multipart,
            :class => "as_form #{form_action.to_s}",
            :method => method,
@@ -43,11 +46,10 @@ end
 
   <p class="form-footer">
     <%= submit_tag as_(submit_text), :class => "submit" if !persistent || persistent == :optional %>
-    <%= submit_tag as_(:apply), :class => "submit", :name => 'dont_close' if persistent %>
+    <%= submit_tag as_(apply_text), :class => "submit", :name => 'dont_close' if persistent %>
     <%= link_to(as_(:cancel), main_path_to_return, cancel_options) if cancel_link %>
-    <%= loading_indicator_tag(:action => form_action, :id => params[:id]) %>
+    <%= loading_indicator_tag(:action => form_action, :id => @record.try(:id)) %>
     <%= render :partial => footer_extension, :locals => { :form_action => form_action } if footer_extension %>
   </p>
 
 </form>
-<%= javascript_tag("ActiveScaffold.focus_first_element_of_form('#{element_form_id(:action => form_action)}');") %>