test/com/sun/javadoc/testJavascript/TestJavascript.java

changeset 3258
fd9b6417c521
parent 2085
3344ea7404b1
child 3295
859dc787b52b
     1.1 --- a/test/com/sun/javadoc/testJavascript/TestJavascript.java	Tue Jul 05 15:03:58 2016 -0700
     1.2 +++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java	Wed Jul 06 20:07:09 2016 -0700
     1.3 @@ -23,7 +23,7 @@
     1.4  
     1.5  /*
     1.6   * @test
     1.7 - * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756
     1.8 + * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756 8151921
     1.9   * @summary  Verify that the output has the right javascript.
    1.10   * @author   jamieh
    1.11   * @library  ../lib/
    1.12 @@ -50,11 +50,12 @@
    1.13              "<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>"},
    1.14          {BUG_ID + FS + "index.html",
    1.15              "<script type=\"text/javascript\">" + NL +
    1.16 -                        "    targetPage = \"\" + window.location.search;" + NL +
    1.17 -            "    if (targetPage != \"\" && targetPage != \"undefined\")" + NL +
    1.18 -            "        targetPage = targetPage.substring(1);" + NL +
    1.19 -            "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL +
    1.20 -            "        targetPage = \"undefined\";" + NL +
    1.21 +            "    tmpTargetPage = \"\" + window.location.search;" + NL +
    1.22 +            "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + NL +
    1.23 +            "        tmpTargetPage = tmpTargetPage.substring(1);" + NL +
    1.24 +            "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + NL +
    1.25 +            "        tmpTargetPage = \"undefined\";" + NL +
    1.26 +            "    targetPage = tmpTargetPage;" + NL +
    1.27              "    function validURL(url) {" + NL +
    1.28              "        try {" + NL +
    1.29              "            url = decodeURIComponent(url);" + NL +

mercurial