Changeset 3634

Timestamp:

02/22/06 09:59:22 (3 years ago)

Author:

madrobby

Message:

Update script.aculo.us to V1.5.3 [Thomas Fuchs]

Files:

• trunk/actionpack/CHANGELOG (modified) (1 diff)
• trunk/actionpack/lib/action_view/helpers/javascripts/controls.js (modified) (8 diffs)
• trunk/actionpack/lib/action_view/helpers/javascripts/dragdrop.js (modified) (4 diffs)
• trunk/actionpack/lib/action_view/helpers/javascripts/effects.js (modified) (2 diffs)
• trunk/railties/CHANGELOG (modified) (1 diff)
• trunk/railties/html/javascripts/controls.js (modified) (8 diffs)
• trunk/railties/html/javascripts/dragdrop.js (modified) (4 diffs)
• trunk/railties/html/javascripts/effects.js (modified) (2 diffs)

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Update script.aculo.us to V1.5.3 [Thomas Fuchs]
-
-* Added various InPlaceEditor options, #3746, #3891, #3896, #3906 [Bill Burcham, ruairi, sl33p3r]

trunk/actionpack/lib/action_view/helpers/javascripts/controls.js

@@ -317 +317 @@
-Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.prototype), {
-  initialize: function(element, update, url, options) {
-       
+  
-    this.options.asynchronous  = true;
-    this.options.onComplete    = this.onComplete.bind(this);
@@ -484 +484 @@
-      highlightcolor: Ajax.InPlaceEditor.defaultHighlightColor,
-      highlightendcolor: "#FFFFFF",
- 
+ 
-      submitOnBlur: false,
-
+
+
-    }, options || {});
-
@@ -555 +556 @@
-      okButton.type = "submit";
-      okButton.value = this.options.okText;
+      okButton.className = 'editor_ok_button';
-      this.form.appendChild(okButton);
-    }
@@ -563 +565 @@
-      cancelLink.appendChild(document.createTextNode(this.options.cancelText));
-      cancelLink.onclick = this.onclickCancel.bind(this);
+      cancelLink.className = 'editor_cancel';      
-      this.form.appendChild(cancelLink);
-    }
@@ -591 +594 @@
-      textField.value = text;
-      textField.style.backgroundColor = this.options.highlightcolor;
+      textField.className = 'editor_field';
-      var size = this.options.size || this.options.cols || 0;
-      if (size != 0) textField.size = size;
@@ -604 +608 @@
-      textArea.rows = this.options.rows;
-      textArea.cols = this.options.cols || 40;
+      textArea.className = 'editor_field';      
-      if (this.options.submitOnBlur)
-        textArea.onblur = this.onSubmit.bind(this);
@@ -656 +661 @@
-    this.onLoading();
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // stop the event to avoid a page refresh in Safari
-    if (arguments.length > 1) {
@@ -749 +761 @@
-  }
-};
+
+Ajax.InPlaceCollectionEditor = Class.create();
+Object.extend(Ajax.InPlaceCollectionEditor.prototype, Ajax.InPlaceEditor.prototype);
+Object.extend(Ajax.InPlaceCollectionEditor.prototype, {
+  createEditField: function() {
+    if (!this.cached_selectTag) {
+      var selectTag = document.createElement("select");
+      var collection = this.options.collection || [];
+      var optionTag;
+      collection.each(function(e,i) {
+        optionTag = document.createElement("option");
+        optionTag.value = (e instanceof Array) ? e[0] : e;
+        if(this.options.value==optionTag.value) optionTag.selected = true;
+        optionTag.appendChild(document.createTextNode((e instanceof Array) ? e[1] : e));
+        selectTag.appendChild(optionTag);
+      }.bind(this));
+      this.cached_selectTag = selectTag;
+    }
+
+    this.editField = this.cached_selectTag;
+    if(this.options.loadTextURL) this.loadExternalText();
+    this.form.appendChild(this.editField);
+    this.options.callback = function(form, value) {
+      return "value=" + encodeURIComponent(value);
+    }
+  }
+});
-
-// Delayed observer, like Form.Element.Observer, 

trunk/actionpack/lib/action_view/helpers/javascripts/dragdrop.js

@@ -350 +350 @@
-  
-  keyPress: function(event) {
-!event.keyCode=
+event.keyCode!
-    this.finishDrag(event, false);
-    Event.stop(event);
@@ -480 +480 @@
-      ghosting:    false,
-      scroll:      false,
-null
+/^[^_]*_(.*)$/
-      onChange:    Prototype.emptyFunction,
-      onUpdate:    Prototype.emptyFunction
@@ -637 +637 @@
-  sequence: function(element) {
-    element = $(element);
-
-
-
-
-
-
-
+
+
-    return $(this.findElements(element, options) || []).map( function(item) {
-      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
@@ -649 +644 @@
-  },
-
+  setSequence: function(element, new_sequence) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[2] || {});
+    
+    var nodeMap = {};
+    this.findElements(element, options).each( function(n) {
+        if (n.id.match(options.format))
+            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
+        n.parentNode.removeChild(n);
+    });
+   
+    new_sequence.each(function(ident) {
+        var n = nodeMap[ident];
+        if (n) {
+            n[1].appendChild(n[0]);
+            delete nodeMap[ident];
+        }
+    });
+  },
+
-  serialize: function(element) {
-    element = $(element);
+    var name = encodeURIComponent(
+      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
-    return Sortable.sequence(element, arguments[1]).map( function(item) {
-encodeURIComponent(element.id)
+name
-    }).join('&');
-  }

trunk/actionpack/lib/action_view/helpers/javascripts/effects.js

@@ -585 +585 @@
-Effect.BlindDown = function(element) {
-  element = $(element);
-  var oldHeight = Element.getStyle(element, 'height');
-  var elementDimensions = Element.getDimensions(element);
-  return new Effect.Scale(element, 100, 
@@ -598 +597 @@
-        show(effect.element); 
-      }},  
-
-
-
-
+
+
+
-    }, arguments[1] || {})
-  );

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Update script.aculo.us to V1.5.3 [Thomas Fuchs]
-
-* Added SIGTRAP signal handler to RailsFCGIHandler that'll force the process into a breakpoint after the next request. This breakpoint can then be caught with script/breakpointer and give you access to the Ruby image inside that process. Useful for debugging memory leaks among other things [DHH]

trunk/railties/html/javascripts/controls.js

@@ -317 +317 @@
-Object.extend(Object.extend(Ajax.Autocompleter.prototype, Autocompleter.Base.prototype), {
-  initialize: function(element, update, url, options) {
-       
+  
-    this.options.asynchronous  = true;
-    this.options.onComplete    = this.onComplete.bind(this);
@@ -484 +484 @@
-      highlightcolor: Ajax.InPlaceEditor.defaultHighlightColor,
-      highlightendcolor: "#FFFFFF",
- 
+ 
-      submitOnBlur: false,
-
+
+
-    }, options || {});
-
@@ -555 +556 @@
-      okButton.type = "submit";
-      okButton.value = this.options.okText;
+      okButton.className = 'editor_ok_button';
-      this.form.appendChild(okButton);
-    }
@@ -563 +565 @@
-      cancelLink.appendChild(document.createTextNode(this.options.cancelText));
-      cancelLink.onclick = this.onclickCancel.bind(this);
+      cancelLink.className = 'editor_cancel';      
-      this.form.appendChild(cancelLink);
-    }
@@ -591 +594 @@
-      textField.value = text;
-      textField.style.backgroundColor = this.options.highlightcolor;
+      textField.className = 'editor_field';
-      var size = this.options.size || this.options.cols || 0;
-      if (size != 0) textField.size = size;
@@ -604 +608 @@
-      textArea.rows = this.options.rows;
-      textArea.cols = this.options.cols || 40;
+      textArea.className = 'editor_field';      
-      if (this.options.submitOnBlur)
-        textArea.onblur = this.onSubmit.bind(this);
@@ -656 +661 @@
-    this.onLoading();
-    
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    // stop the event to avoid a page refresh in Safari
-    if (arguments.length > 1) {
@@ -749 +761 @@
-  }
-};
+
+Ajax.InPlaceCollectionEditor = Class.create();
+Object.extend(Ajax.InPlaceCollectionEditor.prototype, Ajax.InPlaceEditor.prototype);
+Object.extend(Ajax.InPlaceCollectionEditor.prototype, {
+  createEditField: function() {
+    if (!this.cached_selectTag) {
+      var selectTag = document.createElement("select");
+      var collection = this.options.collection || [];
+      var optionTag;
+      collection.each(function(e,i) {
+        optionTag = document.createElement("option");
+        optionTag.value = (e instanceof Array) ? e[0] : e;
+        if(this.options.value==optionTag.value) optionTag.selected = true;
+        optionTag.appendChild(document.createTextNode((e instanceof Array) ? e[1] : e));
+        selectTag.appendChild(optionTag);
+      }.bind(this));
+      this.cached_selectTag = selectTag;
+    }
+
+    this.editField = this.cached_selectTag;
+    if(this.options.loadTextURL) this.loadExternalText();
+    this.form.appendChild(this.editField);
+    this.options.callback = function(form, value) {
+      return "value=" + encodeURIComponent(value);
+    }
+  }
+});
-
-// Delayed observer, like Form.Element.Observer, 

trunk/railties/html/javascripts/dragdrop.js

@@ -350 +350 @@
-  
-  keyPress: function(event) {
-!event.keyCode=
+event.keyCode!
-    this.finishDrag(event, false);
-    Event.stop(event);
@@ -480 +480 @@
-      ghosting:    false,
-      scroll:      false,
-null
+/^[^_]*_(.*)$/
-      onChange:    Prototype.emptyFunction,
-      onUpdate:    Prototype.emptyFunction
@@ -637 +637 @@
-  sequence: function(element) {
-    element = $(element);
-
-
-
-
-
-
-
+
+
-    return $(this.findElements(element, options) || []).map( function(item) {
-      return item.id.match(options.format) ? item.id.match(options.format)[1] : '';
@@ -649 +644 @@
-  },
-
+  setSequence: function(element, new_sequence) {
+    element = $(element);
+    var options = Object.extend(this.options(element), arguments[2] || {});
+    
+    var nodeMap = {};
+    this.findElements(element, options).each( function(n) {
+        if (n.id.match(options.format))
+            nodeMap[n.id.match(options.format)[1]] = [n, n.parentNode];
+        n.parentNode.removeChild(n);
+    });
+   
+    new_sequence.each(function(ident) {
+        var n = nodeMap[ident];
+        if (n) {
+            n[1].appendChild(n[0]);
+            delete nodeMap[ident];
+        }
+    });
+  },
+
-  serialize: function(element) {
-    element = $(element);
+    var name = encodeURIComponent(
+      (arguments[1] && arguments[1].name) ? arguments[1].name : element.id);
-    return Sortable.sequence(element, arguments[1]).map( function(item) {
-encodeURIComponent(element.id)
+name
-    }).join('&');
-  }

trunk/railties/html/javascripts/effects.js

@@ -585 +585 @@
-Effect.BlindDown = function(element) {
-  element = $(element);
-  var oldHeight = Element.getStyle(element, 'height');
-  var elementDimensions = Element.getDimensions(element);
-  return new Effect.Scale(element, 100, 
@@ -598 +597 @@
-        show(effect.element); 
-      }},  
-
-
-
-
+
+
+
-    }, arguments[1] || {})
-  );