Changeset 4766

Timestamp:

08/15/06 14:20:55 (2 years ago)

Author:

madrobby

Message:

Updated trunk to script.aculo.us 1.6.2

Files:

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

trunk/actionpack/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Updated to script.aculo.us 1.6.2 [Thomas Fuchs]
-
-* Relax Routing's anchor pattern warning; it was preventing use of [^/] inside restrictions. [Nicholas Seckar]

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

@@ -33 +33 @@
-// useful when one of the tokens is \n (a newline), as it 
-// allows smart autocompletion after linebreaks.
+
+if(typeof Effect == 'undefined')
+  throw("controls.js requires including script.aculo.us' effects.js library");
-
-var Autocompleter = {}
@@ -95 +98 @@
-  
-  fixIEOverlapping: function() {
-
+, {setTop:(!this.update.style.height)}
-    this.iefix.style.zIndex = 1;
-    this.update.style.zIndex = 2;
@@ -203 +206 @@
-    if(this.index > 0) this.index--
-      else this.index = this.entryCount-1;
+    this.getEntry(this.index).scrollIntoView(true);
-  },
-  
@@ -208 +212 @@
-    if(this.index < this.entryCount-1) this.index++
-      else this.index = 0;
+    this.getEntry(this.index).scrollIntoView(false);
-  },
-  
@@ -532 +537 @@
-    this.createForm();
-    this.element.parentNode.insertBefore(this.form, this.element);
-
+if (!this.options.loadTextURL) 
-    // stop the event to avoid a page refresh in Safari
-    if (evt) {
@@ -637 +642 @@
-    this.editField.disabled = false;
-    this.editField.value = transport.responseText.stripTags();
+    Field.scrollFreeActivate(this.editField);
-  },
-  onclickCancel: function() {

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

@@ -5 +5 @@
-
-/*--------------------------------------------------------------------------*/
+
+if(typeof Effect == 'undefined')
+  throw("dragdrop.js requires including script.aculo.us' effects.js library");
-
-var Droppables = {
@@ -205 +208 @@
-
-var Draggable = Class.create();
+Draggable._revertCache = {};
+Draggable._dragging    = {};
+
-Draggable.prototype = {
-  initialize: function(element) {
-    var options = Object.extend({
-      handle: false,
-
-
+
+
+
+
-      },
-      reverteffect: function(element, top_offset, left_offset) {
-        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
-
+
+
+
+
-      },
-
-
+
+
+
+
+
+
-      },
-      zindex: 1000,
@@ -263 +278 @@
-  
-  initDrag: function(event) {
+    if(typeof Draggable._dragging[this.element] != undefined &&
+      Draggable._dragging[this.element]) return;
-    if(Event.isLeftClick(event)) {    
-      // abort on form elements, fixes a Firefox issue
@@ -273 +290 @@
-        src.tagName=='TEXTAREA')) return;
-        
-this.element._revert
-this.element._revert
-this.element._revert
+Draggable._revertCache[this.element]
+Draggable._revertCache[this.element]
+Draggable._revertCache[this.element]
-      }
-      
@@ -413 +430 @@
-    if(this.options.snap) {
-      if(typeof this.options.snap == 'function') {
-
+,this
-      } else {
-      if(this.options.snap instanceof Array) {
@@ -441 +458 @@
-  
-  startScrolling: function(speed) {
+    if(!(speed[0] || speed[1])) return;
-    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
-    this.lastScrolled = new Date();
@@ -707 +725 @@
-      var index;
-      
-
+, only: droponOptions.only
-      var child = null;
-            
@@ -868 +886 @@
-    if (options.tree) {
-      return Sortable.tree(element, arguments[1]).children.map( function (item) {
-
+[id]
-                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
-      }).flatten().join('&');

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

@@ -106 +106 @@
-var Effect = {
-  tagifyText: function(element) {
+    if(typeof Builder == 'undefined')
+      throw("Effect.tagifyText requires including script.aculo.us' builder.js library");
+      
-    var tagifyStyle = 'position:relative';
-    if(/MSIE/.test(navigator.userAgent)) tagifyStyle += ';zoom:1';
@@ -162 +165 @@
-Effect.Transitions = {}
-
-
-
-
+
+
-Effect.Transitions.sinoidal = function(pos) {
-  return (-Math.cos(pos*Math.PI)/2) + 0.5;
@@ -354 +356 @@
-    this.element = $(element);
-    // make this work on IE on elements without 'layout'
-
+currentStyle.
-      this.element.setStyle({zoom: 1});
-    var options = Object.extend({
@@ -394 +396 @@
-  update: function(position) {
-    this.element.setStyle({
-this.options.x  * position + this.originalLeft
-this.options.y  * position + this.originalTop
+Math.round(this.options.x  * position + this.originalLeft)
+Math.round(this.options.y  * position + this.originalTop)
-    });
-  }
@@ -434 +436 @@
-    
-    var fontSize = this.element.getStyle('font-size') || '100%';
-
+,'pt'
-      if(fontSize.indexOf(fontSizeType)>0) {
-        this.fontSize     = parseFloat(fontSize);
@@ -463 +465 @@
-  setDimensions: function(height, width) {
-    var d = {};
-width
-height
+Math.round(width)
+Math.round(height)
-    if(this.options.scaleFromCenter) {
-      var topd  = (height - this.dims[0])/2;
@@ -590 +592 @@
-  element = $(element);
-  element.makeClipping();
- 
+
-    Object.extend({ scaleContent: false, 
-      scaleX: false, 
@@ -605 +607 @@
-  element = $(element);
-  var elementDimensions = element.getDimensions();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -626 +627 @@
-  element = $(element);
-  var oldOpacity = element.getInlineOpacity();
-{ 
+Object.extend({
-    duration: 0.4,
-    from: 0,
@@ -646 +647 @@
-      })
-    }
-
+, arguments[1] || {})
-}
-
@@ -702 +703 @@
-    scaleContent: false, 
-    scaleX: false, 
-0
+window.opera ? 0 : 1
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
@@ -730 +731 @@
-  );
-}
-
+
-Effect.SlideUp = function(element) {
-  element = $(element);
-  element.cleanWhitespace();
-  var oldInnerBottom = $(element.firstChild).getStyle('bottom');
-0, 
+window.opera ? 0 : 1,
-   Object.extend({ scaleContent: false, 
-    scaleX: false, 

trunk/railties/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Updated to script.aculo.us 1.6.2 [Thomas Fuchs]
-
-* Assign Routing.controller_paths; fix script/about and rails info controller. [Nicholas Seckar]

trunk/railties/html/javascripts/controls.js

@@ -33 +33 @@
-// useful when one of the tokens is \n (a newline), as it 
-// allows smart autocompletion after linebreaks.
+
+if(typeof Effect == 'undefined')
+  throw("controls.js requires including script.aculo.us' effects.js library");
-
-var Autocompleter = {}
@@ -95 +98 @@
-  
-  fixIEOverlapping: function() {
-
+, {setTop:(!this.update.style.height)}
-    this.iefix.style.zIndex = 1;
-    this.update.style.zIndex = 2;
@@ -203 +206 @@
-    if(this.index > 0) this.index--
-      else this.index = this.entryCount-1;
+    this.getEntry(this.index).scrollIntoView(true);
-  },
-  
@@ -208 +212 @@
-    if(this.index < this.entryCount-1) this.index++
-      else this.index = 0;
+    this.getEntry(this.index).scrollIntoView(false);
-  },
-  
@@ -532 +537 @@
-    this.createForm();
-    this.element.parentNode.insertBefore(this.form, this.element);
-
+if (!this.options.loadTextURL) 
-    // stop the event to avoid a page refresh in Safari
-    if (evt) {
@@ -637 +642 @@
-    this.editField.disabled = false;
-    this.editField.value = transport.responseText.stripTags();
+    Field.scrollFreeActivate(this.editField);
-  },
-  onclickCancel: function() {

trunk/railties/html/javascripts/dragdrop.js

@@ -5 +5 @@
-
-/*--------------------------------------------------------------------------*/
+
+if(typeof Effect == 'undefined')
+  throw("dragdrop.js requires including script.aculo.us' effects.js library");
-
-var Droppables = {
@@ -205 +208 @@
-
-var Draggable = Class.create();
+Draggable._revertCache = {};
+Draggable._dragging    = {};
+
-Draggable.prototype = {
-  initialize: function(element) {
-    var options = Object.extend({
-      handle: false,
-
-
+
+
+
+
-      },
-      reverteffect: function(element, top_offset, left_offset) {
-        var dur = Math.sqrt(Math.abs(top_offset^2)+Math.abs(left_offset^2))*0.02;
-
+
+
+
+
-      },
-
-
+
+
+
+
+
+
-      },
-      zindex: 1000,
@@ -263 +278 @@
-  
-  initDrag: function(event) {
+    if(typeof Draggable._dragging[this.element] != undefined &&
+      Draggable._dragging[this.element]) return;
-    if(Event.isLeftClick(event)) {    
-      // abort on form elements, fixes a Firefox issue
@@ -273 +290 @@
-        src.tagName=='TEXTAREA')) return;
-        
-this.element._revert
-this.element._revert
-this.element._revert
+Draggable._revertCache[this.element]
+Draggable._revertCache[this.element]
+Draggable._revertCache[this.element]
-      }
-      
@@ -413 +430 @@
-    if(this.options.snap) {
-      if(typeof this.options.snap == 'function') {
-
+,this
-      } else {
-      if(this.options.snap instanceof Array) {
@@ -441 +458 @@
-  
-  startScrolling: function(speed) {
+    if(!(speed[0] || speed[1])) return;
-    this.scrollSpeed = [speed[0]*this.options.scrollSpeed,speed[1]*this.options.scrollSpeed];
-    this.lastScrolled = new Date();
@@ -707 +725 @@
-      var index;
-      
-
+, only: droponOptions.only
-      var child = null;
-            
@@ -868 +886 @@
-    if (options.tree) {
-      return Sortable.tree(element, arguments[1]).children.map( function (item) {
-
+[id]
-                encodeURIComponent(item.id)].concat(item.children.map(arguments.callee));
-      }).flatten().join('&');

trunk/railties/html/javascripts/effects.js

@@ -106 +106 @@
-var Effect = {
-  tagifyText: function(element) {
+    if(typeof Builder == 'undefined')
+      throw("Effect.tagifyText requires including script.aculo.us' builder.js library");
+      
-    var tagifyStyle = 'position:relative';
-    if(/MSIE/.test(navigator.userAgent)) tagifyStyle += ';zoom:1';
@@ -162 +165 @@
-Effect.Transitions = {}
-
-
-
-
+
+
-Effect.Transitions.sinoidal = function(pos) {
-  return (-Math.cos(pos*Math.PI)/2) + 0.5;
@@ -354 +356 @@
-    this.element = $(element);
-    // make this work on IE on elements without 'layout'
-
+currentStyle.
-      this.element.setStyle({zoom: 1});
-    var options = Object.extend({
@@ -394 +396 @@
-  update: function(position) {
-    this.element.setStyle({
-this.options.x  * position + this.originalLeft
-this.options.y  * position + this.originalTop
+Math.round(this.options.x  * position + this.originalLeft)
+Math.round(this.options.y  * position + this.originalTop)
-    });
-  }
@@ -434 +436 @@
-    
-    var fontSize = this.element.getStyle('font-size') || '100%';
-
+,'pt'
-      if(fontSize.indexOf(fontSizeType)>0) {
-        this.fontSize     = parseFloat(fontSize);
@@ -463 +465 @@
-  setDimensions: function(height, width) {
-    var d = {};
-width
-height
+Math.round(width)
+Math.round(height)
-    if(this.options.scaleFromCenter) {
-      var topd  = (height - this.dims[0])/2;
@@ -590 +592 @@
-  element = $(element);
-  element.makeClipping();
- 
+
-    Object.extend({ scaleContent: false, 
-      scaleX: false, 
@@ -605 +607 @@
-  element = $(element);
-  var elementDimensions = element.getDimensions();
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
@@ -626 +627 @@
-  element = $(element);
-  var oldOpacity = element.getInlineOpacity();
-{ 
+Object.extend({
-    duration: 0.4,
-    from: 0,
@@ -646 +647 @@
-      })
-    }
-
+, arguments[1] || {})
-}
-
@@ -702 +703 @@
-    scaleContent: false, 
-    scaleX: false, 
-0
+window.opera ? 0 : 1
-    scaleMode: {originalHeight: elementDimensions.height, originalWidth: elementDimensions.width},
-    restoreAfterFinish: true,
@@ -730 +731 @@
-  );
-}
-
+
-Effect.SlideUp = function(element) {
-  element = $(element);
-  element.cleanWhitespace();
-  var oldInnerBottom = $(element.firstChild).getStyle('bottom');
-0, 
+window.opera ? 0 : 1,
-   Object.extend({ scaleContent: false, 
-    scaleX: false,