infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-03 18:25:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge

Browse Source
This commit is contained in:
Chris Hegarty 2013-06-11 09:25:57 +01:00
commit d758772ec0
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
langtools/src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
View File

@ -314,7 +314,8 @@ public class HtmlWriter {
" if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + DocletConstants.NL +
" targetPage = \"undefined\";" + DocletConstants.NL +
" function validURL(url) {" + DocletConstants.NL +
" if (!(url.indexOf(\".html\") == url.length - 5))" + DocletConstants.NL +
" var pos = url.indexOf(\".html\");" + DocletConstants.NL +
" if (pos == -1 || pos != url.length - 5)" + DocletConstants.NL +
" return false;" + DocletConstants.NL +
" var allowNumber = false;" + DocletConstants.NL +
" var allowSep = false;" + DocletConstants.NL +

5
langtools/test/com/sun/javadoc/testJavascript/TestJavascript.java
View File

@ -23,7 +23,7 @@
/*
* @test
* @bug 4665566 4855876 7025314 8012375
* @bug 4665566 4855876 7025314 8012375 8015997
* @summary Verify that the output has the right javascript.
* @author jamieh
* @library ../lib/
@ -56,7 +56,8 @@ public class TestJavascript extends JavadocTester {
" if (targetPage.indexOf(\":\") != -1 || (targetPage != \"\" && !validURL(targetPage)))" + NL +
" targetPage = \"undefined\";" + NL +
" function validURL(url) {" + NL +
" if (!(url.indexOf(\".html\") == url.length - 5))" + NL +
" var pos = url.indexOf(\".html\");" + NL +
" if (pos == -1 || pos != url.length - 5)" + NL +
" return false;" + NL +
" var allowNumber = false;" + NL +
" var allowSep = false;" + NL +