tapestry-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hls...@apache.org
Subject tapestry-5 git commit: Add a disabled parameter to the Confirm mixin
Date Mon, 02 Feb 2015 23:53:26 GMT
Repository: tapestry-5
Updated Branches:
  refs/heads/master 27bf34c4b -> ad5cca595


Add a disabled parameter to the Confirm mixin


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

Branch: refs/heads/master
Commit: ad5cca5951b1133d15d445384f0af52a69b8be37
Parents: 27bf34c
Author: Howard M. Lewis Ship <hlship@apache.org>
Authored: Mon Feb 2 15:53:21 2015 -0800
Committer: Howard M. Lewis Ship <hlship@apache.org>
Committed: Mon Feb 2 15:53:21 2015 -0800

----------------------------------------------------------------------
 .../tapestry5/corelib/mixins/Confirm.java       | 24 +++++++++++++++-----
 1 file changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/ad5cca59/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Confirm.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Confirm.java
b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Confirm.java
index 2d39a8f..1464129 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Confirm.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/corelib/mixins/Confirm.java
@@ -1,5 +1,3 @@
-// Copyright 2013 The Apache Software Foundation
-//
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -16,9 +14,10 @@ package org.apache.tapestry5.corelib.mixins;
 
 import org.apache.tapestry5.BindingConstants;
 import org.apache.tapestry5.MarkupWriter;
-import org.apache.tapestry5.annotations.Import;
+import org.apache.tapestry5.annotations.Environmental;
 import org.apache.tapestry5.annotations.MixinAfter;
 import org.apache.tapestry5.annotations.Parameter;
+import org.apache.tapestry5.services.javascript.JavaScriptSupport;
 
 /**
  * A mixin that can be placed on a clickable component, such as {@link org.apache.tapestry5.corelib.components.LinkSubmit},
@@ -32,7 +31,6 @@ import org.apache.tapestry5.annotations.Parameter;
  * @since 5.4
  */
 @MixinAfter
-@Import(module = "t5/core/confirm-click")
 public class Confirm
 {
     /**
@@ -47,9 +45,23 @@ public class Confirm
     @Parameter(value = "message:private-default-confirm-title", defaultPrefix = BindingConstants.LITERAL)
     private String title;
 
+    /**
+     * If true, then the mixin does nothing (no attributes added, no module imported).
+     */
+    @Parameter("false")
+    private boolean disabled;
+
+    @Environmental
+    private JavaScriptSupport javaScriptSupport;
+
     void beginRender(MarkupWriter writer)
     {
-        writer.attributes("data-confirm-title", title,
-                "data-confirm-message", message);
+        if (!disabled)
+        {
+            javaScriptSupport.require("t5/core/confirm-click");
+
+            writer.attributes("data-confirm-title", title,
+                    "data-confirm-message", message);
+        }
     }
 }


Mime
View raw message