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: Revert "cause "require is not a function" error on index page"
Date Wed, 18 Mar 2015 07:52:40 GMT
Repository: tapestry-5
Updated Branches:
  refs/heads/master da4dc29d6 -> eed92d68f


Revert "cause "require is not a function" error on index page"

This reverts commit 2f1c8eec4dceda31b8a9eb75dd31bcb821a8bd1b.


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

Branch: refs/heads/master
Commit: eed92d68f260991bac33573ed7d0a149ca1cd83e
Parents: da4dc29
Author: Jochen Kemnade <jochen.kemnade@eddyson.de>
Authored: Wed Mar 18 08:52:26 2015 +0100
Committer: Jochen Kemnade <jochen.kemnade@eddyson.de>
Committed: Wed Mar 18 08:52:26 2015 +0100

----------------------------------------------------------------------
 .../java/org/apache/tapestry5/integration/app1/pages/Index.java  | 2 --
 tapestry-core/src/test/resources/META-INF/modules/index.js       | 4 ----
 2 files changed, 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/eed92d68/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
index ed10c09..f146ec1 100644
--- a/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
+++ b/tapestry-core/src/test/java/org/apache/tapestry5/integration/app1/pages/Index.java
@@ -15,7 +15,6 @@ package org.apache.tapestry5.integration.app1.pages;
 import org.apache.tapestry5.ComponentResources;
 import org.apache.tapestry5.Link;
 import org.apache.tapestry5.PersistenceConstants;
-import org.apache.tapestry5.annotations.Import;
 import org.apache.tapestry5.annotations.InjectPage;
 import org.apache.tapestry5.annotations.Persist;
 import org.apache.tapestry5.annotations.Property;
@@ -30,7 +29,6 @@ import java.util.*;
 /**
  * Have to start somewhere!
  */
-@Import(module="index")
 public class Index
 {
     @Persist(PersistenceConstants.FLASH)

http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/eed92d68/tapestry-core/src/test/resources/META-INF/modules/index.js
----------------------------------------------------------------------
diff --git a/tapestry-core/src/test/resources/META-INF/modules/index.js b/tapestry-core/src/test/resources/META-INF/modules/index.js
deleted file mode 100644
index 1cdd11c..0000000
--- a/tapestry-core/src/test/resources/META-INF/modules/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-define([ "t5/core/ajax" ], function(ajax) {
-	ajax("index.foobar", {});
-	ajax("index.foobar", {});
-});
\ No newline at end of file


Mime
View raw message