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/10/28 17:20:11 UTC
[3/3] git commit: ISIS-570: error in JGrowl javascript causing
drop-downs to not render correctly.
ISIS-570: error in JGrowl javascript causing drop-downs to not render correctly.
In addition:
- made the bookmark panel close more quickly
Project: http://git-wip-us.apache.org/repos/asf/isis/repo
Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/9bc9cf69
Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/9bc9cf69
Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/9bc9cf69
Branch: refs/heads/master
Commit: 9bc9cf6910019ffa6b03f393ba88ce46bd09865a
Parents: 6ad65ff
Author: Dan Haywood <da...@apache.org>
Authored: Mon Oct 28 16:19:37 2013 +0000
Committer: Dan Haywood <da...@apache.org>
Committed: Mon Oct 28 16:19:37 2013 +0000
----------------------------------------------------------------------
.../viewer/wicket/ui/components/actions/ActionPanel.java | 2 ++
.../wicket/ui/components/bookmarkedpages/slide-panel.js | 8 ++++----
.../org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java | 5 +++--
.../org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java | 3 ++-
4 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/isis/blob/9bc9cf69/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
index 9527f92..1bf070e 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/actions/ActionPanel.java
@@ -225,6 +225,8 @@ public class ActionPanel extends PanelAbstract<ActionModel> implements ActionExe
String message = recognizeException(ex, feedbackForm);
if (message != null) {
+ // no need to add to message broker, should already have been added...
+
if(feedbackForm == null) {
// forward on instead to void page
// (otherwise, we'll have rendered an action parameters page
http://git-wip-us.apache.org/repos/asf/isis/blob/9bc9cf69/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
index c467bcc..bd638b2 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/bookmarkedpages/slide-panel.js
@@ -20,17 +20,17 @@ $(document).ready(function(){
var showBookmarks = function(){
$('#bookmarkedPagesSlidingDiv').stop().animate(
- {width:"400px", opacity:0.95}, 250,
+ {width:"300px", opacity:0.95}, 100,
function() {
- $('.content').fadeIn('125');
+ $('.content').fadeIn('50');
});
$('.showPanelTab').animate({opacity: 0.5});
};
var hideBookmarks = function(){
- $('.content').fadeOut('125',
+ $('.content').fadeOut('0',
function() {
- $('#bookmarkedPagesSlidingDiv').stop().animate({width:"0", opacity:0.1}, 125);
+ $('#bookmarkedPagesSlidingDiv').stop().animate({width:"0", opacity:0.1}, 0);
});
$('.showPanelTab').animate({opacity: 1.0});
};
http://git-wip-us.apache.org/repos/asf/isis/blob/9bc9cf69/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
index 1261a2a..e049695 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/errors/JGrowlUtil.java
@@ -41,10 +41,11 @@ public class JGrowlUtil {
return buf.toString();
}
- private static void addJGrowlCall(final String msg, final String cssClassSuffix, boolean sticky, final StringBuilder buf) {
+ private static void addJGrowlCall(final String msg2, final String cssClassSuffix, boolean sticky, final StringBuilder buf) {
+ final String msg = msg2.replaceAll("\"", "\'");
buf.append("$.jGrowl(\"").append(msg).append('\"');
buf.append(", {");
- buf.append("theme: \'jgrowl-").append(cssClassSuffix).append("\'");
+ buf.append("theme: \"jgrowl-").append(cssClassSuffix).append("\"");
if (sticky) {
buf.append(", sticky: true");
}
http://git-wip-us.apache.org/repos/asf/isis/blob/9bc9cf69/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
----------------------------------------------------------------------
diff --git a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
index e589df0..d882b17 100644
--- a/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
+++ b/component/viewer/wicket/ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.java
@@ -186,7 +186,8 @@ public abstract class PageAbstract extends WebPage {
final String feedbackMsg = JGrowlUtil.asJGrowlCalls(getMessageBroker());
if (!Strings.isNullOrEmpty(feedbackMsg)) {
- response.render(OnDomReadyHeaderItem.forScript(feedbackMsg));
+ final OnDomReadyHeaderItem forScript = OnDomReadyHeaderItem.forScript(feedbackMsg);
+ response.render(forScript);
}
if(applicationCss != null) {