Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Tue Jul 05 15:03:58 2016 -0700
     1.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Wed Jul 06 20:07:09 2016 -0700
     1.3 @@ -380,11 +380,12 @@
     1.4          HtmlTree script = new HtmlTree(HtmlTag.SCRIPT);
     1.5          script.addAttr(HtmlAttr.TYPE, "text/javascript");
     1.6          String scriptCode = DocletConstants.NL +
     1.7 -                "    targetPage = \"\" + window.location.search;" + DocletConstants.NL +
     1.8 -                "    if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
     1.9 -                "        targetPage = targetPage.substring(1);" + DocletConstants.NL +
    1.10 -                "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
    1.11 -                "        targetPage = \"undefined\";" + DocletConstants.NL +
    1.12 +                "    tmpTargetPage = \"\" + window.location.search;" + DocletConstants.NL +
    1.13 +                "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + DocletConstants.NL +
    1.14 +                "        tmpTargetPage = tmpTargetPage.substring(1);" + DocletConstants.NL +
    1.15 +                "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + DocletConstants.NL +
    1.16 +                "        tmpTargetPage = \"undefined\";" + DocletConstants.NL +
    1.17 +                "    targetPage = tmpTargetPage;" + DocletConstants.NL +
    1.18                  "    function validURL(url) {" + DocletConstants.NL +
    1.19                  "        try {" + DocletConstants.NL +
    1.20                  "            url = decodeURIComponent(url);" + DocletConstants.NL +

     2.1 --- a/test/com/sun/javadoc/testJavascript/TestJavascript.java	Tue Jul 05 15:03:58 2016 -0700
     2.2 +++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java	Wed Jul 06 20:07:09 2016 -0700
     2.3 @@ -23,7 +23,7 @@
     2.4  
     2.5  /*
     2.6   * @test
     2.7 - * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756
     2.8 + * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756 8151921
     2.9   * @summary  Verify that the output has the right javascript.
    2.10   * @author   jamieh
    2.11   * @library  ../lib/
    2.12 @@ -50,11 +50,12 @@
    2.13              "<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>"},
    2.14          {BUG_ID + FS + "index.html",
    2.15              "<script type=\"text/javascript\">" + NL +
    2.16 -                        "    targetPage = \"\" + window.location.search;" + NL +
    2.17 -            "    if (targetPage != \"\" && targetPage != \"undefined\")" + NL +
    2.18 -            "        targetPage = targetPage.substring(1);" + NL +
    2.19 -            "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL +
    2.20 -            "        targetPage = \"undefined\";" + NL +
    2.21 +            "    tmpTargetPage = \"\" + window.location.search;" + NL +
    2.22 +            "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + NL +
    2.23 +            "        tmpTargetPage = tmpTargetPage.substring(1);" + NL +
    2.24 +            "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + NL +
    2.25 +            "        tmpTargetPage = \"undefined\";" + NL +
    2.26 +            "    targetPage = tmpTargetPage;" + NL +
    2.27              "    function validURL(url) {" + NL +
    2.28              "        try {" + NL +
    2.29              "            url = decodeURIComponent(url);" + NL +