You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2013/11/06 23:43:18 UTC
[8/8] git commit: TAP5-2218: Update to Bootstrap 3.0.2
TAP5-2218: Update to Bootstrap 3.0.2
Project: http://git-wip-us.apache.org/repos/asf/tapestry-5/repo
Commit: http://git-wip-us.apache.org/repos/asf/tapestry-5/commit/79917ead
Tree: http://git-wip-us.apache.org/repos/asf/tapestry-5/tree/79917ead
Diff: http://git-wip-us.apache.org/repos/asf/tapestry-5/diff/79917ead
Branch: refs/heads/master
Commit: 79917eadf52efddb531586a236daef54f9100a36
Parents: 42834ad
Author: Howard M. Lewis Ship <hl...@apache.org>
Authored: Wed Nov 6 14:43:01 2013 -0800
Committer: Howard M. Lewis Ship <hl...@apache.org>
Committed: Wed Nov 6 14:43:01 2013 -0800
----------------------------------------------------------------------
.../apache/tapestry5/modules/AssetsModule.java | 5 +
.../tapestry5/modules/TapestryModule.java | 5 -
.../tapestry5/bootstrap-3.0.1/css/bootstrap.css | 7059 -----------------
.../fonts/glyphicons-halflings-regular.eot | Bin 20290 -> 0 bytes
.../fonts/glyphicons-halflings-regular.svg | 229 -
.../fonts/glyphicons-halflings-regular.ttf | Bin 41236 -> 0 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 23292 -> 0 bytes
.../tapestry5/bootstrap-3.0.1/js/affix.js | 126 -
.../tapestry5/bootstrap-3.0.1/js/alert.js | 98 -
.../tapestry5/bootstrap-3.0.1/js/button.js | 109 -
.../tapestry5/bootstrap-3.0.1/js/carousel.js | 217 -
.../tapestry5/bootstrap-3.0.1/js/collapse.js | 179 -
.../tapestry5/bootstrap-3.0.1/js/dropdown.js | 154 -
.../tapestry5/bootstrap-3.0.1/js/modal.js | 246 -
.../tapestry5/bootstrap-3.0.1/js/popover.js | 117 -
.../tapestry5/bootstrap-3.0.1/js/scrollspy.js | 158 -
.../assets/tapestry5/bootstrap-3.0.1/js/tab.js | 135 -
.../tapestry5/bootstrap-3.0.1/js/tooltip.js | 386 -
.../tapestry5/bootstrap-3.0.1/js/transition.js | 56 -
.../bootstrap-3.0.2/css/bootstrap-theme.css | 459 ++
.../bootstrap-3.0.2/css/bootstrap-theme.min.css | 9 +
.../tapestry5/bootstrap-3.0.2/css/bootstrap.css | 7098 ++++++++++++++++++
.../bootstrap-3.0.2/css/bootstrap.min.css | 9 +
.../fonts/glyphicons-halflings-regular.eot | Bin 0 -> 20290 bytes
.../fonts/glyphicons-halflings-regular.svg | 229 +
.../fonts/glyphicons-halflings-regular.ttf | Bin 0 -> 41236 bytes
.../fonts/glyphicons-halflings-regular.woff | Bin 0 -> 23292 bytes
.../tapestry5/bootstrap-3.0.2/js/.jshintrc | 14 +
.../tapestry5/bootstrap-3.0.2/js/affix.js | 126 +
.../tapestry5/bootstrap-3.0.2/js/alert.js | 98 +
.../tapestry5/bootstrap-3.0.2/js/button.js | 109 +
.../tapestry5/bootstrap-3.0.2/js/carousel.js | 217 +
.../tapestry5/bootstrap-3.0.2/js/collapse.js | 179 +
.../tapestry5/bootstrap-3.0.2/js/dropdown.js | 154 +
.../tapestry5/bootstrap-3.0.2/js/modal.js | 246 +
.../tapestry5/bootstrap-3.0.2/js/popover.js | 117 +
.../tapestry5/bootstrap-3.0.2/js/scrollspy.js | 158 +
.../assets/tapestry5/bootstrap-3.0.2/js/tab.js | 135 +
.../tapestry5/bootstrap-3.0.2/js/tooltip.js | 386 +
.../tapestry5/bootstrap-3.0.2/js/transition.js | 56 +
40 files changed, 9804 insertions(+), 9274 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/79917ead/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
index 86e5086..d8bd18f 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/AssetsModule.java
@@ -78,6 +78,11 @@ public class AssetsModule
configuration.add(SymbolConstants.ASSET_PATH_PREFIX, "asset");
configuration.add(SymbolConstants.COMPRESSED_ASSET_PATH_PREFIX, "${tapestry.asset-path-prefix}.gz");
+
+ configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "${tapestry.asset.root}/bootstrap-3.0.2");
+ configuration.add(SymbolConstants.REQUIRE_JS, "${tapestry.asset.root}/require-2.1.8.js");
+
+ configuration.add("tapestry.asset.root", "classpath:META-INF/assets/tapestry5");
}
// The use of decorators is to allow third-parties to get their own extensions
http://git-wip-us.apache.org/repos/asf/tapestry-5/blob/79917ead/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
----------------------------------------------------------------------
diff --git a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
index 775dd50..f4c9209 100644
--- a/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
+++ b/tapestry-core/src/main/java/org/apache/tapestry5/modules/TapestryModule.java
@@ -2039,8 +2039,6 @@ public final class TapestryModule
// files deleted between scriptaculous releases to be accidentally left lying around).
// There's also a ClasspathAliasManager contribution based on the path.
- configuration.add("tapestry.asset.root", "classpath:META-INF/assets/tapestry5");
-
configuration.add(SymbolConstants.SCRIPTACULOUS, "${tapestry.asset.root}/scriptaculous_1_9_0");
// Likewise for WebFX DatePicker, currently version 1.0.6
@@ -2109,15 +2107,12 @@ public final class TapestryModule
// By default, no page is on the whitelist unless it has the @WhitelistAccessOnly annotation
configuration.add(MetaDataConstants.WHITELIST_ONLY_PAGE, false);
- configuration.add(SymbolConstants.REQUIRE_JS, "${tapestry.asset.root}/require-2.1.8.js");
configuration.add(SymbolConstants.CONTEXT_PATH, "");
// Leaving this as the default results in a runtime error logged to the console (and a default password is used);
// you are expected to override this symbol.
configuration.add(SymbolConstants.HMAC_PASSPHRASE, "");
- configuration.add(SymbolConstants.BOOTSTRAP_ROOT, "${tapestry.asset.root}/bootstrap-3.0.1");
-
configuration.add(SymbolConstants.SESSION_LOCKING_ENABLED, true);
// TAP5-2070 keep the old behavior, defaults to false