Author: jwaldman
Date: Wed Sep 27 12:38:09 2006
New Revision: 450552
URL: http://svn.apache.org/viewvc?view=rev&rev=450552
Log:
ADFFACES-173 'initialFocusId' attribute support for document component on PDA.
Committed for Piyush Hari.
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimal-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIE-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIERtl-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalInacc-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalPPC-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalSaf-golden.xml
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalScrRdr-golden.xml
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java?view=diff&rev=450552&r1=450551&r2=450552
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
Wed Sep 27 12:38:09 2006
@@ -1,12 +1,12 @@
/*
* Copyright 2000-2006 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.
* You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -51,7 +51,7 @@
{
super(type);
}
-
+
@Override
protected void findTypeConstants(FacesBean.Type type)
{
@@ -199,10 +199,22 @@
{
String onload = toString(bean.getProperty(_onloadKey));
if (PartialPageUtils.supportsPartialRendering(arc))
- {
- // Don't short circuit...
- onload = XhtmlUtils.getChainedJS("_checkLoad(event)", onload, false);
- }
+ {
+ // Don't short circuit...
+ //PH:_checkLoad(event) is replaced by _checkLoad() because on certain
+ //devices like IE Mobile , event object is not defined. Moreover,
+ //_checkLoad function does not use event object. So, remove it
altogether
+ //for all PPR devices
+ onload = XhtmlUtils.getChainedJS("_checkLoad()", onload, false);
+ }
+ //PH: Currently, if a browser supports PPR, _checkLoad function is
called
+ //that sets initialFocus if set.For non-PPR browsers like blackBerry
4.0,
+ //no body onload function is called. hence, initialFocus cannot is not
set.
+ //Therefore, created another function _checkLoadNoPPR() This function is
+ //called by the onLoad JS handler of body tag when device does not
support
+ //PPR
+ else
+ onload = XhtmlUtils.getChainedJS("_checkLoadNoPPR()", onload, false);
return onload;
}
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js?view=diff&rev=450552&r1=450551&r2=450552
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
Wed Sep 27 12:38:09 2006
@@ -277,20 +277,20 @@
version = 1.0;
}
else if(agentString.indexOf("blackberry") != -1)
- {
- // if we support non-BlackBerry Browser agents on blackberry
- // devices in the future, we may need to revisit this because
- // those agents may include "blackberry" in the User-Agent
- // string; we can't just check if the User-Agent "starts with"
- // blackberry because navigator.userAgent on BlackBery Browser 4.0
- // starts with Mozilla/4.0 (even though the User-Agent sent to the
- // server starts with BlackBerry<model>/<version>)
-
- // BlackBerry Browser 4.0+ supports navigator.appVersion,
- // and earlier versions don't support script, so we can
- // leave the version as defined above
- isBlackBerry = true;
- kind = "blackberry";
+ {
+ // if we support non-BlackBerry Browser agents on blackberry
+ // devices in the future, we may need to revisit this because
+ // those agents may include "blackberry" in the User-Agent
+ // string; we can't just check if the User-Agent "starts with"
+ // blackberry because navigator.userAgent on BlackBery Browser 4.0
+ // starts with Mozilla/4.0 (even though the User-Agent sent to the
+ // server starts with BlackBerry<model>/<version>)
+
+ // BlackBerry Browser 4.0+ supports navigator.appVersion,
+ // and earlier versions don't support script, so we can
+ // leave the version as defined above
+ isBlackBerry = true;
+ kind = "blackberry";
}
else if ((agentString.indexOf('mozilla') != -1) &&
(agentString.indexOf('spoofer') == -1) &&
@@ -308,7 +308,6 @@
kind = "nn";
}
}
-
if (agentString.indexOf('win') != -1)
{
isWindows = true;
@@ -748,6 +747,9 @@
event
)
{
+ //PH:set the right event object;
+ event = _getEventObj();
+
// Make sure we don't run through this function twice
// when we close a dialog. The
// _unloadADFDialog function blocks a second run
@@ -2249,7 +2251,6 @@
*/
function _setFocus(currInput)
{
-
// check if currInput is showing before setting focus, for example
// ColorField has required validation on hidden field,
// but cannot receive focus.
@@ -2257,10 +2258,12 @@
{
currInput.focus();
+ //PH:element["value"] is not supported for PIE,IEM and BB. Therefore
+ //use element.value which is supported by all
if ((currInput.type == "text")
- && (currInput["value"] != (void 0))
- && (currInput["value"] != null)
- && (currInput["value"].length > 0))
+ && (currInput.value != (void 0))
+ && (currInput.value != null)
+ && (currInput.value.length > 0))
{
// IE fails on this select if a timeout occurs to handle a
// pending event. Don't do it if we've reset the delayed
@@ -2589,19 +2592,15 @@
*/
function _isShowing(
input)
- {
- // detect lack of focus method and hidden input
- if (_agent.isPIE)
- {
- if (!input.focus() || (input.type == 'hidden'))
- return false;
- }
- else
- {
- if (!input.focus || (input.type == 'hidden'))
+ {
+ //PH: removed !input.focus because firstly, focus() function is supported
by
+ //all browsers (PIE,IEM,BB,FF,IE) and secondly, _isShowing should be
treated
+ //as a function to test visibility only. If there is a case where one
really
+ //wants to test whether focus function exists or not, do it in an if
+ //statement and call _isShowing within it.
+ if (input.type == 'hidden')
return false;
- }
-
+
// determine visibility from style information
if (_agent.isIE)
{
@@ -2629,15 +2628,22 @@
return true;
}
// TODO: Write correct version for Safari
- else if (!_agent.isNav && !_agent.isSafari)
+ //PH: I don't know if this code is Firefox specific, if it is then one might
+ //want to change the if condition to if(_agent.isGecko) instead of doing
+ //!_agent.isNav and !_agent.isSafari because with the existing condition
+ //Black Berry,IE Mobile and Pocket IE all enter into this fragment.
+ //To prevent this use !_agent.isPIE and !_agent.isBlackBerry.
+ if (!_agent.isNav && !_agent.isSafari && !_agent.isPIE &&
!_agent.isBlackBerry)
{
var computedStyle =
input.ownerDocument.defaultView.getComputedStyle(input,
null);
-
+
// either of these styles will prevent focus from succeeding
return ((computedStyle["visibility"] != "hidden") &&
(computedStyle["display"] != "none"));
}
+
+ return true;
}
/**
@@ -3103,35 +3109,56 @@
id
)
{
- //
- // If we arent' on Internet Explorers before 5,
- // use the DOM way of doing this
- //
- if ((_agent.kind != "ie") || (_agent.version >= 5))
+ //PH: Since BB supports getDocumentById use this to obtain the element.
+ if(typeof(doc.getElementById) != 'undefined')
{
- //VAC added because PIE document object does not support the getElementById
- //function.
- if(!_agent.isPIE){
- var element = doc.getElementById(id);
-
- // IE's implementation of getElementById() is buggy. If
- // the page contains an anchor which has the same name
- // as the requested id, IE will return the anchor, even
- // if the anchor's id attribute is not set. So, make
- // sure that we actually get back an element with the
- // correct id.
- if ((element == null) || (element.id == id))
- return element;
- }
- // If we get here, that means that IE has probably returned
- // an anchor instead of the desired element. Let's scan
- // the entire DOM tree to find the element we want.
- return _findElementById(doc, id);
- }
- else
- {
- return doc.all[id];
- }
+ //
+ // If we arent' on Internet Explorers before 5,
+ // use the DOM way of doing this
+ //
+ //PH:exclude BlackBerry
+ if (((_agent.kind != "ie") || (_agent.version >= 5)) &&
(!_agent.isBlackBerry))
+ {
+ var element = doc.getElementById(id);
+
+ // IE's implementation of getElementById() is buggy. If
+ // the page contains an anchor which has the same name
+ // as the requested id, IE will return the anchor, even
+ // if the anchor's id attribute is not set. So, make
+ // sure that we actually get back an element with the
+ // correct id.
+ if ((element == null) || (element.id == id))
+ return element;
+ // If we get here, that means that IE has probably returned
+ // an anchor instead of the desired element. Let's scan
+ // the entire DOM tree to find the element we want.
+ return _findElementById(doc, id);
+ }
+
+ return doc.getElementById(id);
+ }
+ //PH:if agent is PIE get elements this way since getElementById is
+ //not supported
+ if(_agent.isPIE)
+ {
+ //if element is not within a form
+ if(doc.forms.length == 0)
+ return window[id];
+ else
+ //check to see if element is within the form, if so return the element
else do nothing
+ for(var i = 0; i<doc.forms.length; i++)
+ {
+ var f = doc.forms[i];
+ if(f[id])
+ return f[id];
+ }
+
+ //element is not within the form but form(s) is(are) present.
+ return window[id];
+ }
+
+ return doc.all[id];
+
}
// A recursive method which searches the entire DOM tree
@@ -4488,6 +4515,20 @@
return true;
}
+/**PH: Currently, if a browser supports PPR, the _checkLoad function
+ * is set as the body onload to perform some initialization, both PPR related
+ * and not (such as setting the initial focus).
+ * Because this function was not called for non-PPR browsers (like BlackBerry
+ * 4.0), the non-PPR initialization was not happening on those browsers.
+ * Therefore, I created another function called _checkLoadNoPPR to handle
+ * non-PPR related initialization, such as setting the initialFocus, and
+ * set the body onload to this method for browsers that do not support PPR.
+ */
+function _checkLoadNoPPR()
+{
+ if(_initialFocusID != null)
+ _setFocus(_getElementById(document,_initialFocusID));
+}
/**
* Called by the load handler of each document body to prepare event handlers
@@ -4584,20 +4625,17 @@
// Set initialFocus if necessary
if ((!_agent.isNav) && (_initialFocusID != null))
{
- var myElement = _getElementById(document, _initialFocusID);
- if (myElement && myElement.focus)
- {
- myElement.focus();
- if (myElement.type == 'text')
- myElement.select();
- }
- }
+ var myElement = _getElementById(document,_initialFocusID);
+ //PH: Set Focus on element for all browsers.
+ if(myElement)
+ _setFocus(myElement);
+ }
+
if (!_agent.isNav)
_loadScriptLibraries(document);
}
-
//
// Event handle that blocks keys that lead to a page reloading.
//
@@ -5458,4 +5496,14 @@
window.setTimeout(_spinboxRepeat.functionString, 1000);
}
+}
+//PH:This method returns the 'event' object
+function _getEventObj()
+{
+ if(typeof(event) == 'undefined')
+ return window.event;
+ else
+ return event;
+
+ return null;
}
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimal-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimal-golden.xml?view=diff&rev=450552&r1=450551&r2=450552
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimal-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimal-golden.xml
Wed Sep 27 12:38:09 2006
@@ -1,7 +1,7 @@
<results>
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -24,7 +24,7 @@
<body
id="myBodyId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -47,7 +47,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
title="myShortDesc"
>
@@ -72,7 +72,7 @@
<body
id="mainId"
onclick="test-onclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -96,7 +96,7 @@
<body
id="mainId"
ondblclick="test-ondblclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -120,7 +120,7 @@
<body
id="mainId"
onkeydown="test-onkeydown"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -144,7 +144,7 @@
<body
id="mainId"
onkeypress="test-onkeypress"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -168,7 +168,7 @@
<body
id="mainId"
onkeyup="test-onkeyup"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -191,7 +191,7 @@
<body
id="mainId"
- onload="return _chain('_checkLoad(event)','test-onload',this,event)"
+ onload="return _chain('_checkLoad()','test-onload',this,event)"
onunload="_checkUnload(event)"
>
@@ -214,7 +214,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousedown="test-onmousedown"
onunload="_checkUnload(event)"
>
@@ -238,7 +238,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousemove="test-onmousemove"
onunload="_checkUnload(event)"
>
@@ -262,7 +262,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseout="test-onmouseout"
onunload="_checkUnload(event)"
>
@@ -286,7 +286,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseover="test-onmouseover"
onunload="_checkUnload(event)"
>
@@ -310,7 +310,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseup="test-onmouseup"
onunload="_checkUnload(event)"
>
@@ -334,7 +334,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="return
_chain('_checkUnload(event)','test-onunload',this,event)"
>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIE-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIE-golden.xml?view=diff&rev=450552&r1=450551&r2=450552
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIE-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIE-golden.xml
Wed Sep 27 12:38:09 2006
@@ -1,7 +1,7 @@
<results>
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -24,7 +24,7 @@
<body
id="myBodyId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -47,7 +47,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
title="myShortDesc"
>
@@ -72,7 +72,7 @@
<body
id="mainId"
onclick="test-onclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -96,7 +96,7 @@
<body
id="mainId"
ondblclick="test-ondblclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -120,7 +120,7 @@
<body
id="mainId"
onkeydown="test-onkeydown"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -144,7 +144,7 @@
<body
id="mainId"
onkeypress="test-onkeypress"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -168,7 +168,7 @@
<body
id="mainId"
onkeyup="test-onkeyup"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -191,7 +191,7 @@
<body
id="mainId"
- onload="return _chain('_checkLoad(event)','test-onload',this,event)"
+ onload="return _chain('_checkLoad()','test-onload',this,event)"
onunload="_checkUnload(event)"
>
@@ -214,7 +214,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousedown="test-onmousedown"
onunload="_checkUnload(event)"
>
@@ -238,7 +238,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousemove="test-onmousemove"
onunload="_checkUnload(event)"
>
@@ -262,7 +262,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseout="test-onmouseout"
onunload="_checkUnload(event)"
>
@@ -286,7 +286,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseover="test-onmouseover"
onunload="_checkUnload(event)"
>
@@ -310,7 +310,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseup="test-onmouseup"
onunload="_checkUnload(event)"
>
@@ -334,7 +334,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="return
_chain('_checkUnload(event)','test-onunload',this,event)"
>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIERtl-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIERtl-golden.xml?view=diff&rev=450552&r1=450551&r2=450552
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIERtl-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalIERtl-golden.xml
Wed Sep 27 12:38:09 2006
@@ -1,7 +1,7 @@
<results>
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -24,7 +24,7 @@
<body
id="myBodyId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -47,7 +47,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
title="myShortDesc"
>
@@ -72,7 +72,7 @@
<body
id="mainId"
onclick="test-onclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -96,7 +96,7 @@
<body
id="mainId"
ondblclick="test-ondblclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -120,7 +120,7 @@
<body
id="mainId"
onkeydown="test-onkeydown"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -144,7 +144,7 @@
<body
id="mainId"
onkeypress="test-onkeypress"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -168,7 +168,7 @@
<body
id="mainId"
onkeyup="test-onkeyup"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -191,7 +191,7 @@
<body
id="mainId"
- onload="return _chain('_checkLoad(event)','test-onload',this,event)"
+ onload="return _chain('_checkLoad()','test-onload',this,event)"
onunload="_checkUnload(event)"
>
@@ -214,7 +214,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousedown="test-onmousedown"
onunload="_checkUnload(event)"
>
@@ -238,7 +238,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousemove="test-onmousemove"
onunload="_checkUnload(event)"
>
@@ -262,7 +262,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseout="test-onmouseout"
onunload="_checkUnload(event)"
>
@@ -286,7 +286,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseover="test-onmouseover"
onunload="_checkUnload(event)"
>
@@ -310,7 +310,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseup="test-onmouseup"
onunload="_checkUnload(event)"
>
@@ -334,7 +334,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="return
_chain('_checkUnload(event)','test-onunload',this,event)"
>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalInacc-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalInacc-golden.xml?view=diff&rev=450552&r1=450551&r2=450552
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalInacc-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalInacc-golden.xml
Wed Sep 27 12:38:09 2006
@@ -1,7 +1,7 @@
<results>
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -20,7 +20,7 @@
<body
id="myBodyId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -39,7 +39,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
title="myShortDesc"
>
@@ -60,7 +60,7 @@
<body
id="mainId"
onclick="test-onclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -80,7 +80,7 @@
<body
id="mainId"
ondblclick="test-ondblclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -100,7 +100,7 @@
<body
id="mainId"
onkeydown="test-onkeydown"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -120,7 +120,7 @@
<body
id="mainId"
onkeypress="test-onkeypress"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -140,7 +140,7 @@
<body
id="mainId"
onkeyup="test-onkeyup"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -159,7 +159,7 @@
<body
id="mainId"
- onload="return _chain('_checkLoad(event)','test-onload',this,event)"
+ onload="return _chain('_checkLoad()','test-onload',this,event)"
onunload="_checkUnload(event)"
>
@@ -178,7 +178,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousedown="test-onmousedown"
onunload="_checkUnload(event)"
>
@@ -198,7 +198,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousemove="test-onmousemove"
onunload="_checkUnload(event)"
>
@@ -218,7 +218,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseout="test-onmouseout"
onunload="_checkUnload(event)"
>
@@ -238,7 +238,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseover="test-onmouseover"
onunload="_checkUnload(event)"
>
@@ -258,7 +258,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseup="test-onmouseup"
onunload="_checkUnload(event)"
>
@@ -278,7 +278,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="return
_chain('_checkUnload(event)','test-onunload',this,event)"
>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalPPC-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalPPC-golden.xml?view=diff&rev=450552&r1=450551&r2=450552
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalPPC-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalPPC-golden.xml
Wed Sep 27 12:38:09 2006
@@ -1,7 +1,7 @@
<results>
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -24,7 +24,7 @@
<body
id="myBodyId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -47,7 +47,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
title="myShortDesc"
>
@@ -72,7 +72,7 @@
<body
id="mainId"
onclick="test-onclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -96,7 +96,7 @@
<body
id="mainId"
ondblclick="test-ondblclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -120,7 +120,7 @@
<body
id="mainId"
onkeydown="test-onkeydown"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -144,7 +144,7 @@
<body
id="mainId"
onkeypress="test-onkeypress"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -168,7 +168,7 @@
<body
id="mainId"
onkeyup="test-onkeyup"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -191,7 +191,7 @@
<body
id="mainId"
- onload="return _chain('_checkLoad(event)','test-onload',this,event)"
+ onload="return _chain('_checkLoad()','test-onload',this,event)"
onunload="_checkUnload(event)"
>
@@ -214,7 +214,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousedown="test-onmousedown"
onunload="_checkUnload(event)"
>
@@ -238,7 +238,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousemove="test-onmousemove"
onunload="_checkUnload(event)"
>
@@ -262,7 +262,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseout="test-onmouseout"
onunload="_checkUnload(event)"
>
@@ -286,7 +286,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseover="test-onmouseover"
onunload="_checkUnload(event)"
>
@@ -310,7 +310,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseup="test-onmouseup"
onunload="_checkUnload(event)"
>
@@ -334,7 +334,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="return
_chain('_checkUnload(event)','test-onunload',this,event)"
>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalSaf-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalSaf-golden.xml?view=diff&rev=450552&r1=450551&r2=450552
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalSaf-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalSaf-golden.xml
Wed Sep 27 12:38:09 2006
@@ -1,7 +1,7 @@
<results>
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -24,7 +24,7 @@
<body
id="myBodyId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -47,7 +47,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
title="myShortDesc"
>
@@ -72,7 +72,7 @@
<body
id="mainId"
onclick="test-onclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -96,7 +96,7 @@
<body
id="mainId"
ondblclick="test-ondblclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -120,7 +120,7 @@
<body
id="mainId"
onkeydown="test-onkeydown"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -144,7 +144,7 @@
<body
id="mainId"
onkeypress="test-onkeypress"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -168,7 +168,7 @@
<body
id="mainId"
onkeyup="test-onkeyup"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -191,7 +191,7 @@
<body
id="mainId"
- onload="return _chain('_checkLoad(event)','test-onload',this,event)"
+ onload="return _chain('_checkLoad()','test-onload',this,event)"
onunload="_checkUnload(event)"
>
@@ -214,7 +214,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousedown="test-onmousedown"
onunload="_checkUnload(event)"
>
@@ -238,7 +238,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousemove="test-onmousemove"
onunload="_checkUnload(event)"
>
@@ -262,7 +262,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseout="test-onmouseout"
onunload="_checkUnload(event)"
>
@@ -286,7 +286,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseover="test-onmouseover"
onunload="_checkUnload(event)"
>
@@ -310,7 +310,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseup="test-onmouseup"
onunload="_checkUnload(event)"
>
@@ -334,7 +334,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="return
_chain('_checkUnload(event)','test-onunload',this,event)"
>
Modified:
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalScrRdr-golden.xml
URL:
http://svn.apache.org/viewvc/incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalScrRdr-golden.xml?view=diff&rev=450552&r1=450551&r2=450552
==============================================================================
---
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalScrRdr-golden.xml
(original)
+++
incubator/adffaces/trunk/trinidad/trinidad-impl/src/test/resources/org/apache/myfaces/trinidadinternal/renderkit/golden/body-minimalScrRdr-golden.xml
Wed Sep 27 12:38:09 2006
@@ -1,7 +1,7 @@
<results>
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -24,7 +24,7 @@
<body
id="myBodyId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -47,7 +47,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
title="myShortDesc"
>
@@ -72,7 +72,7 @@
<body
id="mainId"
onclick="test-onclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -96,7 +96,7 @@
<body
id="mainId"
ondblclick="test-ondblclick"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -120,7 +120,7 @@
<body
id="mainId"
onkeydown="test-onkeydown"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -144,7 +144,7 @@
<body
id="mainId"
onkeypress="test-onkeypress"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -168,7 +168,7 @@
<body
id="mainId"
onkeyup="test-onkeyup"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="_checkUnload(event)"
>
@@ -191,7 +191,7 @@
<body
id="mainId"
- onload="return _chain('_checkLoad(event)','test-onload',this,event)"
+ onload="return _chain('_checkLoad()','test-onload',this,event)"
onunload="_checkUnload(event)"
>
@@ -214,7 +214,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousedown="test-onmousedown"
onunload="_checkUnload(event)"
>
@@ -238,7 +238,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmousemove="test-onmousemove"
onunload="_checkUnload(event)"
>
@@ -262,7 +262,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseout="test-onmouseout"
onunload="_checkUnload(event)"
>
@@ -286,7 +286,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseover="test-onmouseover"
onunload="_checkUnload(event)"
>
@@ -310,7 +310,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onmouseup="test-onmouseup"
onunload="_checkUnload(event)"
>
@@ -334,7 +334,7 @@
<body
id="mainId"
- onload="_checkLoad(event)"
+ onload="_checkLoad()"
onunload="return
_chain('_checkUnload(event)','test-onunload',this,event)"
>
