active_scaffold 3.2.20 → 3.3.0.rc

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

@@ -0,0 +1,11 @@
+jQuery(document).ready(function() {
+  jQuery(document).on('as:element_updated', function(event) {
+    jQuery('select.chosen', event.target).chosen();
+  });
+  jQuery(document).on('as:action_success', 'a.as_action', function(event, action_link) {
+    if (action_link.adapter) {
+      jQuery('select.chosen', action_link.adapter).chosen();
+    }
+  });
+  jQuery('select.chosen').chosen();
+});

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

@@ -1,4 +1,3 @@
-<%# encoding: utf-8 %>
 <%= ActiveScaffold::Bridges[:date_picker].localization %>
 
 jQuery(document).ready(function() {

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

@@ -46,15 +46,15 @@ $.fn.editInPlace = function(options) {
 /// Required Options: Either url or callback, so the editor knows what to do with the edited values.
 $.fn.editInPlace.defaults = {
 	url:				"", // string: POST URL to send edited content
-	ajax_data_type: "html", // string: dataType (html|script) for ajax call to save updated value
+	ajax_data_type:		"html", // string: dataType (html|script) for ajax call to save updated value
 	bg_over:			"#ffc", // string: background color of hover of unactivated editor
 	bg_out:				"transparent", // string: background color on restore from hover
-	hover_class:		"",  // string: class added to root element during hover. Will override bg_over and bg_out
+	hover_class:		"", // string: class added to root element during hover. Will override bg_over and bg_out
 	show_buttons:		false, // boolean: will show the buttons: cancel or save; will automatically cancel out the onBlur functionality
 	save_button:		'<button class="inplace_save">Save</button>', // string: image button tag to use as “Save” button
 	cancel_button:		'<button class="inplace_cancel">Cancel</button>', // string: image button tag to use as “Cancel” button
 	params:				"", // string: example: first_name=dave&last_name=hauenstein extra paramters sent via the post request to the server
-	field_type:			"text", // string: "text", "textarea", or "select", or "remote", or "clone";  The type of form field that will appear on instantiation
+	field_type:			"text", // string: "text", "textarea", or "select", or "remote", or "clone"; The type of form field that will appear on instantiation
 	default_text:		"(Click here to add text)", // string: text to show up if the element that has this functionality is empty
 	use_html:			false, // boolean, set to true if the editor should use jQuery.fn.html() to extract the value to show from the dom node (keep in mind that IE will uppercase all tags, so use with caution)
 	textarea_rows:		10, // integer: set rows attribute of textarea, if field_type is set to textarea. Use CSS if possible though
@@ -62,28 +62,29 @@ $.fn.editInPlace.defaults = {
 	select_text:		"Choose new value", // string: default text to show up in select box
 	select_options:		"", // string or array: Used if field_type is set to 'select'. Can be comma delimited list of options 'textandValue,text:value', Array of options ['textAndValue', 'text:value'] or array of arrays ['textAndValue', ['text', 'value']]. The last form is especially usefull if your labels or values contain colons)
 	text_size:			null, // integer: set cols attribute of text input, if field_type is set to text. Use CSS if possible though
-	editor_url: null, // for field_type: remote url to get html_code for edit_control
-	loading_text: 'Loading...', // shown if inplace editor is loaded from server
+	editor_url:			null, // for field_type: remote url to get html_code for edit_control
+	loading_text:		'Loading...', // shown if inplace editor is loaded from server
 	// Specifying callback_skip_dom_reset will disable all saving_* options
 	saving_text:		undefined, // string: text to be used when server is saving information. Example "Saving..."
 	saving_image:		"", // string: uses saving text specify an image location instead of text while server is saving
 	saving_animation_color: 'transparent', // hex color string, will be the color the pulsing animation during the save pulses to. Note: Only works if jquery-ui is loaded
-	clone_selector: null, // if field_type clone a selector to clone editor from
-	clone_id_suffix: null, // if field_type clone a suffix to create unique ids
+	clone_selector:		null, // if field_type clone a selector to clone editor from
+	clone_id_suffix:	null, // if field_type clone a suffix to create unique ids
 	
 	value_required:		false, // boolean: if set to true, the element will not be saved unless a value is entered
 	element_id:			"element_id", // string: name of parameter holding the id or the editable
 	update_value:		"update_value", // string: name of parameter holding the updated/edited value
 	original_value:		'original_value', // string: name of parameter holding the updated/edited value
 	original_html:		"original_html", // string: name of parameter holding original_html value of the editable /* DEPRECATED in 2.2.0 */ use original_value instead.
-	save_if_nothing_changed:	false,  // boolean: submit to function or server even if the user did not change anything
+	save_if_nothing_changed:	false, // boolean: submit to function or server even if the user did not change anything
 	on_blur:			"save", // string: "save" or null; what to do on blur; will be overridden if show_buttons is true
 	cancel:				"", // string: if not empty, a jquery selector for elements that will not cause the editor to open even though they are clicked. E.g. if you have extra buttons inside editable fields
 	
 	// All callbacks will have this set to the DOM node of the editor that triggered the callback
 	
 	callback:			null, // function: function to be called when editing is complete; cancels ajax submission to the url param. Prototype: function(idOfEditor, enteredText, orinalHTMLContent, settingsParams, callbacks). The function needs to return the value that should be shown in the dom. Returning undefined means cancel and will restore the dom and trigger an error. callbacks is a dictionary with two functions didStartSaving and didEndSaving() that you can use to tell the inline editor that it should start and stop any saving animations it has configured. /* DEPRECATED in 2.1.0 */ Parameter idOfEditor, use $(this).attr('id') instead
-	callback_skip_dom_reset: false, // boolean: set this to true if the callback should handle replacing the editor with the new value to show
+	callback_skip_dom_reset:	false, // boolean: set this to true if the callback should handle replacing the editor with the new value to show
+	beforeSend:			null, // function: this function gets called before sending new value to server. Prototype: function(request, requestSettings)
 	success:			null, // function: this function gets called if server responds with a success. Prototype: function(newEditorContentString)
 	error:				null, // function: this function gets called if server responds with an error. Prototype: function(request)
 	error_sink:			function(idOfEditor, errorString) { alert(errorString); }, // function: gets id of the editor and the error. Make sure the editor has an id, or it will just be undefined. If set to null, no error will be reported. /* DEPRECATED in 2.1.0 */ Parameter idOfEditor, use $(this).attr('id') instead
@@ -156,7 +157,7 @@ $.extend(InlineEditor.prototype, {
 	},
 	
 	disconnectOpeningEvents: function() {
-	 	// prevent re-opening the editor when it is already open
+		// prevent re-opening the editor when it is already open
 		this.dom.unbind('.editInPlace');
 	},
 	
@@ -184,8 +185,8 @@ $.extend(InlineEditor.prototype, {
 		this.saveOriginalValue();
 		this.markEditorAsActive();
 		this.replaceContentWithEditor();
-    this.setInitialValue();
-    this.workAroundMissingBlurBug();
+		this.setInitialValue();
+		this.workAroundMissingBlurBug();
 		this.connectClosingEventsToEditor();
 		this.triggerDelegateCall('didOpenEditInPlace');
 	},
@@ -240,15 +241,15 @@ $.extend(InlineEditor.prototype, {
 	},
 	
 	workAroundMissingBlurBug: function() {
-    // Strangely, all browser will forget to send a blur event to an input element
-    // when another one is created and selected programmatically. (at least under some circumstances).
-    // This means that if another inline editor is opened, existing inline editors will _not_ close
-    // if they are configured to submit when blurred.
+		// Strangely, all browser will forget to send a blur event to an input element
+		// when another one is created and selected programmatically. (at least under some circumstances).
+		// This means that if another inline editor is opened, existing inline editors will _not_ close
+		// if they are configured to submit when blurred.
 		
 		// Using parents() instead document as base to workaround the fact that in the unittests
 		// the editor is not a child of window.document but of a document fragment
-    var ourInput = this.dom.find(':input');
-    this.dom.parents(':last').find('.editInPlace-active :input').not(ourInput).blur();
+		var ourInput = this.dom.find(':input');
+		this.dom.parents(':last').find('.editInPlace-active :input').not(ourInput).blur();
 	},
 	
 	replaceContentWithEditor: function() {
@@ -270,7 +271,7 @@ $.extend(InlineEditor.prototype, {
 			editor = this.createSelectEditor();
 		else if ("text" === this.settings.field_type)
 			editor = $('<input type="text" ' + this.inputNameAndClass() 
-				+ ' size="' + this.settings.text_size  + '" />');
+				+ ' size="' + this.settings.text_size + '" />');
 		else if ("textarea" === this.settings.field_type)
 			editor = $('<textarea ' + this.inputNameAndClass() 
 				+ ' rows="' + this.settings.textarea_rows + '" '
@@ -278,93 +279,93 @@ $.extend(InlineEditor.prototype, {
 		else if ("remote" === this.settings.field_type)
 			editor = this.createRemoteGeneratedEditor();
 		else if ("clone" === this.settings.field_type) {
-		  editor = this.cloneEditor();
-		  return editor;
+			editor = this.cloneEditor();
+			return editor;
 		}
 		return editor;
 	},
 	
-  setInitialValue: function() {
-    if (this.settings.field_type == 'remote') return; // remote generated editor doesn't need initial value
-    var initialValue = this.triggerDelegateCall('willOpenEditInPlace', this.originalValue);
-    var editor = this.dom.find(':input');
-    editor.val(initialValue);
-    
-    // Workaround for select fields which don't contain the original value.
-    // Somehow the browsers don't like to select the instructional choice (disabled) in that case
-    if (editor.val() !== initialValue)
-      editor.val(''); // selects instructional choice
-  },
-  
+	setInitialValue: function() {
+		if (this.settings.field_type == 'remote' || this.settings.field_type == 'clone') return; // remote and clone generated editor doesn't need initial value
+		var initialValue = this.triggerDelegateCall('willOpenEditInPlace', this.originalValue);
+		var editor = this.dom.find(':input');
+		editor.val(initialValue);
+
+		// Workaround for select fields which don't contain the original value.
+		// Somehow the browsers don't like to select the instructional choice (disabled) in that case
+		if (editor.val() !== initialValue)
+			editor.val(''); // selects instructional choice
+	},
+
 	createRemoteGeneratedEditor: function () {
-	  this.dom.html(this.settings.loading_text);
-	  return $($.ajax({
-            url: this.settings.editor_url,
-            async: false
-           }).responseText);
+		this.dom.html(this.settings.loading_text);
+		return $($.ajax({
+			url: this.settings.editor_url,
+			async: false
+		}).responseText);
 	},
 	
 	cloneEditor: function() {
-    var patternNodes = this.getPatternNodes(this.settings.clone_selector);
-    if (patternNodes.editNode == null) {
-      alert('did not find any matching node for ' + this.settings.clone_selector);
-      return;
-    }
-
-    var editorNode = patternNodes.editNode.clone();
-    var clonedNodes = null;
-    if (editorNode.attr('id')) editorNode.attr('id', editorNode.attr('id') + this.settings.clone_id_suffix);
-    editorNode.attr('name', 'inplace_value');
-    editorNode.addClass('editor_field');
-    this.setValue(editorNode, this.originalValue);
-    clonedNodes = editorNode;
-    
-    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);
-        }
-        clonedNodes = clonedNodes.after(patternNode);
-      });
-    }
-    return clonedNodes;
-  },
-  
-  getPatternNodes: function(clone_selector) {
-    var nodes = {editNode: null, additionalNodes: null};
-    var selectedNodes = $(clone_selector);
-    var firstNode = selectedNodes.first();
-    
-    if (typeof(firstNode) !== 'undefined') {
-      // AS inplace_edit_control_container -> we have to select all child nodes
-      // Workaround for ie which does not support css > selector
-      if (firstNode.hasClass('as_inplace_pattern')) {
-        selectedNodes = firstNode.children();
-      }
-      nodes.editNode = selectedNodes.first();
-      nodes.additionalNodes = selectedNodes.slice(1);
-    }
-    return nodes;
-  },
-  
-  setValue: function(editField, textValue) {
-    var function_name = 'setValueFor' + editField.get(0).nodeName.toLowerCase();
-    if (typeof(this[function_name]) == 'function') {
-      this[function_name](editField, textValue);
-    } else {
-      editField.val(textValue);
-    }
-  },
-  
-  setValueForselect: function(editField, textValue) {
-    var option_value = editField.children("option:contains('" + textValue + "')").val();
-    
-    if (typeof(option_value) !== 'undefined') {
-      editField.val(option_value);
-    }
-  },
+		var patternNodes = this.getPatternNodes(this.settings.clone_selector);
+		if (patternNodes.editNode == null) {
+			alert('did not find any matching node for ' + this.settings.clone_selector);
+			return;
+		}
+
+		var editorNode = patternNodes.editNode.clone();
+		var clonedNodes = null;
+		if (editorNode.attr('id')) editorNode.attr('id', editorNode.attr('id') + this.settings.clone_id_suffix);
+		editorNode.attr('name', 'inplace_value');
+		editorNode.addClass('editor_field');
+		this.setValue(editorNode, this.originalValue);
+		clonedNodes = editorNode;
+
+		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);
+				}
+				clonedNodes = clonedNodes.after(patternNode);
+			});
+		}
+		return clonedNodes;
+	},
+
+	getPatternNodes: function(clone_selector) {
+		var nodes = {editNode: null, additionalNodes: null};
+		var selectedNodes = $(clone_selector);
+		var firstNode = selectedNodes.first();
+
+		if (typeof(firstNode) !== 'undefined') {
+			// AS inplace_edit_control_container -> we have to select all child nodes
+			// Workaround for ie which does not support css > selector
+			if (firstNode.hasClass('as_inplace_pattern')) {
+				selectedNodes = firstNode.children();
+			}
+			nodes.editNode = selectedNodes.first();
+			nodes.additionalNodes = selectedNodes.slice(1);
+		}
+		return nodes;
+	},
 	
+	setValue: function(editField, textValue) {
+		var function_name = 'setValueFor' + editField.get(0).nodeName.toLowerCase();
+		if (typeof(this[function_name]) == 'function') {
+			this[function_name](editField, textValue);
+		} else {
+			editField.val(textValue);
+		}
+	},
+
+	setValueForselect: function(editField, textValue) {
+		var option_value = editField.children("option:contains('" + textValue + "')").val();
+
+		if (typeof(option_value) !== 'undefined') {
+			editField.val(option_value);
+		}
+	},
+
 	inputNameAndClass: function() {
 		return ' name="inplace_value" class="inplace_field" ';
 	},
@@ -386,10 +387,10 @@ $.extend(InlineEditor.prototype, {
 			var value = trim(currentTextAndValue[1] || currentTextAndValue[0]);
 			var text = trim(currentTextAndValue[0]);
 			
-      var option = $('<option>').val(value).text(text);
+			var option = $('<option>').val(value).text(text);
 			editor.append(option);
 		}
-    
+
 		return editor;
 	},
 	
@@ -449,7 +450,7 @@ $.extend(InlineEditor.prototype, {
 			if (enter === event.which)
 				return that.dom.find('form').submit();
 		});
-	 	
+		
 	},
 	
 	handleCancelEditor: function(anEvent) {
@@ -470,15 +471,15 @@ $.extend(InlineEditor.prototype, {
 		if (false === this.triggerDelegateCall('shouldCloseEditInPlace', true, anEvent))
 			return;
 
-    var editor = this.dom.find(':input:not(:button)').not('input:checkbox:not(:checked)').not('input:radio:not(:checked)');
-    var enteredText = '';
-    if (editor.length > 1) {
-      enteredText = jQuery.map(editor, function(item, index) {
-        return $(item).val();
-      });
-    } else {
-		  enteredText = editor.val();
-    }
+		var editor = this.dom.find('[name]:input:not(:button,[name=""])').not('input:checkbox:not(:checked)').not('input:radio:not(:checked)');
+		var enteredText = '';
+		if (editor.length > 1) {
+			enteredText = jQuery.map(editor, function(item, index) {
+			return $(item).val();
+		});
+		} else {
+			enteredText = editor.val();
+		}
 		enteredText = this.triggerDelegateCall('willCloseEditInPlace', enteredText);
 		
 		if (this.isDisabledDefaultSelectChoice()
@@ -555,15 +556,15 @@ $.extend(InlineEditor.prototype, {
 	
 	handleSubmitToServer: function(enteredText) {
 		var data = '';
-    if (typeof(enteredText) === 'string') {
-      data += this.settings.update_value + '=' + encodeURIComponent(enteredText) + '&';
-    } else {
-      for(var i = 0;i < enteredText.length; i++) {
-        data += this.settings.update_value + '[]=' + encodeURIComponent(enteredText[i]) + '&';
-      }
-    }
-
-    data += this.settings.element_id + '=' + this.dom.attr("id")
+		if (typeof(enteredText) === 'string') {
+			data += this.settings.update_value + '=' + encodeURIComponent(enteredText) + '&';
+		} else {
+			for(var i = 0;i < enteredText.length; i++) {
+				data += this.settings.update_value + '[]=' + encodeURIComponent(enteredText[i]) + '&';
+			}
+		}
+
+		data += this.settings.element_id + '=' + this.dom.attr("id")
 			+ ((this.settings.params) ? '&' + this.settings.params : '')
 			+ '&' + this.settings.original_html + '=' + encodeURIComponent(this.originalValue) /* DEPRECATED in 2.2.0 */
 			+ '&' + this.settings.original_value + '=' + encodeURIComponent(this.originalValue);
@@ -576,19 +577,22 @@ $.extend(InlineEditor.prototype, {
 			type: "POST",
 			data: data,
 			dataType: that.settings.ajax_data_type,
+			beforeSend: function(request, settings) {
+				that.triggerCallback(that.settings.beforeSend, request, settings);
+			},
 			complete: function(request){
 				that.didEndSaving();
 			},
 			success: function(data){
-			  if (that.settings.ajax_data_type == 'html') {
-          var new_text = data || that.settings.default_text;
-          
-          /* put the newly updated info into the original element */
-          // FIXME: should be affected by the preferences switch
-          that.dom.html(new_text);
-          // REFACT: remove dom parameter, already in this, not documented, should be easy to remove
-          // REFACT: callback should be able to override what gets put into the DOM
-        }
+				if (that.settings.ajax_data_type == 'html') {
+					var new_text = data || that.settings.default_text;
+
+					/* put the newly updated info into the original element */
+					// FIXME: should be affected by the preferences switch
+					that.dom.html(new_text);
+					// REFACT: remove dom parameter, already in this, not documented, should be easy to remove
+					// REFACT: callback should be able to override what gets put into the DOM
+				}
 				that.triggerCallback(that.settings.success,data);
 			},
 			error: function(request) {
@@ -620,7 +624,7 @@ $.extend(InlineEditor.prototype, {
 			|| ! $.isFunction(this.settings.delegate[aDelegateMethodName]))
 			return defaultReturnValue;
 		
-		var delegateReturnValue =  this.settings.delegate[aDelegateMethodName](this.dom, this.settings, optionalEvent);
+		var delegateReturnValue = this.settings.delegate[aDelegateMethodName](this.dom, this.settings, optionalEvent);
 		return (undefined === delegateReturnValue)
 			? defaultReturnValue
 			: delegateReturnValue;

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

@@ -12,6 +12,15 @@ if (!Element.Methods.highlight) Element.addMethods({highlight: Prototype.emptyFu
 
 
 document.observe("dom:loaded", function() {
+  document.on('click', function(event) {
+    $$('.action_group.dyn ul').invoke('remove');
+  });
+  document.on('ajax:complete', '.action_group.dyn ul a', function() {
+    var source = event.findElement();
+    var action_link = ActiveScaffold.find_action_link(source);
+    if (action_link.loading_indicator) action_link.loading_indicator.css('visibility','hidden');  
+    $(source).up('.action_group.dyn ul').remove();
+  });
   document.on('ajax:create', 'form.as_form', function(event) {
     var source = event.findElement();
     var as_form = event.findElement('form');
@@ -42,7 +51,7 @@ document.observe("dom:loaded", function() {
       return false;
     }
   });
-  document.on('submit', 'form.as_form.as_remote_upload', function(event) {
+  document.on('submit', 'form.as_form:not([data-remote])', function(event) {
     var as_form = event.findElement('form');
     if (as_form && as_form.readAttribute('data-loading') == 'true') {
       setTimeout("ActiveScaffold.disable_form('" + as_form.readAttribute('id') + "')", 10);
@@ -95,7 +104,7 @@ document.observe("dom:loaded", function() {
     var action_link = ActiveScaffold.find_action_link(as_cancel);
     
     if (action_link) {
-      var refresh_data = action_link.readAttribute('data-cancel-refresh') || as_cancel.readAttribute('data-refresh');
+      var refresh_data = action_link.tag.readAttribute('data-cancel-refresh') || as_cancel.readAttribute('data-refresh');
       if (refresh_data && action_link.refresh_url) {
         event.memo.url = action_link.refresh_url;
       } else if (!refresh_data || as_cancel.readAttribute('href').blank()) {
@@ -392,8 +401,9 @@ var ActiveScaffold = {
     return element;
   },
   
-  remove: function(element) {
+  remove: function(element, callback) {
     $(element).remove();
+    if (callback) callback();
   },
   
   update_inplace_edit: function(element, value, empty) {
@@ -447,6 +457,20 @@ var ActiveScaffold = {
         tbody.insert({bottom: html});
       }
       new_row = Selector.findChildElements(tbody, ['tr.record']).last();
+    } else if (typeof options.insert_at == 'object') {
+      var insert_method, get_method, row, id;
+      if (options.insert_at.after) {
+        insert_method = 'after';
+        get_method = 'next';
+      } else {
+        insert_method = 'before';
+        get_method = 'previous';
+      }
+      if (id = options.insert_at[insert_method]) row = $(id);
+      if (row) {
+        row.insert({insert_method: html});
+        new_row = row[get_method]();
+      }
     }
     
     this.stripe(tbody);
@@ -477,11 +501,12 @@ var ActiveScaffold = {
         action_link.close_previous_adapter();
       }
     }
-    row.remove();
-    tbody = $(tbody);
-    this.stripe(tbody);
-    this.decrement_record_count(tbody.up('div.active-scaffold'));
-    this.reload_if_empty(tbody, page_reload_url);
+    ActiveScaffold.remove(row, function() {
+      tbody = $(tbody);
+      ActiveScaffold.stripe(tbody);
+      ActiveScaffold.decrement_record_count(tbody.up('div.active-scaffold'));
+      ActiveScaffold.reload_if_empty(tbody, page_reload_url);
+    });
   },
 
   delete_subform_record: function(record) {
@@ -511,6 +536,13 @@ var ActiveScaffold = {
     element = $(element);
     return ActiveScaffold.ActionLink.get(element.match('.actions a') ? element : element.up('.as_adapter')); 
   },
+
+  display_dynamic_action_group: function(link, html) {
+    link = $(link);
+    link.next('ul').remove();
+    link.up('td').addClassName('action_group dyn');
+    link.insert({after: html});
+  },
   
   scroll_to: function(element, checkInViewport) {
     if (typeof checkInViewport == 'undefined') checkInViewport = true;
@@ -650,17 +682,21 @@ var ActiveScaffold = {
     var params = null;
 
     if (send_form) {
-      var selector;
+      var selector, base = as_form;
+      if (send_form == 'row') base = element.up('.association-record, form');
       if (selector = element.readAttribute('data-update_send_form_selector'))
-        params = Form.serializeElements(as_form.getElementsBySelector(selector), true);
+        params = Form.serializeElements(base.getElementsBySelector(selector), true);
+      else if (base != as_form)
+        params = Form.serializeElements(base.getElementsBySelector('input, textarea, select'), true);
       else params = as_form.serialize(true);
+      params['_method'] = '';
     } else {
         params = {value: val};
     }
     params.source_id = source_id;
 
     new Ajax.Request(url, {
-      method: 'get',
+      method: 'post',
       parameters: params,
       onLoading: function(response) {
         element.next('img.loading-indicator').style.visibility = 'visible';
@@ -803,7 +839,9 @@ ActiveScaffold.ActionLink = {
       if (parent && parent.nodeName.toUpperCase() == 'TD') {
         // record action
         parent = parent.up('tr.record')
-        new ActiveScaffold.Actions.Record(parent.select('a.as_action'), parent, parent.down('td.actions .loading-indicator'));
+        var loading_indicator = parent.down('td.actions .loading-indicator');
+        if (!loading_indicator) loading_indicator = element.parent().find('.loading-indicator');
+        new ActiveScaffold.Actions.Record(parent.select('a.as_action'), parent, loading_indicator);
       } else if (parent && parent.nodeName.toUpperCase() == 'DIV') {
         //table action
         new ActiveScaffold.Actions.Table(parent.select('a.as_action'), parent.up('div.active-scaffold').down('tbody.before-header'), parent.down('.loading-indicator'));
@@ -836,10 +874,17 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
   },
 
   close: function() {
-    this.enable();
-    this.adapter.remove();
-    if (this.hide_target) this.target.show();
-    if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(this.target.id, ActiveScaffold.config.scroll_on_close == 'checkInViewport');
+    var link = this;
+    ActiveScaffold.remove(this.adapter, function() {
+      link.enable();
+      if (link.hide_target) link.target.show();
+      if (ActiveScaffold.config.scroll_on_close) ActiveScaffold.scroll_to(link.target.id, ActiveScaffold.config.scroll_on_close == 'checkInViewport');
+    });
+  },
+
+  reload: function() {
+    this.close();
+    this.open();
   },
 
   get_new_adapter_id: function() {
@@ -878,6 +923,10 @@ ActiveScaffold.ActionLink.Abstract = Class.create({
     this.adapter = element;
     this.adapter.addClassName('as_adapter');
     this.adapter.store('action_link', this);
+  },
+  
+  keep_open: function() {
+    return !this.tag.readAttribute('data-keep-open').blank();
   }
 });
 
@@ -901,9 +950,8 @@ ActiveScaffold.Actions.Record = Class.create(ActiveScaffold.Actions.Abstract, {
 ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstract, {
   close_previous_adapter: function() {
     this.set.links.each(function(item) {
-      if (item.url != this.url && item.is_disabled() && item.adapter) {
-        item.enable();
-        item.adapter.remove();
+      if (item.url != this.url && item.is_disabled() && !item.keep_open() && item.adapter) {
+        ActiveScaffold.remove(item.adapter, function () { item.enable(); });
       }
     }.bind(this));
   },
@@ -934,7 +982,7 @@ ActiveScaffold.ActionLink.Record = Class.create(ActiveScaffold.ActionLink.Abstra
     $super();
     if (refreshed_content_or_reload) {
       if (typeof refreshed_content_or_reload == 'string') {
-        ActiveScaffold.update_row(this.target, refreshed_content_or_update);
+        ActiveScaffold.update_row(this.target, refreshed_content_or_reload);
       } else if (this.refresh_url) {
         var target = this.target;
         new Ajax.Request(this.refresh_url, {
@@ -997,11 +1045,6 @@ ActiveScaffold.ActionLink.Table = Class.create(ActiveScaffold.ActionLink.Abstrac
     }
     ActiveScaffold.highlight(this.adapter.down('td').down());
   },
-
-  reload: function() {
-    this.close();
-    this.open();
-  },
 });
 
 if (Ajax.InPlaceEditor) {