You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by ma...@apache.org on 2008/12/05 09:42:33 UTC
svn commit: r723656 - in
/myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main:
java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/
javascript/META-INF/adf/jsLibs/
Author: matzew
Date: Fri Dec 5 00:42:33 2008
New Revision: 723656
URL: http://svn.apache.org/viewvc?rev=723656&view=rev
Log:
TRINIDAD-1329 - Nokia S40 brower shows message box even when there is no error message to show
TRINIDAD-1331 - BlackBerry 8300 shows NOSCRIPT message when JavaScript is disabled
TRINIDAD-1332 - BlackBerry Bold and Storm do not work
Thanks to Tadashi Enomori for these patches
Modified:
myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java
myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
Modified: myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java?rev=723656&r1=723655&r2=723656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java (original)
+++ myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/BodyRenderer.java Fri Dec 5 00:42:33 2008
@@ -126,13 +126,10 @@
// Since we are supporting Non-JavaScript browsers of generic PDA,
// we don't need to prompt any message in the client side regarding
// the JavaScript capability of generic PDA browsers.
- if (!isGenericPDA(arc))
- {
- _renderNoScript(context, arc);
- }
if (supportsScripting(arc))
{
+ _renderNoScript(context, arc);
_storeInitialFocus(arc, bean);
}
Modified: myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java?rev=723656&r1=723655&r2=723656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java (original)
+++ myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/java/org/apache/myfaces/trinidadinternal/renderkit/core/xhtml/MessageBoxRenderer.java Fri Dec 5 00:42:33 2008
@@ -456,7 +456,10 @@
return inlineStyle;
// Ensure the MessageBox is hidden for inline mode when there are no messages
- return inlineStyle + ";display:none;";
+ if (inlineStyle != null)
+ return inlineStyle + ";display:none;";
+
+ return "display:none;";
}
@Override
Modified: myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js
URL: http://svn.apache.org/viewvc/myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js?rev=723656&r1=723655&r2=723656&view=diff
==============================================================================
--- myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js (original)
+++ myfaces/trinidad/branches/1.2.10.1-branch/trinidad-impl/src/main/javascript/META-INF/adf/jsLibs/Core.js Fri Dec 5 00:42:33 2008
@@ -187,6 +187,7 @@
else if(_agent.isBlackBerry)
{
retVal = false;
+ retVal = _agent.version >= 4.6;
}
return retVal;