{{title}}
-{{body}}
- {{control "author" author}}
-- Job @@ -7,29 +7,29 @@ {{#if job.id}} {{#if job.repo.slug}} - {{#linkTo "job" repo job}}{{job.number}}{{/linkTo}} + {{#link-to "job" repo job}}{{job.number}}{{/link-to}} {{/if}} {{/if}}
- {{t jobs.state}}
- {{capitalize job.state}}
- {{t jobs.finished_at}} -
- {{formatTime job.finishedAt}} +
- {{formatTime job.finishedAt}}
- {{t jobs.duration}} -
- {{formatDuration job.duration}} +
- {{formatDuration job.duration}}
- {{t jobs.commit}} -
- {{formatCommit commit}} +
- {{formatCommit commit}} {{#if build.pullRequest}}
- {{t builds.pull_request}} -
- #{{build.pullRequestNumber}} {{build.pullRequestTitle}} +
- #{{build.pullRequestNumber}} {{build.pullRequestTitle}} {{else}} {{#if commit.compareUrl}}
- {{t jobs.compare}} -
- {{pathFrom commit.compareUrl}} +
- {{pathFrom commit.compareUrl}} {{/if}} {{/if}} {{#if commit.authorName}} diff --git a/assets/scripts/app/templates/layouts/top.hbs b/assets/scripts/app/templates/layouts/top.hbs index e883d6aa..0f583cf6 100644 --- a/assets/scripts/app/templates/layouts/top.hbs +++ b/assets/scripts/app/templates/layouts/top.hbs @@ -1,10 +1,10 @@ -{{#linkTo "index.current"}} +{{#link-to "index.current"}}
- - {{#linkTo "index.current"}}{{t layouts.top.home}}{{/linkTo}} + {{#link-to "index.current"}}{{t layouts.top.home}}{{/link-to}}
- {{t layouts.top.blog}} @@ -29,13 +29,13 @@
- Travis CI for Private Repositories -
- +
-
{{#if signedOut}} {{t layouts.top.github_login}} {{/if}} {{#if signedIn}} - {{#linkTo "profile" class="signed-in"}}
{{userName}}{{/linkTo}} + {{#link-to "profile" class="signed-in"}}
- - {{#linkTo "profile.index" class="signed-in"}}{{t layouts.top.accounts}}{{/linkTo}} + {{#link-to "profile.index" class="signed-in"}}{{t layouts.top.accounts}}{{/link-to}}
-
{{t layouts.top.sign_out}}
diff --git a/assets/scripts/app/templates/no_owned_repos.hbs b/assets/scripts/app/templates/no_owned_repos.hbs
index ca925208..534f3481 100644
--- a/assets/scripts/app/templates/no_owned_repos.hbs
+++ b/assets/scripts/app/templates/no_owned_repos.hbs
@@ -11,7 +11,7 @@
Step 1: Enabling your projectsdiff --git a/assets/scripts/app/templates/profile/accounts.hbs b/assets/scripts/app/templates/profile/accounts.hbs index 56f5610b..09c3a2df 100644 --- a/assets/scripts/app/templates/profile/accounts.hbs +++ b/assets/scripts/app/templates/profile/accounts.hbs @@ -2,14 +2,14 @@
- Start by going to your {{#linkTo "profile.index"}}profile{{/linkTo}} and enable one of your projects. We've been + Start by going to your {{#link-to "profile.index"}}profile{{/link-to}} and enable one of your projects. We've been synchronizing all repositories you have administrative access to. Pick one and flip the switch next to it.
- +
-
Accounts
- +
-
{{#with view.account}} {{#if login}} - {{#linkTo "account.index" this}}Repositories{{/linkTo}} + {{#link-to "account.index" this}}Repositories{{/link-to}} {{/if}} {{/with}}
{{#if view.displayUser}}
- - +
-
- {{#linkTo "account.profile" view.account}}Profile{{/linkTo}} + {{#link-to "account.profile" view.account}}Profile{{/link-to}}
{{/if}}
diff --git a/assets/scripts/app/templates/profile/tabs/hooks.hbs b/assets/scripts/app/templates/profile/tabs/hooks.hbs
index dc920183..8aec75ac 100644
--- a/assets/scripts/app/templates/profile/tabs/hooks.hbs
+++ b/assets/scripts/app/templates/profile/tabs/hooks.hbs
@@ -17,13 +17,13 @@
- - {{hook.slug}} +
-
+ {{hook.slug}}
{{#if hook.isSaving}}{{/if}}
{{hook.description}}
- + {{#if hook.active}} ON @@ -54,8 +54,8 @@-
{{#each hook in unAdminisetableHooks}}
-
- - {{hook.slug}} +
-
+ {{hook.slug}}
{{hook.description}}
{{/each}}
diff --git a/assets/scripts/app/templates/profile/tabs/user.hbs b/assets/scripts/app/templates/profile/tabs/user.hbs
index b42239c8..d926d3f2 100644
--- a/assets/scripts/app/templates/profile/tabs/user.hbs
+++ b/assets/scripts/app/templates/profile/tabs/user.hbs
@@ -1,4 +1,4 @@
- - - {{user.login}} + {{user.login}}
-
{{t queue}}: {{queue.name}}
--
+
- +
-
{{t layouts.application.my_repositories}}
- - +
-
{{t layouts.application.recent}}
- - +
-
{{t layouts.application.search}}
-
+ {{bind-attr class="view.canCancelBuild::disabled"}}>
{{/if}}
{{#if view.displayCancelJob}}
-
+ {{bind-attr class="view.canCancelJob::disabled"}}>
{{/if}}
{{#if view.displayRequeueBuild}}
-
+ {{bind-attr class="view.canRequeueBuild::disabled"}}>
{{/if}}
{{#if view.displayRequeueJob}}
-
+ {{bind-attr class="view.canRequeueJob::disabled"}}>
{{/if}}
{{!TODO: for some reason showDownloadLog, which just delegates to jobIdForLog
does not refresh 'if' properly, need further investigation}}
{{#if view.jobIdForLog}}
-
-
+
{{/if}}
{{#if view.displayCodeClimate}}
-
+ {{bind-attr class=":open-popup"}}>
diff --git a/assets/scripts/app/templates/repos/show/tabs.hbs b/assets/scripts/app/templates/repos/show/tabs.hbs
index b1671c2f..e94d49e3 100644
--- a/assets/scripts/app/templates/repos/show/tabs.hbs
+++ b/assets/scripts/app/templates/repos/show/tabs.hbs
@@ -1,58 +1,58 @@
- +
-
{{#if repo.slug}} - {{#linkTo "repo" repo currentWhen="repo.index"}} + {{#link-to "repo" repo currentWhen="repo.index"}} {{t repositories.tabs.current}} - {{/linkTo}} + {{/link-to}} {{/if}}
- - +
-
{{#if repo.slug}} - {{#linkTo "builds" repo}} + {{#link-to "builds" repo}} {{t repositories.tabs.build_history}} - {{/linkTo}} + {{/link-to}} {{/if}}
- - +
-
{{#if repo.slug}} - {{#linkTo "pullRequests" repo}} + {{#link-to "pullRequests" repo}} {{t repositories.tabs.pull_requests}} - {{/linkTo}} + {{/link-to}} {{/if}}
- - +
-
{{#if repo.slug}} - {{#linkTo "branches" repo}} + {{#link-to "branches" repo}} {{t repositories.tabs.branches}} - {{/linkTo}} + {{/link-to}} {{/if}}
- - +
-
{{#if build.id}} {{#if repo.slug}} - {{#linkTo "build" repo build}} + {{#link-to "build" repo build}} {{t repositories.tabs.build}} #{{build.number}} - {{/linkTo}} + {{/link-to}} {{/if}} {{/if}}
- - +
-
{{#if job.id}} {{#if repo.slug}} - {{#linkTo "job" repo job}} + {{#link-to "job" repo job}} {{t repositories.tabs.job}} #{{job.number}} - {{/linkTo}} + {{/link-to}} {{/if}} {{/if}}
diff --git a/assets/scripts/app/templates/repos/show/tools.hbs b/assets/scripts/app/templates/repos/show/tools.hbs index f6368253..5cc706df 100644 --- a/assets/scripts/app/templates/repos/show/tools.hbs +++ b/assets/scripts/app/templates/repos/show/tools.hbs @@ -6,7 +6,7 @@ - + {{bind-attr class=":open-popup view.canRegenerateKey::disabled"}}> Regenerate Key @@ -14,7 +14,7 @@
- {{post.title}} + {{/each}} + {{/with}} + ``` + + Without the `as` operator, it would be impossible to reference `user.name` in the example above. + @method with @for Ember.Handlebars.helpers @param {Function} context @param {Hash} options @return {String} HTML string */ -EmberHandlebars.registerHelper('with', function(context, options) { +EmberHandlebars.registerHelper('with', function withHelper(context, options) { if (arguments.length === 4) { - var keywordName, path, rootPath, normalized; + var keywordName, path, rootPath, normalized, contextPath; Ember.assert("If you pass more than one argument to the with helper, it must be in the form #with foo as bar", arguments[1] === "as"); options = arguments[3]; @@ -25784,8 +27775,12 @@ EmberHandlebars.registerHelper('with', function(context, options) { Ember.assert("You must pass a block to the with helper", options.fn && options.fn !== Handlebars.VM.noop); + var localizedOptions = o_create(options); + localizedOptions.data = o_create(options.data); + localizedOptions.data.keywords = o_create(options.data.keywords || {}); + if (Ember.isGlobalPath(path)) { - Ember.bind(options.data.keywords, keywordName, path); + contextPath = path; } else { normalized = normalizePath(this, path, options.data); path = normalized.path; @@ -25794,14 +27789,14 @@ EmberHandlebars.registerHelper('with', function(context, options) { // This is a workaround for the fact that you cannot bind separate objects // together. When we implement that functionality, we should use it here. var contextKey = Ember.$.expando + Ember.guidFor(rootPath); - options.data.keywords[contextKey] = rootPath; - + localizedOptions.data.keywords[contextKey] = rootPath; // if the path is '' ("this"), just bind directly to the current context - var contextPath = path ? contextKey + '.' + path : contextKey; - Ember.bind(options.data.keywords, keywordName, contextPath); + contextPath = path ? contextKey + '.' + path : contextKey; } - return bind.call(this, path, options, true, exists); + Ember.bind(localizedOptions.data.keywords, keywordName, contextPath); + + return bind.call(this, path, localizedOptions, true, exists); } else { Ember.assert("You must pass exactly one argument to the with helper", arguments.length === 2); Ember.assert("You must pass a block to the with helper", options.fn && options.fn !== Handlebars.VM.noop); @@ -25819,7 +27814,7 @@ EmberHandlebars.registerHelper('with', function(context, options) { @param {Hash} options @return {String} HTML string */ -EmberHandlebars.registerHelper('if', function(context, options) { +EmberHandlebars.registerHelper('if', function ifHelper(context, options) { Ember.assert("You must pass exactly one argument to the if helper", arguments.length === 2); Ember.assert("You must pass a block to the if helper", options.fn && options.fn !== Handlebars.VM.noop); @@ -25833,7 +27828,7 @@ EmberHandlebars.registerHelper('if', function(context, options) { @param {Hash} options @return {String} HTML string */ -EmberHandlebars.registerHelper('unless', function(context, options) { +EmberHandlebars.registerHelper('unless', function unlessHelper(context, options) { Ember.assert("You must pass exactly one argument to the unless helper", arguments.length === 2); Ember.assert("You must pass a block to the unless helper", options.fn && options.fn !== Handlebars.VM.noop); @@ -25968,7 +27963,7 @@ EmberHandlebars.registerHelper('unless', function(context, options) { @param {Hash} options @return {String} HTML string */ -EmberHandlebars.registerHelper('bind-attr', function(options) { +EmberHandlebars.registerHelper('bind-attr', function bindAttrHelper(options) { var attrs = options.hash; @@ -26014,7 +28009,9 @@ EmberHandlebars.registerHelper('bind-attr', function(options) { observer = function observer() { var result = handlebarsGet(ctx, path, options); - Ember.assert(fmt("Attributes must be numbers, strings or booleans, not %@", [result]), result === null || result === undefined || typeof result === 'number' || typeof result === 'string' || typeof result === 'boolean'); + Ember.assert(fmt("Attributes must be numbers, strings or booleans, not %@", [result]), + result === null || result === undefined || typeof result === 'number' || + typeof result === 'string' || typeof result === 'boolean'); var elem = view.$("[data-bindattr-" + dataId + "='" + dataId + "']"); @@ -26064,11 +28061,12 @@ EmberHandlebars.registerHelper('bind-attr', function(options) { @param {Hash} options @return {String} HTML string */ -EmberHandlebars.registerHelper('bindAttr', EmberHandlebars.helpers['bind-attr']); +EmberHandlebars.registerHelper('bindAttr', function bindAttrHelper() { + Ember.warn("The 'bindAttr' view helper is deprecated in favor of 'bind-attr'"); + return EmberHandlebars.helpers['bind-attr'].apply(this, arguments); +}); /** - @private - Helper that, given a space-separated string of property paths and a context, returns an array of class names. Calling this method also has the side effect of setting up observers at those property paths, such that if they @@ -26080,6 +28078,7 @@ EmberHandlebars.registerHelper('bindAttr', EmberHandlebars.helpers['bind-attr']) "fooBar"). If the value is a string, it will add that string as the class. Otherwise, it will not add any new class name. + @private @method bindClasses @for Ember.Handlebars @param {Ember.Object} context The context from which to lookup properties @@ -26327,7 +28326,7 @@ EmberHandlebars.ViewHelper = Ember.Object.create({ return 'templateData.keywords.' + path; } else if (Ember.isGlobalPath(path)) { return null; - } else if (path === 'this') { + } else if (path === 'this' || path === '') { return '_parentView.context'; } else { return '_parentView.context.' + path; @@ -26546,7 +28545,7 @@ EmberHandlebars.ViewHelper = Ember.Object.create({ @param {Hash} options @return {String} HTML string */ -EmberHandlebars.registerHelper('view', function(path, options) { +EmberHandlebars.registerHelper('view', function viewHelper(path, options) { Ember.assert("The view helper only takes a single argument", arguments.length <= 2); // If no path is provided, treat path param as options. @@ -26564,8 +28563,6 @@ EmberHandlebars.registerHelper('view', function(path, options) { (function() { -/*globals Handlebars */ - // TODO: Don't require all of this module /** @module ember @@ -26696,7 +28693,7 @@ var get = Ember.get, handlebarsGet = Ember.Handlebars.get, fmt = Ember.String.fm @return {String} HTML string @deprecated Use `{{each}}` helper instead. */ -Ember.Handlebars.registerHelper('collection', function(path, options) { +Ember.Handlebars.registerHelper('collection', function collectionHelper(path, options) { Ember.deprecate("Using the {{collection}} helper without specifying a class has been deprecated as the {{each}} helper now supports the same functionality.", path !== 'collection'); // If no path is provided, treat path param as options. @@ -26727,10 +28724,17 @@ Ember.Handlebars.registerHelper('collection', function(path, options) { if (hash.itemView) { var controller = data.keywords.controller; - Ember.assert('You specified an itemView, but the current context has no container to look the itemView up in. This probably means that you created a view manually, instead of through the container. Instead, use container.lookup("view:viewName"), which will properly instantiate your view.', controller && controller.container); + Ember.assert('You specified an itemView, but the current context has no ' + + 'container to look the itemView up in. This probably means ' + + 'that you created a view manually, instead of through the ' + + 'container. Instead, use container.lookup("view:viewName"), ' + + 'which will properly instantiate your view.', + controller && controller.container); var container = controller.container; itemViewClass = container.resolve('view:' + hash.itemView); - Ember.assert('You specified the itemView ' + hash.itemView + ", but it was not found at " + container.describe("view:" + hash.itemView) + " (and it was not registered in the container)", !!itemViewClass); + Ember.assert('You specified the itemView ' + hash.itemView + ", but it was " + + "not found at " + container.describe("view:" + hash.itemView) + + " (and it was not registered in the container)", !!itemViewClass); } else if (hash.itemViewClass) { itemViewClass = handlebarsGet(collectionPrototype, hash.itemViewClass, options); } else { @@ -26764,7 +28768,7 @@ Ember.Handlebars.registerHelper('collection', function(path, options) { } var emptyViewClass; - if (inverse && inverse !== Handlebars.VM.noop) { + if (inverse && inverse !== Ember.Handlebars.VM.noop) { emptyViewClass = get(collectionPrototype, 'emptyViewClass'); emptyViewClass = emptyViewClass.extend({ template: inverse, @@ -26819,13 +28823,13 @@ var handlebarsGet = Ember.Handlebars.get; @param {String} property @return {String} HTML string */ -Ember.Handlebars.registerHelper('unbound', function(property, fn) { +Ember.Handlebars.registerHelper('unbound', function unboundHelper(property, fn) { var options = arguments[arguments.length - 1], helper, context, out; if (arguments.length > 2) { // Unbound helper call. options.data.isUnbound = true; - helper = Ember.Handlebars.helpers[arguments[0]] || Ember.Handlebars.helperMissing; + helper = Ember.Handlebars.helpers[arguments[0]] || Ember.Handlebars.helpers.helperMissing; out = helper.apply(this, Array.prototype.slice.call(arguments, 1)); delete options.data.isUnbound; return out; @@ -26846,7 +28850,7 @@ Ember.Handlebars.registerHelper('unbound', function(property, fn) { @submodule ember-handlebars */ -var handlebarsGet = Ember.Handlebars.get, normalizePath = Ember.Handlebars.normalizePath; +var get = Ember.get, handlebarsGet = Ember.Handlebars.get, normalizePath = Ember.Handlebars.normalizePath; /** `log` allows you to output the value of a variable in the current rendering @@ -26860,7 +28864,7 @@ var handlebarsGet = Ember.Handlebars.get, normalizePath = Ember.Handlebars.norma @for Ember.Handlebars.helpers @param {String} property */ -Ember.Handlebars.registerHelper('log', function(property, options) { +Ember.Handlebars.registerHelper('log', function logHelper(property, options) { var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this, normalized = normalizePath(context, property, options.data), pathRoot = normalized.root, @@ -26876,14 +28880,44 @@ Ember.Handlebars.registerHelper('log', function(property, options) { {{debugger}} ``` + Before invoking the `debugger` statement, there + are a few helpful variables defined in the + body of this helper that you can inspect while + debugging that describe how and where this + helper was invoked: + + - templateContext: this is most likely a controller + from which this template looks up / displays properties + - typeOfTemplateContext: a string description of + what the templateContext is + + For example, if you're wondering why a value `{{foo}}` + isn't rendering as expected within a template, you + could place a `{{debugger}}` statement, and when + the `debugger;` breakpoint is hit, you can inspect + `templateContext`, determine if it's the object you + expect, and/or evaluate expressions in the console + to perform property lookups on the `templateContext`: + + ``` + > templateContext.get('foo') // -> "
-
{{#each job in queue}}
{{#view Travis.QueueItemView jobBinding="job"}}
{{#if job.repo.slug}}
- {{#linkTo "job" job.repo job}}
+ {{#link-to "job" job.repo job}}
{{job.repo.slug}}
#{{job.number}}
- {{/linkTo}}
+ {{/link-to}}
{{/if}}
{{/view}}
{{else}}
diff --git a/assets/scripts/app/templates/repos/list.hbs b/assets/scripts/app/templates/repos/list.hbs
index 378891fc..09e0cdd9 100644
--- a/assets/scripts/app/templates/repos/list.hbs
+++ b/assets/scripts/app/templates/repos/list.hbs
@@ -11,22 +11,22 @@
{{#if slug}} - {{#linkTo "repo" this class="slug"}}{{slug}}{{/linkTo}} + {{#link-to "repo" this class="slug"}}{{slug}}{{/link-to}} {{/if}}{{#with lastBuildHash}} {{#if repo.slug}} - {{#linkTo "build" repo id class="last_build"}}{{number}}{{/linkTo}} + {{#link-to "build" repo id class="last_build"}}{{number}}{{/link-to}} {{/if}} {{/with}}{{t repositories.duration}}: - {{formatDuration lastBuildDuration}} + {{formatDuration lastBuildDuration}}
{{t repositories.finished_at}}: - {{formatTime lastBuildFinishedAt}} + {{formatTime lastBuildFinishedAt}}
diff --git a/assets/scripts/app/templates/repos/list/tabs.hbs b/assets/scripts/app/templates/repos/list/tabs.hbs index 3511bef4..04d03fa3 100644 --- a/assets/scripts/app/templates/repos/list/tabs.hbs +++ b/assets/scripts/app/templates/repos/list/tabs.hbs @@ -1,13 +1,13 @@-
-
+{{#if view.isEmpty}} {{view Travis.ReposEmptyView}} {{else}} {{#if repo.isLoaded}} {{#with repo}}-diff --git a/assets/scripts/app/templates/repos/show/actions.hbs b/assets/scripts/app/templates/repos/show/actions.hbs index 181d23e6..362c9536 100644 --- a/assets/scripts/app/templates/repos/show/actions.hbs +++ b/assets/scripts/app/templates/repos/show/actions.hbs @@ -3,39 +3,39 @@ {{#if view.displayCancelBuild}}{{#linkTo "repo" this}}{{slug}}{{/linkTo}}
-+
{{#link-to "repo" this}}{{slug}}{{/link-to}}
+{{view Travis.RepoShowToolsView}}-
-
+
Integrating Code Climate's test coverage reporting with your test suite on Travis CI allows to track changes in coverage over time. If you haven't tried it out already, sign + {{bind-attr href="Travis.config.code_climate_url"}}" target="_blank">sign up today to improve your code's quality. New customers get 20% off for the first three months!
diff --git a/assets/scripts/app/templates/status_images.hbs b/assets/scripts/app/templates/status_images.hbs index f5dc5c0a..0f832f2b 100644 --- a/assets/scripts/app/templates/status_images.hbs +++ b/assets/scripts/app/templates/status_images.hbs @@ -9,25 +9,25 @@- +
- +
- +
- +
- +
- +
diff --git a/assets/scripts/app/templates/workers/list.hbs b/assets/scripts/app/templates/workers/list.hbs index 6f41d33e..a9387fe9 100644 --- a/assets/scripts/app/templates/workers/list.hbs +++ b/assets/scripts/app/templates/workers/list.hbs @@ -14,9 +14,9 @@ {{#if worker.isWorking}} {{#if worker.jobId}} - {{#linkTo "job" worker.repo worker.jobId}} + {{#link-to "job" worker.repo worker.jobId}} {{view.display}} - {{/linkTo}} + {{/link-to}} {{/if}} {{else}} {{view.display}} diff --git a/assets/scripts/app/views/repo/show.coffee b/assets/scripts/app/views/repo/show.coffee index a27a0b29..5deaf914 100644 --- a/assets/scripts/app/views/repo/show.coffee +++ b/assets/scripts/app/views/repo/show.coffee @@ -37,7 +37,7 @@ Travis.reopen tabBinding: 'controller.tab' contextBinding: 'controller' - # hrm. how to parametrize bindAttr? + # hrm. how to parametrize bind-attr? classCurrent: (-> 'active' if @get('tab') == 'current' ).property('tab') diff --git a/assets/scripts/app/views/top.coffee b/assets/scripts/app/views/top.coffee index ac9e8d24..fe5d7aea 100644 --- a/assets/scripts/app/views/top.coffee +++ b/assets/scripts/app/views/top.coffee @@ -4,7 +4,7 @@ tabBinding: 'controller.tab' - # hrm. how to parametrize bindAttr? + # hrm. how to parametrize bind-attr? classHome: (-> 'active' if @get('tab') == 'home' ).property('tab') diff --git a/assets/scripts/vendor/ember.js b/assets/scripts/vendor/ember.js index 735ee4b1..2758331a 100644 --- a/assets/scripts/vendor/ember.js +++ b/assets/scripts/vendor/ember.js @@ -1,15 +1,14 @@ -// ========================================================================== -// Project: Ember - JavaScript Application Framework -// Copyright: Copyright 2011-2013 Tilde Inc. and contributors -// Portions Copyright 2006-2011 Strobe Inc. -// Portions Copyright 2008-2011 Apple Inc. All rights reserved. -// License: Licensed under MIT license -// See https://raw.github.com/emberjs/ember.js/master/LICENSE -// ========================================================================== +/*! + * @overview Ember - JavaScript Application Framework + * @copyright Copyright 2011-2014 Tilde Inc. and contributors + * Portions Copyright 2006-2011 Strobe Inc. + * Portions Copyright 2008-2011 Apple Inc. All rights reserved. + * @license Licensed under MIT license + * See https://raw.github.com/emberjs/ember.js/master/LICENSE + * @version 1.3.0 + */ - // Version: 1.2.0 - (function() { /*global __fail__*/ @@ -32,7 +31,20 @@ if ('undefined' === typeof Ember) { } } -Ember.ENV = 'undefined' === typeof ENV ? {} : ENV; +// This needs to be kept in sync with the logic in +// `packages/ember-metal/lib/core.js`. +// +// This is duplicated here to ensure that `Ember.ENV` +// is setup even if `Ember` is not loaded yet. +if (Ember.ENV) { + // do nothing if Ember.ENV is already setup +} else if ('undefined' !== typeof EmberENV) { + Ember.ENV = EmberENV; +} else if('undefined' !== typeof ENV) { + Ember.ENV = ENV; +} else { + Ember.ENV = {}; +} if (!('MANDATORY_SETTER' in Ember.ENV)) { Ember.ENV.MANDATORY_SETTER = true; // default to true for debug dist @@ -184,20 +196,19 @@ if (!Ember.testing) { })(); -// ========================================================================== -// Project: Ember - JavaScript Application Framework -// Copyright: Copyright 2011-2013 Tilde Inc. and contributors -// Portions Copyright 2006-2011 Strobe Inc. -// Portions Copyright 2008-2011 Apple Inc. All rights reserved. -// License: Licensed under MIT license -// See https://raw.github.com/emberjs/ember.js/master/LICENSE -// ========================================================================== +/*! + * @overview Ember - JavaScript Application Framework + * @copyright Copyright 2011-2014 Tilde Inc. and contributors + * Portions Copyright 2006-2011 Strobe Inc. + * Portions Copyright 2008-2011 Apple Inc. All rights reserved. + * @license Licensed under MIT license + * See https://raw.github.com/emberjs/ember.js/master/LICENSE + * @version 1.3.0 + */ - // Version: 1.2.0 - (function() { -var define, requireModule; +var define, requireModule, require, requirejs; (function() { var registry = {}, seen = {}; @@ -206,36 +217,52 @@ var define, requireModule; registry[name] = { deps: deps, callback: callback }; }; - requireModule = function(name) { + requirejs = require = requireModule = function(name) { + requirejs._eak_seen = registry; + if (seen[name]) { return seen[name]; } seen[name] = {}; - var mod, deps, callback, reified, exports; - - mod = registry[name]; - - if (!mod) { - throw new Error("Module '" + name + "' not found."); + if (!registry[name]) { + throw new Error("Could not find module " + name); } - deps = mod.deps; - callback = mod.callback; - reified = []; + var mod = registry[name], + deps = mod.deps, + callback = mod.callback, + reified = [], + exports; for (var i=0, l=deps.length; i+ }); + ``` + + @property promise + */ promise: Ember.computed(function(key, promise) { if (arguments.length === 2) { promise = resolve(promise); @@ -16216,12 +18099,47 @@ Ember.PromiseProxyMixin = Ember.Mixin.create({ } }), - then: function(fulfill, reject) { - return get(this, 'promise').then(fulfill, reject); - } + /** + An alias to the proxied promise's `then`. + + See RSVP.Promise.then. + + @method then + @param {Function} callback + @return {RSVP.Promise} + */ + then: promiseAlias('then'), + + /** + An alias to the proxied promise's `catch`. + + See RSVP.Promise.catch. + + @method catch + @param {Function} callback + @return {RSVP.Promise} + */ + 'catch': promiseAlias('catch'), + + /** + An alias to the proxied promise's `finally`. + + See RSVP.Promise.finally. + + @method finally + @param {Function} callback + @return {RSVP.Promise} + */ + 'finally': promiseAlias('finally') + }); - +function promiseAlias(name) { + return function () { + var promise = get(this, 'promise'); + return promise[name].apply(promise, arguments); + }; +} })(); @@ -16344,11 +18262,12 @@ Ember.TrackedArray.prototype = { items in the array. `callback` will be called for each operation and will be passed the following arguments: - * {array} items The items for the given operation - * {number} offset The computed offset of the items, ie the index in the - array of the first item for this operation. - * {string} operation The type of the operation. One of - `Ember.TrackedArray.{RETAIN, DELETE, INSERT}` + + * {array} items The items for the given operation + * {number} offset The computed offset of the items, ie the index in the + array of the first item for this operation. + * {string} operation The type of the operation. One of + `Ember.TrackedArray.{RETAIN, DELETE, INSERT}` @method apply @param {function} callback @@ -16370,7 +18289,7 @@ Ember.TrackedArray.prototype = { }, /** - Return an ArrayOperationMatch for the operation that contains the item at `index`. + Return an `ArrayOperationMatch` for the operation that contains the item at `index`. @method _findArrayOperation @@ -16532,10 +18451,10 @@ Ember.TrackedArray.prototype = { @method ArrayOperation @private - @property {string} type The type of the operation. One of + @param {string} type The type of the operation. One of `Ember.TrackedArray.{RETAIN, INSERT, DELETE}` - @property {number} count The number of items in this operation. - @property {array} items The items of the operation, if included. RETAIN and + @param {number} count The number of items in this operation. + @param {array} items The items of the operation, if included. RETAIN and INSERT include their items, DELETE does not. */ function ArrayOperation (operation, count, items) { @@ -16550,11 +18469,11 @@ function ArrayOperation (operation, count, items) { @method ArrayOperationMatch @private - @property {ArrayOperation} operation - @property {number} index The index of `operation` in the array of operations. - @property {boolean} split Whether or not the item index searched for would + @param {ArrayOperation} operation + @param {number} index The index of `operation` in the array of operations. + @param {boolean} split Whether or not the item index searched for would require a split for a new operation type. - @property {number} rangeStart The index of the first item in the operation, + @param {number} rangeStart The index of the first item in the operation, with respect to the tracked array. The index of the last item can be computed from `rangeStart` and `operation.count`. */ @@ -16815,7 +18734,7 @@ var get = Ember.get, set = Ember.set; @extends Ember.Object @uses Ember.MutableArray */ -Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray,/** @scope Ember.ArrayProxy.prototype */ { +Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray, { /** The content array. Must be an object that implements `Ember.Array` and/or @@ -16869,11 +18788,10 @@ Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray,/** @scope Ember.Array }, /** - @private - Invoked when the content property is about to change. Notifies observers that the entire array content will change. + @private @method _contentWillChange */ _contentWillChange: Ember.beforeObserver('content', function() { @@ -16895,11 +18813,10 @@ Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray,/** @scope Ember.Array contentArrayDidChange: Ember.K, /** - @private - Invoked when the content property changes. Notifies observers that the entire array content has changed. + @private @method _contentDidChange */ _contentDidChange: Ember.observer('content', function() { @@ -17598,7 +19515,7 @@ var get = Ember.get, set = Ember.set, guidFor = Ember.guidFor, isNone = Ember.is @since Ember 0.9 */ Ember.Set = Ember.CoreObject.extend(Ember.MutableEnumerable, Ember.Copyable, Ember.Freezable, - /** @scope Ember.Set.prototype */ { + { // .......................................................... // IMPLEMENT ENUMERABLE APIS @@ -17973,32 +19890,30 @@ Ember.Deferred = Deferred; var forEach = Ember.ArrayPolyfills.forEach; /** -@module ember -@submodule ember-runtime + @module ember + @submodule ember-runtime */ var loadHooks = Ember.ENV.EMBER_LOAD_HOOKS || {}; var loaded = {}; /** + Detects when a specific package of Ember (e.g. 'Ember.Handlebars') + has fully loaded and is available for extension. -Detects when a specific package of Ember (e.g. 'Ember.Handlebars') -has fully loaded and is available for extension. + The provided `callback` will be called with the `name` passed + resolved from a string into the object: -The provided `callback` will be called with the `name` passed -resolved from a string into the object: + ``` javascript + Ember.onLoad('Ember.Handlebars' function(hbars){ + hbars.registerHelper(...); + }); + ``` -```javascript -Ember.onLoad('Ember.Handlebars' function(hbars){ - hbars.registerHelper(...); -}); -``` - - -@method onLoad -@for Ember -@param name {String} name of hook -@param callback {Function} callback to be called + @method onLoad + @for Ember + @param name {String} name of hook + @param callback {Function} callback to be called */ Ember.onLoad = function(name, callback) { var object; @@ -18012,14 +19927,13 @@ Ember.onLoad = function(name, callback) { }; /** + Called when an Ember.js package (e.g Ember.Handlebars) has finished + loading. Triggers any callbacks registered for this event. -Called when an Ember.js package (e.g Ember.Handlebars) has finished -loading. Triggers any callbacks registered for this event. - -@method runLoadHooks -@for Ember -@param name {String} name of hook -@param object {Object} object to pass to callbacks + @method runLoadHooks + @for Ember + @param name {String} name of hook + @param object {Object} object to pass to callbacks */ Ember.runLoadHooks = function(name, object) { loaded[name] = object; @@ -18056,6 +19970,7 @@ var get = Ember.get; @class ControllerMixin @namespace Ember + @uses Ember.ActionHandler */ Ember.ControllerMixin = Ember.Mixin.create(Ember.ActionHandler, { /* ducktype as a controller */ @@ -18952,8 +20867,7 @@ Ember._RenderBuffer = function(tagName) { this.buffer = ""; }; -Ember._RenderBuffer.prototype = -/** @scope Ember.RenderBuffer.prototype */ { +Ember._RenderBuffer.prototype = { // The root view's element _element: null, @@ -18961,12 +20875,11 @@ Ember._RenderBuffer.prototype = _hasElement: true, /** - @private - An internal set used to de-dupe class names when `addClass()` is used. After each call to `addClass()`, the `classes` property will be updated. + @private @property elementClasses @type Array @default [] @@ -19411,7 +21324,7 @@ var get = Ember.get, set = Ember.set, fmt = Ember.String.fmt; @private @extends Ember.Object */ -Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.prototype */{ +Ember.EventDispatcher = Ember.Object.extend({ /** The set of events names (and associated handler function names) to be setup @@ -19455,8 +21368,6 @@ Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.pro }, /** - @private - The root DOM element to which event listeners should be attached. Event listeners will be attached to the document unless this is overridden. @@ -19465,6 +21376,7 @@ Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.pro The default body is a string since this may be evaluated before document.body exists in the DOM. + @private @property rootElement @type DOMElement @default 'body' @@ -19472,8 +21384,6 @@ Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.pro rootElement: 'body', /** - @private - Sets up event listeners for standard browser events. This will be called after the browser sends a `DOMContentReady` event. By @@ -19481,6 +21391,7 @@ Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.pro would like to register the listeners on a different element, set the event dispatcher's `root` property. + @private @method setup @param addedEvents {Hash} */ @@ -19512,8 +21423,6 @@ Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.pro }, /** - @private - Registers an event listener on the document. If the given event is triggered, the provided event handler will be triggered on the target view. @@ -19528,6 +21437,7 @@ Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.pro setupHandler('mousedown', 'mouseDown'); ``` + @private @method setupHandler @param {Element} rootElement @param {String} event the browser-originated event to listen to @@ -19537,7 +21447,7 @@ Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.pro var self = this; rootElement.on(event + '.ember', '.ember-view', function(evt, triggeringManager) { - return Ember.handleErrors(function() { + return Ember.handleErrors(function handleViewEvent() { var view = Ember.View.views[this.id], result = true, manager = null; @@ -19556,7 +21466,7 @@ Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.pro }); rootElement.on(event + '.ember', '[data-ember-action]', function(evt) { - return Ember.handleErrors(function() { + return Ember.handleErrors(function handleActionEvent() { var actionId = Ember.$(evt.currentTarget).attr('data-ember-action'), action = Ember.Handlebars.ActionHelper.registeredActions[actionId]; @@ -19602,7 +21512,7 @@ Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.pro }, _bubbleEvent: function(view, evt, eventName) { - return Ember.run(function() { + return Ember.run(function bubbleEvent() { return view.handleEvent(eventName, evt); }); }, @@ -19751,6 +21661,7 @@ Ember.TEMPLATES = {}; @namespace Ember @extends Ember.Object @uses Ember.Evented + @uses Ember.ActionHandler */ Ember.CoreView = Ember.Object.extend(Ember.Evented, Ember.ActionHandler, { @@ -19798,8 +21709,6 @@ Ember.CoreView = Ember.Object.extend(Ember.Evented, Ember.ActionHandler, { }, /** - @private - Invoked by the view system when this view needs to produce an HTML representation. This method will create a new render buffer, if needed, then apply any default attributes, such as class names and visibility. @@ -19814,6 +21723,7 @@ Ember.CoreView = Ember.Object.extend(Ember.Evented, Ember.ActionHandler, { @param {Ember.RenderBuffer} buffer the render buffer. If no buffer is passed, a default buffer, using the current view's `tagName`, will be used. + @private */ renderToBuffer: function(parentBuffer, bufferOperation) { var name = 'render.' + this.instrumentName, @@ -19821,7 +21731,7 @@ Ember.CoreView = Ember.Object.extend(Ember.Evented, Ember.ActionHandler, { this.instrumentDetails(details); - return Ember.instrument(name, details, function() { + return Ember.instrument(name, details, function instrumentRenderToBuffer() { return this._renderToBuffer(parentBuffer, bufferOperation); }, this); }, @@ -19848,13 +21758,12 @@ Ember.CoreView = Ember.Object.extend(Ember.Evented, Ember.ActionHandler, { }, /** - @private - Override the default event firing from `Ember.Evented` to also call methods with the given name. @method trigger @param name {String} + @private */ trigger: function(name) { this._super.apply(this, arguments); @@ -20256,6 +22165,22 @@ var EMPTY_ARRAY = []; }); ``` + If you have nested resources, your Handlebars template will look like this: + + ```html + + ``` + + And `templateName` property: + + ```javascript + AView = Ember.View.extend({ + templateName: 'posts/new' + }); + ``` + Using a value for `templateName` that does not have a Handlebars template with a matching `data-template-name` attribute will throw an error. @@ -20524,8 +22449,7 @@ var EMPTY_ARRAY = []; @namespace Ember @extends Ember.CoreView */ -Ember.View = Ember.CoreView.extend( -/** @scope Ember.View.prototype */ { +Ember.View = Ember.CoreView.extend({ concatenatedProperties: ['classNames', 'classNameBindings', 'attributeBindings'], @@ -20533,7 +22457,7 @@ Ember.View = Ember.CoreView.extend( @property isView @type Boolean @default true - @final + @static */ isView: true, @@ -20658,8 +22582,6 @@ Ember.View = Ember.CoreView.extend( }).volatile(), /** - @private - Private copy of the view's template context. This can be set directly by Handlebars without triggering the observer that causes the view to be re-rendered. @@ -20675,6 +22597,7 @@ Ember.View = Ember.CoreView.extend( something of a hack and should be revisited. @property _context + @private */ _context: Ember.computed(function(key) { var parentView, controller; @@ -20692,12 +22615,11 @@ Ember.View = Ember.CoreView.extend( }), /** - @private - If a value that affects template rendering changes, the view should be re-rendered to reflect the new value. @method _contextDidChange + @private */ _contextDidChange: Ember.observer('context', function() { this.rerender(); @@ -20713,14 +22635,13 @@ Ember.View = Ember.CoreView.extend( isVisible: true, /** - @private - Array of child views. You should never edit this array directly. Instead, use `appendChild` and `removeFromParent`. @property childViews @type Array @default [] + @private */ childViews: childViewsProperty, @@ -20787,7 +22708,7 @@ Ember.View = Ember.CoreView.extend( /** Return the nearest ancestor that has a given property. - @property nearestWithProperty + @function nearestWithProperty @param {String} property A property name @return Ember.View */ @@ -20804,7 +22725,7 @@ Ember.View = Ember.CoreView.extend( Return the nearest ancestor whose parent is an instance of `klass`. - @property nearestChildOf + @method nearestChildOf @param {Class} klass Subclass of Ember.View (or Ember.View itself) @return Ember.View */ @@ -20818,11 +22739,10 @@ Ember.View = Ember.CoreView.extend( }, /** - @private - When the parent view changes, recursively invalidate `controller` @method _parentViewDidChange + @private */ _parentViewDidChange: Ember.observer('_parentView', function() { if (this.isDestroying) { return; } @@ -20937,14 +22857,13 @@ Ember.View = Ember.CoreView.extend( }, /** - @private - Iterates over the view's `classNameBindings` array, inserts the value of the specified property into the `classNames` array, then creates an observer to update the view's element if the bound property ever changes in the future. @method _applyClassNameBindings + @private */ _applyClassNameBindings: function(classBindings) { var classNames = this.classNames, @@ -21015,13 +22934,12 @@ Ember.View = Ember.CoreView.extend( }, /** - @private - Iterates through the view's attribute bindings, sets up observers for each, then applies the current value of the attributes to the passed render buffer. @method _applyAttributeBindings @param {Ember.RenderBuffer} buffer + @private */ _applyAttributeBindings: function(buffer, attributeBindings) { var attributeValue, elem; @@ -21051,8 +22969,6 @@ Ember.View = Ember.CoreView.extend( }, /** - @private - Given a property name, returns a dasherized version of that property name if the property evaluates to a non-falsy value. @@ -21061,6 +22977,7 @@ Ember.View = Ember.CoreView.extend( @method _classStringForProperty @param property + @private */ _classStringForProperty: function(property) { var parsedPath = Ember.View._parsePropertyPath(property); @@ -21179,7 +23096,7 @@ Ember.View = Ember.CoreView.extend( finished synchronizing @method replaceIn - @param {String|DOMElement|jQuery} A selector, element, HTML string, or jQuery object + @param {String|DOMElement|jQuery} target A selector, element, HTML string, or jQuery object @return {Ember.View} received */ replaceIn: function(target) { @@ -21195,8 +23112,6 @@ Ember.View = Ember.CoreView.extend( }, /** - @private - Schedules a DOM operation to occur during the next render phase. This ensures that all bindings have finished synchronizing before the view is rendered. @@ -21216,6 +23131,7 @@ Ember.View = Ember.CoreView.extend( @method _insertElementLater @param {Function} fn the function that inserts the element into the DOM + @private */ _insertElementLater: function(fn) { this._scheduledInsert = Ember.run.scheduleOnce('render', this, '_insertElement', fn); @@ -21327,13 +23243,12 @@ Ember.View = Ember.CoreView.extend( willClearRender: Ember.K, /** - @private - Run this callback on the current view (unless includeSelf is false) and recursively on child views. @method invokeRecursively @param fn {Function} - @param includeSelf (optional, default true) + @param includeSelf {Boolean} Includes itself if true. + @private */ invokeRecursively: function(fn, includeSelf) { var childViews = (includeSelf === false) ? this._childViews : [this]; @@ -21418,8 +23333,6 @@ Ember.View = Ember.CoreView.extend( willDestroyElement: Ember.K, /** - @private - Triggers the `willDestroyElement` event (which invokes the `willDestroyElement()` method if it exists) on this view and all child views. @@ -21428,6 +23341,7 @@ Ember.View = Ember.CoreView.extend( `willClearRender` event recursively. @method _notifyWillDestroyElement + @private */ _notifyWillDestroyElement: function() { var viewCollection = this.viewHierarchyCollection(); @@ -21437,13 +23351,12 @@ Ember.View = Ember.CoreView.extend( }, /** - @private - If this view's element changes, we need to invalidate the caches of our child views so that we do not retain references to DOM elements that are no longer needed. @method _elementDidChange + @private */ _elementDidChange: Ember.observer('element', function() { this.forEachChildView(function(view) { @@ -21637,14 +23550,14 @@ Ember.View = Ember.CoreView.extend( // /** - @private - Setup a view, but do not finish waking it up. - - configure `childViews` - - register the view with the global views hash, which is used for event + + * configure `childViews` + * register the view with the global views hash, which is used for event dispatch @method init + @private */ init: function() { this.elementId = this.elementId || guidFor(this); @@ -21823,12 +23736,11 @@ Ember.View = Ember.CoreView.extend( becameHidden: Ember.K, /** - @private - When the view's `isVisible` property changes, toggle the visibility element of the actual DOM element. @method _isVisibleDidChange + @private */ _isVisibleDidChange: Ember.observer('isVisible', function() { var $el = this.$(); @@ -21909,13 +23821,12 @@ Ember.View = Ember.CoreView.extend( // /** - @private - Handle events from `Ember.EventDispatcher` @method handleEvent @param eventName {String} @param evt {Event} + @private */ handleEvent: function(eventName, evt) { return this.currentState.handleEvent(this, eventName, evt); @@ -22022,8 +23933,6 @@ Ember.View.reopen({ Ember.View.reopenClass({ /** - @private - Parse a path and return an object which holds the parsed properties. For example a path like "content.isEnabled:enabled:disabled" will return the @@ -22040,6 +23949,7 @@ Ember.View.reopenClass({ @method _parsePropertyPath @static + @private */ _parsePropertyPath: function(path) { var split = path.split(':'), @@ -22066,8 +23976,6 @@ Ember.View.reopenClass({ }, /** - @private - Get the class name for a given value, based on the path, optional `className` and optional `falsyClassName`. @@ -22089,6 +23997,7 @@ Ember.View.reopenClass({ @param className @param falsyClassName @static + @private */ _classStringForValue: function(path, val, className, falsyClassName) { // When using the colon syntax, evaluate the truthiness or falsiness @@ -22168,6 +24077,10 @@ Ember.View.applyAttributeBindings = function(elem, name, value) { // We can't set properties to undefined or null if (Ember.isNone(value)) { value = ''; } + if (!value) { + elem.removeAttr(name); + } + if (value !== elem.prop(name)) { // value and booleans should always be properties elem.prop(name, value); @@ -22335,7 +24248,10 @@ Ember.merge(inBuffer, { }, empty: function() { - Ember.assert("Emptying a view in the inBuffer state is not allowed and should not happen under normal circumstances. Most likely there is a bug in your application. This may be due to excessive property change notifications."); + Ember.assert("Emptying a view in the inBuffer state is not allowed and " + + "should not happen under normal circumstances. Most likely " + + "there is a bug in your application. This may be due to " + + "excessive property change notifications."); }, renderToBufferIfNeeded: function (view, buffer) { @@ -22563,7 +24479,7 @@ var ViewCollection = Ember._ViewCollection; /** A `ContainerView` is an `Ember.View` subclass that implements `Ember.MutableArray` - allowing programatic management of its child views. + allowing programmatic management of its child views. ## Setting Initial Child Views @@ -22603,7 +24519,7 @@ var ViewCollection = Ember._ViewCollection; ## Adding and Removing Child Views - The container view implements `Ember.MutableArray` allowing programatic management of its child views. + The container view implements `Ember.MutableArray` allowing programmatic management of its child views. To remove a view, pass that view into a `removeObject` call on the container view. @@ -22776,10 +24692,9 @@ Ember.ContainerView = Ember.View.extend(Ember.MutableArray, { }).volatile(), /** - @private - Instructs each child view to render to the passed render buffer. + @private @method render @param {Ember.RenderBuffer} buffer the buffer to render to */ @@ -22792,14 +24707,13 @@ Ember.ContainerView = Ember.View.extend(Ember.MutableArray, { instrumentName: 'container', /** - @private - When a child view is removed, destroy its element so that it is removed from the DOM. The array observer that triggers this action is set up in the `renderToBuffer` method. + @private @method childViewsWillChange @param {Ember.Array} views the child views array before mutation @param {Number} start the start position of the mutation @@ -22822,8 +24736,6 @@ Ember.ContainerView = Ember.View.extend(Ember.MutableArray, { }, /** - @private - When a child view is added, make sure the DOM gets updated appropriately. If the view has already rendered an element, we tell the child view to @@ -22832,6 +24744,7 @@ Ember.ContainerView = Ember.View.extend(Ember.MutableArray, { into an element, we insert the string representation of the child into the appropriate place in the buffer. + @private @method childViewsDidChange @param {Ember.Array} views the array of child views afte the mutation has occurred @param {Number} start the start position of the mutation @@ -23049,7 +24962,7 @@ var get = Ember.get, set = Ember.set, fmt = Ember.String.fmt; Ember.CollectionView.CONTAINER_MAP['article'] = 'section' ``` - ## Programatic creation of child views + ## Programmatic creation of child views For cases where additional customization beyond the use of a single `itemViewClass` or `tagName` matching is required CollectionView's @@ -23109,7 +25022,7 @@ var get = Ember.get, set = Ember.set, fmt = Ember.String.fmt; @extends Ember.ContainerView @since Ember 0.9 */ -Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionView.prototype */ { +Ember.CollectionView = Ember.ContainerView.extend({ /** A list of items to be displayed by the `Ember.CollectionView`. @@ -23121,12 +25034,11 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie content: null, /** - @private - This provides metadata about what kind of empty view class this collection would like if it is being instantiated from another system (like Handlebars) + @private @property emptyViewClass */ emptyViewClass: Ember.View, @@ -23159,11 +25071,10 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie }, /** - @private - Invoked when the content property is about to change. Notifies observers that the entire array content will change. + @private @method _contentWillChange */ _contentWillChange: Ember.beforeObserver('content', function() { @@ -23175,13 +25086,12 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie }), /** - @private - Check to make sure that the content has changed, and if so, update the children directly. This is always scheduled asynchronously, to allow the element to be created before bindings have synchronized and vice versa. + @private @method _contentDidChange */ _contentDidChange: Ember.observer('content', function() { @@ -23197,10 +25107,9 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie }), /** - @private - Ensure that the content implements Ember.Array + @private @method _assertArrayLike */ _assertArrayLike: function(content) { @@ -23398,7 +25307,7 @@ var get = Ember.get, set = Ember.set, isNone = Ember.isNone, to the view object and actions are targeted at the view object. There is no access to the surrounding context or outer controller; all - contextual information is passed in. + contextual information must be passed in. The easiest way to create an `Ember.Component` is via a template. If you name a template @@ -23417,19 +25326,23 @@ var get = Ember.get, set = Ember.set, isNone = Ember.isNone, {{person.signature}}
``` - You can also use `yield` inside a template to - include the **contents** of the custom tag: + You can use `yield` inside a template to + include the **contents** of any block attached to + the component. The block will be executed in the + context of the surrounding context or outer controller: - ```html + ```handlebars {{#app-profile person=currentUser}}Admin mode
+ {{! Executed in the controllers context. }} {{/app-profile}} ``` - ```html + ```handlebars{{person.title}}
- {{yield}} + {{! Executed in the components context. }} + {{yield}} {{! block contents }} ``` If you want to customize the component, in order to @@ -23480,6 +25393,11 @@ Ember.Component = Ember.View.extend(Ember.TargetActionSupport, { set(this, 'controller', this); }, + defaultLayout: function(options){ + options.data = {view: options._context}; + Ember.Handlebars.helpers['yield'].apply(this, [options]); + }, + // during render, isolate keywords cloneKeywords: function() { return { @@ -23608,10 +25526,15 @@ Ember.Component = Ember.View.extend(Ember.TargetActionSupport, { // Send the default action if (action === undefined) { actionName = get(this, 'action'); - Ember.assert("The default action was triggered on the component " + this.toString() + ", but the action name (" + actionName + ") was not a string.", isNone(actionName) || typeof actionName === 'string'); + Ember.assert("The default action was triggered on the component " + this.toString() + + ", but the action name (" + actionName + ") was not a string.", + isNone(actionName) || typeof actionName === 'string'); } else { actionName = get(this, action); - Ember.assert("The " + action + " action was triggered on the component " + this.toString() + ", but the action name (" + actionName + ") was not a string.", isNone(actionName) || typeof actionName === 'string'); + Ember.assert("The " + action + " action was triggered on the component " + + this.toString() + ", but the action name (" + actionName + + ") was not a string.", + isNone(actionName) || typeof actionName === 'string'); } // If no action name for that action could be found, just abort. @@ -23716,13 +25639,20 @@ define("metamorph", "use strict"; // ========================================================================== // Project: metamorph - // Copyright: ©2011 My Company Inc. All rights reserved. + // Copyright: ©2014 Tilde, Inc. All rights reserved. // ========================================================================== var K = function() {}, guid = 0, - document = this.document, - disableRange = ('undefined' === typeof ENV ? {} : ENV).DISABLE_RANGE_API, + disableRange = (function(){ + if ('undefined' !== typeof MetamorphENV) { + return MetamorphENV.DISABLE_RANGE_API; + } else if ('undefined' !== ENV) { + return ENV.DISABLE_RANGE_API; + } else { + return false; + } + })(), // Feature-detect the W3C range API, the extended check is for IE9 which only partially supports ranges supportsRange = (!disableRange) && document && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment, @@ -23834,7 +25764,7 @@ define("metamorph", /** * @public - * + * * Remove this object (including starting and ending * placeholders). * @@ -24070,6 +26000,10 @@ define("metamorph", // swallow some of the content. node = firstNodeFor(start.parentNode, html); + if (outerToo) { + start.parentNode.removeChild(start); + } + // copy the nodes for the HTML between the starting and ending // placeholder. while (node) { @@ -24194,13 +26128,19 @@ var objectCreate = Object.create || function(parent) { return new F(); }; -var Handlebars = this.Handlebars || (Ember.imports && Ember.imports.Handlebars); +var Handlebars = (Ember.imports && Ember.imports.Handlebars) || (this && this.Handlebars); if (!Handlebars && typeof require === 'function') { Handlebars = require('handlebars'); } -Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1. Include a SCRIPT tag in the HTML HEAD linking to the Handlebars file before you link to Ember.", Handlebars); -Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1, COMPILER_REVISION expected: 4, got: " + Handlebars.COMPILER_REVISION + " - Please note: Builds of master may have other COMPILER_REVISION values.", Handlebars.COMPILER_REVISION === 4); +Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1. Include " + + "a SCRIPT tag in the HTML HEAD linking to the Handlebars file " + + "before you link to Ember.", Handlebars); + +Ember.assert("Ember Handlebars requires Handlebars version 1.0 or 1.1, " + + "COMPILER_REVISION expected: 4, got: " + Handlebars.COMPILER_REVISION + + " - Please note: Builds of master may have other COMPILER_REVISION values.", + Handlebars.COMPILER_REVISION === 4); /** Prepares the Handlebars templating library for use inside Ember's view @@ -24282,20 +26222,19 @@ Ember.Handlebars.helper = function(name, value) { }; /** - @private - Returns a helper function that renders the provided ViewClass. Used internally by Ember.Handlebars.helper and other methods involving helper/component registration. + @private @method helper @for Ember.Handlebars @param {Function} ViewClass view class constructor */ Ember.Handlebars.makeViewHelper = function(ViewClass) { return function(options) { - Ember.assert("You can only pass attributes (such as name=value) not bare values to a helper for a View", arguments.length < 2); + Ember.assert("You can only pass attributes (such as name=value) not bare values to a helper for a View found in '" + ViewClass.toString() + "'", arguments.length < 2); return Ember.Handlebars.helpers.view.call(this, ViewClass, options); }; }; @@ -24345,12 +26284,11 @@ Ember.Handlebars.JavaScriptCompiler.prototype.initializeBuffer = function() { }; /** - @private - Override the default buffer for Ember Handlebars. By default, Handlebars creates an empty String at the beginning of each invocation and appends to it. Ember's Handlebars overrides this to append to a single shared buffer. + @private @method appendToBuffer @param string {String} */ @@ -24368,7 +26306,7 @@ Ember.Handlebars.JavaScriptCompiler.prototype.appendToBuffer = function(string) // instead, as expected. // // This can go away once the following is closed: -// https://github.com/wycats/handlebars.js/issues/617 +// https://github.com/wycats/handlebars.js/issues/634 var DOT_LOOKUP_REGEX = /helpers\.(.*?)\)/, BRACKET_STRING_LOOKUP_REGEX = /helpers\['(.*?)'/, @@ -24398,12 +26336,11 @@ Ember.Handlebars.JavaScriptCompiler.prototype.ambiguousBlockValue = function() { var prefix = "ember" + (+new Date()), incr = 1; /** - @private - Rewrite simple mustaches from `{{foo}}` to `{{bind "foo"}}`. This means that all simple mustaches in Ember's Handlebars will also set up an observer to keep the DOM up to date when the underlying property changes. + @private @method mustache @for Ember.Handlebars.Compiler @param mustache @@ -24446,7 +26383,7 @@ Ember.Handlebars.precompile = function(string) { knownHelpers: { action: true, unbound: true, - bindAttr: true, + 'bind-attr': true, template: true, view: true, _triageMustache: true @@ -24493,11 +26430,10 @@ var slice = Array.prototype.slice, originalTemplate = Ember.Handlebars.template; /** - @private - If a path starts with a reserved keyword, returns the root that should be used. + @private @method normalizePath @for Ember @param root {Object} @@ -24551,19 +26487,17 @@ var handlebarsGet = Ember.Handlebars.get = function(root, path, options) { normalizedPath = normalizePath(root, path, data), value; - // In cases where the path begins with a keyword, change the - // root to the value represented by that keyword, and ensure - // the path is relative to it. - root = normalizedPath.root; - path = normalizedPath.path; + + root = normalizedPath.root; + path = normalizedPath.path; - value = Ember.get(root, path); + value = Ember.get(root, path); + + if (value === undefined && root !== Ember.lookup && Ember.isGlobalPath(path)) { + value = Ember.get(Ember.lookup, path); + } + - // If the path starts with a capital letter, look it up on Ember.lookup, - // which defaults to the `window` object in browsers. - if (value === undefined && root !== Ember.lookup && Ember.isGlobalPath(path)) { - value = Ember.get(Ember.lookup, path); - } return value; }; @@ -24603,8 +26537,6 @@ Ember.Handlebars.resolveHash = function(context, hash, options) { }; /** - @private - Registers a helper in Handlebars that will be called if no property with the given name can be found on the current context object, and no helper with that name is registered. @@ -24612,6 +26544,7 @@ Ember.Handlebars.resolveHash = function(context, hash, options) { This throws an exception with a more helpful error message so the user can track down where the problem is happening. + @private @method helperMissing @for Ember.Handlebars.helpers @param {String} path @@ -24622,14 +26555,11 @@ Ember.Handlebars.registerHelper('helperMissing', function(path) { var options = arguments[arguments.length - 1]; - + var helper = Ember.Handlebars.resolveHelper(options.data.view.container, path); - var helper = Ember.Handlebars.resolveHelper(options.data.view.container, path); - - if (helper) { - return helper.apply(this, slice.call(arguments, 1)); - } - + if (helper) { + return helper.apply(this, slice.call(arguments, 1)); + } error = "%@ Handlebars error: Could not find property '%@' on object %@."; if (options.data) { @@ -24639,8 +26569,6 @@ Ember.Handlebars.registerHelper('helperMissing', function(path) { }); /** - @private - Registers a helper in Handlebars that will be called if no property with the given name can be found on the current context object, and no helper with that name is registered. @@ -24648,6 +26576,7 @@ Ember.Handlebars.registerHelper('helperMissing', function(path) { This throws an exception with a more helpful error message so the user can track down where the problem is happening. + @private @method helperMissing @for Ember.Handlebars.helpers @param {String} path @@ -24657,16 +26586,19 @@ Ember.Handlebars.registerHelper('blockHelperMissing', function(path) { var options = arguments[arguments.length - 1]; - + Ember.assert("`blockHelperMissing` was invoked without a helper name, which " + + "is most likely due to a mismatch between the version of " + + "Ember.js you're running now and the one used to precompile your " + + "templates. Please make sure the version of " + + "`ember-handlebars-compiler` you're using is up to date.", path); - Ember.assert("`blockHelperMissing` was invoked without a helper name, which is most likely due to a mismatch between the version of Ember.js you're running now and the one used to precompile your templates. Please make sure the version of `ember-handlebars-compiler` you're using is up to date.", path); + var helper = Ember.Handlebars.resolveHelper(options.data.view.container, path); - var helper = Ember.Handlebars.resolveHelper(options.data.view.container, path); - - if (helper) { - return helper.apply(this, slice.call(arguments, 1)); - } - + if (helper) { + return helper.apply(this, slice.call(arguments, 1)); + } else { + return Handlebars.helpers.helperMissing.call(this, path); + } return Handlebars.helpers.blockHelperMissing.apply(this, arguments); }); @@ -24787,8 +26719,6 @@ Ember.Handlebars.registerBoundHelper = function(name, fn) { }; /** - @private - A (mostly) private helper function to `registerBoundHelper`. Takes the provided Handlebars helper function fn and returns it in wrapped bound helper form. @@ -24807,6 +26737,7 @@ Ember.Handlebars.registerBoundHelper = function(name, fn) { In the above example, if the helper function hadn't been wrapped in `makeBoundHelper`, the registered helper would be unbound. + @private @method makeBoundHelper @for Ember.Handlebars @param {Function} function @@ -24820,8 +26751,8 @@ Ember.Handlebars.makeBoundHelper = function(fn) { numProperties = properties.length, options = arguments[arguments.length - 1], normalizedProperties = [], - types = options.types, data = options.data, + types = data.isUnbound ? slice.call(options.types, 1) : options.types, hash = options.hash, view = data.view, contexts = options.contexts, @@ -24852,7 +26783,11 @@ Ember.Handlebars.makeBoundHelper = function(fn) { normalizedProperties.push(normalizedProp); watchedProperties.push(normalizedProp); } else { - normalizedProperties.push(null); + if(data.isUnbound) { + normalizedProperties.push({path: properties[loc]}); + }else { + normalizedProperties.push(null); + } } } @@ -24930,10 +26865,9 @@ Ember.Handlebars.makeBoundHelper = function(fn) { }; /** - @private - Renders the unbound form of an otherwise bound helper function. + @private @method evaluateUnboundHelper @param {Function} fn @param {Object} context @@ -24941,7 +26875,15 @@ Ember.Handlebars.makeBoundHelper = function(fn) { @param {String} options */ function evaluateUnboundHelper(context, fn, normalizedProperties, options) { - var args = [], hash = options.hash, boundOptions = hash.boundOptions, loc, len, property, boundOption; + var args = [], + hash = options.hash, + boundOptions = hash.boundOptions, + types = slice.call(options.types, 1), + loc, + len, + property, + propertyType, + boundOption; for (boundOption in boundOptions) { if (!boundOptions.hasOwnProperty(boundOption)) { continue; } @@ -24950,18 +26892,22 @@ function evaluateUnboundHelper(context, fn, normalizedProperties, options) { for(loc = 0, len = normalizedProperties.length; loc < len; ++loc) { property = normalizedProperties[loc]; - args.push(Ember.Handlebars.get(property.root, property.path, options)); + propertyType = types[loc]; + if(propertyType === "ID") { + args.push(Ember.Handlebars.get(property.root, property.path, options)); + } else { + args.push(property.path); + } } args.push(options); return fn.apply(context, args); } /** - @private - Overrides Handlebars.template so that we can distinguish user-created, top-level templates from inner contexts. + @private @method template @for Ember.Handlebars @param {String} spec @@ -25081,7 +27027,7 @@ var DOMManager = { view.transitionTo('preRender'); - Ember.run.schedule('render', this, function() { + Ember.run.schedule('render', this, function renderMetamorphView() { if (view.isDestroying) { return; } view.clearRenderedChildren(); @@ -25513,6 +27459,7 @@ Ember._HandlebarsBoundView = Ember._MetamorphView.extend({ var get = Ember.get, set = Ember.set, fmt = Ember.String.fmt; var handlebarsGet = Ember.Handlebars.get, normalizePath = Ember.Handlebars.normalizePath; var forEach = Ember.ArrayPolyfills.forEach; +var o_create = Ember.create; var EmberHandlebars = Ember.Handlebars, helpers = EmberHandlebars.helpers; @@ -25643,8 +27590,6 @@ function simpleBind(currentContext, property, options) { } /** - @private - '_triageMustache' is used internally select between a binding, helper, or component for the given context. Until this point, it would be hard to determine if the mustache is a property reference or a regular helper reference. This triage @@ -25652,6 +27597,7 @@ function simpleBind(currentContext, property, options) { This would not be typically invoked by directly. + @private @method _triageMustache @for Ember.Handlebars.helpers @param {String} property Property/helperID to triage @@ -25665,13 +27611,10 @@ EmberHandlebars.registerHelper('_triageMustache', function(property, options) { return helpers[property].call(this, options); } - - - var helper = Ember.Handlebars.resolveHelper(options.data.view.container, property); - if (helper) { - return helper.call(this, options); - } - + var helper = Ember.Handlebars.resolveHelper(options.data.view.container, property); + if (helper) { + return helper.call(this, options); + } return helpers.bind.call(this, property, options); }); @@ -25697,8 +27640,6 @@ Ember.Handlebars.resolveHelper = function(container, name) { }; /** - @private - `bind` can be used to display a value, then update that value if it changes. For example, if you wanted to print the `title` property of `content`: @@ -25714,13 +27655,14 @@ Ember.Handlebars.resolveHelper = function(container, name) { relies on Ember's KVO system. For all other browsers this will be handled for you automatically. + @private @method bind @for Ember.Handlebars.helpers @param {String} property Property to bind @param {Function} fn Context to provide for rendering @return {String} HTML string */ -EmberHandlebars.registerHelper('bind', function(property, options) { +EmberHandlebars.registerHelper('bind', function bindHelper(property, options) { Ember.assert("You cannot pass more than one argument to the bind helper", arguments.length <= 2); var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this; @@ -25733,8 +27675,6 @@ EmberHandlebars.registerHelper('bind', function(property, options) { }); /** - @private - Use the `boundIf` helper to create a conditional that re-evaluates whenever the truthiness of the bound value changes. @@ -25744,13 +27684,14 @@ EmberHandlebars.registerHelper('bind', function(property, options) { {{/boundIf}} ``` + @private @method boundIf @for Ember.Handlebars.helpers @param {String} property Property to bind @param {Function} fn Context to provide for rendering @return {String} HTML string */ -EmberHandlebars.registerHelper('boundIf', function(property, fn) { +EmberHandlebars.registerHelper('boundIf', function boundIfHelper(property, fn) { var context = (fn.contexts && fn.contexts.length) ? fn.contexts[0] : this; var func = function(result) { var truthy = result && get(result, 'isTruthy'); @@ -25767,15 +27708,65 @@ EmberHandlebars.registerHelper('boundIf', function(property, fn) { }); /** + Use the `{{with}}` helper when you want to scope context. Take the following code as an example: + + ```handlebars +{{user.name}}
+ +++ ``` + + `{{with}}` can be our best friend in these cases, + instead of writing `user.role.*` over and over, we use `{{#with user.role}}`. + Now the context within the `{{#with}} .. {{/with}}` block is `user.role` so you can do the following: + + ```handlebars +{{user.role.label}}
+ {{user.role.id}} + +{{user.role.description}}
+{{user.name}}
+ ++ {{#with user.role}} ++ ``` + + ### `as` operator + + This operator aliases the scope to a new name. It's helpful for semantic clarity and to retain + default scope or to reference from another `{{with}}` block. + + ```handlebars + // posts might not be + {{#with user.posts as blogPosts}} +{{label}}
+ {{id}} + +{{description}}
+ {{/with}} ++ There are {{blogPosts.length}} blog posts written by {{user.name}}. ++ + {{#each post in blogPosts}} +" + ``` + @method debugger @for Ember.Handlebars.helpers @param {String} property */ -Ember.Handlebars.registerHelper('debugger', function(options) { +Ember.Handlebars.registerHelper('debugger', function debuggerHelper(options) { + + // These are helpful values you can inspect while debugging. + var templateContext = this; + var typeOfTemplateContext = Ember.inspect(templateContext); + debugger; }); + + })(); @@ -27262,7 +29296,7 @@ GroupedEach.prototype = { @param [options.itemController] {String} name of a controller to be created for each item @param [options.groupedRows] {boolean} enable normal item-by-item rendering when inside a `#group` helper */ -Ember.Handlebars.registerHelper('each', function(path, options) { +Ember.Handlebars.registerHelper('each', function eachHelper(path, options) { if (arguments.length === 4) { Ember.assert("If you pass more than one argument to the each helper, it must be in the form #each foo in bar", arguments[1] === "in"); @@ -27410,7 +29444,7 @@ Ember.Handlebars.registerHelper('template', function(name, options) { @param {String} partialName the name of the template to render minus the leading underscore */ -Ember.Handlebars.registerHelper('partial', function(name, options) { +Ember.Handlebars.registerHelper('partial', function partialHelper(name, options) { var context = (options.contexts && options.contexts.length) ? options.contexts[0] : this; @@ -27546,7 +29580,7 @@ var get = Ember.get, set = Ember.set; @param {Hash} options @return {String} HTML string */ -Ember.Handlebars.registerHelper('yield', function(options) { +Ember.Handlebars.registerHelper('yield', function yieldHelper(options) { var view = options.data.view; while (view && !get(view, 'layout')) { @@ -27590,7 +29624,7 @@ Ember.Handlebars.registerHelper('yield', function(options) { @param {String} str The string to format */ -Ember.Handlebars.registerHelper('loc', function(str) { +Ember.Handlebars.registerHelper('loc', function locHelper(str) { return Ember.String.loc(str); }); @@ -27622,7 +29656,7 @@ var set = Ember.set, get = Ember.get; The internal class used to create text inputs when the `{{input}}` helper is used with `type` of `checkbox`. - See Handlebars.helpers.input for usage details. + See [handlebars.helpers.input](/api/classes/Ember.Handlebars.helpers.html#method_input) for usage details. ## Direct manipulation of `checked` @@ -27870,7 +29904,7 @@ var get = Ember.get, set = Ember.set; The internal class used to create text inputs when the `{{input}}` helper is used with `type` of `text`. - See [handlebars.helpers.input](Ember.Handlebars.helpers.html#method_input) for usage details. + See [Handlebars.helpers.input](/api/classes/Ember.Handlebars.helpers.html#method_input) for usage details. ## Layout and LayoutName properties @@ -27883,8 +29917,7 @@ var get = Ember.get, set = Ember.set; @extends Ember.Component @uses Ember.TextSupport */ -Ember.TextField = Ember.Component.extend(Ember.TextSupport, - /** @scope Ember.TextField.prototype */ { +Ember.TextField = Ember.Component.extend(Ember.TextSupport, { classNames: ['ember-text-field'], tagName: "input", @@ -28439,9 +30472,7 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({ @namespace Ember @extends Ember.View */ -Ember.Select = Ember.View.extend( - /** @scope Ember.Select.prototype */ { - +Ember.Select = Ember.View.extend({ tagName: 'select', classNames: ['ember-select'], defaultTemplate: Ember.Handlebars.template(function anonymous(Handlebars,depth0,helpers,partials,data) { @@ -28451,11 +30482,12 @@ helpers = this.merge(helpers, Ember.Handlebars.helpers); data = data || {}; function program1(depth0,data) { - var buffer = '', hashTypes, hashContexts; + var buffer = '', stack1, hashTypes, hashContexts; data.buffer.push(""); return buffer; } @@ -28855,6 +30887,7 @@ function program7(depth0,data) { if you are deploying to browsers where the `required` attribute is used, you can add this to the `TextField`'s `attributeBindings` property: + ```javascript Ember.TextField.reopen({ attributeBindings: ['required'] @@ -28919,6 +30952,7 @@ function program7(depth0,data) { capablilties of checkbox inputs in your applications by reopening this class. For example, if you wanted to add a css class to all checkboxes in your application: + ```javascript Ember.Checkbox.reopen({ classNames: ['my-app-checkbox'] @@ -29077,7 +31111,7 @@ Ember.Handlebars.registerHelper('input', function(options) { extend the capabilities of text areas in your application by reopening this class. For example, if you are deploying to browsers where the `required` attribute is used, you can globally add support for the `required` attribute - on all {{textarea}}'s' in your app by reopening `Ember.TextArea` or + on all `{{textarea}}`s' in your app by reopening `Ember.TextArea` or `Ember.TextSupport` and adding it to the `attributeBindings` concatenated property: @@ -29150,8 +31184,6 @@ Ember.ComponentLookup = Ember.Object.extend({ */ /** - @private - Find templates stored in the head tag as script tags and make them available to `Ember.CoreView` in the global `Ember.TEMPLATES` object. This will be run as as jQuery DOM-ready callback. @@ -29161,6 +31193,7 @@ Ember.ComponentLookup = Ember.Object.extend({ Those with type `text/x-raw-handlebars` will be compiled with regular Handlebars and are suitable for use in views' computed properties. + @private @method bootstrap @for Ember.Handlebars @static @@ -29200,35 +31233,6 @@ function bootstrap() { Ember.Handlebars.bootstrap( Ember.$(document) ); } -function registerComponents(container) { - var templates = Ember.TEMPLATES, match; - if (!templates) { return; } - - for (var prop in templates) { - if (match = prop.match(/^components\/(.*)$/)) { - registerComponent(container, match[1]); - } - } -} - - -function registerComponent(container, name) { - Ember.assert("You provided a template named 'components/" + name + "', but custom components must include a '-'", name.match(/-/)); - - var fullName = 'component:' + name; - - container.injection(fullName, 'layout', 'template:components/' + name); - - var Component = container.lookupFactory(fullName); - - if (!Component) { - container.register(fullName, Ember.Component); - Component = container.lookupFactory(fullName); - } - - Ember.Handlebars.helper(name, Component); -} - function registerComponentLookup(container) { container.register('component-lookup:main', Ember.ComponentLookup); } @@ -29250,13 +31254,12 @@ Ember.onLoad('Ember.Application', function(Application) { initialize: bootstrap }); - - Application.initializer({ - name: 'registerComponentLookup', - after: 'domTemplates', - initialize: registerComponentLookup - }); + Application.initializer({ + name: 'registerComponentLookup', + after: 'domTemplates', + initialize: registerComponentLookup }); +}); })(); @@ -30053,7 +32056,7 @@ define("router", // TODO: separate into module? Router.Transition = Transition; - __exports__['default'] = Router; + __exports__["default"] = Router; /** @@ -30283,7 +32286,7 @@ define("router", if (isParam(object)) { var name = recogHandler.names[0]; - if ("" + object !== this.currentParams[name]) { return false; } + if (!this.currentParams || "" + object !== this.currentParams[name]) { return false; } } else if (handlerInfo.context !== object) { return false; } @@ -31367,7 +33370,8 @@ DSL.prototype = { this.push(options.path, name, null, options.queryParams); } - }, + + }, push: function(url, name, callback, queryParams) { var parts = name.split('.'); @@ -31378,7 +33382,7 @@ DSL.prototype = { route: function(name, options) { route(this, name, options); - }, + }, generate: function() { var dslMatches = this.matches; @@ -31433,7 +33437,7 @@ var get = Ember.get; */ /** - + Finds a controller instance. @for Ember @@ -31445,17 +33449,22 @@ Ember.controllerFor = function(container, controllerName, lookupOptions) { }; /** - Generates a controller automatically if none was provided. - The type of generated controller depends on the context. + Generates a controller factory + + The type of the generated controller factory is derived + from the context. If the context is an array an array controller + is generated, if an object, an object controller otherwise, a basic + controller is generated. + You can customize your generated controllers by defining - `App.ObjectController` and `App.ArrayController` - + `App.ObjectController` or `App.ArrayController`. + @for Ember - @method generateController + @method generateControllerFactory @private */ -Ember.generateController = function(container, controllerName, context) { - var ControllerFactory, fullName, instance, name, factoryName, controllerType; +Ember.generateControllerFactory = function(container, controllerName, context) { + var Factory, fullName, instance, name, factoryName, controllerType; if (context && Ember.isArray(context)) { controllerType = 'array'; @@ -31467,7 +33476,7 @@ Ember.generateController = function(container, controllerName, context) { factoryName = 'controller:' + controllerType; - ControllerFactory = container.lookupFactory(factoryName).extend({ + Factory = container.lookupFactory(factoryName).extend({ isGenerated: true, toString: function() { return "(generated " + controllerName + " controller)"; @@ -31476,9 +33485,27 @@ Ember.generateController = function(container, controllerName, context) { fullName = 'controller:' + controllerName; - container.register(fullName, ControllerFactory); + container.register(fullName, Factory); - instance = container.lookup(fullName); + return Factory; +}; + +/** + Generates and instantiates a controller. + + The type of the generated controller factory is derived + from the context. If the context is an array an array controller + is generated, if an object, an object controller otherwise, a basic + controller is generated. + + @for Ember + @method generateController + @private +*/ +Ember.generateController = function(container, controllerName, context) { + Ember.generateControllerFactory(container, controllerName, context); + var fullName = 'controller:' + controllerName; + var instance = container.lookup(fullName); if (get(instance, 'namespace.LOG_ACTIVE_GENERATION')) { Ember.Logger.info("generated -> " + fullName, { fullName: fullName }); @@ -31500,6 +33527,7 @@ Ember.generateController = function(container, controllerName, context) { var Router = requireModule("router")['default']; var get = Ember.get, set = Ember.set; var defineProperty = Ember.defineProperty; +var slice = Array.prototype.slice; var DefaultView = Ember._MetamorphView; /** @@ -31511,18 +33539,49 @@ var DefaultView = Ember._MetamorphView; @extends Ember.Object */ Ember.Router = Ember.Object.extend(Ember.Evented, { + /** + The `location` property determines the type of URL's that your + application will use. + + The following location types are currently available: + + * `hash` + * `history` + * `none` + + @property location + @default 'hash' + @see {Ember.Location} + */ location: 'hash', init: function() { this.router = this.constructor.router || this.constructor.map(Ember.K); this._activeViews = {}; this._setupLocation(); + + if (get(this, 'namespace.LOG_TRANSITIONS_INTERNAL')) { + this.router.log = Ember.Logger.debug; + } }, + /** + Represents the current URL. + + @method url + @returns {String} The current URL. + */ url: Ember.computed(function() { return get(this, 'location').getURL(); }), + /** + Initializes the current router instance and sets up the change handling + event listeners used by the instances `location` implementation. + + @method startRouting + @private + */ startRouting: function() { this.router = this.router || this.constructor.map(Ember.K); @@ -31543,19 +33602,25 @@ Ember.Router = Ember.Object.extend(Ember.Evented, { this.handleURL(location.getURL()); }, + /** + Handles updating the paths and notifying any listeners of the URL + change. + + Triggers the router level `didTransition` hook. + + @method didTransition + @private + */ didTransition: function(infos) { updatePaths(this); - - this._cancelLoadingEvent(); - + this._cancelLoadingEvent(); + this.notifyPropertyChange('url'); - - // Put this in the runloop so url will be accurate. Seems - // less surprising than didTransition being out of sync. - Ember.run.once(this, this.trigger, 'didTransition'); - + // Put this in the runloop so url will be accurate. Seems + // less surprising than didTransition being out of sync. + Ember.run.once(this, this.trigger, 'didTransition'); if (get(this, 'namespace').LOG_TRANSITIONS) { Ember.Logger.log("Transitioned into '" + Ember.Router._routePath(infos) + "'"); @@ -31590,6 +33655,14 @@ Ember.Router = Ember.Object.extend(Ember.Evented, { return this.location.formatURL(url); }, + /** + Determines if the supplied route is currently active. + + @method isActive + @param routeName + @returns {Boolean} + @private + */ isActive: function(routeName) { var router = this.router; return router.isActive.apply(router, arguments); @@ -31599,16 +33672,22 @@ Ember.Router = Ember.Object.extend(Ember.Evented, { this.router.trigger.apply(this.router, arguments); }, + /** + Does this router instance have the given route. + + @method hasRoute + @returns {Boolean} + @private + */ hasRoute: function(route) { return this.router.hasRoute(route); }, /** - @private - Resets the state of the router by clearing the current route handlers and deactivating them. + @private @method reset */ reset: function() { @@ -31655,6 +33734,10 @@ Ember.Router = Ember.Object.extend(Ember.Evented, { options.implementation = location; location = set(this, 'location', Ember.Location.create(options)); } + + // ensure that initState is called AFTER the rootURL is set on + // the location instance + if (typeof location.initState === 'function') { location.initState(); } }, _getHandlerFunction: function() { @@ -31671,8 +33754,6 @@ Ember.Router = Ember.Object.extend(Ember.Evented, { seen[name] = true; if (!handler) { - - container.register(routeName, DefaultRoute.extend()); handler = container.lookup(routeName); @@ -31718,7 +33799,7 @@ Ember.Router = Ember.Object.extend(Ember.Evented, { _doTransition: function(method, args) { // Normalize blank route to root URL. - args = [].slice.call(args); + args = slice.call(args); args[0] = args[0] || '/'; var passedName = args[0], name, self = this, @@ -31739,14 +33820,11 @@ Ember.Router = Ember.Object.extend(Ember.Evented, { var transitionPromise = this.router[method].apply(this.router, args); - // Don't schedule loading state entry if user has already aborted the transition. - - transitionPromise.then(null, function(error) { if (error.name === "UnrecognizedURLError") { Ember.assert("The URL '" + error.message + "' did not match any routes in your application"); } - }); + }, 'Ember: Check for Router unrecognized URL error'); // We want to return the configurable promise object // so that callers of this function can use `.method()` on it, @@ -31756,21 +33834,18 @@ Ember.Router = Ember.Object.extend(Ember.Evented, { _scheduleLoadingEvent: function(transition, originRoute) { this._cancelLoadingEvent(); - - this._loadingStateTimer = Ember.run.scheduleOnce('routerTransitions', this, '_fireLoadingEvent', transition, originRoute); - + this._loadingStateTimer = Ember.run.scheduleOnce('routerTransitions', this, '_fireLoadingEvent', transition, originRoute); }, _fireLoadingEvent: function(transition, originRoute) { - - if (!this.router.activeTransition) { - // Don't fire an event if we've since moved on from - // the transition that put us in a loading state. - return; - } + if (!this.router.activeTransition) { + // Don't fire an event if we've since moved on from + // the transition that put us in a loading state. + return; + } - transition.trigger(true, 'loading', transition, originRoute); - }, + transition.trigger(true, 'loading', transition, originRoute); + }, _cancelLoadingEvent: function () { if (this._loadingStateTimer) { @@ -31781,13 +33856,13 @@ Ember.Router = Ember.Object.extend(Ember.Evented, { }); /** - @private - Helper function for iterating root-ward, starting from (but not including) the provided `originRoute`. Returns true if the last callback fired requested to bubble upward. + + @private */ function forEachRouteAbove(originRoute, transition, callback) { var handlerInfos = transition.handlerInfos, @@ -31820,63 +33895,57 @@ var defaultActionHandlers = { }, error: function(error, transition, originRoute) { - + // Attempt to find an appropriate error substate to enter. + var router = originRoute.router; - // Attempt to find an appropriate error substate to enter. - var router = originRoute.router; - - var tryTopLevel = forEachRouteAbove(originRoute, transition, function(route, childRoute) { - var childErrorRouteName = findChildRouteName(route, childRoute, 'error'); - if (childErrorRouteName) { - router.intermediateTransitionTo(childErrorRouteName, error); - return; - } - return true; - }); - - if (tryTopLevel) { - // Check for top-level error state to enter. - if (routeHasBeenDefined(originRoute.router, 'application_error')) { - router.intermediateTransitionTo('application_error', error); - return; - } - } else { - // Don't fire an assertion if we found an error substate. + var tryTopLevel = forEachRouteAbove(originRoute, transition, function(route, childRoute) { + var childErrorRouteName = findChildRouteName(route, childRoute, 'error'); + if (childErrorRouteName) { + router.intermediateTransitionTo(childErrorRouteName, error); return; } - + return true; + }); - Ember.Logger.assert(false, 'Error while loading route: ' + Ember.inspect(error)); + if (tryTopLevel) { + // Check for top-level error state to enter. + if (routeHasBeenDefined(originRoute.router, 'application_error')) { + router.intermediateTransitionTo('application_error', error); + return; + } + } else { + // Don't fire an assertion if we found an error substate. + return; + } + + Ember.Logger.error('Error while loading route: ' + error.stack); }, loading: function(transition, originRoute) { - + // Attempt to find an appropriate loading substate to enter. + var router = originRoute.router; - // Attempt to find an appropriate loading substate to enter. - var router = originRoute.router; + var tryTopLevel = forEachRouteAbove(originRoute, transition, function(route, childRoute) { + var childLoadingRouteName = findChildRouteName(route, childRoute, 'loading'); - var tryTopLevel = forEachRouteAbove(originRoute, transition, function(route, childRoute) { - var childLoadingRouteName = findChildRouteName(route, childRoute, 'loading'); - - if (childLoadingRouteName) { - router.intermediateTransitionTo(childLoadingRouteName); - return; - } - - // Don't bubble above pivot route. - if (transition.pivotHandler !== route) { - return true; - } - }); - - if (tryTopLevel) { - // Check for top-level loading state to enter. - if (routeHasBeenDefined(originRoute.router, 'application_loading')) { - router.intermediateTransitionTo('application_loading'); - return; - } + if (childLoadingRouteName) { + router.intermediateTransitionTo(childLoadingRouteName); + return; } - + + // Don't bubble above pivot route. + if (transition.pivotHandler !== route) { + return true; + } + }); + + if (tryTopLevel) { + // Check for top-level loading state to enter. + if (routeHasBeenDefined(originRoute.router, 'application_loading')) { + router.intermediateTransitionTo('application_loading'); + return; + } + } } }; @@ -31886,6 +33955,8 @@ function findChildRouteName(parentRoute, originatingChildRoute, name) { targetChildRouteName = originatingChildRoute.routeName.split('.').pop(), namespace = parentRoute.routeName === 'application' ? '' : parentRoute.routeName + '.'; + + // Second, try general loading state, e.g. 'loading' childName = namespace + name; if (routeHasBeenDefined(router, childName)) { return childName; @@ -31927,7 +33998,7 @@ function triggerEvent(handlerInfos, ignoreFailure, args) { } if (!eventWasHandled && !ignoreFailure) { - throw new Ember.Error("Nothing handled the action '" + name + "'."); + throw new Ember.Error("Nothing handled the action '" + name + "'. If you did handle the action, this error can be caused by returning true from an action handler in a controller, causing the action to bubble."); } } @@ -31957,41 +34028,6 @@ function updatePaths(router) { set(appController, 'currentRouteName', infos[infos.length - 1].name); } -function scheduleLegacyLoadingRouteEntry(router) { - cancelLegacyLoadingRouteEntry(router); - if (router.router.activeTransition) { - router._legacyLoadingStateTimer = Ember.run.scheduleOnce('routerTransitions', null, enterLegacyLoadingRoute, router); - } -} - -function enterLegacyLoadingRoute(router) { - var loadingRoute = router.router.getHandler('loading'); - if (loadingRoute && !loadingRoute._loadingStateActive) { - if (loadingRoute.enter) { loadingRoute.enter(); } - if (loadingRoute.setup) { loadingRoute.setup(); } - loadingRoute._loadingStateActive = true; - } -} - -function cancelLegacyLoadingRouteEntry(router) { - if (router._legacyLoadingStateTimer) { - Ember.run.cancel(router._legacyLoadingStateTimer); - } - router._legacyLoadingStateTimer = null; -} - -function exitLegacyLoadingRoute(router) { - - cancelLegacyLoadingRouteEntry(router); - - var loadingRoute = router.router.getHandler('loading'); - - if (loadingRoute && loadingRoute._loadingStateActive) { - if (loadingRoute.exit) { loadingRoute.exit(); } - loadingRoute._loadingStateActive = false; - } -} - Ember.Router.reopenClass({ router: null, map: function(callback) { @@ -32003,10 +34039,6 @@ Ember.Router.reopenClass({ this.reopenClass({ router: router }); } - if (get(this, 'namespace.LOG_TRANSITIONS_INTERNAL')) { - router.log = Ember.Logger.debug; - } - var dsl = Ember.RouterDSL.map(function() { this.resource('application', { path: "/" }, function() { for (var i=0; i < router.callbacks.length; i++) { @@ -32024,11 +34056,32 @@ Ember.Router.reopenClass({ _routePath: function(handlerInfos) { var path = []; + // We have to handle coalescing resource names that + // are prefixed with their parent's names, e.g. + // ['foo', 'foo.bar.baz'] => 'foo.bar.baz', not 'foo.foo.bar.baz' + + function intersectionMatches(a1, a2) { + for (var i = 0, len = a1.length; i < len; ++i) { + if (a1[i] !== a2[i]) { + return false; + } + } + return true; + } + for (var i=1, l=handlerInfos.length; i + + ++ ``` + + To disable bubbling, pass `bubbles=false` to the helper: ```handlebars @@ -34619,7 +36749,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) { @param {Object} [context]* @param {Hash} options */ - EmberHandlebars.registerHelper('action', function(actionName) { + EmberHandlebars.registerHelper('action', function actionHelper(actionName) { var options = arguments[arguments.length - 1], contexts = a_slice.call(arguments, 1, -1); @@ -34650,6 +36780,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) { action.target = { root: root, target: target, options: options }; action.bubbles = hash.bubbles; + action.preventDefault = hash.preventDefault; var actionId = ActionHelper.registerAction(actionName, action, hash.allowedKeys); return new SafeString('data-ember-action="' + actionId + '"'); @@ -34661,109 +36792,6 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) { -(function() { -/** -@module ember -@submodule ember-routing -*/ - -if (Ember.ENV.EXPERIMENTAL_CONTROL_HELPER) { - var get = Ember.get, set = Ember.set; - - /** - `{{control}}` works like render, except it uses a new controller instance for every call, instead of reusing the singleton controller. - - The control helper is currently under development and is considered experimental. - To enable it, set `ENV.EXPERIMENTAL_CONTROL_HELPER = true` before requiring Ember. - - For example if you had this `author` template. - - ```handlebars - - ``` - - You could render it inside the `post` template using the `control` helper. - - ```handlebars --- ``` - - @method control - @for Ember.Handlebars.helpers - @param {String} path - @param {String} modelPath - @param {Hash} options - @return {String} HTML string - */ - Ember.Handlebars.registerHelper('control', function(path, modelPath, options) { - if (arguments.length === 2) { - options = modelPath; - modelPath = undefined; - } - - var model; - - if (modelPath) { - model = Ember.Handlebars.get(this, modelPath, options); - } - - var controller = options.data.keywords.controller, - view = options.data.keywords.view, - children = get(controller, '_childContainers'), - controlID = options.hash.controlID, - container, subContainer; - - if (children.hasOwnProperty(controlID)) { - subContainer = children[controlID]; - } else { - container = get(controller, 'container'), - subContainer = container.child(); - children[controlID] = subContainer; - } - - var normalizedPath = path.replace(/\//g, '.'); - - var childView = subContainer.lookup('view:' + normalizedPath) || subContainer.lookup('view:default'), - childController = subContainer.lookup('controller:' + normalizedPath), - childTemplate = subContainer.lookup('template:' + path); - - Ember.assert("Could not find controller for path: " + normalizedPath, childController); - Ember.assert("Could not find view for path: " + normalizedPath, childView); - - set(childController, 'target', controller); - set(childController, 'model', model); - - options.hash.template = childTemplate; - options.hash.controller = childController; - - function observer() { - var model = Ember.Handlebars.get(this, modelPath, options); - set(childController, 'model', model); - childView.rerender(); - } - - if (modelPath) { - Ember.addObserver(this, modelPath, observer); - childView.one('willDestroyElement', this, function() { - Ember.removeObserver(this, modelPath, observer); - }); - } - - Ember.Handlebars.helpers.view.call(this, childView, options); - }); -} - -})(); - - - (function() { })(); @@ -34784,8 +36812,8 @@ Ember.ControllerMixin.reopen({ be either a single route or route path: ```javascript - aController.transitionToRoute('blogPosts'); - aController.transitionToRoute('blogPosts.recentEntries'); + aController.transitionToRoute('blogPosts'); + aController.transitionToRoute('blogPosts.recentEntries'); ``` Optionally supply a model for the route in question. The model @@ -34793,19 +36821,18 @@ Ember.ControllerMixin.reopen({ the route: ```javascript - aController.transitionToRoute('blogPost', aPost); + aController.transitionToRoute('blogPost', aPost); ``` Multiple models will be applied last to first recursively up the resource tree. ```javascript + this.resource('blogPost', {path:':blogPostId'}, function(){ + this.resource('blogComment', {path: ':blogCommentId'}); + }); - this.resource('blogPost', {path:':blogPostId'}, function(){ - this.resource('blogComment', {path: ':blogCommentId'}); - }); - - aController.transitionToRoute('blogComment', aPost, aComment); + aController.transitionToRoute('blogComment', aPost, aComment); ``` See also 'replaceRoute'. @@ -34839,8 +36866,8 @@ Ember.ControllerMixin.reopen({ Beside that, it is identical to `transitionToRoute` in all other respects. ```javascript - aController.replaceRoute('blogPosts'); - aController.replaceRoute('blogPosts.recentEntries'); + aController.replaceRoute('blogPosts'); + aController.replaceRoute('blogPosts.recentEntries'); ``` Optionally supply a model for the route in question. The model @@ -34848,19 +36875,18 @@ Ember.ControllerMixin.reopen({ the route: ```javascript - aController.replaceRoute('blogPost', aPost); + aController.replaceRoute('blogPost', aPost); ``` Multiple models will be applied last to first recursively up the resource tree. ```javascript + this.resource('blogPost', {path:':blogPostId'}, function(){ + this.resource('blogComment', {path: ':blogCommentId'}); + }); - this.resource('blogPost', {path:':blogPostId'}, function(){ - this.resource('blogComment', {path: ':blogCommentId'}); - }); - - aController.replaceRoute('blogComment', aPost, aComment); + aController.replaceRoute('blogComment', aPost, aComment); ``` @param {String} name the name of the route @@ -34926,9 +36952,11 @@ Ember.View.reopen({ // The html for myView now looks like: //Child view:- myView.connectOutlet('main', Ember.View.extend({ + var FooView = Ember.View.extend({ template: Ember.Handlebars.compile('Foo
') - })); + }); + var fooView = FooView.create(); + myView.connectOutlet('main', fooView); // The html for myView now looks like: //Child view: //@@ -34961,12 +36989,11 @@ Ember.View.reopen({ }, /** - @private - Determines if the view has already been created by checking if the view has the same constructor, template, and context as the view in the `_outlets` object. + @private @method _hasEquivalentView @param {String} outletName The name of the outlet we are checking @param {Object} view An Ember.View @@ -34994,9 +37021,11 @@ Ember.View.reopen({ // myView's html: //Foo
Child view:- myView.connectOutlet('main', Ember.View.extend({ + var FooView = Ember.View.extend({ template: Ember.Handlebars.compile('Foo
') - })); + }); + var fooView = FooView.create(); + myView.connectOutlet('main', fooView); // myView's html: //Child view: //@@ -35019,11 +37048,10 @@ Ember.View.reopen({ }, /** - @private - Gets an outlet that is pending disconnection and then nullifys the object on the `_outlet` object. + @private @method _finishDisconnections */ _finishDisconnections: function() { @@ -35068,28 +37096,76 @@ queues.splice(indexOf.call(queues, 'actions') + 1, 0, 'routerTransitions'); var get = Ember.get, set = Ember.set; -/* - This file implements the `location` API used by Ember's router. - - That API is: - - getURL: returns the current URL - setURL(path): sets the current URL - replaceURL(path): replace the current URL (optional) - onUpdateURL(callback): triggers the callback when the URL changes - formatURL(url): formats `url` to be placed into `href` attribute - - Calling setURL or replaceURL will not trigger onUpdateURL callbacks. - - TODO: This should perhaps be moved so that it's visible in the doc output. -*/ - /** Ember.Location returns an instance of the correct implementation of the `location` API. - You can pass it a `implementation` ('hash', 'history', 'none') to force a - particular implementation. + ## Implementations + + You can pass an implementation name (`hash`, `history`, `none`) to force a + particular implementation to be used in your application. + + ### HashLocation + + Using `HashLocation` results in URLs with a `#` (hash sign) separating the + server side URL portion of the URL from the portion that is used by Ember. + This relies upon the `hashchange` event existing in the browser. + + Example: + + ```javascript + App.Router.map(function() { + this.resource('posts', function() { + this.route('new'); + }); + }); + + App.Router.reopen({ + location: 'hash' + }); + ``` + + This will result in a posts.new url of `/#/posts/new`. + + ### HistoryLocation + + Using `HistoryLocation` results in URLs that are indistinguishable from a + standard URL. This relies upon the browser's `history` API. + + Example: + + ```javascript + App.Router.map(function() { + this.resource('posts', function() { + this.route('new'); + }); + }); + + App.Router.reopen({ + location: 'history' + }); + ``` + + This will result in a posts.new url of `/posts/new`. + + ### NoneLocation + + Using `NoneLocation` causes Ember to not store the applications URL state + in the actual URL. This is generally used for testing purposes, and is one + of the changes made when calling `App.setupForTesting()`. + + ## Location API + + Each location implementation must provide the following methods: + + * implementation: returns the string name used to reference the implementation. + * getURL: returns the current URL. + * setURL(path): sets the current URL. + * replaceURL(path): replace the current URL (optional). + * onUpdateURL(callback): triggers the callback when the URL changes. + * formatURL(url): formats `url` to be placed into `href` attribute. + + Calling setURL or replaceURL will not trigger onUpdateURL callbacks. @class Location @namespace Ember @@ -35097,20 +37173,24 @@ var get = Ember.get, set = Ember.set; */ Ember.Location = { /** - Create an instance of a an implementation of the `location` API. Requires - an options object with an `implementation` property. + This is deprecated in favor of using the container to lookup the location + implementation as desired. - Example + For example: ```javascript - var hashLocation = Ember.Location.create({implementation: 'hash'}); - var historyLocation = Ember.Location.create({implementation: 'history'}); - var noneLocation = Ember.Location.create({implementation: 'none'}); + // Given a location registered as follows: + container.register('location:history-test', HistoryTestLocation); + + // You could create a new instance via: + container.lookup('location:history-test'); ``` @method create @param {Object} options @return {Object} an instance of an implementation of the `location` API + @deprecated Use the container to lookup the location implementation that you + need. */ create: function(options) { var implementation = options && options.implementation; @@ -35123,23 +37203,26 @@ Ember.Location = { }, /** - Registers a class that implements the `location` API with an implementation - name. This implementation name can then be specified by the location property on - the application's router class. + This is deprecated in favor of using the container to register the + location implementation as desired. - Example + Example: ```javascript - Ember.Location.registerImplementation('history', Ember.HistoryLocation); + Application.initializer({ + name: "history-test-location", - App.Router.reopen({ - location: 'history' + initialize: function(container, application) { + application.register('location:history-test', HistoryTestLocation); + } }); ``` - @method registerImplementation - @param {String} name - @param {Object} implementation of the `location` API + @method registerImplementation + @param {String} name + @param {Object} implementation of the `location` API + @deprecated Register your custom location implementation with the + container directly. */ registerImplementation: function(name, implementation) { this.implementations[name] = implementation; @@ -35174,10 +37257,9 @@ Ember.NoneLocation = Ember.Object.extend({ path: '', /** - @private - Returns the current path. + @private @method getURL @return {String} path */ @@ -35186,11 +37268,10 @@ Ember.NoneLocation = Ember.Object.extend({ }, /** - @private - Set the path and remembers what was set. Using this method to change the path will not invoke the `updateURL` callback. + @private @method setURL @param path {String} */ @@ -35199,12 +37280,11 @@ Ember.NoneLocation = Ember.Object.extend({ }, /** - @private - Register a callback to be invoked when the path changes. These callbacks will execute when the user presses the back or forward button, but not after `setURL` is invoked. + @private @method onUpdateURL @param callback {Function} */ @@ -35213,10 +37293,9 @@ Ember.NoneLocation = Ember.Object.extend({ }, /** - @private - Sets the path and calls the `updateURL` callback. + @private @method handleURL @param callback {Function} */ @@ -35226,14 +37305,13 @@ Ember.NoneLocation = Ember.Object.extend({ }, /** - @private - Given a URL, formats it to be placed into the page as part of an element's `href` attribute. This is used, for example, when using the {{action}} helper to generate a URL based on an event. + @private @method formatURL @param url {String} @return {String} url @@ -35261,8 +37339,8 @@ Ember.Location.registerImplementation('none', Ember.NoneLocation); var get = Ember.get, set = Ember.set; /** - Ember.HashLocation implements the location API using the browser's - hash. At present, it relies on a hashchange event existing in the + `Ember.HashLocation` implements the location API using the browser's + hash. At present, it relies on a `hashchange` event existing in the browser. @class HashLocation @@ -35276,10 +37354,9 @@ Ember.HashLocation = Ember.Object.extend({ }, /** - @private - Returns the current `location.hash`, minus the '#' at the front. + @private @method getURL */ getURL: function() { @@ -35288,12 +37365,11 @@ Ember.HashLocation = Ember.Object.extend({ }, /** - @private - Set the `location.hash` and remembers what was set. This prevents `onUpdateURL` callbacks from triggering when the hash was set by `HashLocation`. + @private @method setURL @param path {String} */ @@ -35303,11 +37379,10 @@ Ember.HashLocation = Ember.Object.extend({ }, /** - @private - Uses location.replace to update the url without a page reload or history modification. + @private @method replaceURL @param path {String} */ @@ -35316,12 +37391,11 @@ Ember.HashLocation = Ember.Object.extend({ }, /** - @private - Register a callback to be invoked when the hash changes. These callbacks will execute when the user presses the back or forward button, but not after `setURL` is invoked. + @private @method onUpdateURL @param callback {Function} */ @@ -35342,14 +37416,13 @@ Ember.HashLocation = Ember.Object.extend({ }, /** - @private - Given a URL, formats it to be placed into the page as part of an element's `href` attribute. This is used, for example, when using the {{action}} helper to generate a URL based on an event. + @private @method formatURL @param url {String} */ @@ -35358,10 +37431,9 @@ Ember.HashLocation = Ember.Object.extend({ }, /** - @private - Cleans up the HashLocation event listener. + @private @method willDestroy */ willDestroy: function() { @@ -35399,14 +37471,12 @@ Ember.HistoryLocation = Ember.Object.extend({ init: function() { set(this, 'location', get(this, 'location') || window.location); - this.initState(); }, /** - @private - Used to set state on first call to setURL + @private @method initState */ initState: function() { @@ -35423,10 +37493,9 @@ Ember.HistoryLocation = Ember.Object.extend({ rootURL: '/', /** + Returns the current `location.pathname` without `rootURL`. + @private - - Returns the current `location.pathname` without rootURL - @method getURL @return url {String} */ @@ -35443,10 +37512,9 @@ Ember.HistoryLocation = Ember.Object.extend({ }, /** - @private - Uses `history.pushState` to update the url without a page reload. + @private @method setURL @param path {String} */ @@ -35460,11 +37528,10 @@ Ember.HistoryLocation = Ember.Object.extend({ }, /** - @private - Uses `history.replaceState` to update the url without a page reload or history modification. + @private @method replaceURL @param path {String} */ @@ -35478,12 +37545,11 @@ Ember.HistoryLocation = Ember.Object.extend({ }, /** - @private - Get the current `history.state` Polyfill checks for native browser support and falls back to retrieving from a private _historyState variable + @private @method getState @return state {Object} */ @@ -35492,10 +37558,9 @@ Ember.HistoryLocation = Ember.Object.extend({ }, /** + Pushes a new state. + @private - - Pushes a new state - @method pushState @param path {String} */ @@ -35514,10 +37579,9 @@ Ember.HistoryLocation = Ember.Object.extend({ }, /** + Replaces the current state. + @private - - Replaces the current state - @method replaceState @param path {String} */ @@ -35536,11 +37600,10 @@ Ember.HistoryLocation = Ember.Object.extend({ }, /** - @private - Register a callback to be invoked whenever the browser history changes, including using forward and back buttons. + @private @method onUpdateURL @param callback {Function} */ @@ -35559,10 +37622,9 @@ Ember.HistoryLocation = Ember.Object.extend({ }, /** - @private - Used when using `{{action}}` helper. The url is always appended to the rootURL. + @private @method formatURL @param url {String} @return formatted url {String} @@ -35578,10 +37640,9 @@ Ember.HistoryLocation = Ember.Object.extend({ }, /** - @private - Cleans up the HistoryLocation event listener. + @private @method willDestroy */ willDestroy: function() { @@ -35818,7 +37879,10 @@ Ember.DefaultResolver = Ember.Object.extend({ type = split[0], name = split[1]; - Ember.assert("Tried to normalize a container name without a colon (:) in it. You probably tried to lookup a name that did not contain a type, a colon, and a name. A proper lookup name would be `view:post`.", split.length === 2); + Ember.assert("Tried to normalize a container name without a colon (:) in " + + "it. You probably tried to lookup a name that did not contain " + + "a type, a colon, and a name. A proper lookup name would be " + + "`view:post`.", split.length === 2); if (type !== 'template') { var result = name; @@ -35852,7 +37916,7 @@ Ember.DefaultResolver = Ember.Object.extend({ typeSpecificResolveMethod = this[parsedName.resolveMethodName]; if (!parsedName.name || !parsedName.type) { - throw new TypeError("Invalid fullName: `" + fullName + "`, must of of the form `type:name` "); + throw new TypeError("Invalid fullName: `" + fullName + "`, must be of the form `type:name` "); } if (typeSpecificResolveMethod) { @@ -36124,7 +38188,7 @@ DeprecatedContainer.prototype = { App = Ember.Application.create({ customEvents: { // add support for the paste event - 'paste: "paste" + paste: "paste" } }); ``` @@ -36246,7 +38310,7 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin App = Ember.Application.create({ customEvents: { // add support for the paste event - 'paste: "paste" + paste: "paste" } }); ``` @@ -36288,13 +38352,12 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin }, /** - @private - Build the container for the current application. Also register a default application view in case the application itself does not. + @private @method buildContainer @return {Ember.Container} the configured container */ @@ -36305,8 +38368,6 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin }, /** - @private - If the application has not opted out of routing and has not explicitly defined a router, supply a default router for the application author to configure. @@ -36321,6 +38382,7 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin }); ``` + @private @method defaultRouter @return {Ember.Router} the default router */ @@ -36338,8 +38400,6 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin }, /** - @private - Automatically initialize the application once the DOM has become ready. @@ -36352,6 +38412,7 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin `advanceReadiness()` once all of your code has finished loading. + @private @method scheduleInitialize */ scheduleInitialize: function() { @@ -36360,7 +38421,7 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin if (!this.$ || this.$.isReady) { Ember.run.schedule('actions', self, '_initialize'); } else { - this.$().ready(function() { + this.$().ready(function runInitialize() { Ember.run(self, '_initialize'); }); } @@ -36423,12 +38484,12 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin App.Person = Ember.Object.extend({}); App.Orange = Ember.Object.extend({}); App.Email = Ember.Object.extend({}); - App.Session = Ember.Object.create({}); + App.session = Ember.Object.create({}); App.register('model:user', App.Person, {singleton: false }); App.register('fruit:favorite', App.Orange); App.register('communication:main', App.Email, {singleton: false}); - App.register('session', App.Session, {instantiate: false}); + App.register('session', App.session, {instantiate: false}); ``` @method register @@ -36462,28 +38523,26 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin }, /** - @private - @deprecated - Calling initialize manually is not supported. Please see Ember.Application#advanceReadiness and Ember.Application#deferReadiness. + @private + @deprecated @method initialize **/ initialize: function() { Ember.deprecate('Calling initialize manually is not supported. Please see Ember.Application#advanceReadiness and Ember.Application#deferReadiness'); }, /** - @private - Initialize the application. This happens automatically. Run any initializers and run the application load hook. These hooks may choose to defer readiness. For example, an authentication hook might want to defer readiness until the auth token has been retrieved. + @private @method _initialize */ _initialize: function() { @@ -36637,12 +38696,11 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin }, /** - @private - Setup up the event dispatcher to receive events on the application's `rootElement` with any registered `customEvents`. + @private @method setupEventDispatcher */ setupEventDispatcher: function() { @@ -36655,11 +38713,10 @@ var Application = Ember.Application = Ember.Namespace.extend(Ember.DeferredMixin }, /** - @private - trigger a new call to `route` whenever the URL changes. If the application has a router, use it to route to the current URL, and + @private @method startRouting @property router {Ember.Router} */ @@ -36732,8 +38789,6 @@ Ember.Application.reopenClass({ }, /** - @private - This creates a container with the default Ember naming conventions. It also configures the container: @@ -36751,6 +38806,7 @@ Ember.Application.reopenClass({ * the application view receives the application template as its `defaultTemplate` property + @private @method buildContainer @static @param {Ember.Application} namespace the application to build the @@ -36771,10 +38827,7 @@ Ember.Application.reopenClass({ container.optionsForType('component', { singleton: false }); container.optionsForType('view', { singleton: false }); container.optionsForType('template', { instantiate: false }); - - - container.optionsForType('helper', { instantiate: false }); - + container.optionsForType('helper', { instantiate: false }); container.register('application:main', namespace, { instantiate: false }); @@ -36797,8 +38850,6 @@ Ember.Application.reopenClass({ }); /** - @private - This function defines the default lookup rules for container lookups: * templates are looked up on `Ember.TEMPLATES` @@ -36809,6 +38860,7 @@ Ember.Application.reopenClass({ This allows the application to register default injections in the container that could be overridden by the normal naming convention. + @private @method resolverFor @param {Ember.Namespace} namespace the namespace to look for classes @return {*} the resolved value for a given lookup @@ -36868,21 +38920,52 @@ Ember.runLoadHooks('Ember.Application', Ember.Application); var get = Ember.get, set = Ember.set; function verifyNeedsDependencies(controller, container, needs) { - var dependency, i, l; + var dependency, i, l, missing = []; for (i=0, l=needs.length; iFoo
+
@@ -6,7 +6,7 @@ {{t profiles.show.github}}:diff --git a/assets/scripts/app/templates/queues/list.hbs b/assets/scripts/app/templates/queues/list.hbs index fe08ffd2..b652c221 100644 --- a/assets/scripts/app/templates/queues/list.hbs +++ b/assets/scripts/app/templates/queues/list.hbs @@ -2,16 +2,16 @@ {{#each queue in controller}}
Travis
-{{/linkTo}} +{{/link-to}}-
-
{{#collection Travis.AccountsListView contentBinding="controller"}}
- {{#linkTo "account.index" view.account class="name"}}{{view.name}}{{/linkTo}}
+ {{#link-to "account.index" view.account class="name"}}{{view.name}}{{/link-to}}
Repositories: {{view.account.reposCount}} diff --git a/assets/scripts/app/templates/profile/tabs.hbs b/assets/scripts/app/templates/profile/tabs.hbs index 8f770575..6afb10c8 100644 --- a/assets/scripts/app/templates/profile/tabs.hbs +++ b/assets/scripts/app/templates/profile/tabs.hbs @@ -1,17 +1,17 @@
-
-
-
{{#each hook in hooks}}
-