Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
openanolis
dragonwell8_langtools
提交
6ea2c144
D
dragonwell8_langtools
项目概览
openanolis
/
dragonwell8_langtools
通知
0
Star
2
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
D
dragonwell8_langtools
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
提交
6ea2c144
编写于
10月 04, 2013
作者:
B
bpatel
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
8024756: method grouping tabs are not selectable
Reviewed-by: jjg
上级
8bbcd4ea
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
23 addition
and
11 deletion
+23
-11
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
...com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
+6
-2
test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java
...om/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java
+9
-5
test/com/sun/javadoc/testJavascript/TestJavascript.java
test/com/sun/javadoc/testJavascript/TestJavascript.java
+8
-4
未找到文件。
src/share/classes/com/sun/tools/doclets/formats/html/markup/HtmlWriter.java
浏览文件 @
6ea2c144
...
@@ -310,8 +310,12 @@ public class HtmlWriter {
...
@@ -310,8 +310,12 @@ public class HtmlWriter {
if
(
winTitle
!=
null
&&
winTitle
.
length
()
>
0
)
{
if
(
winTitle
!=
null
&&
winTitle
.
length
()
>
0
)
{
script
.
addAttr
(
HtmlAttr
.
TYPE
,
"text/javascript"
);
script
.
addAttr
(
HtmlAttr
.
TYPE
,
"text/javascript"
);
String
scriptCode
=
"<!--"
+
DocletConstants
.
NL
+
String
scriptCode
=
"<!--"
+
DocletConstants
.
NL
+
" if (location.href.indexOf('is-external=true') == -1) {"
+
DocletConstants
.
NL
+
" try {"
+
DocletConstants
.
NL
+
" parent.document.title=\""
+
winTitle
+
"\";"
+
DocletConstants
.
NL
+
" if (location.href.indexOf('is-external=true') == -1) {"
+
DocletConstants
.
NL
+
" parent.document.title=\""
+
winTitle
+
"\";"
+
DocletConstants
.
NL
+
" }"
+
DocletConstants
.
NL
+
" }"
+
DocletConstants
.
NL
+
" catch(err) {"
+
DocletConstants
.
NL
+
" }"
+
DocletConstants
.
NL
+
" }"
+
DocletConstants
.
NL
+
"//-->"
+
DocletConstants
.
NL
;
"//-->"
+
DocletConstants
.
NL
;
RawHtml
scriptContent
=
new
RawHtml
(
scriptCode
);
RawHtml
scriptContent
=
new
RawHtml
(
scriptCode
);
...
...
test/com/sun/javadoc/JavascriptWinTitle/JavascriptWinTitle.java
浏览文件 @
6ea2c144
/*
/*
* Copyright (c) 2002, 201
0
, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2002, 201
3
, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
*
* This code is free software; you can redistribute it and/or modify it
* This code is free software; you can redistribute it and/or modify it
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
/*
/*
* @test
* @test
* @bug 4645058 4747738 4855054
* @bug 4645058 4747738 4855054
8024756
* @summary Javascript IE load error when linked by -linkoffline
* @summary Javascript IE load error when linked by -linkoffline
* Window title shouldn't change when loading left frames (javascript)
* Window title shouldn't change when loading left frames (javascript)
* @author dkramer
* @author dkramer
...
@@ -115,9 +115,13 @@ public class JavascriptWinTitle {
...
@@ -115,9 +115,13 @@ public class JavascriptWinTitle {
// Test that win title javascript is followed by NOSCRIPT code.
// Test that win title javascript is followed by NOSCRIPT code.
{
"<script type=\"text/javascript\"><!--"
+
LS
+
{
"<script type=\"text/javascript\"><!--"
+
LS
+
" if (location.href.indexOf('is-external=true') == -1) {"
+
LS
+
" try {"
+
LS
+
" parent.document.title=\"C (Window Title)\";"
+
LS
+
" if (location.href.indexOf('is-external=true') == -1) {"
+
LS
+
" }"
+
LS
+
"//-->"
+
LS
+
"</script>"
,
" parent.document.title=\"C (Window Title)\";"
+
LS
+
" }"
+
LS
+
" }"
+
LS
+
" catch(err) {"
+
LS
+
" }"
+
LS
+
"//-->"
+
LS
+
"</script>"
,
TMPDEST_DIR1
+
FS
+
"p1"
+
FS
+
"C.html"
TMPDEST_DIR1
+
FS
+
"p1"
+
FS
+
"C.html"
}
}
...
...
test/com/sun/javadoc/testJavascript/TestJavascript.java
浏览文件 @
6ea2c144
...
@@ -23,7 +23,7 @@
...
@@ -23,7 +23,7 @@
/*
/*
* @test
* @test
* @bug 4665566 4855876 7025314 8012375 8015997 8016328
* @bug 4665566 4855876 7025314 8012375 8015997 8016328
8024756
* @summary Verify that the output has the right javascript.
* @summary Verify that the output has the right javascript.
* @author jamieh
* @author jamieh
* @library ../lib/
* @library ../lib/
...
@@ -104,9 +104,13 @@ public class TestJavascript extends JavadocTester {
...
@@ -104,9 +104,13 @@ public class TestJavascript extends JavadocTester {
//Make sure title javascript only runs if is-external is not true
//Make sure title javascript only runs if is-external is not true
{
BUG_ID
+
FS
+
"pkg"
+
FS
+
"C.html"
,
{
BUG_ID
+
FS
+
"pkg"
+
FS
+
"C.html"
,
" if (location.href.indexOf('is-external=true') == -1) {"
+
NL
+
" try {"
+
NL
+
" parent.document.title=\"C\";"
+
NL
+
" if (location.href.indexOf('is-external=true') == -1) {"
+
NL
+
" }"
},
" parent.document.title=\"C\";"
+
NL
+
" }"
+
NL
+
" }"
+
NL
+
" catch(err) {"
+
NL
+
" }"
},
};
};
private
static
final
String
[][]
NEGATED_TEST
=
NO_TEST
;
private
static
final
String
[][]
NEGATED_TEST
=
NO_TEST
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录