Updated Branches: refs/heads/master 5659f8bfd -> 9cd1ca923
Transient used to be a future reserved keyword and YUICompressor chokes on it. Rename to ephemeral. Fix typos. Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/9cd1ca92 Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/9cd1ca92 Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/9cd1ca92 Branch: refs/heads/master Commit: 9cd1ca923e6ca5e0ed12ba2bcb883f672c331b16 Parents: 5659f8b Author: Ulrich Staerk <[email protected]> Authored: Wed Feb 27 22:35:19 2013 +0100 Committer: Ulrich Staerk <[email protected]> Committed: Wed Feb 27 22:35:19 2013 +0100 ---------------------------------------------------------------------- .../META-INF/modules/t5/core/alert.coffee | 6 +++--- .../java/org/apache/tapestry5/alerts/Alert.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd1ca92/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 a2810e3..1a4df63 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,10 +117,10 @@ define ["./dom", "./console", "./messages", "./builder", "./ajax", "_"], container.append element - if data.transient - _.delay removeAlert, exports.TRAINSIENT_DURATION, container, element + if data.ephemeral + _.delay removeAlert, exports.TRANSIENT_DURATION, container, element - alert.TRAINSIENT_DURATION = 5000 + alert.TRANSIENT_DURATION = 5000 # Export the alert function exports = alert http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/9cd1ca92/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 b7a8d8d..e830ad9 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("transient", true); + result.put("ephemeral", true); } if (duration.persistent)
