You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2013/12/12 13:47:02 UTC
[1/2] git commit: ISIS-633: escape button for action prompt dialog.
Updated Branches:
refs/heads/master a8381b5d6 -> 08d5ca7b0
ISIS-633: escape button for action prompt dialog.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/d8dbc05b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/d8dbc05b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/d8dbc05b
Branch: refs/heads/master
Commit: d8dbc05b4cb49f88c4f1bd398400f0af21a0d068
Parents: a8381b5
Author: Dan Haywood <da...@apache.org>
Authored: Thu Dec 12 12:45:49 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Dec 12 12:45:49 2013 +0000
----------------------------------------------------------------------
.../actionprompt/ActionPromptModalWindow.java | 32 ++++++++++++++++++++
.../ui/pages/jquery.isis.wicket.viewer.js | 19 +++++-------
2 files changed, 40 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/d8dbc05b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
index 3878e57..44ce9c9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actionprompt/ActionPromptModalWindow.java
@@ -17,8 +17,11 @@
package org.apache.isis.viewer.wicket.ui.components.actionprompt;
import org.apache.wicket.Component;
+import org.apache.wicket.ajax.AbstractDefaultAjaxBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow;
+import org.apache.wicket.markup.head.IHeaderResponse;
+import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.isis.core.commons.config.IsisConfiguration;
import org.apache.isis.core.runtime.system.context.IsisContext;
@@ -55,6 +58,35 @@ public class ActionPromptModalWindow extends ModalWindow implements ActionPrompt
public ActionPromptModalWindow(String id) {
super(id);
setMaskType(MaskType.SEMI_TRANSPARENT);
+ add(new CloseOnEscapeKeyBehavior(this));
+ }
+
+ private static class CloseOnEscapeKeyBehavior extends AbstractDefaultAjaxBehavior {
+ private static final long serialVersionUID = 1L;
+ private final ModalWindow modal;
+ public CloseOnEscapeKeyBehavior(ModalWindow modal) {
+ this.modal = modal;
+ }
+ @Override
+ protected void respond(AjaxRequestTarget target) {
+ if(modal.isShown()) {
+ modal.close(target);
+ }
+ }
+ @Override
+ public void renderHead(Component component, IHeaderResponse response) {
+ String javaScript = "" +
+ "$(document).ready(function() {\n" +
+ " $(document).bind('keyup', function(evt) {\n" +
+ " if (evt.keyCode == 27) {\n" +
+ getCallbackScript() + "\n" +
+ " evt.preventDefault();\n" +
+ " }\n" +
+ " });\n" +
+ "});";
+ String id ="closeModal";
+ response.render(JavaScriptHeaderItem.forScript(javaScript, id));
+ }
}
@Override
http://git-wip-us.apache.org/repos/asf/isis/blob/d8dbc05b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
index a18ea44..cd7e2b9 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/jquery.isis.wicket.viewer.js
@@ -18,30 +18,27 @@
*/
$(document).ready(function() {
- var timeoutId;
+ var isisVeilTimeoutId;
isisShowVeil = function() {
- if(timeoutId) {
- clearTimeout(timeoutId);
- timeoutId = null;
+ if(isisVeilTimeoutId) {
+ clearTimeout(isisVeilTimeoutId);
+ isisVeilTimeoutId = null;
}
$("#veil").stop().show();
}
isisFadeInVeil = function(attributes, jqxhr, settings) {
- /*
- $("#veil").fadeIn(750);
- */
// use timeouts because JQuery's delay(...) cannot be stopped.
var activeEl = attributes.currentTarget.activeElement;
- timeoutId = setTimeout(function() {
+ isisVeilTimeoutId = setTimeout(function() {
$("#veil").fadeIn(750);
}, 250);
}
isisHideVeil = function(attributes, jqXHR, settings) {
- if(timeoutId) {
- clearTimeout(timeoutId);
- timeoutId = null;
+ if(isisVeilTimeoutId) {
+ clearTimeout(isisVeilTimeoutId);
+ isisVeilTimeoutId = null;
}
$("#veil").stop().hide();
}
[2/2] git commit: ISIS-632: PublishedEvent#id set to 42 chars.
Posted by da...@apache.org.
ISIS-632: PublishedEvent#id set to 42 chars.
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/08d5ca7b
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/08d5ca7b
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/08d5ca7b
Branch: refs/heads/master
Commit: 08d5ca7b027a44da748700823bf2266dfe63bea9
Parents: d8dbc05
Author: Dan Haywood <da...@apache.org>
Authored: Thu Dec 12 12:46:15 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Thu Dec 12 12:46:15 2013 +0000
----------------------------------------------------------------------
.../jdo/applib/service/publish/PublishedEvent.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/08d5ca7b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEvent.java
----------------------------------------------------------------------
diff --git a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEvent.java b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEvent.java
index f641d12..ecb08a6 100644
--- a/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEvent.java
+++ b/component/objectstore/jdo/jdo-applib/src/main/java/org/apache/isis/objectstore/jdo/applib/service/publish/PublishedEvent.java
@@ -35,6 +35,7 @@ import org.apache.isis.applib.annotation.NotPersisted;
import org.apache.isis.applib.annotation.Programmatic;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
+import org.apache.isis.applib.services.publish.EventMetadata;
import org.apache.isis.applib.services.publish.EventType;
@javax.jdo.annotations.PersistenceCapable(identityType=IdentityType.APPLICATION)
@@ -82,7 +83,7 @@ public class PublishedEvent {
private String id;
- @javax.jdo.annotations.Column(length=32)
+ @javax.jdo.annotations.Column(length=40)
@javax.jdo.annotations.PrimaryKey
@MemberOrder(sequence = "2")
public String getId() {
@@ -99,8 +100,16 @@ public class PublishedEvent {
/**
* Programmatic because information also available in the {@link #getId() id}.
+ *
+ * <p>
+ * Length of 42 because 36 chars (UUID) + 1 character + 5 chars for sequence number (allowing up to 99,999 events
+ * per Isis xactn).
+ *
+ * <p>
+ * @see EventMetadata#getId()
+ * @see https://issues.apache.org/jira/browse/ISIS-632
*/
- @javax.jdo.annotations.Column(length=32)
+ @javax.jdo.annotations.Column(length=42)
@Programmatic
public String getTransactionId() {
return transactionId;