Changeset 7296

Timestamp:

08/09/07 09:27:11 (2 years ago)

Author:

madrobby

Message:

script.aculo.us: Effect.ScrollTo is now no longer a core effect (returns a Effect.Tween instance now), some effect code refactoring to take advantage of new Prototype 1.6 features

Files:

• spinoffs/scriptaculous/CHANGELOG (modified) (1 diff)
• spinoffs/scriptaculous/lib/prototype.js (modified) (47 diffs)
• spinoffs/scriptaculous/src/effects.js (modified) (15 diffs)
• spinoffs/scriptaculous/test/unit/effects_test.html (modified) (1 diff)

spinoffs/scriptaculous/CHANGELOG

@@ -1 +1 @@
-*SVN*
+
+* Some effect code refactoring to take advantage of new Prototype 1.6 features.
+
+* Effect.ScrollTo is now no longer a core effect (returns a Effect.Tween instance now).
-
-* Add Effect.Tween, a new core effect. This effect tweens between two values and sets a property or calls a method on an object (including DOM elements); or allows for a callback method, which will be automatically bound to the object.

spinoffs/scriptaculous/lib/prototype.js

@@ -39 +39 @@
-var Class = {
-  create: function(parent, methods) {
-typeof parent !== 'function'
+!Object.isFunction(parent)
-      methods = parent, parent = null;
-
@@ -175 +175 @@
-  isFunction: function(object) {
-    return typeof object == "function";
+  },
+
+  isString: function(object) {
+    return typeof object == "string";
+  },
+
+  isNumber: function(object) {
+    return typeof object == "number";
+  },
+
+  isUndefined: function(object) {
+    return typeof object == "undefined";
-  }
-});
@@ -180 +192 @@
-Object.extend(Function.prototype, {
-  argumentNames: function() {
-
+[\s\(]*
-    return names.length == 1 && !names[0] ? [] : names;
-  },
@@ -250 +262 @@
-        returnValue = lambda();
-        break;
-
+ 
-    }
-
@@ -388 +400 @@
-  toQueryParams: function(separator) {
-    var match = this.strip().match(/([^?#]*)(#.*)?$/);
-
-
-
+ 
+
+ 
-      if ((pair = pair.split('='))[0]) {
-        var key = decodeURIComponent(pair.shift());
@@ -513 +525 @@
-
-String.prototype.gsub.prepareReplacement = function(replacement) {
-typeof replacement == 'function'
+Object.isFunction(replacement)
-  var template = new Template(replacement);
-  return function(match) { return template.evaluate(match) };
@@ -536 +548 @@
-
-  evaluate: function(object) {
-typeof object.toTemplateReplacements == 'function'
+Object.isFunction(object.toTemplateReplacements)
-      object = object.toTemplateReplacements();
-
@@ -562 +574 @@
-};
-
-
+ 
-
-var Enumerable = {
@@ -641 +653 @@
-    var results = [];
-
-typeof filter == "string"
+Object.isString(filter)
-      filter = new RegExp(filter);
-
@@ -652 +664 @@
-
-  include: function(object) {
-typeof this.indexOf == 'function'
+Object.isFunction(this.indexOf)
-      return this.indexOf(object) != -1;
-
@@ -754 +766 @@
-  zip: function() {
-    var iterator = Prototype.K, args = $A(arguments);
-typeof args.last() == 'function'
+Object.isFunction(args.last())
-      iterator = args.pop();
-
@@ -796 +808 @@
-  function $A(iterable) {
-    if (!iterable) return [];
-typeof iterable == 'function'
-
+Object.isFunction(iterable)
+  
-      return iterable.toArray();
-    } else {
@@ -898 +910 @@
-
-// use native browser JS 1.6 implementation if available
-typeof Array.prototype.forEach == 'function'
+Object.isFunction(Array.prototype.forEach)
-  Array.prototype._each = Array.prototype.forEach;
-
@@ -967 +979 @@
-var Hash = function(object) {
-  if (object instanceof Hash) this.merge(object);
-
+ 
-};
-
@@ -1157 +1169 @@
-  dispatch: function(callback, request, transport, json) {
-    this.each(function(responder) {
-typeof responder[callback] == 'function'
+Object.isFunction(responder[callback])
-        try {
-          responder[callback].apply(responder, [request, transport, json]);
-
+ 
-      }
-    });
@@ -1177 +1189 @@
-});
-
-
+ 
-Ajax.Base.prototype = {
-  setOptions: function(options) {
@@ -1189 +1201 @@
-      evalJS:       true
-    };
-
+ 
-
-    this.options.method = this.options.method.toLowerCase();
-typeof this.options.parameters == 'string'
+Object.isString(this.options.parameters)
-      this.options.parameters = this.options.parameters.toQueryParams();
-  }
@@ -1287 +1299 @@
-      var extras = this.options.requestHeaders;
-
-typeof extras.push == 'function'
+Object.isFunction(extras.push)
-        for (var i = 0, length = extras.length; i < length; i += 2)
-          headers[extras[i]] = extras[i+1];
@@ -1461 +1473 @@
-    if (receiver = $(receiver)) {
-      if (options.insertion) {
-typeof options.insertion == 'string'
-
+Object.isString(options.insertion)
+ 
-          receiver.insert(insertion);
-        }
@@ -1485 +1497 @@
-    this.decay = (this.options.decay || 1);
-
-
+ 
-    this.container = container;
-    this.url = url;
@@ -1523 +1535 @@
-    return elements;
-  }
-typeof element == 'string'
+Object.isString(element)
-    element = document.getElementById(element);
-  return Element.extend(element);
@@ -1632 +1644 @@
-    element = $(element);
-
-typeof insertions == 'string' || typeof insertions == 'number'
+Object.isString(insertions) || Object.isNumber(insertions)
-        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
-          insertions = {bottom:insertions};
@@ -1665 +1677 @@
-    if (Object.isElement(wrapper))
-      $(wrapper).writeAttribute(attributes || { });
-typeof wrapper == 'string'
+Object.isString(wrapper)
-    else wrapper = new Element('div', wrapper);
-    if (element.parentNode)
@@ -1728 +1740 @@
-
-  match: function(element, selector) {
-typeof selector == 'string'
+Object.isString(selector)
-      selector = new Selector(selector);
-    return selector.match($(element));
@@ -1902 +1914 @@
-    element = $(element);
-    var elementStyle = element.style, match;
-typeof styles === 'string'
+Object.isString(styles)
-      element.style.cssText += ';' + styles;
-      return styles.include('opacity') ?
@@ -2199 +2211 @@
-    element = $(element);
-
-typeof insertions == 'string' || typeof insertions == 'number'
+Object.isString(insertions) || Object.isNumber(insertions)
-        Object.isElement(insertions) || (insertions && (insertions.toElement || insertions.toHTML)))
-bottom:insertions
+ bottom: insertions 
-
-    var t = Element._insertionTranslations, content, position, pos, tagName;
@@ -2575 +2587 @@
-    for (property in methods) {
-      value = methods[property];
-typeof value == 'function'
+Object.isFunction(value)
-        element[property] = value.methodize();
-    }
@@ -2637 +2649 @@
-    for (var property in methods) {
-      var value = methods[property];
-typeof value != 'function'
+!Object.isFunction(value)
-      if (!onlyIfAbsent || !(property in destination))
-        destination[property] = value.methodize();
@@ -2676 +2688 @@
-    for (var tag in Element.Methods.ByTag) {
-      var klass = findDOMClass(tag);
-typeof klass == "undefined"
+Object.isUndefined(klass)
-      copy(T[tag], klass.prototype);
-    }
@@ -2686 +2698 @@
-  if (Element.extend.refresh) Element.extend.refresh();
-  Element.cache = { };
+};
+
+document.viewport = {
+  getDimensions: function() {
+    var dimensions = { };
+    $w('width height').each(function(d) {
+      var D = d.capitalize();
+      dimensions[d] = self['inner' + D] ||
+       (document.documentElement['client' + D] || document.body['client' + D]);
+    });
+    return dimensions;
+  },
+
+  getWidth: function() {
+    return this.getDimensions().width;
+  },
+
+  getHeight: function() {
+    return this.getDimensions().height;
+  },
+
+  getScrollOffsets: function() {
+    return Element._returnOffset(
+      window.pageXOffset || document.documentElement.scrollLeft || document.body.scrollLeft,
+      window.pageYOffset || document.documentElement.scrollTop || document.body.scrollTop);
+  }
-};
-/* Portions of the Selector class are derived from Jack Slocum’s DomQuery,
@@ -2708 +2746 @@
-
-    if (Selector._cache[e]) {
-
-
+
+
+
+
-    this.matcher = ["this.matcher = function(root) {",
-                    "var r = root, h = Selector.handlers, c = false, n;"];
@@ -2718 +2758 @@
-        p = ps[i];
-        if (m = e.match(p)) {
-typeof c[i] == 'function'
+Object.isFunction(c[i])
-              new Template(c[i]).evaluate(m));
-          e = e.replace(m[0], '');
@@ -2744 +2784 @@
-      for (var i in ps) {
-        if (m = e.match(ps[i])) {
-typeof x[i] == 'function'
+Object.isFunction(x[i])
-            new Template(x[i]).evaluate(m));
-          e = e.replace(m[0], '');
@@ -2808 +2848 @@
-
-Object.extend(Selector, {
-
+ 
-
-  xpath: {
@@ -2830 +2870 @@
-      var h = Selector.xpath.pseudos[m[1]];
-      if (!h) return '';
-typeof h === 'function'
+Object.isFunction(h)
-      return new Template(Selector.xpath.pseudos[m[1]]).evaluate(m);
-    },
@@ -2859 +2899 @@
-          for (var i in p) {
-            if (m = e.match(p[i])) {
-typeof x[i] == 'function'
+Object.isFunction(x[i])
-              exclusion.push("(" + v.substring(1, v.length - 1) + ")");
-              e = e.replace(m[0], '');
@@ -3293 +3333 @@
-
-  findElement: function(elements, expression, index) {
-typeof expression == 'number'
+Object.isNumber(expression)
-      index = expression; expression = false;
-    }
@@ -3327 +3367 @@
-    var key, value, submitted = false, submit = options.submit;
-
-
+ 
-      if (!element.disabled && element.name) {
-        key = element.name; value = $(element).getValue();
@@ -3410 +3450 @@
-
-  request: function(form, options) {
-
+ 
-
-    var params = options.parameters, action = form.readAttribute('action') || '';
@@ -3417 +3457 @@
-
-    if (params) {
-typeof params == 'string'
+Object.isString(params)
-      Object.extend(options.parameters, params);
-    }
@@ -3448 +3488 @@
-      var value = element.getValue();
-      if (value != undefined) {
-
+ 
-        pair[element.name] = value;
-        return Hash.toQueryString(pair);
@@ -3485 +3525 @@
-          !['button', 'reset', 'submit'].include(element.type)))
-        element.select();
-
+ 
-    return element;
-  },
@@ -3575 +3615 @@
-/*--------------------------------------------------------------------------*/
-
-
+ 
-Abstract.TimedObserver.prototype = {
-  initialize: function(element, frequency, callback) {
@@ -3592 +3632 @@
-  onTimerEvent: function() {
-    var value = this.getValue();
-'string' == typeof this.lastValue && 'string' == typeof value
+Object.isString(this.lastValue) && Object.isString(value)
-      ? this.lastValue != value : String(this.lastValue) != String(value));
-    if (changed) {
@@ -3617 +3657 @@
-/*--------------------------------------------------------------------------*/
-
-
+ 
-Abstract.EventObserver.prototype = {
-  initialize: function(element, callback) {
@@ -3892 +3932 @@
-
-      event.eventName = eventName;
-
+ 
-
-      if (document.createEvent) {
@@ -4075 +4115 @@
-
-  clone: function(source, target, options) {
-
+ 
-    return Element.clonePosition(target, source, options);
-  }

spinoffs/scriptaculous/src/effects.js

@@ -63 +63 @@
-/*--------------------------------------------------------------------------*/
-
-Array.prototype.call = function() {
-  var args = arguments;
-  this.each(function(f){ f.apply(this, args) });
-}
-
-/*--------------------------------------------------------------------------*/
-
-var Effect = {
-  _elementDoesNotExistError: {
@@ -170 +163 @@
-/* ------------- core effects ------------- */
-
-
-
+
-  initialize: function() {
-    this.effects  = [];
@@ -223 +215 @@
-      this.effects[i] && this.effects[i].loop(timePos);
-  }
-
+, Enumerable)
-
-Effect.Queues = {
@@ -323 +315 @@
-}
-
-
-
+
-  initialize: function(effects) {
-    this.effects = effects || [];
@@ -345 +336 @@
-Effect.Tween = Class.create(Effect.Base, {
-  initialize: function(object, from, to) {
-typeof object == 'string'
+Object.isString(object)
-    var args = $A(arguments), method = args.last(), 
-      options = args.length == 5 ? args[3] : null;
-typeof method == 'function'
-typeof object[method] == 'function'
+Object.isFunction(method)
+Object.isFunction(object[method])
-      function(value) { object[method] = value };
-    this.start(Object.extend({ from: from, to: to }, options || {}));
@@ -358 +349 @@
-});
-
-
-
+
-  initialize: function() {
-    var options = Object.extend({
@@ -369 +359 @@
-});
-
-
-
+
-  initialize: function(element) {
-    this.element = $(element);
@@ -388 +377 @@
-});
-
-
-
+
-  initialize: function(element) {
-    this.element = $(element);
@@ -401 +389 @@
-  },
-  setup: function() {
-    // Bug in Opera: Opera returns the "real" position of a static element or
-    // relative element that does not have top/left explicitly set.
-    // ==> Always set top and left for position relative elements in your stylesheets 
-    // (to 0 if you do not need them) 
-    this.element.makePositioned();
-    this.originalLeft = parseFloat(this.element.getStyle('left') || '0');
-    this.originalTop  = parseFloat(this.element.getStyle('top')  || '0');
-    if(this.options.mode == 'absolute') {
-      // absolute movement, so we need to calc deltaX and deltaY
-      this.options.x = this.options.x - this.originalLeft;
-      this.options.y = this.options.y - this.originalTop;
@@ -428 +411 @@
-};
-
-
-
+
-  initialize: function(element, percent) {
-    this.element = $(element);
@@ -503 +485 @@
-});
-
-
-
+
-  initialize: function(element) {
-    this.element = $(element);
@@ -539 +520 @@
-});
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    this.start(arguments[1] || {});
-  },
@@ -562 +555 @@
-      this.scrollStart + (position*this.delta));
-  }
-
+*/
-
-/* ------------- combination effects ------------- */
@@ -943 +936 @@
-};
-
-
-
+
-  initialize: function(element) {
-    this.element = $(element);
@@ -1027 +1019 @@
-          (Math.round(transform.originalValue[2]+
-            (transform.targetValue[2]-transform.originalValue[2])*position)).toColorPart() :
-
-(
+(
+
-    this.element.setStyle(style, true);
-  }
-});
-
-
-
+
-  initialize: function(tracks){
-    this.tracks  = [];

spinoffs/scriptaculous/test/unit/effects_test.html

@@ -443 +443 @@
-      $('error_message').morph('font-size:17px').morph('opacity:0',{delay:3});
-      wait(4100,function(){ // 3000ms delay + 1000ms default duration
-Opacity(
+Style('opacity'
-      });
-    }},