Skip to content

Commit

Permalink
Merge pull request #3648 from rjackson/split_ember_view_core_up
Browse files Browse the repository at this point in the history
[DOC release] Fix template lookup documentation.
  • Loading branch information
stefanpenner committed Nov 1, 2013
2 parents 7939ffb + 7808d76 commit 6a29470
Showing 1 changed file with 4 additions and 15 deletions.
19 changes: 4 additions & 15 deletions packages/ember-views/lib/views/view.js
Original file line number Diff line number Diff line change
Expand Up @@ -857,9 +857,8 @@ Ember.View = Ember.CoreView.extend(
/**
The name of the template to lookup if no template is provided.
`Ember.View` will look for a template with this name in this view's
`templates` object. By default, this will be a global object
shared in `Ember.TEMPLATES`.
By default `Ember.View` will lookup a template with this name in
`Ember.TEMPLATES` (a shared global object).
@property templateName
@type String
Expand All @@ -870,25 +869,15 @@ Ember.View = Ember.CoreView.extend(
/**
The name of the layout to lookup if no layout is provided.
`Ember.View` will look for a template with this name in this view's
`templates` object. By default, this will be a global object
shared in `Ember.TEMPLATES`.
By default `Ember.View` will lookup a template with this name in
`Ember.TEMPLATES` (a shared global object).
@property layoutName
@type String
@default null
*/
layoutName: null,

/**
The hash in which to look for `templateName`.
@property templates
@type Ember.Object
@default Ember.TEMPLATES
*/
templates: Ember.TEMPLATES,

/**
The template used to render the view. This should be a function that
accepts an optional context parameter and returns a string of HTML that
Expand Down

0 comments on commit 6a29470

Please sign in to comment.