Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/scriptaculous.js (from r1086647, tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/scriptaculous.js) URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/scriptaculous.js?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/scriptaculous.js&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/scriptaculous.js&r1=1086647&r2=1087139&rev=1087139&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/scriptaculous.js (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/scriptaculous.js Wed Mar 30 23:41:38 2011 @@ -1,6 +1,6 @@ -// script.aculo.us scriptaculous.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008 +// script.aculo.us scriptaculous.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010 -// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Copyright (c) 2005-2010 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 @@ -24,10 +24,18 @@ // For details, see the script.aculo.us web site: http://script.aculo.us/ var Scriptaculous = { - Version: '1.8.2', + Version: '1.9.0', require: function(libraryName) { - // inserting via DOM fails in Safari 2.0, so brute force approach - document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>'); + try{ + // inserting via DOM fails in Safari 2.0, so brute force approach + document.write('<script type="text/javascript" src="'+libraryName+'"><\/script>'); + } catch(e) { + // for xhtml+xml served content, fall back to DOM methods + var script = document.createElement('script'); + script.type = 'text/javascript'; + script.src = libraryName; + document.getElementsByTagName('head')[0].appendChild(script); + } }, REQUIRED_PROTOTYPE: '1.6.0.3', load: function() {
Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/slider.js (from r1086647, tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/slider.js) URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/slider.js?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/slider.js&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/slider.js&r1=1086647&r2=1087139&rev=1087139&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/slider.js (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/slider.js Wed Mar 30 23:41:38 2011 @@ -1,6 +1,6 @@ -// script.aculo.us slider.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008 +// script.aculo.us slider.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010 -// Copyright (c) 2005-2008 Marty Haught, Thomas Fuchs +// Copyright (c) 2005-2010 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/ @@ -209,12 +209,12 @@ Control.Slider = Class.create({ var pointer = [Event.pointerX(event), Event.pointerY(event)]; var track = handle; if (track==this.track) { - var offsets = Position.cumulativeOffset(this.track); + var offsets = this.track.cumulativeOffset(); this.event = event; this.setValue(this.translateToValue( (this.isVertical() ? pointer[1]-offsets[1] : pointer[0]-offsets[0])-(this.handleLength/2) )); - var offsets = Position.cumulativeOffset(this.activeHandle); + var offsets = this.activeHandle.cumulativeOffset(); this.offsetX = (pointer[0] - offsets[0]); this.offsetY = (pointer[1] - offsets[1]); } else { @@ -227,7 +227,7 @@ Control.Slider = Class.create({ this.activeHandleIdx = this.handles.indexOf(this.activeHandle); this.updateStyles(); - var offsets = Position.cumulativeOffset(this.activeHandle); + var offsets = this.activeHandle.cumulativeOffset(); this.offsetX = (pointer[0] - offsets[0]); this.offsetY = (pointer[1] - offsets[1]); } @@ -246,7 +246,7 @@ Control.Slider = Class.create({ }, draw: function(event) { var pointer = [Event.pointerX(event), Event.pointerY(event)]; - var offsets = Position.cumulativeOffset(this.track); + var offsets = this.track.cumulativeOffset(); pointer[0] -= this.offsetX + offsets[0]; pointer[1] -= this.offsetY + offsets[1]; this.event = event; Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/sound.js (from r1086647, tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/sound.js) URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/sound.js?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/sound.js&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/sound.js&r1=1086647&r2=1087139&rev=1087139&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/sound.js (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/sound.js Wed Mar 30 23:41:38 2011 @@ -1,6 +1,6 @@ -// script.aculo.us sound.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008 +// script.aculo.us sound.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010 -// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) // // Based on code created by Jules Gravinese (http://www.webveteran.com/) // @@ -50,6 +50,10 @@ Sound = { if(Prototype.Browser.Gecko && navigator.userAgent.indexOf("Win") > 0){ if(navigator.plugins && $A(navigator.plugins).detect(function(p){ return p.name.indexOf('QuickTime') != -1 })) Sound.template = new Template('<object id="sound_#{track}_#{id}" width="0" height="0" type="audio/mpeg" data="#{url}"/>'); + else if(navigator.plugins && $A(navigator.plugins).detect(function(p){ return p.name.indexOf('Windows Media') != -1 })) + Sound.template = new Template('<object id="sound_#{track}_#{id}" type="application/x-mplayer2" data="#{url}"></object>'); + else if(navigator.plugins && $A(navigator.plugins).detect(function(p){ return p.name.indexOf('RealPlayer') != -1 })) + Sound.template = new Template('<embed type="audio/x-pn-realaudio-plugin" style="height:0" id="sound_#{track}_#{id}" src="#{url}" loop="false" autostart="true" hidden="true"/>'); else Sound.play = function(){}; -} \ No newline at end of file +} \ No newline at end of file Copied: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/unittest.js (from r1086647, tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/unittest.js) URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/unittest.js?p2=tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/unittest.js&p1=tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/unittest.js&r1=1086647&r2=1087139&rev=1087139&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_8_2/unittest.js (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/scriptaculous_1_9_0/unittest.js Wed Mar 30 23:41:38 2011 @@ -1,8 +1,8 @@ -// script.aculo.us unittest.js v1.8.2, Tue Nov 18 18:30:58 +0100 2008 +// script.aculo.us unittest.js v1.9.0, Thu Dec 23 16:54:48 -0500 2010 -// Copyright (c) 2005-2008 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) -// (c) 2005-2008 Jon Tirsen (http://www.tirsen.com) -// (c) 2005-2008 Michael Schuerig (http://www.schuerig.de/michael/) +// Copyright (c) 2005-2010 Thomas Fuchs (http://script.aculo.us, http://mir.aculo.us) +// (c) 2005-2010 Jon Tirsen (http://www.tirsen.com) +// (c) 2005-2010 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/ Modified: tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js?rev=1087139&r1=1087138&r2=1087139&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/main/resources/org/apache/tapestry5/tapestry.js Wed Mar 30 23:41:38 2011 @@ -91,9 +91,9 @@ var Tapestry = { CONSOLE_DURATION : 10, /** - * CSS Class added to a <form> element that directs Tapestry to prevent - * normal (HTTP POST) form submission, in favor of Ajax (XmlHttpRequest) - * submission. + * CSS Class added to a <form> element that directs Tapestry to + * prevent normal (HTTP POST) form submission, in favor of Ajax + * (XmlHttpRequest) submission. */ PREVENT_SUBMISSION : "t-prevent-submission", @@ -122,7 +122,7 @@ var Tapestry = { }); overlay.setOpacity(0.0); - body.insert( { + body.insert({ top : overlay }); @@ -134,7 +134,7 @@ var Tapestry = { var messageDiv = new Element("div", { 'class' : 't-page-loading-banner' }).update(Tapestry.Messages.pageIsLoading); - overlay.insert( { + overlay.insert({ top : messageDiv }); @@ -220,10 +220,11 @@ var Tapestry = { * When a submit element is clicked, record the name of the element into * the associated form. This is necessary for some Ajax processing, see * TAPESTRY-2324. - * - * TAP5-1418: Added "type=image" so that they set the submitting element correctly. + * + * TAP5-1418: Added "type=image" so that they set the submitting element + * correctly. */ - $$("INPUT[type=submit]","INPUT[type=image]").each(function(element) { + $$("INPUT[type=submit]", "INPUT[type=image]").each(function(element) { var t = $T(element); if (!t.trackingClicks) { @@ -409,10 +410,10 @@ var Tapestry = { var successHandler = options.onSuccess || Prototype.emptyFunction; - var finalOptions = $H( { + var finalOptions = $H({ onException : Tapestry.ajaxExceptionHandler, onFailure : Tapestry.ajaxFailureHandler - }).update(options).update( { + }).update(options).update({ onSuccess : function(response, jsonResponse) { /* * When the page is unloaded, pending Ajax requests appear to @@ -449,8 +450,9 @@ var Tapestry = { /** * Obtains the Tapestry.ZoneManager object associated with a triggering - * element (an <a> or <form>) configured to update a zone. Writes errors to - * the AjaxConsole if the zone and ZoneManager can not be resolved. + * element (an <a> or <form>) configured to update a zone. + * Writes errors to the AjaxConsole if the zone and ZoneManager can not be + * resolved. * * @param element * triggering element (id or instance) @@ -465,8 +467,8 @@ var Tapestry = { /** * Obtains the Tapestry.ZoneManager object associated with a zone element - * (usually a <div>). Writes errors to the Ajax console if the element or - * manager can not be resolved. + * (usually a <div>). Writes errors to the Ajax console if the element + * or manager can not be resolved. * * @param zoneElement * zone element (id or instance) @@ -615,7 +617,7 @@ var Tapestry = { "<" + newTagName).replace(new RegExp("</" + tag + ">$", "i"), "</" + newTagName + ">"); - element.insert( { + element.insert({ before : replaceHTML }); @@ -685,7 +687,7 @@ var Tapestry = { } }; -Element.addMethods( { +Element.addMethods({ /** * Works upward from the element, checking to see if the element is visible. @@ -858,7 +860,7 @@ Element } }); -Element.addMethods( [ 'INPUT', 'SELECT', 'TEXTAREA' ], { +Element.addMethods([ 'INPUT', 'SELECT', 'TEXTAREA' ], { /** * Invoked on a form element (INPUT, SELECT, etc.), gets or creates the * Tapestry.FieldEventManager for that field. @@ -1208,7 +1210,7 @@ Tapestry.Initializer = { fname : "Tapestry.Validator." + functionName, params : Object - .toJSON( [ + .toJSON([ field.id, message, constraint ]), @@ -1381,7 +1383,7 @@ Tapestry.Validator = { } }; -Tapestry.ErrorPopup = Class.create( { +Tapestry.ErrorPopup = Class.create({ /* * If the images associated with the error popup are overridden (by @@ -1407,7 +1409,7 @@ Tapestry.ErrorPopup = Class.create( { var body = $(document.body); - body.insert( { + body.insert({ bottom : this.outerDiv }); @@ -1466,7 +1468,7 @@ Tapestry.ErrorPopup = Class.create( { repositionBubble : function() { var fieldPos = this.field.cumulativeOffset(); - this.outerDiv.setStyle( { + this.outerDiv.setStyle({ top : (fieldPos[1] + this.BUBBLE_VERT_OFFSET) + "px", left : (fieldPos[0] + this.BUBBLE_HORIZONTAL_OFFSET) + "px", width : this.BUBBLE_WIDTH, @@ -1522,7 +1524,7 @@ Tapestry.ErrorPopup = Class.create( { } }); -Tapestry.FormEventManager = Class.create( { +Tapestry.FormEventManager = Class.create({ initialize : function(spec) { this.form = $(spec.formId); @@ -1562,7 +1564,7 @@ Tapestry.FormEventManager = Class.create name : "t:submit" }); - firstHidden.insert( { + firstHidden.insert({ after : this.submitHidden }); } else @@ -1642,7 +1644,7 @@ Tapestry.FormEventManager = Class.create } }); -Tapestry.FieldEventManager = Class.create( { +Tapestry.FieldEventManager = Class.create({ initialize : function(field) { this.field = $(field); @@ -1820,7 +1822,7 @@ Tapestry.ElementEffect = { * Manages a <div> (or other element) for dynamic updates. * */ -Tapestry.ZoneManager = Class.create( { +Tapestry.ZoneManager = Class.create({ /* * spec are the parameters for the Zone: trigger: required -- name or * instance of link. element: required -- name or instance of div element to @@ -1909,7 +1911,7 @@ Tapestry.ZoneManager = Class.create( { * zones is an object of zone ids and zone content that will be * present in a multi-zone update response. */ - Object.keys(reply.zones).each(function(zoneId) { + reply.zones && Object.keys(reply.zones).each(function(zoneId) { var manager = Tapestry.findZoneManagerForZone(zoneId); if (manager) { @@ -1931,7 +1933,7 @@ Tapestry.ZoneManager = Class.create( { */ updateFromURL : function(URL, parameters) { - var finalParameters = $H( { + var finalParameters = $H({ "t:zoneid" : this.element.id }).update(this.specParameters); @@ -1948,7 +1950,7 @@ Tapestry.ZoneManager = Class.create( { } }); -Tapestry.FormInjector = Class.create( { +Tapestry.FormInjector = Class.create({ initialize : function(spec) { this.element = $(spec.element); @@ -2014,7 +2016,7 @@ Tapestry.ScriptManager = { * Complete URLs of virtually loaded scripts (combined scripts loaded as a * single virtual asset). */ - virtualScripts : $A( []), + virtualScripts : $A([]), initialize : function() { @@ -2042,7 +2044,7 @@ Tapestry.ScriptManager = { type : 'text/javascript' }); - $$("head").first().insert( { + $$("head").first().insert({ bottom : element }); @@ -2071,8 +2073,8 @@ Tapestry.ScriptManager = { }, /** - * Checks to see if the given collection (of <script> or <style> elements) - * contains the given asset URL. + * Checks to see if the given collection (of <script> or <style> + * elements) contains the given asset URL. * * @param collection * @param prop @@ -2173,7 +2175,7 @@ Tapestry.ScriptManager = { if (s.media != undefined) element.writeAttribute('media', s.media); - head.insert( { + head.insert({ bottom : element }); Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java?rev=1087139&r1=1087138&r2=1087139&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/FormTests.java Wed Mar 30 23:41:38 2011 @@ -1,4 +1,4 @@ -// Copyright 2009, 2010 The Apache Software Foundation +// Copyright 2009, 2010, 2011 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -700,7 +700,7 @@ public class FormTests extends TapestryC // Wait a moment for the page to initialize. - waitForCSSSelectedElementToAppear("//a[@id='fred']"); + waitForElementToAppear("fred"); click("//a[@id='fred']"); Modified: tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ZoneTests.java URL: http://svn.apache.org/viewvc/tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ZoneTests.java?rev=1087139&r1=1087138&r2=1087139&view=diff ============================================================================== --- tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ZoneTests.java (original) +++ tapestry/tapestry5/trunk/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/ZoneTests.java Wed Mar 30 23:41:38 2011 @@ -1,4 +1,4 @@ -// Copyright 2009, 2010 The Apache Software Foundation +// Copyright 2009, 2010, 2011 The Apache Software Foundation // // Licensed under the Apache License, Version 2.0 (the "License"); // you may not use this file except in compliance with the License. @@ -180,7 +180,7 @@ public class ZoneTests extends TapestryC String now = getText("now"); - waitForCSSSelectedElementToAppear("//a[@id='mySubmit']"); + waitForElementToAppear("mySubmit"); click("//a[@id='mySubmit']");
