Updated Branches: refs/heads/wicket-1.5.x 47bac2897 -> 603db1a9a
WICKET-5119 PopupSettings IE8 - dosen't work secound time a link is clicked. Try/catch the focusing of the popup window because it throws exceptions in IE8+ Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/603db1a9 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/603db1a9 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/603db1a9 Branch: refs/heads/wicket-1.5.x Commit: 603db1a9a18c2ccba19b7ba126e39425bcd5b42f Parents: 47bac28 Author: Martin Tzvetanov Grigorov <[email protected]> Authored: Fri Apr 26 16:44:51 2013 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Fri Apr 26 16:45:46 2013 +0200 ---------------------------------------------------------------------- .../wicket/markup/html/link/PopupSettings.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/603db1a9/wicket-core/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java index 50859a8..4f85c76 100644 --- a/wicket-core/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java +++ b/wicket-core/src/main/java/org/apache/wicket/markup/html/link/PopupSettings.java @@ -160,7 +160,7 @@ public class PopupSettings implements IClusterable windowTitle = windowTitle.replaceAll("\\W", "_"); } - StringBuilder script = new StringBuilder("var w = window.open(" + target + ", '").append( + StringBuilder script = new StringBuilder("var w = window.open(" + target + ", '").append( windowTitle).append("', '"); script.append("scrollbars=").append(flagToString(SCROLLBARS)); @@ -190,7 +190,7 @@ public class PopupSettings implements IClusterable script.append(",top=").append(top); } - script.append("'); if(w.blur) w.focus();").append(" return false;"); + script.append("'); try {if (w.blur) w.focus();}catch(ignore){}; return false;"); return script.toString(); }
