@@ -1,7 +1,12 @@ -*SVN* - -* Update to Prototype 1.5.1_rc0 - See http://dev.rubyonrails.org/browser/spinoffs/prototype/trunk/CHANGELOG?rev=6369 for more information +*V1.7.1 beta 1* (March 12, 2007) + +* Update to Prototype 1.5.1 r6386 + - Fixes SlideUp/SlideDown on IE + - Fixes an opacity problem with IE + - Performance optimizations + - See http://dev.rubyonrails.org/browser/spinoffs/prototype/trunk/CHANGELOG?rev=6381 for more information + +* Make builder unit tests work on IE * Fix id assignment for sounds on Firefox/Windows, fixes #7709 [Robert Wallis] CHANGELOG @@ -1,4 +1,4 @@ -Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the MIT-LICENSE @@ -5,7 +5,7 @@ require 'rake' PKG_NAME = 'scriptaculous-js' PKG_BUILD = ENV['PKG_BUILD'] ? '.' + ENV['PKG_BUILD'] : '' PKG_TIMESTAMP = Time.new.to_s -PKG_VERSION = '1.7.0' + PKG_BUILD +PKG_VERSION = '1.7.1_beta1' + PKG_BUILD PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}" PKG_DESTINATION = ENV["PKG_DESTINATION"] || "dist" @@ -26,7 +26,8 @@ PKG_FILES = FileList[ 'lib/prototype.js', 'test/**/*.html', 'test/**/*.css', - 'test/**/*.png' + 'test/**/*.png', + 'test/**/*.mp3' ] SRC_FILES = FileList[ Rakefile @@ -1,4 +1,4 @@ -/* Prototype JavaScript framework, version 1.5.1_rc0 +/* Prototype JavaScript framework, version 1.5.1_rc1 * (c) 2005-2007 Sam Stephenson * * Prototype is freely distributable under the terms of an MIT-style license. @@ -7,7 +7,7 @@ /*--------------------------------------------------------------------------*/ var Prototype = { - Version: '1.5.1_rc0', + Version: '1.5.1_rc1', Browser: { IE: !!(window.attachEvent && !window.opera), @@ -628,6 +628,21 @@ var $A = Array.from = function(iterable) { } } +if (Prototype.Browser.WebKit) { + $A = Array.from = function(iterable) { + if (!iterable) return []; + if (!(typeof iterable == 'function' && iterable == '[object NodeList]') && + iterable.toArray) { + return iterable.toArray(); + } else { + var results = []; + for (var i = 0, length = iterable.length; i < length; i++) + results.push(iterable[i]); + return results; + } + } +} + Object.extend(Array.prototype, Enumerable); if (!Array.prototype._reverse) @@ -1273,7 +1288,7 @@ Element.extend = function(element) { element[property] = cache.findOrStore(value); } - element._extended = true; + element._extended = Prototype.emptyFunction; return element; }; @@ -1359,7 +1374,7 @@ Element.Methods = { }, descendants: function(element) { - return $A($(element).getElementsByTagName('*')); + return $A($(element).getElementsByTagName('*')).each(Element.extend); }, immediateDescendants: function(element) { @@ -1424,6 +1439,7 @@ Element.Methods = { readAttribute: function(element, name) { element = $(element); if (Prototype.Browser.IE) { + if (!element.attributes) return null; var t = Element._attributeTranslations; if (t.values[name]) return t.values[name](element, name); if (t.names[name]) name = t.names[name]; @@ -2225,15 +2241,12 @@ Object.extend(Selector, { // filters out duplicates and extends all nodes unique: function(nodes) { if (nodes.length == 0) return nodes; - var results = [nodes[0]], n; - nodes[0]._counted = true; - for (var i = 0, l = nodes.length; i < l; i++) { - n = nodes[i]; - if (!n._counted) { + var results = [], n; + for (var i = 0, l = nodes.length; i < l; i++) + if (!(n = nodes[i])._counted) { n._counted = true; results.push(Element.extend(n)); } - } return Selector.handlers.unmark(results); }, lib/prototype.js @@ -1,4 +1,4 @@ -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // // script.aculo.us is freely distributable under the terms of an MIT-style license. // For details, see the script.aculo.us web site: http://script.aculo.us/ src/builder.js @@ -1,6 +1,6 @@ -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// (c) 2005, 2006 Ivan Krstic (http://blogs.law.harvard.edu/ivan) -// (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com) +// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// (c) 2005-2007 Ivan Krstic (http://blogs.law.harvard.edu/ivan) +// (c) 2005-2007 Jon Tirsen (http://www.tirsen.com) // Contributors: // Richard Livsey // Rahul Bhargava src/controls.js @@ -1,5 +1,5 @@ -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// (c) 2005, 2006 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz) +// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// (c) 2005-2007 Sammi Williams (http://www.oriontransfer.co.nz, sammi@oriontransfer.co.nz) // // script.aculo.us is freely distributable under the terms of an MIT-style license. // For details, see the script.aculo.us web site: http://script.aculo.us/ @@ -245,6 +245,7 @@ Draggable.prototype = { }, zindex: 1000, revert: false, + quiet: false, scroll: false, scrollSensitivity: 20, scrollSpeed: 15, @@ -353,8 +354,12 @@ Draggable.prototype = { updateDrag: function(event, pointer) { if(!this.dragging) this.startDrag(event); - Position.prepare(); - Droppables.show(pointer, this.element); + + if(!this.options.quiet){ + Position.prepare(); + Droppables.show(pointer, this.element); + } + Draggables.notify('onDrag', this, event); this.draw(pointer); @@ -389,6 +394,12 @@ Draggable.prototype = { finishDrag: function(event, success) { this.dragging = false; + + if(this.options.quiet){ + Position.prepare(); + var pointer = [Event.pointerX(event), Event.pointerY(event)]; + Droppables.show(pointer, this.element); + } if(this.options.ghosting) { Position.relativize(this.element); @@ -620,6 +631,7 @@ var Sortable = { delay: 0, hoverclass: null, ghosting: false, + quiet: false, scroll: false, scrollSensitivity: 20, scrollSpeed: 15, @@ -634,6 +646,7 @@ var Sortable = { // build options for the draggables var options_for_draggable = { revert: true, + quiet: options.quiet, scroll: options.scroll, scrollSpeed: options.scrollSpeed, scrollSensitivity: options.scrollSensitivity, src/dragdrop.js @@ -1,4 +1,4 @@ -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // Contributors: // Justin Palmer (http://encytemedia.com/) // Mark Pilgrim (http://diveintomark.org/) src/effects.js @@ -1,4 +1,4 @@ -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the @@ -22,7 +22,7 @@ // For details, see the script.aculo.us web site: http://script.aculo.us/ var Scriptaculous = { - Version: '1.7.0', + Version: '1.7.1_beta1', require: function(libraryName) { // inserting via DOM fails in Safari 2.0, so brute force approach document.write('<script type="text/javascript" src="'+libraryName+'"></script>'); src/scriptaculous.js @@ -1,4 +1,4 @@ -// Copyright (c) 2005, 2006 Marty Haught, Thomas Fuchs +// Copyright (c) 2005-2007 Marty Haught, Thomas Fuchs // // script.aculo.us is freely distributable under the terms of an MIT-style license. // For details, see the script.aculo.us web site: http://script.aculo.us/ src/slider.js @@ -1,6 +1,6 @@ -// Copyright (c) 2005, 2006 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// (c) 2005, 2006 Jon Tirsen (http://www.tirsen.com) -// (c) 2005, 2006 Michael Schuerig (http://www.schuerig.de/michael/) +// Copyright (c) 2005-2007 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// (c) 2005-2007 Jon Tirsen (http://www.tirsen.com) +// (c) 2005-2007 Michael Schuerig (http://www.schuerig.de/michael/) // // script.aculo.us is freely distributable under the terms of an MIT-style license. // For details, see the script.aculo.us web site: http://script.aculo.us/ src/unittest.js @@ -9,9 +9,9 @@ <script src="../../src/unittest.js" type="text/javascript"></script> <link rel="stylesheet" href="../test.css" type="text/css" /> </head> -<body> +<body class="navigation"> -<h1>script.aculo.us Functional Tests</h1> +<h1>script.aculo.us<br/>Functional Tests</h1> <p id="version"></p> @@ -23,17 +23,38 @@ <p><a href="http://wiki.script.aculo.us/scriptaculous/show/UnitTesting" target="test">Documentation</a></p> +<h2>Effects</h2> <ul> - <li><a href="position_clone_test.html" target="test">position_clone_test</a></li> + <li><b><a href="effects_random_demo.html" target="test">Random effects test</a></b></li> + <li><a href="effects_test.html" target="test">effects_test</a></li> + <li><a href="effect_direct_test.html" target="test">$$ selector effects/visualEffect</a></li> + <li><a href="effects_queue_test.html" target="test">effects_queue</a></li> + <li><a href="effects_queue_limit_test.html" target="test">effects_queue_limit</a></li> + <li><a href="effects_toggle_test.html" target="test">Effect.toggle</a></li> + <li><a href="effects2_test.html" target="test">effects2_test</a></li> + <li><a href="effects3_test.html" target="test">effects3_test</a></li> + <li><a href="effects4_test.html" target="test">effects4_test</a></li> + <li><a href="effects5_test.html" target="test">effects5_test</a></li> + <li><a href="effects6_test.html" target="test">effects6_test</a></li> + <li><a href="effects_grow_strink_test.html" target="test">Grow/Shrink</a></li> + <li><a href="effects_blind_test.html" target="test">BlindUp/BlindDown</a></li> + <li><a href="effect_scale_test.html" target="test">Effect.Scale</a></li> + <li><a href="effect_puff_test.html" target="test">Effect.Puff</a></li> + <li><a href="effects_float_appear_test.html" target="test">Test for Safari .Appear w/ floats</a></li> + <li><a href="effects_highlight_bg_image.html" target="test">Effect.Highlight keepBackgroundImage option</a></li> + <li><a href="texteffects_test.html" target="test">texteffects_test.html</a></li> </ul> + +<h2>Controls</h2> <ul> <li><a href="ajax_autocompleter_test.html" target="test">ajax_autocompleter_test</a></li> <li><a href="ajax_autocompleter2_test.html" target="test">ajax_autocompleter2_test</a></li> -</ul> -<ul> <li><a href="ajax_inplaceeditor_test.html" target="test">ajax_inplaceeditor_test</a></li> <li><a href="ajax_inplacecollectioneditor_test.html" target="test">ajax_inplacecollectioneditor_test</a></li> + <li><a href="slider_test.html" target="test">slider_test</a></li> </ul> + +<h2>Drag & Drop</h2> <ul> <li><a href="dragdrop_test.html" target="test">dragdrop_test</a></li> <li><a href="dragdrop2_test.html" target="test">dragdrop2_test</a></li> @@ -45,45 +66,23 @@ <li><a href="dragdrop8_test.html" target="test">dragdrop8_test</a></li> <li><a href="dragdrop9_test.html" target="test">Revert: failure</a></li> <li><a href="dragdrop_delay_test.html" target="test">dragdrop delay test</a></li> -</ul> -<ul> <li><a href="sortable_test.html" target="test">sortable_test</a></li> <li><a href="sortable2_test.html" target="test">sortable2_test</a></li> <li><a href="sortable3_test.html" target="test">sortable3_test</a></li> <li><a href="sortable4_test.html" target="test">sortable4_test</a></li> <li><a href="sortable5_test.html" target="test">sortable5_test</a></li> <li><a href="sortable6_test.html" target="test">sortable5_test</a></li> -</ul> -<ul> <li><a href="sortable_tree_test.html" target="test">Sortable trees</a></li> </ul> + +<h2>Sound (experimental)</h2> <ul> - <li><a href="slider_test.html" target="test">slider_test</a></li> -</ul> -<ul> - <li><b><a href="effects_random_demo.html" target="test">Random effects test</a></b></li> - <li><a href="effects_test.html" target="test">effects_test</a></li> - <li><a href="effect_direct_test.html" target="test">$$ selector effects/visualEffect</a></li> - <li><a href="effects_queue_test.html" target="test">effects_queue</a></li> - <li><a href="effects_queue_limit_test.html" target="test">effects_queue_limit</a></li> - <li><a href="effects_toggle_test.html" target="test">Effect.toggle</a></li> - <li><a href="effects2_test.html" target="test">effects2_test</a></li> - <li><a href="effects3_test.html" target="test">effects3_test</a></li> - <li><a href="effects4_test.html" target="test">effects4_test</a></li> - <li><a href="effects5_test.html" target="test">effects5_test</a></li> - <li><a href="effects6_test.html" target="test">effects6_test</a></li> - <li><a href="effects_grow_strink_test.html" target="test">Grow/Shrink</a></li> - <li><a href="effects_blind_test.html" target="test">BlindUp/BlindDown</a></li> - <li><a href="effect_scale_test.html" target="test">Effect.Scale</a></li> - <li><a href="effect_puff_test.html" target="test">Effect.Puff</a></li> - <li><a href="effects_float_appear_test.html" target="test">Test for Safari .Appear w/ floats</a></li> - <li><a href="effects_highlight_bg_image.html" target="test">Effect.Highlight keepBackgroundImage option</a></li> -</ul> -<ul> - <li><a href="texteffects_test.html" target="test">texteffects_test.html</a></li> + <li><a href="sound_test.html" target="test">sound_test.html</a></li> </ul> + +<h2>Miscellaneous</h2> <ul> - <li><a href="sound_test.html" target="test">sound_test.html</a></li> + <li><a href="position_clone_test.html" target="test">position_clone_test</a></li> </ul> </body> test/functional/index.html @@ -6,6 +6,51 @@ body { font-size:0.8em; } +.navigation { + background: #9DC569; + color: #fff; +} + +.navigation h1 { + font-size: 20px; +} + +.navigation h2 { + font-size: 16px; + font-weight: normal; + margin: 0; + border: 1px solid #e8a400; + border-bottom: 0; + background: #ffc; + color: #E8A400; + padding: 8px; + padding-bottom: 0; +} + +.navigation ul { + margin-top: 0; + border: 1px solid #E8A400; + border-top: none; + background: #ffc; + padding: 8px; + margin-left: 0; +} + +.navigation ul li { + font-size: 12px; + list-style-type: none; + margin-top: 1px; + margin-bottom: 1px; +} + +.navigation a { + color: #ffc; +} + +.navigation ul li a { + color: #000; +} + #log { padding-bottom: 1em; border-bottom: 2px solid #000; test/test.css @@ -15,7 +15,7 @@ <body> <h1>script.aculo.us Unit test file</h1> <p> - Tests for the Ajax.Autocompleter. + Tests for Ajax.Autocompleter in controls.js. </p>  test/unit/ajax_autocompleter_test.html @@ -12,7 +12,7 @@ <body> <h1>script.aculo.us Unit test file</h1> <p> - Tests for the Ajax.InPlaceEditor. + Tests for Ajax.InPlaceEditor in controls.js </p>  test/unit/ajax_inplaceeditor_test.html @@ -10,9 +10,9 @@ <link rel="stylesheet" href="../test.css" type="text/css" /> </head> <body> -<h1>script.aculo.us Builder unit test file</h1> +<h1>script.aculo.us Unit test file</h1> <p> - Tests for Builder. + Tests for builder.js </p>  @@ -24,6 +24,26 @@ <script type="text/javascript" language="javascript" charset="utf-8"> // <![CDATA[ + // Serializes a node and it's contents to plain old HTML + // IMPORTANT: style attributes can't be correctly serialized cross-browser wise, + // so the contents of style attributes must match what IE thinks is correct + function serializeNode(node){ + if(node.nodeType == 3) return node.nodeValue; + node = $(node); + var tag = node.tagName.toLowerCase(); + return '<' + ([tag].concat($A(node.attributes).map(function(attr){ + // Filter out stuff that we don't need + if(attr.nodeName == '_extended' || attr.nodeName == '_counted' || + typeof attr.nodeValue == 'function' ||!Element.hasAttribute(node, attr.nodeName)) return; + // remove trailing ; in style attributes on Firefox + var value = node.readAttribute(attr.nodeName); + if(attr.nodeName == 'style' && value.endsWith(';')) + value = value.substr(0, value.length-1); + return attr.nodeName + '="' + value + '"' + }).compact().sort())).join(' ') + '>' + $A(node.childNodes).map(serializeNode).join('') + + '</' + tag + '>'; + } + new Test.Unit.Runner({ setup: function() { @@ -80,7 +100,6 @@ assertEqual(10, element.childNodes.length); var element = Builder.node('div', Builder.node('span')); - console.log(element); assertEqual(1, element.childNodes.length); assertEqual('SPAN', element.childNodes[0].tagName); @@ -172,7 +191,7 @@ testBuilderComplexExample: function() { with(this) { var element = Builder.node('div',{id:'ghosttrain'},[ - Builder.node('div',{style:'font-size: 11px; font-weight: bold;'},[ + Builder.node('div',{style:'font-weight: bold; font-size: 11px'},[ Builder.node('h1','Ghost Train'), "testtext", 2, 3, 4, Builder.node('ul',[ @@ -185,7 +204,10 @@ $('result').appendChild(element); // browsers aren't sure about upper and lower case on elements - assertEqual('<div id="ghosttrain"><div style="font-size: 11px; font-weight: bold;"><h1>ghost train</h1>testtext234<ul><li onclick="alert(\'test\')">click me</li></ul></div></div>', $('result').innerHTML.toLowerCase()); + assertEqual( + '<div id="ghosttrain"><div style="font-weight: bold; font-size: 11px">' + + '<h1>Ghost Train</h1>testtext234<ul><li onclick="alert(\'test\')">click me</li></ul></div></div>', + serializeNode($('result').childNodes[0])); }}, testBuilderShortcuts: function() { with(this) { @@ -198,7 +220,7 @@ assertEqual('SPAN', element.childNodes[0].tagName); var element = DIV({id:'ghosttrain'},[ - DIV({style:'font-size: 11px; font-weight: bold;'},[ + DIV({style:'font-weight: bold; font-size: 11px'},[ H1('Ghost Train'), "testtext", 2, 3, 4, UL([ @@ -209,16 +231,18 @@ assertEqual('DIV', element.nodeName); $('result').appendChild(element); - assertEqual('<div id="ghosttrain"><div style="font-size: 11px; font-weight: bold;"><h1>ghost train</h1>testtext234<ul><li onclick="alert(\'test\')">click me</li></ul></div></div>', $('result').innerHTML.toLowerCase()); + + assertEqual( + '<div id="ghosttrain"><div style="font-weight: bold; font-size: 11px">' + + '<h1>Ghost Train</h1>testtext234<ul><li onclick="alert(\'test\')">click me</li></ul></div></div>', + serializeNode($('result').childNodes[0])); }}, testBuilderBuild: function() { with(this) { ['<span>this is <b>neat!</b></span>',' \n<span>this is <b>neat!</b></span>\n '].each( function(html){ var node = Builder.build(html); - assertEqual('SPAN', node.tagName.toUpperCase()); - assertEqual('this is <b>neat!</b>', - node.innerHTML.toLowerCase()); + assertEqual('<span>this is <b>neat!</b></span>', serializeNode(node)); }); }} test/unit/builder_test.html @@ -8,11 +8,29 @@ <script src="../../src/scriptaculous.js" type="text/javascript"></script> <script src="../../src/unittest.js" type="text/javascript"></script> <link rel="stylesheet" href="../test.css" type="text/css" /> + <style type="text/css" media="screen"> + #rotfl { + color: red; + font-family: serif; + font-style: italic; + font-size: 40px; + background: #fed; + padding: 1em; + width: 400px; + } + .final { + color: #fff; + font-style: italic; + font-size: 20px; + background: #000; + opacity: 0.5; + } + </style> </head> <body> <h1>script.aculo.us Unit test file</h1> <p> - Tests the effects + Tests for effects.js </p>  @@ -21,6 +39,24 @@  <div id="testlog"> </div> +<div class="morphing blub" style="font-size:25px;color:#f00">Well</div> +<div class="morphing">You know</div> +<div id="blah" style="border:1px solid black;width:100px">Whoo-hoo!</div> + +<div id="error_message">ERROR MESSAGE</div> +<div id="error_message_2">SECOND ERROR MESSAGE</div> +<div id="error_message_3" style="border:1px solid red; width:100px; color: #f00">THIRD ERROR MESSAGE</div> + +<ul class="error-list" id="error_test_ul"> + <li>Lorem ipsum dolor sit amet, consectetur adipisicing elit,</li> + <li>sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.</li> + <li>Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris</li> + <li>nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in</li> + <li>reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</li> +</ul> + +<div id="rotfl">ROTFL</div> +  <script type="text/javascript" language="javascript" charset="utf-8"> // <![CDATA[ @@ -32,10 +68,8 @@ ['Fade','Appear','BlindUp','BlindDown','Puff','SwitchOff','DropOut','Shake', 'SlideUp','SlideDown','Pulsate','Squish','Fold','Grow','Shrink']; - var COMBINED_RJS_EFFECTS = $w(''+ - 'fade appear blind_up blind_down puff switch_off drop_out shake '+ - 'slide_up slide_down pulsate squish fold grow shrink' - ); + var COMBINED_RJS_EFFECTS = $w('fade appear blind_up blind_down puff switch_off '+ + 'drop_out shake slide_up slide_down pulsate squish fold grow shrink'); var tmp, tmp2; @@ -131,6 +165,7 @@ testInspect: function() { with(this) { var e1 = new Effect.Opacity('sandbox',{from:1.0,to:0.5,duration:0.5}); + info( e1.inspect() ); assertEqual(0, e1.inspect().indexOf('#<Effect:')); assert(e1.inspect().indexOf('idle')>0); wait(1000, function() { @@ -274,7 +309,7 @@ $('sandbox').innerHTML = ""; $('sandbox').appendChild( Builder.node('div',{id:'test_element'}, - [Builder.node('span','test')])); //some effects require a child element + Builder.node('span','test'))); //some effects require a child element // should work with new Effect.Blah syntax var effect = new Effect[fx]('test_element'); @@ -337,6 +372,133 @@ benchmark(function(){ e.render(0.5); },1000, 'With afterUpdate event'); + }}, + + testElementMorph: function() { with(this) { + $('error_test_ul').morph('font-size:40px', {duration: 0.5}).setStyle({marginRight:'17px'}); + $('error_message_2').morph({ + fontSize: '20px', + color: '#f00', + backgroundColor: '#ffffff' + }, + { + duration:0.5 + }); + $('error_message_3').morph('final', {duration:0.5}); + wait(1000,function(){ + assertEqual('17px', $('error_test_ul').getStyle('margin-right')); + assertEqual('40px', $('error_test_ul').getStyle('font-size')); + assertEqual('#ffffff', $('error_message_2').getStyle('background-color').parseColor()); + assertEqual('20px', $('error_message_2').getStyle('font-size')); + assertEqual('italic', $('error_message_3').getStyle('font-style')); + assertEqual('20px', $('error_message_3').getStyle('font-size')); + assertEqual(.5, $('error_message_3').getStyle('opacity')); + assertEqual('', $('error_message_3').style.fontSize); + }); + }}, + + testElementMorphChaining: function() { with(this) { + $('error_message').morph('font-size:17px').morph('opacity:0',{delay:3}); + wait(4100,function(){ // 3000ms delay + 1000ms default duration + assertEqual(0, $('error_message').getOpacity()); + }); + }}, + + testTransformBySelector: function() { with(this) { + new Effect.Transform([ + { 'ul.error-list li': 'font-size:20px;text-indent:40pt' } + ],{ duration: 0.5 }).play(); + + wait(700,function(){ + var idx = 0; + $A($('error_test_ul').cleanWhitespace().childNodes).each(function(node){ + assertEqual('20px', $(node).getStyle('font-size')); + assertEqual('40pt', $(node).getStyle('text-indent')); + idx++; + }); + assertEqual(5, idx); + }); + }}, + + testTransformUsesCSSClassPresets: function() { with(this) { + assertEqual('40px', $('rotfl').getStyle('font-size')); + + // Render the effect at half-way through, font-size should be + // exactly half-way between original and target + new Effect.Transform([ + { 'rotfl': 'font-size:20px;text-indent:40pt;background-color:#888' } + ],{ sync:true }).play().render(0.5); + + wait(1100,function(){ + // shoould be 30px = 40px + (20px-40px)/2 + assertEqual('30px', $('rotfl').getStyle('font-size')); + }); + }}, + + testTransformMultiple: function() { with(this) { + var transformation = new Effect.Transform([ + { 'div.morphing': 'font-size:20px;padding-left:40em;opacity:0.5' }, + { 'blah' : + 'width:480px;border-width:10px;border-right-width:20px;' + + 'margin:20px;margin-bottom:-20px;font-size:30px;' + + 'background:#954' } + ],{ duration: 0.5 }); + + var generatedEffect = transformation.play(); + + assertEqual(3, generatedEffect.effects.length); + + wait(700, function(){ + // have a look at the generated color transforms for the 3rd found element + // which is the "blah" div + assertEqual('blah', generatedEffect.effects[2].element.id); + assertEnumEqual([255,255,255], + generatedEffect.effects[2].transforms.detect( function(transform){ + return (transform.style == 'backgroundColor') + }).originalValue); + assertEnumEqual([153,85,68], + generatedEffect.effects[2].transforms.detect( function(transform){ + return (transform.style == 'backgroundColor') + }).targetValue); + + assertEqual('20px', $$('div.morphing').first().getStyle('font-size')); + assertEqual('20px', $$('div.morphing').last().getStyle('font-size')); + assertEqual('30px', $('blah').getStyle('font-size')); + + // border-width/border-right-width should be set independently + assertEqual('10px', $('blah').getStyle('border-top-width')); + assertEqual('10px', $('blah').getStyle('border-bottom-width')); + assertEqual('10px', $('blah').getStyle('border-left-width')); + assertEqual('20px', $('blah').getStyle('border-right-width')); + + // colors should assume transition from + // #ffffff (white) if original was transparent + // we now should have arrived at the given color + assertEqual('#995544', $('blah').getStyle('background-color').parseColor()); + + // play again = should have same values + transformation.play(); + wait(700, function(){ + assertEqual('20px', $$('div.morphing').first().getStyle('font-size')); + assertEqual('20px', $$('div.morphing').last().getStyle('font-size')); + assertEqual('30px', $('blah').getStyle('font-size')); + + $('blah').setStyle({'font-size':'100px'}); + assertEqual('100px', $('blah').getStyle('font-size')); + transformation.play(); + wait(700, function(){ + assertEqual('30px', $('blah').getStyle('font-size')); + + new Effect.Transform([ + { 'blah': 'color: #80d980; background: #208020' } + ],{ duration: 1.1 }).play(); + wait(1500, function(){ + assertEqual('#80d980', $('blah').getStyle('color').parseColor()); + assertEqual('#208020', $('blah').getStyle('background-color').parseColor()); + }); + }); + }); + }); }} }); test/unit/effects_test.html @@ -17,7 +17,7 @@ <body> <h1>script.aculo.us Unit test file</h1> <p> - Test element extensions + Tests for Element extensions in effects.js </p>  test/unit/element_test.html @@ -9,9 +9,9 @@ <script src="../../src/unittest.js" type="text/javascript"></script> <link rel="stylesheet" href="../test.css" type="text/css" /> </head> -<body> +<body class="navigation"> -<h1>script.aculo.us Unit Tests</h1> +<h1>script.aculo.us<br/>Unit Tests</h1> <p id="version"></p> @@ -23,47 +23,42 @@ <p><a href="http://wiki.script.aculo.us/scriptaculous/show/UnitTesting" target="test">Documentation</a></p> -<p> - Please note that some of these unit tests require Firefox <= 1.0.4 (due to a Firefox bug, - 1.0.5 and later won't work [until fixed]). -</p> - <h2>scriptaculous.js</h2> <ul> <li><a href="loading_test.html" target="test">Dynamic loading test</a></li> </ul> -<h2>controls.js</h2> +<h2>effects.js</h2> <ul> - <li><a href="ajax_autocompleter_test.html" target="test">Ajax.Autocompleter test</a></li> - <li><a href="ajax_inplaceeditor_test.html" target="test">Ajax.InPlaceEditor test</a></li> + <li><a href="effects_test.html" target="test">Effects test</a></li> + <li><a href="string_test.html" target="test">String test</a></li> + <li><a href="element_test.html" target="test">Element extensions test</a></li> + <li><a href="position_clone_test.html" target="test">Position.clone test</a></li> </ul> -<h2>slider.js</h2> +<h2>dragdrop.js</h2> <ul> - <li><a href="slider_test.html" target="test">Control.Slider test</a></li> + <li><a href="dragdrop_test.html" target="test">Drag & Drop test</a></li> + <li><a href="sortable_test.html" target="test">Sortable test</a></li> </ul> -<h2>util.js</h2> +<h2>builder.js</h2> <ul> <li><a href="builder_test.html" target="test">Builder test</a></li> - <li><a href="string_test.html" target="test">String test</a></li> - <li><a href="element_test.html" target="test">Element extensions test</a></li> - <li><a href="position_clone_test.html" target="test">Position.clone test</a></li> </ul> -<h2>dragdrop.js</h2> +<h2>controls.js</h2> <ul> - <li><a href="dragdrop_test.html" target="test">Drag & Drop test</a></li> - <li><a href="sortable_test.html" target="test">Sortable test</a></li> + <li><a href="ajax_autocompleter_test.html" target="test">Ajax.Autocompleter test</a></li> + <li><a href="ajax_inplaceeditor_test.html" target="test">Ajax.InPlaceEditor test</a></li> </ul> -<h2>effects.js</h2> +<h2>slider.js</h2> <ul> - <li><a href="effects_test.html" target="test">Effects test</a></li> - <li><a href="transform_test.html" target="test">Transform test</a></li> + <li><a href="slider_test.html" target="test">Control.Slider test</a></li> </ul> + <h2>unittest.js</h2> <ul> <li><a href="unittest_test.html" target="test">Unittest test</a></li> test/unit/index.html @@ -12,7 +12,7 @@ <body> <h1>script.aculo.us Unit test file</h1> <p> - Test dynamic loading + Test dynamic loading in scriptaculous.js </p>  test/unit/loading_test.html @@ -12,7 +12,7 @@ <body> <h1>script.aculo.us Unit test file</h1> <p> - Tests for String.prototype extensions + Tests for Postion.clone (to be moved to Prototype) </p>  test/unit/position_clone_test.html @@ -12,7 +12,7 @@ <body> <h1>script.aculo.us Unit test file</h1> <p> - Test of slider.js + Tests for slider.js </p> <div id="track1" style="width:200px;background-color:#aaa;height:5px;"> test/unit/slider_test.html @@ -12,7 +12,7 @@ <body> <h1>script.aculo.us Unit test file</h1> <p> - Tests for String.prototype extensions + Tests for String.prototype extensions in effects.js </p>  test/unit/string_test.html test/unit/transform_test.html a4ccda89c1dd5a719fd2586a57fbb3ffdec90ef7 Thomas Fuchs thomas@fesch.at http://github.com/madrobby/scriptaculous/commit/6dcf9193f340bc4fbd6f3b09041ef2a0fed51aa9 6dcf9193f340bc4fbd6f3b09041ef2a0fed51aa9

2007-03-11T16:26:54-07:00

script.aculo.us: prepare 1.7.1_beta1, update Prototype, test housekeeping git-svn-id: http://svn.rubyonrails.org/rails/spinoffs/scriptaculous@6387 5ecf4fe2-1ee6-0310-87b1-e25e094e27de a46eb34c3805b5ac8a8982ecc9ecb30587d5ff7b Thomas Fuchs thomas@fesch.at