Skip to content

The Unified and Autonomous Development Platform

Fix cispec job sort issue on firefox - again

Robin Shen5db707ac085a
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java
index 845db4ea33..c6327efe39 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecBlobViewPanel.java
@@ -29,7 +29,7 @@ import io.onedev.server.web.page.project.blob.render.view.BlobViewPanel;
@SuppressWarnings("serial")
public class CISpecBlobViewPanel extends BlobViewPanel {
- private AbstractPostAjaxBehavior behavior;
+ private AbstractPostAjaxBehavior selectBehavior;
public CISpecBlobViewPanel(String id, BlobRenderContext context) {
super(id, context);
@@ -74,7 +74,7 @@ public class CISpecBlobViewPanel extends BlobViewPanel {
add(invalidFrag);
}
- add(behavior = new AbstractPostAjaxBehavior() {
+ add(selectBehavior = new AbstractPostAjaxBehavior() {
@Override
protected void respond(AjaxRequestTarget target) {
@@ -94,7 +94,7 @@ public class CISpecBlobViewPanel extends BlobViewPanel {
String selection = CISpecRendererProvider.getSelection(context.getPosition());
String script = String.format("onedev.server.ciSpec.onDomReady(%s, %s);",
selection!=null? "'" + JavaScriptEscape.escapeJavaScript(selection) + "'": "undefined",
- behavior.getCallbackFunction(CallbackParameter.explicit("selection")));
+ selectBehavior.getCallbackFunction(CallbackParameter.explicit("selection")));
response.render(OnDomReadyHeaderItem.forScript(script));
}
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html
index 1a8e9f7c22..3116941505 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.html
@@ -15,7 +15,7 @@
<span class="drag-indicator"><i class="fa fa-reorder"></i></span>
<span class="name"></span>
</a>
- <a wicket:id="delete" title="Delete job" class="delete"><i class="fa fa-trash"></i></a>
+ <a title="Delete job" class="delete"><i class="fa fa-trash"></i></a>
</div></div>
<a wicket:id="add" class="add btn btn-success btn-block">
<i class="fa fa-plus"></i> Add New
diff --git a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java
index 96d1ae2485..5416e17084 100644
--- a/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java
+++ b/server-core/src/main/java/io/onedev/server/web/page/project/blob/render/renderers/cispec/CISpecEditPanel.java
@@ -7,6 +7,7 @@ import javax.validation.Validator;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.attributes.CallbackParameter;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.behavior.AttributeAppender;
import org.apache.wicket.behavior.Behavior;
@@ -18,6 +19,7 @@ import org.apache.wicket.markup.html.form.FormComponentPanel;
import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.markup.repeater.RepeatingView;
import org.apache.wicket.model.Model;
+import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.validation.IValidatable;
import org.apache.wicket.validation.IValidator;
import org.unbescape.javascript.JavaScriptEscape;
@@ -31,15 +33,16 @@ import io.onedev.server.ci.CISpecAware;
import io.onedev.server.ci.job.Job;
import io.onedev.server.ci.job.JobAware;
import io.onedev.server.migration.VersionedDocument;
+import io.onedev.server.web.behavior.AbstractPostAjaxBehavior;
import io.onedev.server.web.behavior.sortable.SortBehavior;
import io.onedev.server.web.behavior.sortable.SortPosition;
import io.onedev.server.web.component.MultilineLabel;
import io.onedev.server.web.editable.BeanDescriptor;
import io.onedev.server.web.editable.BeanEditor;
+import io.onedev.server.web.editable.Path;
import io.onedev.server.web.editable.PathNode;
import io.onedev.server.web.editable.PathNode.Indexed;
import io.onedev.server.web.editable.PathNode.Named;
-import io.onedev.server.web.editable.Path;
import io.onedev.server.web.page.project.blob.render.BlobRenderContext;
import io.onedev.server.web.util.WicketUtils;
@@ -54,6 +57,8 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe
private RepeatingView jobContents;
+ private AbstractPostAjaxBehavior deleteBehavior;
+
public CISpecEditPanel(String id, BlobRenderContext context, byte[] initialContent) {
super(id, Model.of(initialContent));
this.context = context;
@@ -73,23 +78,8 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe
private Component newJobNav(Job job) {
WebMarkupContainer nav = new WebMarkupContainer(jobNavs.newChildId());
-
- nav.add(new AjaxLink<Void>("delete") {
-
- @SuppressWarnings("deprecation")
- @Override
- public void onClick(AjaxRequestTarget target) {
- int index = WicketUtils.getChildIndex(jobNavs, nav);
- jobNavs.remove(nav);
- jobContents.remove(jobContents.get(index));
- target.appendJavaScript(String.format("onedev.server.ciSpec.edit.deleteJob(%d);", index));
- }
-
- });
nav.add(AttributeAppender.append("data-name", job.getName()));
-
jobNavs.add(nav.setOutputMarkupId(true));
-
return nav;
}
@@ -114,11 +104,11 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe
protected void onInitialize() {
super.onInitialize();
- Fragment validFrag;
+ Fragment content;
if (parseResult instanceof CISpec) {
CISpec ciSpec = (CISpec) parseResult;
- validFrag = new Fragment("content", "validFrag", this);
+ content = new Fragment("content", "validFrag", this);
jobNavs = new RepeatingView("navs");
jobContents = new RepeatingView("contents");
@@ -126,10 +116,10 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe
newJobNav(job);
newJobContent(job);
}
- validFrag.add(jobNavs);
- validFrag.add(jobContents);
+ content.add(jobNavs);
+ content.add(jobContents);
- validFrag.add(new AjaxLink<Void>("add") {
+ content.add(new AjaxLink<Void>("add") {
@Override
public void onClick(AjaxRequestTarget target) {
@@ -149,14 +139,15 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe
script = String.format(""
+ "onedev.server.ciSpec.showJob(%d); "
- + "$('#%s .select').click(onedev.server.ciSpec.selectJob);",
- jobNavs.size() - 1, nav.getMarkupId());
+ + "$('#%s .select').mouseup(onedev.server.ciSpec.selectJob);"
+ + "$('#%s .delete').mouseup(onedev.server.ciSpec.deleteJob);",
+ jobNavs.size() - 1, nav.getMarkupId(), nav.getMarkupId());
target.appendJavaScript(script);
}
});
- validFrag.add(new SortBehavior() {
+ content.add(new SortBehavior() {
@SuppressWarnings("deprecation")
@Override
@@ -220,10 +211,22 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe
});
} else {
- validFrag = new Fragment("content", "invalidFrag", this);
- validFrag.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString((Throwable) parseResult)));
+ content = new Fragment("content", "invalidFrag", this);
+ content.add(new MultilineLabel("errorMessage", Throwables.getStackTraceAsString((Throwable) parseResult)));
}
- add(validFrag);
+ add(content);
+
+ add(deleteBehavior = new AbstractPostAjaxBehavior() {
+
+ @SuppressWarnings("deprecation")
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ int index = RequestCycle.get().getRequest().getRequestParameters().getParameterValue("index").toInt();
+ jobNavs.remove(jobNavs.get(index));
+ jobContents.remove(jobContents.get(index));
+ }
+
+ });
}
@Override
@@ -241,8 +244,10 @@ public class CISpecEditPanel extends FormComponentPanel<byte[]> implements CISpe
super.renderHead(response);
response.render(JavaScriptHeaderItem.forReference(new CISpecResourceReference()));
String selection = CISpecRendererProvider.getSelection(context.getPosition());
- String script = String.format("onedev.server.ciSpec.onDomReady(%s);",
- selection!=null? "'" + JavaScriptEscape.escapeJavaScript(selection) + "'": "undefined");
+
+ String script = String.format("onedev.server.ciSpec.onDomReady(%s, undefined, %s);",
+ selection!=null? "'" + JavaScriptEscape.escapeJavaScript(selection) + "'": "undefined",
+ deleteBehavior.getCallbackFunction(CallbackParameter.explicit("index")));
response.render(OnDomReadyHeaderItem.forScript(script));
}
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 d161007cca..608fcafaa9 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
@@ -1,8 +1,9 @@
onedev.server.ciSpec = {
- onDomReady: function(selection, callback) {
+ onDomReady: function(selection, selectCallback, deleteCallback) {
var activeJobIndex = -1;
var $body = $(".ci-spec>.valid>.jobs>.body");
- $body.data("callback", callback);
+ $body.data("selectCallback", selectCallback);
+ $body.data("deleteCallback", deleteCallback);
$body.find(">.contents>.content").each(function() {
var $this = $(this);
@@ -26,14 +27,15 @@ onedev.server.ciSpec = {
// 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);
+ $body.find(".side>.navs>.nav>.delete").mouseup(onedev.server.ciSpec.edit.deleteJob);
},
selectJob: function() {
var $nav = $(this).parent();
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"));
+ if ($body.data("selectCallback"))
+ $body.data("selectCallback")("jobs/" + $nav.data("name"));
}
},
showJob: function(index) {
@@ -50,17 +52,22 @@ onedev.server.ciSpec = {
onedev.server.focus.doFocus($content);
},
edit: {
- deleteJob: function(index) {
- var $body = $(".ci-spec-edit .jobs>.body");
- var $navs = $body.find(">.side>.navs");
- var $contents = $body.children(".contents");
+ deleteJob: function() {
+ var $nav = $(this).parent();
+ if (!$nav.hasClass("ui-sortable-helper")) {
+ var $body = $(".ci-spec-edit .jobs>.body");
+ var $navs = $body.find(">.side>.navs");
+ var $contents = $body.children(".contents");
+ var index = $nav.index();
+ var $nav = $navs.children().eq(index);
+ $nav.remove();
+ $contents.children().eq(index).remove();
- var $nav = $navs.children().eq(index);
- $nav.remove();
- $contents.children().eq(index).remove();
-
- if ($nav.hasClass("active"))
- onedev.server.ciSpec.showJob(0);
+ if ($nav.hasClass("active"))
+ onedev.server.ciSpec.showJob(0);
+
+ $body.data("deleteCallback")(index);
+ }
},
swapJobs: function(index1, index2) {
var $contents = $(".ci-spec-edit .jobs>.body>.contents");