Merge pull request #12211 from Gaurav0/include_transition_yuidoc

[DOC] Add router.js to yuidoc.json
emberjs · Mar 16, 2016 · df19615 · df19615
2 parents ed298ce + 7eace13
commit df19615
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/bower.json b/bower.json
@@ -12,7 +12,7 @@
   "devDependencies": {
     "backburner": "https://github.com/ebryn/backburner.js.git#325a969dbc7eae42dc1edfbf0ae9fb83923df5a6",
     "rsvp": "https://github.com/tildeio/rsvp.js.git#3.0.20",
-    "router.js": "https://github.com/tildeio/router.js.git#ed45bc5c5e055af0ab875ef2c52feda792ee23e4",
+    "router.js": "https://github.com/tildeio/router.js.git#04b27c911995902b022966f4d29d8686ba7d847c",
     "dag-map": "https://github.com/krisselden/dag-map.git#1.0.2",
     "ember-dev": "https://github.com/emberjs/ember-dev.git#eace5340485bdb5e4223ab67fecf4aff31c1940c"
   }

diff --git a/yuidoc.json b/yuidoc.json
@@ -16,9 +16,10 @@
       "packages/ember-application/lib",
       "packages/ember-testing/lib",
       "packages/ember-extension-support/lib",
-      "bower_components/rsvp/lib"
+      "bower_components/rsvp/lib",
+      "bower_components/router.js/lib/router"
     ],
-    "exclude": "vendor",
+    "exclude": "vendor,bower_components/router.js/lib/router/handler-info,bower_components/router.js/lib/router/transition-intent,bower_components/router.js/lib/router/router.js,bower_components/router.js/lib/router/transition-intent.js,bower_components/router.js/lib/router/transition-state.js,bower_components/router.js/lib/router/unrecognized-url-error.js,bower_components/router.js/lib/router/utils.js",
     "outdir":   "docs"
   }
 }