# HG changeset patch
# User bpatel
# Date 1476290396 -3600
# Node ID 2f2976a5f69ed8479de386aed63215dec838865b
# Parent 77c1fe1091934e22bdc6bf7de9aea56775daab36
8151921: Improved page resolution
Summary: Include indenting changes to HtmlWriter.java from 8011650
Reviewed-by: jjg, ksrini
diff -r 77c1fe109193 -r 2f2976a5f69e src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
--- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed Oct 12 17:37:29 2016 +0100
+++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java Wed Oct 12 17:39:56 2016 +0100
@@ -357,14 +357,16 @@
*
* @return a content for the SCRIPT tag
*/
- protected Content getFramesetJavaScript(){
+ protected Content getFramesetJavaScript() {
HtmlTree script = new HtmlTree(HtmlTag.SCRIPT);
script.addAttr(HtmlAttr.TYPE, "text/javascript");
- String scriptCode = DocletConstants.NL + " targetPage = \"\" + window.location.search;" + DocletConstants.NL +
- " if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
- " targetPage = targetPage.substring(1);" + DocletConstants.NL +
- " if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
- " targetPage = \"undefined\";" + DocletConstants.NL +
+ String scriptCode = DocletConstants.NL +
+ " tmpTargetPage = \"\" + window.location.search;" + DocletConstants.NL +
+ " if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + DocletConstants.NL +
+ " tmpTargetPage = tmpTargetPage.substring(1);" + DocletConstants.NL +
+ " if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + DocletConstants.NL +
+ " tmpTargetPage = \"undefined\";" + DocletConstants.NL +
+ " targetPage = tmpTargetPage;" + DocletConstants.NL +
" function validURL(url) {" + DocletConstants.NL +
" try {" + DocletConstants.NL +
" url = decodeURIComponent(url);" + DocletConstants.NL +
diff -r 77c1fe109193 -r 2f2976a5f69e test/com/sun/javadoc/testJavascript/TestJavascript.java
--- a/test/com/sun/javadoc/testJavascript/TestJavascript.java Wed Oct 12 17:37:29 2016 +0100
+++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java Wed Oct 12 17:39:56 2016 +0100
@@ -23,7 +23,7 @@
/*
* @test
- * @bug 4665566 4855876 7025314 8012375 8015998 8016328 8024756
+ * @bug 4665566 4855876 7025314 8012375 8015997 8016328 8024756 8151921
* @summary Verify that the output has the right javascript.
* @author jamieh
* @library ../lib/
@@ -50,11 +50,12 @@
"Frames"},
{BUG_ID + FS + "index.html",
"