Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
xxadev
jenkins
提交
121a6e01
J
jenkins
项目概览
xxadev
/
jenkins
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
J
jenkins
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
121a6e01
编写于
4月 18, 2017
作者:
J
Jesse Glick
浏览文件
操作
浏览文件
下载
差异文件
Merge commit '
33942677
' into security-master
上级
f7075e60
33942677
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
43 addition
and
14 deletion
+43
-14
cli/pom.xml
cli/pom.xml
+1
-1
core/pom.xml
core/pom.xml
+1
-1
core/src/main/java/hudson/model/UpdateCenter.java
core/src/main/java/hudson/model/UpdateCenter.java
+4
-1
pom.xml
pom.xml
+1
-1
test/pom.xml
test/pom.xml
+1
-1
war/pom.xml
war/pom.xml
+1
-1
war/src/main/js/pluginSetupWizardGui.js
war/src/main/js/pluginSetupWizardGui.js
+34
-8
未找到文件。
cli/pom.xml
浏览文件 @
121a6e01
...
...
@@ -5,7 +5,7 @@
<parent>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
pom
</artifactId>
<version>
2.5
5
-SNAPSHOT
</version>
<version>
2.5
6
-SNAPSHOT
</version>
</parent>
<artifactId>
cli
</artifactId>
...
...
core/pom.xml
浏览文件 @
121a6e01
...
...
@@ -29,7 +29,7 @@ THE SOFTWARE.
<parent>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
pom
</artifactId>
<version>
2.5
5
-SNAPSHOT
</version>
<version>
2.5
6
-SNAPSHOT
</version>
</parent>
<artifactId>
jenkins-core
</artifactId>
...
...
core/src/main/java/hudson/model/UpdateCenter.java
浏览文件 @
121a6e01
...
...
@@ -1931,8 +1931,11 @@ public class UpdateCenter extends AbstractModelObject implements Saveable, OnMas
throw
new
RuntimeException
(
e
);
}
}
// Must check for success, otherwise may have failed installation
if
(
ij
.
status
instanceof
Success
)
{
return
true
;
}
}
return
true
;
}
}
}
...
...
pom.xml
浏览文件 @
121a6e01
...
...
@@ -33,7 +33,7 @@ THE SOFTWARE.
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
pom
</artifactId>
<version>
2.5
5
-SNAPSHOT
</version>
<version>
2.5
6
-SNAPSHOT
</version>
<packaging>
pom
</packaging>
<name>
Jenkins main module
</name>
...
...
test/pom.xml
浏览文件 @
121a6e01
...
...
@@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
pom
</artifactId>
<version>
2.5
5
-SNAPSHOT
</version>
<version>
2.5
6
-SNAPSHOT
</version>
</parent>
<artifactId>
test
</artifactId>
...
...
war/pom.xml
浏览文件 @
121a6e01
...
...
@@ -28,7 +28,7 @@ THE SOFTWARE.
<parent>
<groupId>
org.jenkins-ci.main
</groupId>
<artifactId>
pom
</artifactId>
<version>
2.5
5
-SNAPSHOT
</version>
<version>
2.5
6
-SNAPSHOT
</version>
</parent>
<artifactId>
jenkins-war
</artifactId>
...
...
war/src/main/js/pluginSetupWizardGui.js
浏览文件 @
121a6e01
...
...
@@ -461,9 +461,34 @@ var createPluginSetupWizard = function(appendTarget) {
setPanel
(
pluginSuccessPanel
,
{
installingPlugins
:
installingPlugins
,
failedPlugins
:
true
});
return
;
}
var
attachScrollEvent
=
function
()
{
var
$c
=
$
(
'
.install-console-scroll
'
);
if
(
!
$c
.
length
)
{
setTimeout
(
attachScrollEvent
,
50
);
return
;
}
var
events
=
$
.
_data
(
$c
[
0
],
"
events
"
);
if
(
!
events
||
!
events
.
scroll
)
{
$c
.
on
(
'
scroll
'
,
function
()
{
if
(
!
$c
.
data
(
'
wasAutoScrolled
'
))
{
var
top
=
$c
[
0
].
scrollHeight
-
$c
.
height
();
if
(
$c
.
scrollTop
()
===
top
)
{
// resume auto-scroll
$c
.
data
(
'
userScrolled
'
,
false
);
}
else
{
// user scrolled up
$c
.
data
(
'
userScrolled
'
,
true
);
}
}
else
{
$c
.
data
(
'
wasAutoScrolled
'
,
false
);
}
});
}
};
initInstallingPluginList
();
setPanel
(
progressPanel
,
{
installingPlugins
:
installingPlugins
});
setPanel
(
progressPanel
,
{
installingPlugins
:
installingPlugins
}
,
attachScrollEvent
);
// call to the installStatus, update progress bar & plugin details; transition on complete
var
updateStatus
=
function
()
{
...
...
@@ -491,8 +516,8 @@ var createPluginSetupWizard = function(appendTarget) {
$
(
'
.progress-bar
'
).
css
({
width
:
((
100.0
*
complete
)
/
total
)
+
'
%
'
});
// update details
var
$
c
=
$
(
'
.install-text
'
);
$
c
.
children
().
remove
();
var
$
txt
=
$
(
'
.install-text
'
);
$
txt
.
children
().
remove
();
for
(
i
=
0
;
i
<
jobs
.
length
;
i
++
)
{
j
=
jobs
[
i
];
...
...
@@ -538,7 +563,7 @@ var createPluginSetupWizard = function(appendTarget) {
else
{
$div
.
addClass
(
'
dependent
'
);
}
$
c
.
append
(
$div
);
$
txt
.
append
(
$div
);
var
$itemProgress
=
$
(
'
.selected-plugin[id="installing-
'
+
jenkins
.
idIfy
(
j
.
name
)
+
'
"]
'
);
if
(
$itemProgress
.
length
>
0
&&
!
$itemProgress
.
is
(
'
.
'
+
state
))
{
...
...
@@ -547,13 +572,14 @@ var createPluginSetupWizard = function(appendTarget) {
}
}
$c
=
$
(
'
.install-console-scroll
'
);
if
(
$c
.
is
(
'
:visible
'
))
{
var
$c
=
$
(
'
.install-console-scroll
'
);
if
(
$c
&&
$c
.
is
(
'
:visible
'
)
&&
!
$c
.
data
(
'
userScrolled
'
))
{
$c
.
data
(
'
wasAutoScrolled
'
,
true
);
$c
.
scrollTop
(
$c
[
0
].
scrollHeight
);
}
// keep polling while install is running
if
(
complete
<
total
||
data
.
state
===
'
INITIAL_PLUGINS_INSTALLING
'
)
{
if
(
complete
<
total
&&
data
.
state
===
'
INITIAL_PLUGINS_INSTALLING
'
)
{
setPanel
(
progressPanel
,
{
installingPlugins
:
installingPlugins
});
// wait a sec
setTimeout
(
updateStatus
,
250
);
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录