diff --git a/packages/ember-glimmer/lib/syntax/mount.js b/packages/ember-glimmer/lib/syntax/mount.js index 95cc7553dda..438b1a2530c 100644 --- a/packages/ember-glimmer/lib/syntax/mount.js +++ b/packages/ember-glimmer/lib/syntax/mount.js @@ -27,10 +27,32 @@ function dynamicEngineFor(vm, args, meta) { {{mount "ember-chat"}} ``` - Currently, the engine name is the only argument that can be passed to - `{{mount}}`. + Additionally, you can also pass in a `model` argument that will be + set as the engines model. This can be an existing object: + + ``` +
+ {{mount 'admin' model=userSettings}} +
+ ``` + + Or an inline `hash`, and you can even pass components: + + + ``` +
+

Application template!

+ {{mount 'admin' model=(hash + title='Secret Admin' + signInButton=(component 'sign-in-button') + )}} +
+ ``` @method mount + @param {String} name Name of the engine to mount. + @param {Object} [model] Object that will be set as + the model of the engine. @for Ember.Templates.helpers @category ember-application-engines @public diff --git a/packages/ember-routing/lib/services/router.js b/packages/ember-routing/lib/services/router.js index 3b415b3dc20..e79018f3054 100644 --- a/packages/ember-routing/lib/services/router.js +++ b/packages/ember-routing/lib/services/router.js @@ -18,9 +18,33 @@ import { shallowEqual } from '../utils'; @category ember-routing-router-service */ const RouterService = Service.extend({ + + /** + @property currentRouteName + @type String + @public + */ currentRouteName: readOnly('_router.currentRouteName'), + + /** + @property currentURL + @type String + @public + */ currentURL: readOnly('_router.currentURL'), + + /** + @property location + @type String + @public + */ location: readOnly('_router.location'), + + /** + @property rootURL + @type String + @public + */ rootURL: readOnly('_router.rootURL'), _router: null,