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 2017/04/24 21:45:23 UTC
isis git commit: ISIS-1603: CSS fix for inline prompt,
ensure ESC triggers cancel second time around
Repository: isis
Updated Branches:
refs/heads/ISIS-1603-no-xeditable cf6517863 -> 7341d7141
ISIS-1603: CSS fix for inline prompt, ensure ESC triggers cancel second time around
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/7341d714
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/7341d714
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/7341d714
Branch: refs/heads/ISIS-1603-no-xeditable
Commit: 7341d7141cd582979279386e451e194beb4a7bb1
Parents: cf65178
Author: Dan Haywood <da...@haywood-associates.co.uk>
Authored: Mon Apr 24 22:45:17 2017 +0100
Committer: Dan Haywood <da...@haywood-associates.co.uk>
Committed: Mon Apr 24 22:45:17 2017 +0100
----------------------------------------------------------------------
.../wicket/ui/components/property/PropertyEditFormPanel.java | 5 +++--
.../apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css | 4 ++++
2 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/7341d714/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
index 9623490..ca2e28e 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/property/PropertyEditFormPanel.java
@@ -115,6 +115,8 @@ public class PropertyEditFormPanel extends PromptFormPanelAbstract<ScalarModel>
if(promptStyle == PromptStyle.INLINE) {
getScalarModel().toViewMode();
+ getScalarModel().clearPending();
+ getScalarModel().reset();
// replace
final String id = propertyEditFormPanel.getId();
@@ -156,7 +158,7 @@ public class PropertyEditFormPanel extends PromptFormPanelAbstract<ScalarModel>
final String javascript = PRE_JS + getCallbackScript() + POST_JS;
response.render(
- JavaScriptContentHeaderItem.forScript(javascript, component.getPath(), null));
+ JavaScriptContentHeaderItem.forScript(javascript, null, null));
}
@Override
@@ -164,7 +166,6 @@ public class PropertyEditFormPanel extends PromptFormPanelAbstract<ScalarModel>
onCancel(target);
}
-
});
}
}
http://git-wip-us.apache.org/repos/asf/isis/blob/7341d714/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
----------------------------------------------------------------------
diff --git a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
index a4c1881..3e0544c 100644
--- a/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
+++ b/core/viewer-wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/bootstrap-overrides.css
@@ -877,3 +877,7 @@ tr.headers th form input {
margin-bottom: 20px
}
+.scalarNameAndValueComponentType .inlineEditForm .form-group {
+ padding-left: 5px;
+ padding-right: 15px;
+}