@@ -45,12 +45,12 @@ S2.FX.Zoom = Class.create(S2.FX.Element, { teardown: function() { this.clone.observe('click', function() { this.overlay.remove(); - this.clone.morph('opacity:0', { + this.clone.morph('opacity:0', { duration: 0.2, after: function() { this.clone.remove(); - }.bind(this) - }); + }.bind(this) + }) }.bind(this)); } }); src/addons/zoom.js @@ -106,10 +106,10 @@ S2.CSS = { * * Returns the value of a CSS color as a RGB triplet: * - * * #abc -> [170, 187, 204] - * * #aabbcc -> not changed + * * \#abc -> [170, 187, 204] + * * \#aabbcc -> not changed * * rgb(1,2,3) -> [1, 2, 3] - * * #xyz -> [NaN, NaN, NaN] + * * \#xyz -> [NaN, NaN, NaN] * * This method does not support HTML color constants. **/ @@ -127,9 +127,9 @@ S2.CSS = { * * Returns a normalized color in the #aabbcc format. * - * * #abc -> Expanded to #aabbcc - * * #aabbcc -> not changed - * * rgb(1,2,3) -> Expanded to #010203 + * * \#abc -> Expanded to #aabbcc + * * \#aabbcc -> not changed + * * rgb(1,2,3) -> Expanded to \#010203 * * other input -> not changed * * This method does not support HTML color constants. src/css.js @@ -10,7 +10,7 @@ * <h2>Features</h2> * * * <a href="scripty2%20fx/element.html#morph-class_method">CSS morphing engine</a>: - * morph from one set of style properties to an other, including + * morph from one set of style properties to another, including * support for all CSS length types (px, em, %, cm, pt, etc.) * * <a href="scripty2%20fx/s2/fx/transitions.html">Extensive transition system</a> * for animation easing and special effects (e.g. bouncing) src/effects/base.js @@ -2,23 +2,23 @@ * S2.FX.Operators * * Effect operators are reusable interpolation functions. - * Operators are used by [[S2.FX.Element]] and it's subclasses. + * Operators are used by [[S2.FX.Element]] and its subclasses. **/ S2.FX.Operators = { }; /** * class S2.FX.Operators.Base * - * This is skeleton base class which must be extended to be useful. + * This is a skeleton base class which must be extended to be useful. **/ S2.FX.Operators.Base = Class.create({ /** * new S2.FX.Operators.Base(effect, object[, options]) * - effect (S2.FX.Effect): The effect which uses this operator - * - object (Object): A releatd object (mostly elements) - * - options (Object): Additional options for the operator. + * - object (Object): A related object (mostly elements) + * - options (Object): Additional options for the operator * - * This is skeleton base class which must be extended to be useful. + * This is a skeleton base class which must be extended to be useful. * * Options: * * `transition`: a [[S2.FX.Transition]] method, defaults to a linear transition src/effects/operators/base.js @@ -20,7 +20,7 @@ S2.FX.Operators.Style = Class.create(S2.FX.Operators.Base, { if(from!=to) this.tweens.push([ property, S2.CSS.interpolate.curry(property, from, to), - item in this.options.propertyTransitions ? + (this.options.propertyTransitions || []).include(item) ? Object.propertize(this.options.propertyTransitions[item], S2.FX.Transitions) : Prototype.K ]); } src/effects/operators/style.js @@ -54,8 +54,9 @@ * with WebKit's CSS transitions `-webkit-transition-timing-function` * CSS property. * - * See http://www.w3.org/TR/css3-transitions/#transition-timing-function_tag - * for more information. + * The W3C has more information about + * <a href="http://www.w3.org/TR/css3-transitions/#transition-timing-function_tag"> + * CSS3 transition timing functions</a>. **/ S2.FX.cubicBezierTransition = function(x1, y1, x2, y2){ return (function(pos){ src/effects/transitions/cubic-bezier.js @@ -108,7 +108,7 @@ Element.addMethods({ /** * Element#fade(@element[, options]) -> element * - * Fade out an element from it's current opacity setting (or 100%). + * Fade out an element from its current opacity setting (or 100%). **/ fade: function(element, options){ return element.effect('morph', Object.extend({ src/extensions/element.js @@ -1,11 +1,42 @@ + +/** section: scripty2 core + * class Function + * + * Extensions to the built-in `Function` object. +**/ + +/** + * Function#optionize() -> Function + * + * Given a function whose last parameter is an object + * of options, return a function that accepts a variable + * number of arguments and always passes the last argument + * that is an object to the options parameter. This way, + * the function can be called with just options, leaving + * the other parameters undefined. + * + * var logOptions = function(a, b, options){ + * console.log(options); + * }.optionize(); + * logOptions({hello: "world"}) -> logs {hello: "world"} + * logOptions(1, {hello: "world"}) -> logs {hello: "world"} + * logOptions(1, 2, {hello: "world"}) -> logs {hello: "world"} + * + * But note that providing too many arguments will not work: + * + * logOptions(1,2,3, {hello: "world"}) -> logs 3 +**/ Function.prototype.optionize = function(){ - var self = this, argumentNames = self.argumentNames(), optionIndex = argumentNames.length - 1, - method = function(){ - var args = $A(arguments), options = typeof args.last() == 'object' ? args.pop() : {}, - prefilledArgs = (optionIndex == 0 ? [] : - ((args.length > 0 ? args : [null]).inGroupsOf(optionIndex).flatten())).concat(options); - return self.apply(this, prefilledArgs); - }; + var self = this, + argumentNames = self.argumentNames(), + optionIndex = argumentNames.length - 1, + method = function(){ + var args = $A(arguments), + options = typeof args.last() == 'object' ? args.pop() : {}, + prefilledArgs = (optionIndex == 0 ? [] : + ((args.length > 0 ? args : [null]).inGroupsOf(optionIndex).flatten())).concat(options); + return self.apply(this, prefilledArgs); + }; method.argumentNames = function(){ return argumentNames }; return method; }; @@ -31,6 +62,24 @@ Number.prototype.tween = function(target, position){ return this + (target-this) * position; }; +/** section: scripty2 core + * class Object + * + * Extensions to the built-in `Object` object. +**/ + +/** + * Object.propertize(property, object) -> Object + * - property (String | Object): item or name of item + * - object (Object): namespace in which to look for named item + * + * If `property` is a string, finds it in the provided `object`. + * Otherwise returns `property`. + * + * Object.propertize(S2.FX.Transitions.sinusoidal, S2.FX.Transitions) -> S2.FX.Transitions.sinusoidal + * Object.propertize('sinusoidal', S2.FX.Transitions) -> S2.FX.Transitions.sinusoidal + * +**/ Object.propertize = function(property, object){ return Object.isString(property) ? object[property] : property; }; \ No newline at end of file src/extensions/misc.js @@ -40,4 +40,5 @@ var S2 = { //= require "extensions/misc" //= require "extensions/element" -//= require "addons/helpers" \ No newline at end of file +//= require "addons/helpers" +//= require "addons/zoom" \ No newline at end of file src/s2.js @@ -20,10 +20,25 @@ new Test.Unit.Runner({ }}, testObjectPropertize: function(){ with(this) { - // TODO + var propertizeTransitions = function(prop) { + return Object.propertize(prop, S2.FX.Transitions); + }; + assertEqual(propertizeTransitions('sinusoidal'), S2.FX.Transitions.sinusoidal); + assertEqual(propertizeTransitions(S2.FX.Transitions.sinusoidal), S2.FX.Transitions.sinusoidal); }}, testFunctionOptionize: function(){ with(this) { - // TODO + var o = {a:1} + optionize = (function(a,b,options) { + return options; + }).optionize(), + + // options set to last object + assertEqual(o, optionize(o)); + assertEqual(o, optionize(1,o)); + assertEqual(o, optionize(1,2,o)); + + // unless the argument is already filled in + assertEqual(3, optionize(1,2,3,o)); }} }); test/unit/extensions_test.js @@ -11,11 +11,11 @@ new Test.Unit.Runner({ assertEqual(0, tmp); wait(250, function(){ assertEqual(0, tmp); - new S2.FX.Morph('sandbox',{style:'font-size:20px',duration:.5}).play(); + new S2.FX.Morph('sandbox',{style:'font-size:20px',duration:.1}).play(); wait(750, function(){ assert(tmp > 0); tmp2 = tmp; - wait(250, function(){ + wait(100, function(){ assertEqual(tmp2, tmp, "heartbeats shouldn't continue when no fx running"); }); }); test/unit/heartbeat_test.js @@ -1,7 +1,7 @@ new Test.Unit.Runner({ testS2Defined: function() { with(this) { - assertNotUndefined(window['s2']); + assertNotUndefined(window['S2']); }} }); \ No newline at end of file test/unit/package_test.js db43178fdcdc5ac647c661c68efbfd5ee780ee9f 40f0bb04082e2a3b156642f3e34fcbe70944f8f6 Thomas Fuchs thomas@fesch.at http://github.com/madrobby/scripty2/commit/8633e3f74b47967e3b24a41507e57c697c868a81 8633e3f74b47967e3b24a41507e57c697c868a81 2009-09-28T02:54:58-07:00 2009-09-28T02:54:58-07:00 Merge remote branch 'asolove/master' Conflicts: test/unit/extensions_test.js e9368cbf486329ffca2af98a3eee4ab87a771d7a Thomas Fuchs thomas@fesch.at