Move troopjs -> troopjs_require and update the main index.html file t…

…o reflect updates in the framework.
tastejs · May 27, 2013 · c67b1ee · c67b1ee
1 parent a5a94bc
commit c67b1ee
Show file tree

Hide file tree

Showing 20 changed files with 2 additions and 2 deletions.
diff --git a/index.html b/index.html
@@ -202,7 +202,7 @@ <h2>Module Loaders</h2>
 						<a href="labs/dependency-examples/canjs_require/" data-source="http://canjs.us" data-content="CanJS is a client-side, JavaScript framework that makes building rich web applications easy. The AMD version lets you use the framework in a fully modular fashion and will only what you actually need.">CanJS + RequireJS</a>
 					</li>
 					<li class="routing labs">
-						<a href="labs/dependency-examples/troopjs/" data-source="https://github.com/troopjs/" data-content="TroopJS attempts to package popular front-end technologies and bind them with minimal effort for the developer. It includes jQuery for DOM manipulation, ComposeJS for object composition, RequireJS for modularity and Has.js for feature detection. On top, it includes Pub/Sub support, templating, weaving (widgets to DOM) and auto-wiring.">TroopJS</a>
+						<a href="labs/dependency-examples/troopjs_require/" data-source="https://github.com/troopjs/" data-content="TroopJS attempts to package popular front-end technologies and bind them with minimal effort for the developer. It includes jQuery for DOM manipulation, When.js for promises, RequireJS for modularity and Has.js for feature detection. On top, it includes Pub/Sub support, templating, weaving (widgets to DOM) and auto-wiring.">TroopJS + RequireJS</a>
 					</li>
 					<li class="routing labs">
 						<a href="labs/dependency-examples/thorax_lumbar/public/" data-source="http://walmartlabs.github.com/lumbar" data-content="An opinionated, battle tested Backbone + Handlebars framework to build large scale web applications. This implementation uses Lumbar, a route based module loader.">Thorax + Lumbar</a>

diff --git a/labs/dependency-examples/troopjs/bower.json → ...dency-examples/troopjs_require/bower.json b/labs/dependency-examples/troopjs/bower.json → ...dency-examples/troopjs_require/bower.json
diff --git a/...troopjs/bower_components/jquery/jquery.js → ...require/bower_components/jquery/jquery.js b/...troopjs/bower_components/jquery/jquery.js → ...require/bower_components/jquery/jquery.js
diff --git a/...pjs/bower_components/requirejs/require.js → ...ire/bower_components/requirejs/require.js b/...pjs/bower_components/requirejs/require.js → ...ire/bower_components/requirejs/require.js
diff --git a/.../bower_components/todomvc-common/base.css → .../bower_components/todomvc-common/base.css b/.../bower_components/todomvc-common/base.css → .../bower_components/todomvc-common/base.css
diff --git a/...s/bower_components/todomvc-common/base.js → ...e/bower_components/todomvc-common/base.js b/...s/bower_components/todomvc-common/base.js → ...e/bower_components/todomvc-common/base.js
diff --git a/...js/bower_components/todomvc-common/bg.png → ...re/bower_components/todomvc-common/bg.png b/...js/bower_components/todomvc-common/bg.png → ...re/bower_components/todomvc-common/bg.png
diff --git a/...s/bower_components/troopjs-bundle/maxi.js → ...e/bower_components/troopjs-bundle/maxi.js b/...s/bower_components/troopjs-bundle/maxi.js → ...e/bower_components/troopjs-bundle/maxi.js
diff --git a/labs/dependency-examples/troopjs/css/app.css → ...ency-examples/troopjs_require/css/app.css b/labs/dependency-examples/troopjs/css/app.css → ...ency-examples/troopjs_require/css/app.css
diff --git a/labs/dependency-examples/troopjs/index.html → ...dency-examples/troopjs_require/index.html b/labs/dependency-examples/troopjs/index.html → ...dency-examples/troopjs_require/index.html
diff --git a/...dency-examples/troopjs/js/widget/clear.js → ...amples/troopjs_require/js/widget/clear.js b/...dency-examples/troopjs/js/widget/clear.js → ...amples/troopjs_require/js/widget/clear.js
diff --git a/...dency-examples/troopjs/js/widget/count.js → ...amples/troopjs_require/js/widget/count.js b/...dency-examples/troopjs/js/widget/count.js → ...amples/troopjs_require/js/widget/count.js
diff --git a/...ency-examples/troopjs/js/widget/create.js → ...mples/troopjs_require/js/widget/create.js b/...ency-examples/troopjs/js/widget/create.js → ...mples/troopjs_require/js/widget/create.js
diff --git a/...ncy-examples/troopjs/js/widget/display.js → ...ples/troopjs_require/js/widget/display.js b/...ncy-examples/troopjs/js/widget/display.js → ...ples/troopjs_require/js/widget/display.js
diff --git a/...ncy-examples/troopjs/js/widget/filters.js → ...ples/troopjs_require/js/widget/filters.js b/...ncy-examples/troopjs/js/widget/filters.js → ...ples/troopjs_require/js/widget/filters.js
diff --git a/...ency-examples/troopjs/js/widget/item.html → ...mples/troopjs_require/js/widget/item.html b/...ency-examples/troopjs/js/widget/item.html → ...mples/troopjs_require/js/widget/item.html
diff --git a/...ndency-examples/troopjs/js/widget/list.js → ...xamples/troopjs_require/js/widget/list.js b/...ndency-examples/troopjs/js/widget/list.js → ...xamples/troopjs_require/js/widget/list.js
diff --git a/...ndency-examples/troopjs/js/widget/mark.js → ...xamples/troopjs_require/js/widget/mark.js b/...ndency-examples/troopjs/js/widget/mark.js → ...xamples/troopjs_require/js/widget/mark.js
diff --git a/labs/dependency-examples/troopjs/readme.md → ...ndency-examples/troopjs_require/readme.md b/labs/dependency-examples/troopjs/readme.md → ...ndency-examples/troopjs_require/readme.md
diff --git a/learn.json b/learn.json
@@ -1694,7 +1694,7 @@
 		"homepage": "troopjs.com",
 		"examples": [{
 			"name": "Dependency Example",
-			"url": "labs/dependency-examples/troopjs"
+			"url": "labs/dependency-examples/troopjs_require"
 		}],
 		"link_groups": [{
 			"heading": "Official Resources",