Merge pull request #4540 from mmun/es6-ember-routing

Es6 ember routing
emberjs · Mar 19, 2014 · 4444525 · 4444525
2 parents 716f53f + de337b6
commit 4444525
Show file tree

Hide file tree

Showing 44 changed files with 2,375 additions and 2,065 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,6 +7,7 @@ packages/ember-extension-support
 packages/ember-testing
 packages/ember-handlebars-compiler
 packages/ember-handlebars
+packages/ember-routing
 *.bpkg
 *.gem
 *.rbc

diff --git a/bin/transpile-packages.js b/bin/transpile-packages.js
@@ -142,7 +142,8 @@ var packages = {
   'ember-extension-support': ['ember-application'],
   'ember-testing': ['ember-application', 'ember-routing'],
   'ember-handlebars-compiler': ['ember-views'],
-  'ember-handlebars': ['metamorph', 'ember-views', 'ember-handlebars-compiler', 'ember-metal/~tests/ember-metal']
+  'ember-handlebars': ['metamorph', 'ember-views', 'ember-handlebars-compiler', 'ember-metal/~tests/ember-metal'],
+  'ember-routing': ['ember-runtime', 'ember-views', 'ember-handlebars']
 };
 
 

diff --git a/packages/ember-application/lib/system/dag.js b/packages/ember-application/lib/system/dag.js
@@ -1,3 +1,8 @@
+requireModule('ember-runtime');
+requireModule('ember-views');
+requireModule('ember-handlebars');
+requireModule('ember-routing');
+
 function visit(vertex, fn, visited, path) {
   var name = vertex.name,
     vertices = vertex.incoming,

diff --git a/packages/ember-routing/lib/helpers.js b/packages/ember-routing/lib/helpers.js
diff --git a/packages/ember-routing/lib/helpers/action.js b/packages/ember-routing/lib/helpers/action.js