Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/.hgtags	Tue Jul 19 15:41:14 2016 -0700
     1.2 +++ b/.hgtags	Wed Jul 20 15:13:13 2016 -0700
     1.3 @@ -593,6 +593,9 @@
     1.4  12846c3fc5a151a33e9446eff6e6704110c00362 jdk8u92-b13
     1.5  c99c71a68555038fdd1e86a10dab9c9007ec3745 jdk8u92-b14
     1.6  71176efa69475fc737d1245a28e739ddf105fd1c jdk8u92-b31
     1.7 +4e8ce6c84e4ca9dd385012c10e059c15dbfcc468 jdk8u92-b32
     1.8 +18568fe46895af6a7b562ffe6334a24fb5d9ee50 jdk8u92-b33
     1.9 +3ca74ce54c351db2ac551e495a8b7ee65fb09e64 jdk8u92-b34
    1.10  580f87c4d91aa8cc493dbbd84a1be9671fd733f3 jdk8u81-b00
    1.11  a93c1e57407944362e05c79d756425e8c1274d9a jdk8u101-b01
    1.12  86a9d99ffadaf26b3d8417666a3600ea1ce7560f jdk8u101-b02
    1.13 @@ -628,6 +631,13 @@
    1.14  16c58d7af5a4937e46bccd58114a56a7ffcd685c jdk8u102-b12
    1.15  56b0df415b570e31dc0b97d4a1c8f28b85240089 jdk8u102-b13
    1.16  0549bf2f507dae59bfcd7d11e038cdc62376fee7 jdk8u102-b14
    1.17 +d86027f25a9aa960d69cf3a524588a873ae888f5 jdk8u102-b31
    1.18 +90f493bfe1faca0573844fdd2497070c8b224d76 jdk8u111-b00
    1.19 +085fd7e08f4855f134a8048251c4535ddde1feee jdk8u111-b01
    1.20 +f66a535fb6b3b41419c987cc90407507a64712b2 jdk8u111-b02
    1.21 +386c8bc6dd3ea0d49ea483cbbe95f4b12b66db23 jdk8u111-b03
    1.22 +fd9b6417c521c5ec26224129d90b38d40c04c54d jdk8u111-b04
    1.23 +5710d574a99aeff3600c49a4aed34fa1b373f7b8 jdk8u111-b05
    1.24  27503e49de52b54dde3a12af28e2d2de473192b3 jdk8u112-b00
    1.25  60a0572cd449e33b7d48b5a40065222ab5accd36 jdk8u112-b01
    1.26  6e20b82db75fbaf5a3e10455d1a28c17381f4be6 jdk8u112-b02

     2.1 --- a/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Tue Jul 19 15:41:14 2016 -0700
     2.2 +++ b/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java	Wed Jul 20 15:13:13 2016 -0700
     2.3 @@ -380,11 +380,12 @@
     2.4          HtmlTree script = new HtmlTree(HtmlTag.SCRIPT);
     2.5          script.addAttr(HtmlAttr.TYPE, "text/javascript");
     2.6          String scriptCode = DocletConstants.NL +
     2.7 -                "    targetPage = \"\" + window.location.search;" + DocletConstants.NL +
     2.8 -                "    if (targetPage != \"\" && targetPage != \"undefined\")" + DocletConstants.NL +
     2.9 -                "        targetPage = targetPage.substring(1);" + DocletConstants.NL +
    2.10 -                "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
    2.11 -                "        targetPage = \"undefined\";" + DocletConstants.NL +
    2.12 +                "    tmpTargetPage = \"\" + window.location.search;" + DocletConstants.NL +
    2.13 +                "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + DocletConstants.NL +
    2.14 +                "        tmpTargetPage = tmpTargetPage.substring(1);" + DocletConstants.NL +
    2.15 +                "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + DocletConstants.NL +
    2.16 +                "        tmpTargetPage = \"undefined\";" + DocletConstants.NL +
    2.17 +                "    targetPage = tmpTargetPage;" + DocletConstants.NL +
    2.18                  "    function validURL(url) {" + DocletConstants.NL +
    2.19                  "        try {" + DocletConstants.NL +
    2.20                  "            url = decodeURIComponent(url);" + DocletConstants.NL +

     3.1 --- a/test/com/sun/javadoc/testJavascript/TestJavascript.java	Tue Jul 19 15:41:14 2016 -0700
     3.2 +++ b/test/com/sun/javadoc/testJavascript/TestJavascript.java	Wed Jul 20 15:13:13 2016 -0700
     3.3 @@ -23,7 +23,7 @@
     3.4  
     3.5  /*
     3.6   * @test
     3.7 - * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756
     3.8 + * @bug      4665566 4855876 7025314 8012375 8015997 8016328 8024756 8151921
     3.9   * @summary  Verify that the output has the right javascript.
    3.10   * @author   jamieh
    3.11   * @library  ../lib/
    3.12 @@ -50,11 +50,12 @@
    3.13              "<a href=\"index.html?TestJavascript.html\" target=\"_top\">Frames</a>"},
    3.14          {BUG_ID + FS + "index.html",
    3.15              "<script type=\"text/javascript\">" + NL +
    3.16 -                        "    targetPage = \"\" + window.location.search;" + NL +
    3.17 -            "    if (targetPage != \"\" && targetPage != \"undefined\")" + NL +
    3.18 -            "        targetPage = targetPage.substring(1);" + NL +
    3.19 -            "    if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL +
    3.20 -            "        targetPage = \"undefined\";" + NL +
    3.21 +            "    tmpTargetPage = \"\" + window.location.search;" + NL +
    3.22 +            "    if (tmpTargetPage != \"\" && tmpTargetPage != \"undefined\")" + NL +
    3.23 +            "        tmpTargetPage = tmpTargetPage.substring(1);" + NL +
    3.24 +            "    if (tmpTargetPage.indexOf(\":\") != -1 || (tmpTargetPage != \"\" && !validURL(tmpTargetPage)))" + NL +
    3.25 +            "        tmpTargetPage = \"undefined\";" + NL +
    3.26 +            "    targetPage = tmpTargetPage;" + NL +
    3.27              "    function validURL(url) {" + NL +
    3.28              "        try {" + NL +
    3.29              "            url = decodeURIComponent(url);" + NL +