tapestry-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jkemn...@apache.org
Subject tapestry-5 git commit: TAP5-2503: the Confirm mixin works with Prototype now
Date Wed, 16 Sep 2015 12:43:31 GMT
Repository: tapestry-5
Updated Branches:
  refs/heads/master 73be2842a -> eb388afe5


TAP5-2503: the Confirm mixin works with Prototype now


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

Branch: refs/heads/master
Commit: eb388afe5b31e76e6dc1b8dbbf5e57e56fd4b5a8
Parents: 73be284
Author: Jochen Kemnade <jochen.kemnade@eddyson.de>
Authored: Wed Sep 16 14:42:54 2015 +0200
Committer: Jochen Kemnade <jochen.kemnade@eddyson.de>
Committed: Wed Sep 16 14:42:54 2015 +0200

----------------------------------------------------------------------
 .../coffeescript/META-INF/modules/t5/core/confirm-click.coffee  | 5 ++---
 .../main/java/org/apache/tapestry5/corelib/mixins/Confirm.java  | 4 ----
 2 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/eb388afe/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/confirm-click.coffee
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/confirm-click.coffee
b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/confirm-click.coffee
index 235e0ad..d8f42c7 100644
--- a/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/confirm-click.coffee
+++ b/tapestry-core/src/main/coffeescript/META-INF/modules/t5/core/confirm-click.coffee
@@ -1,11 +1,10 @@
 # ## t5/core/confirm-click
 #
 # Support for the Tapestry Confirm mixin, and for running confirmation dialogs programmatically.
-# Note that this does not function correctly when Prototype is present.
 
-define ["jquery", "./events", "./dom", "bootstrap/modal"],
+define ["jquery", "./events", "bootstrap/modal"],
 
-  ($, events, dom) ->
+  ($, events) ->
 
     # Runs a modal dialog, invoking a callback if the user selects the OK option. On any
form of cancel,
     # there is no callback.

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/eb388afe/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 8319ccc..d187187 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
@@ -23,10 +23,6 @@ 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},
  * and will raise a confirmation dialog when the element is clicked.
  *
- * Due to conflicts between jQuery (as used by Bootstrap's JavaScript library) and Prototype,
this mixin does not operate
- * when the {@linkplain org.apache.tapestry5.SymbolConstants#JAVASCRIPT_INFRASTRUCTURE_PROVIDER
JavaScript infrastructure provider}
- * is "prototype".
- *
  * @tapestrydoc
  * @since 5.4
  */


Mime
View raw message