Skip to content

The Unified and Autonomous Development Platform

Fix the issue that active job is incorrect in firefox after job sorting

Robin Shen1de8e4a5ca5b
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css
index 11a22b0b36..2f645b5f82 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.css
@@ -101,6 +101,9 @@
.ci-spec>.valid .bean-properties>table>tbody>tr>td.name {
width: 200px;
}
+.ci-spec>.valid .bean-properties>table>tbody>tr.property-retry td.name {
+ width: 100px;
+}
.ci-spec>.valid .bean-properties>table>tbody>tr>td.value .form-control {
height: 32px;
font-size: 13px;
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js
index da0849c81c..d161007cca 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/ci-spec.js
@@ -22,14 +22,19 @@ onedev.server.ciSpec = {
onedev.server.ciSpec.showJob(activeJobIndex);
- $body.find(".side>.navs>.nav>.select").click(onedev.server.ciSpec.selectJob);
+ // use mouseup together with ui-sortable-helper (see selectJob method) class check
+ // to avoid the issue that sortable will fire onclick event in firefox (hence cause
+ // the job being selected while sorting
+ $body.find(".side>.navs>.nav>.select").mouseup(onedev.server.ciSpec.selectJob);
},
selectJob: function() {
var $nav = $(this).parent();
- onedev.server.ciSpec.showJob($nav.index());
- var $body = $(".ci-spec>.valid>.jobs>.body");
- if ($body.data("callback"))
- $body.data("callback")("jobs/" + $nav.data("name"));
+ if (!$nav.hasClass("ui-sortable-helper")) {
+ onedev.server.ciSpec.showJob($nav.index());
+ var $body = $(".ci-spec>.valid>.jobs>.body");
+ if ($body.data("callback"))
+ $body.data("callback")("jobs/" + $nav.data("name"));
+ }
},
showJob: function(index) {
var $body = $(".ci-spec>.valid>.jobs>.body");