You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by ul...@apache.org on 2013/02/28 09:41:37 UTC

git commit: TAP5-2053: Use of 'transient' property in alert options breaks JavaScript processors

Updated Branches:
  refs/heads/master aa9eedfbd -> 8a29dbfbd


TAP5-2053: Use of 'transient' property in alert options breaks
JavaScript processors

I accidentally fixed that earlier by renaming the property to
"ephemeral" which is inconsistent with the remaining naming. Therefore
revert to using "transient" but access the property using square bracket
notation instead of dot notation.

Thanks to Jochen Kemnade for the patch.


Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/8a29dbfb
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/8a29dbfb
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/8a29dbfb

Branch: refs/heads/master
Commit: 8a29dbfbda207f5510de35a2797b5dfb7be3ab5b
Parents: aa9eedf
Author: Ulrich Staerk <ul...@apache.org>
Authored: Thu Feb 28 09:39:14 2013 +0100
Committer: Ulrich Staerk <ul...@apache.org>
Committed: Thu Feb 28 09:41:32 2013 +0100

----------------------------------------------------------------------
 .../META-INF/modules/t5/core/alert.coffee          |    2 +-
 .../java/org/apache/tapestry5/alerts/Alert.java    |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8a29dbfb/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
index 1a4df63..9918442 100644
--- a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
+++ b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/alert.coffee
@@ -117,7 +117,7 @@ define ["./dom", "./console", "./messages", "./builder", "./ajax", "_"],
 
       container.append element
 
-      if data.ephemeral
+      if data['transient']
         _.delay removeAlert, exports.TRANSIENT_DURATION, container, element
 
     alert.TRANSIENT_DURATION = 5000

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/8a29dbfb/tapestry-core/src/main/java/org/apache/tapestry5/alerts/Alert.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/alerts/Alert.java b/tapestry-core/src/main/java/org/apache/tapestry5/alerts/Alert.java
index e830ad9..b7a8d8d 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/alerts/Alert.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/alerts/Alert.java
@@ -86,7 +86,7 @@ public class Alert implements Serializable
 
         if (duration == Duration.TRANSIENT)
         {
-            result.put("ephemeral", true);
+            result.put("transient", true);
         }
 
         if (duration.persistent)