You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2011/05/23 22:47:31 UTC
svn commit: r1126740 -
/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
Author: lu4242
Date: Mon May 23 20:47:30 2011
New Revision: 1126740
URL: http://svn.apache.org/viewvc?rev=1126740&view=rev
Log:
MYFACES-3154 UIDebug doesn't check for existing url parameters
Modified:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
Modified: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java?rev=1126740&r1=1126739&r2=1126740&view=diff
==============================================================================
--- myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java (original)
+++ myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/view/facelets/tag/ui/UIDebug.java Mon May 23 20:47:30 2011
@@ -111,7 +111,16 @@ public final class UIDebug extends UICom
sb.append("var faceletsOrigKeyup = document.onkeyup; document.onkeyup = function(e) { if (window.event) e = window.event; if (String.fromCharCode(e.keyCode) == '"
+ this.getHotkey() + "' & e.shiftKey & e.ctrlKey) faceletsDebug('");
sb.append(actionId);
- sb.append('?');
+
+ int index = actionId.indexOf ("?");
+ if (index != -1)
+ {
+ sb.append("&");
+ }
+ else
+ {
+ sb.append('?');
+ }
sb.append(KEY);
sb.append('=');
sb.append(writeDebugOutput(faces));