Skip to content

The Unified and Autonomous Development Platform

Fix the issue that pressing ESC also closes fork dialog if user wants to escape from insert url dialog

robin shenfc4e431c9928
diff --git a/web/src/main/java/com/gitplex/server/web/assets/js/atwho/jquery.atwho.js b/web/src/main/java/com/gitplex/server/web/assets/js/atwho/jquery.atwho.js
index 22d7daa291..111ddfa919 100644
--- a/web/src/main/java/com/gitplex/server/web/assets/js/atwho/jquery.atwho.js
+++ b/web/src/main/java/com/gitplex/server/web/assets/js/atwho/jquery.atwho.js
@@ -188,8 +188,6 @@ App = (function() {
case KEY_CODE.ESC:
e.preventDefault();
if ((ref = this.controller()) != null) {
- if (ref.view.visible())
- this.$inputor.data("ignoreEsc", true);
ref.view.hide();
}
break;
@@ -223,7 +221,6 @@ App = (function() {
/*case KEY_CODE.ESC:
e.preventDefault();
view.hide(e);
- this.$inputor.data("ignoreEsc", true);
break;
*/
case KEY_CODE.UP:
diff --git a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.html b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.html
index 864bbe3663..5e42876d64 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.html
@@ -1,6 +1,7 @@
<wicket:panel>
<form wicket:id="form" class="create-branch">
<div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
<h4 class="modal-title">Specify Branch Name</h4>
</div>
<div class="modal-body">
@@ -8,10 +9,8 @@
<input wicket:id="name" class="form-control autofocus">
</div>
<div class="modal-footer">
- <div class="form-group">
- <button wicket:id="create" class="btn btn-primary">Create</button>
- <button wicket:id="cancel" class="btn btn-default">Cancel</button>
- </div>
+ <button wicket:id="create" class="btn btn-primary">Create</button>
+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>
</div>
</form>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java
index 3f0f17c4a0..88c575c2db 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/createbranch/CreateBranchPanel.java
@@ -91,6 +91,16 @@ abstract class CreateBranchPanel extends Panel {
}
});
+
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
+ });
+
add(form);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
index 322e8f4f12..e62cb42eca 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
+++ b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagLink.java
@@ -33,7 +33,7 @@ public abstract class CreateTagLink extends ModalLink {
@Override
protected Component newContent(String id, ModalPanel modal) {
- return new CreateTagPanel(id, projectModel, revision) {
+ return new CreateTagPanel(id, projectModel, null, revision) {
@Override
protected void onCreate(AjaxRequestTarget target, String tag) {
diff --git a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.html b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.html
index 7b67af4e3b..0a1e74593a 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.html
@@ -1,24 +1,25 @@
<wicket:panel>
<form wicket:id="form" class="create-tag">
<div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
<h4 class="modal-title">Create Tag</h4>
</div>
<div class="modal-body">
<div wicket:id="feedback"></div>
+ <wicket:enclosure child="name">
<div class="form-group">
<label>Tag Name</label>
<input wicket:id="name" class="form-control autofocus">
</div>
+ </wicket:enclosure>
<div class="form-group">
<label>Tag Message</label>
- <textarea wicket:id="message" rows="10" class="form-control"></textarea>
+ <textarea wicket:id="message" rows="10" class="form-control autofocus"></textarea>
</div>
</div>
<div class="modal-footer">
- <div class="form-group">
- <button wicket:id="create" class="btn btn-primary">Create</button>
- <button wicket:id="cancel" class="btn btn-default">Cancel</button>
- </div>
+ <button wicket:id="create" class="btn btn-primary">Create</button>
+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>
</div>
</form>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java
index a325352a5a..866368fbf7 100644
--- a/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/createtag/CreateTagPanel.java
@@ -1,8 +1,12 @@
package com.gitplex.server.web.component.createtag;
+import javax.annotation.Nullable;
+
+import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
@@ -21,7 +25,7 @@ import com.google.common.base.Preconditions;
import de.agilecoders.wicket.core.markup.html.bootstrap.common.NotificationPanel;
@SuppressWarnings("serial")
-abstract class CreateTagPanel extends Panel {
+public abstract class CreateTagPanel extends Panel {
private final IModel<Project> projectModel;
@@ -31,9 +35,10 @@ abstract class CreateTagPanel extends Panel {
private String tagMessage;
- public CreateTagPanel(String id, IModel<Project> projectModel, String revision) {
+ public CreateTagPanel(String id, IModel<Project> projectModel, @Nullable String tagName, String revision) {
super(id);
this.projectModel = projectModel;
+ this.tagName = tagName;
this.revision = revision;
}
@@ -45,25 +50,29 @@ abstract class CreateTagPanel extends Panel {
form.setOutputMarkupId(true);
form.add(new NotificationPanel("feedback", form));
- final TextField<String> nameInput;
- form.add(nameInput = new TextField<String>("name", new IModel<String>() {
+ Component nameInput;
+ if (tagName == null) {
+ form.add(nameInput = new TextField<String>("name", new IModel<String>() {
- @Override
- public void detach() {
- }
+ @Override
+ public void detach() {
+ }
- @Override
- public String getObject() {
- return tagName;
- }
+ @Override
+ public String getObject() {
+ return tagName;
+ }
- @Override
- public void setObject(String object) {
- tagName = object;
- }
-
- }));
- nameInput.setOutputMarkupId(true);
+ @Override
+ public void setObject(String object) {
+ tagName = object;
+ }
+
+ }));
+ nameInput.setOutputMarkupId(true);
+ } else {
+ form.add(nameInput = new WebMarkupContainer("name").setVisible(false));
+ }
form.add(new TextArea<String>("message", new IModel<String>() {
@@ -127,6 +136,14 @@ abstract class CreateTagPanel extends Panel {
onCancel(target);
}
+ });
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onCancel(target);
+ }
+
});
add(form);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
index 3411773bfe..a31c2c7587 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/InsertUrlPanel.html
@@ -3,7 +3,7 @@
<button wicket:id="close" type="button" class="close">&times;</button>
<h4 wicket:id="title" class="modal-title"></h4>
</div>
- <div class="modal-body insert-url no-autofocus">
+ <div class="modal-body insert-url">
<div class="section">
<div class="content">
<form wicket:id="urlForm" class="form-inline url">
diff --git a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
index 0ecdbcdacb..80e6f91bb6 100644
--- a/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
+++ b/web/src/main/java/com/gitplex/server/web/component/markdown/markdown.js
@@ -315,18 +315,15 @@ gitplex.server.markdown = {
"</div>");
// Make sure to append to body to avoid z-index issues causing modal to sit in background
$("body").append($modal);
- $modal.modal({show: true, backdrop: "static", keyboard: true});
+ $modal.modal({show: true, backdrop: "static", keyboard: false});
$modal.on('hidden.bs.modal', function (e) {
$modal.remove();
$input.focus();
});
- $modal.keydown(function(e) {
- if (e.keyCode == 27)
- $input.data("ignoreEsc", true);
- });
$modal.keyup(function(e) {
- if (e.keyCode == 27)
- $input.data("ignoreEsc", true);
+ if (e.keyCode == 27) {
+ $modal.modal("hide");
+ }
});
if (isImage)
callback("selectImage");
diff --git a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.html b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.html
index 5a44fe42a6..d508021e8c 100644
--- a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.html
@@ -1,7 +1,5 @@
<wicket:panel>
- <div class="modal">
- <div wicket:id="dialog" class="modal-dialog">
- <div wicket:id="content" class="modal-content"></div>
- </div>
+ <div wicket:id="dialog" class="modal-dialog">
+ <div wicket:id="content" class="modal-content"></div>
</div>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
index 759da92a38..08ef620659 100644
--- a/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/ModalPanel.java
@@ -72,6 +72,7 @@ public abstract class ModalPanel extends Panel {
});
+ add(AttributeAppender.append("class", "modal"));
setOutputMarkupId(true);
}
diff --git a/web/src/main/java/com/gitplex/server/web/component/modal/modal.js b/web/src/main/java/com/gitplex/server/web/component/modal/modal.js
index faa8e17fc4..feb7820719 100644
--- a/web/src/main/java/com/gitplex/server/web/component/modal/modal.js
+++ b/web/src/main/java/com/gitplex/server/web/component/modal/modal.js
@@ -1,13 +1,14 @@
gitplex.server.modal = {
onDomReady: function(containerId, closeCallback) {
- var $modal = $("#" + containerId + ">.modal");
+ var $modal = $("#" + containerId);
$modal.data("closeCallback", closeCallback);
$modal.data("keydown", function(e) {
if (e.keyCode == 27
&& $(".select2-drop:visible").length == 0
&& $("body>.floating").length == 0
- && $(".atwho-view:visible").length == 0) {
+ && $(".atwho-view:visible").length == 0
+ && $modal.nextAll(".modal").length == 0) {
gitplex.server.modal.close($modal, true);
}
});
@@ -24,7 +25,7 @@ gitplex.server.modal = {
$(document).off("keydown", $modal.data("keydown"));
- $modal.modal("hide").parent().remove();
+ $modal.modal("hide").remove();
}
};
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.html b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.html
deleted file mode 100644
index 4bf12bf8c1..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<wicket:panel>
- <form wicket:id="form" class="create-tag">
- <div class="modal-header">
- <h4 class="modal-title">Specify Tag Message</h4>
- </div>
- <div class="modal-body">
- <textarea wicket:id="message" rows="10" class="form-control autofocus"></textarea>
- </div>
- <div class="modal-footer">
- <div class="form-group">
- <button wicket:id="create" class="btn btn-primary">Create</button>
- <button wicket:id="cancel" class="btn btn-default">Cancel</button>
- </div>
- </div>
- </form>
-</wicket:panel>
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.java
deleted file mode 100644
index 27a0d951b1..0000000000
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/CreateTagPanel.java
+++ /dev/null
@@ -1,89 +0,0 @@
-package com.gitplex.server.web.component.revisionpicker;
-
-import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.AjaxLink;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
-import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.TextArea;
-import org.apache.wicket.markup.html.panel.Panel;
-import org.apache.wicket.model.IModel;
-
-import com.gitplex.server.GitPlex;
-import com.gitplex.server.manager.UserManager;
-import com.gitplex.server.model.User;
-import com.gitplex.server.model.Project;
-
-@SuppressWarnings("serial")
-abstract class CreateTagPanel extends Panel {
-
- private final IModel<Project> projectModel;
-
- private final String tagName;
-
- private final String revision;
-
- private String message;
-
- public CreateTagPanel(String id, IModel<Project> projectModel, String tagName, String revision) {
- super(id);
- this.projectModel = projectModel;
- this.tagName = tagName;
- this.revision = revision;
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
-
- Form<?> form = new Form<Void>("form");
- form.add(new TextArea<String>("message", new IModel<String>() {
-
- @Override
- public void detach() {
- }
-
- @Override
- public String getObject() {
- return message;
- }
-
- @Override
- public void setObject(String obj) {
- message = obj;
- }
-
- }));
- form.add(new AjaxButton("create") {
-
- @Override
- protected void onSubmit(AjaxRequestTarget target, Form<?> form) {
- super.onSubmit(target, form);
-
- User user = GitPlex.getInstance(UserManager.class).getCurrent();
- projectModel.getObject().tag(tagName, revision, user.asPerson(), message);
- onCreate(target, tagName);
- }
-
- });
- form.add(new AjaxLink<Void>("cancel") {
-
- @Override
- public void onClick(AjaxRequestTarget target) {
- onCancel(target);
- }
-
- });
- add(form);
- }
-
- protected abstract void onCreate(AjaxRequestTarget target, String tagName);
-
- protected abstract void onCancel(AjaxRequestTarget target);
-
- @Override
- protected void onDetach() {
- projectModel.detach();
- super.onDetach();
- }
-
-}
diff --git a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java
index dddd8aa572..d7e8e1fa62 100644
--- a/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java
+++ b/web/src/main/java/com/gitplex/server/web/component/revisionpicker/RevisionSelector.java
@@ -44,6 +44,7 @@ import com.gitplex.server.security.SecurityUtils;
import com.gitplex.server.web.behavior.AbstractPostAjaxBehavior;
import com.gitplex.server.web.behavior.InputChangeBehavior;
import com.gitplex.server.web.behavior.infinitescroll.InfiniteScrollBehavior;
+import com.gitplex.server.web.component.createtag.CreateTagPanel;
import com.gitplex.server.web.component.link.ViewStateAwareAjaxLink;
import com.gitplex.server.web.component.modal.ModalPanel;
import com.gitplex.server.web.component.tabbable.AjaxActionTab;
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.html b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.html
index bbaa1c7a61..48d9b26616 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.html
+++ b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.html
@@ -1,11 +1,15 @@
<wicket:panel>
- <div class="fork-options">
- <form wicket:id="form" class="leave-confirm">
+ <form wicket:id="form" class="leave-confirm">
+ <div class="modal-header">
+ <button wicket:id="close" type="button" class="close">&times;</button>
+ <h4 class="modal-title">Fork Project</h4>
+ </div>
+ <div class="modal-body">
<div wicket:id="editor"></div>
- <div class="actions">
- <button wicket:id="save" class="btn btn-primary">Ok</button>
- <button wicket:id="cancel" class="btn btn-default">Cancel</button>
- </div>
- </form>
- </div>
+ </div>
+ <div class="modal-footer">
+ <button wicket:id="save" class="btn btn-primary">Ok</button>
+ <button wicket:id="cancel" class="btn btn-default">Cancel</button>
+ </div>
+ </form>
</wicket:panel>
\ No newline at end of file
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.java b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.java
index ffe9363655..29d6eb44fc 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.java
+++ b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/ForkOptionPanel.java
@@ -74,6 +74,15 @@ abstract class ForkOptionPanel extends Panel {
}
});
+ form.add(new AjaxLink<Void>("close") {
+
+ @Override
+ public void onClick(AjaxRequestTarget target) {
+ onClose(target);
+ }
+
+ });
+
add(form);
}
diff --git a/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/more-info.css b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/more-info.css
index 65507831e1..d83ca4c789 100644
--- a/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/more-info.css
+++ b/web/src/main/java/com/gitplex/server/web/page/project/moreinfo/more-info.css
@@ -33,7 +33,3 @@
.project.more-info>.clone input {
background: white;
}
-
-.modal-content>.fork-options {
- padding: 20px;
-}
\ No newline at end of file