@@ -61,8 +61,8 @@
{{/if}}
{{/if}}
-
{{#linkTo 'adminUser' this}}{{avatar this imageSize="small"}}{{/linkTo}}
-
{{#linkTo 'adminUser' this}}{{unbound username}}{{/linkTo}}
+
{{#link-to 'adminUser' this}}{{avatar this imageSize="small"}}{{/link-to}}
+
{{#link-to 'adminUser' this}}{{unbound username}}{{/link-to}}
{{shorten email}}
{{{unbound last_emailed_age}}}
{{{unbound last_seen_age}}}
diff --git a/app/assets/javascripts/application.js.erb b/app/assets/javascripts/application.js.erb
index 35acdbfeefb..d81c2f245c8 100644
--- a/app/assets/javascripts/application.js.erb
+++ b/app/assets/javascripts/application.js.erb
@@ -13,18 +13,18 @@
<%
if Rails.env.development?
- require_asset ("./external_development/jquery-2.0.3.js")
+ require_asset ("development/jquery-2.0.3.js")
else
- require_asset ("./external_production/jquery-2.0.3.min.js")
+ require_asset ("production/jquery-2.0.3.min.js")
end
-require_asset ("./external/jquery.ui.widget.js")
-require_asset ("./external/handlebars.js")
+require_asset ("jquery.ui.widget.js")
+require_asset ("handlebars.js")
if Rails.env.development?
- require_asset ("./external_development/ember.js")
+ require_asset ("development/ember.js")
else
- require_asset ("./external_production/ember.js")
+ require_asset ("production/ember.js")
end
require_asset ("./main_include.js")
diff --git a/app/assets/javascripts/discourse.js b/app/assets/javascripts/discourse.js
index 558a06710c7..8927da3ac41 100644
--- a/app/assets/javascripts/discourse.js
+++ b/app/assets/javascripts/discourse.js
@@ -28,7 +28,7 @@ Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
return u + url;
},
- resolver: Discourse.Resolver,
+ Resolver: Discourse.Resolver,
titleChanged: function() {
var title = "";
@@ -112,7 +112,7 @@ Discourse = Ember.Application.createWithMixins(Discourse.Ajax, {
if ($currentTarget.attr('target')) { return; }
if ($currentTarget.data('auto-route')) { return; }
- // If it's an ember #linkTo skip it
+ // If it's an ember #link-to skip it
if ($currentTarget.hasClass('ember-view')) { return; }
if ($currentTarget.hasClass('lightbox')) { return; }
diff --git a/app/assets/javascripts/discourse/controllers/avatar_selector_controller.js b/app/assets/javascripts/discourse/controllers/avatar_selector_controller.js
index 91ce9648bc5..c3564b15aac 100644
--- a/app/assets/javascripts/discourse/controllers/avatar_selector_controller.js
+++ b/app/assets/javascripts/discourse/controllers/avatar_selector_controller.js
@@ -8,15 +8,19 @@
@module Discourse
**/
Discourse.AvatarSelectorController = Discourse.Controller.extend(Discourse.ModalFunctionality, {
- useUploadedAvatar: function() {
- this.set("use_uploaded_avatar", true);
- },
- useGravatar: function() {
- this.set("use_uploaded_avatar", false);
+ actions: {
+ useUploadedAvatar: function() {
+ this.set("use_uploaded_avatar", true);
+ },
+
+ useGravatar: function() {
+ this.set("use_uploaded_avatar", false);
+ }
},
avatarTemplate: function() {
return this.get("use_uploaded_avatar") ? this.get("uploaded_avatar_template") : this.get("gravatar_template");
}.property("use_uploaded_avatar", "uploaded_avatar_template", "gravatar_template")
+
});
diff --git a/app/assets/javascripts/discourse/controllers/composer_controller.js b/app/assets/javascripts/discourse/controllers/composer_controller.js
index e040f094dd2..25158965a9f 100644
--- a/app/assets/javascripts/discourse/controllers/composer_controller.js
+++ b/app/assets/javascripts/discourse/controllers/composer_controller.js
@@ -17,15 +17,6 @@ Discourse.ComposerController = Discourse.Controller.extend({
this.set('similarTopics', Em.A());
},
- togglePreview: function() {
- this.get('model').togglePreview();
- },
-
- // Import a quote from the post
- importQuote: function() {
- this.get('model').importQuote();
- },
-
updateDraftStatus: function() {
this.get('model').updateDraftStatus();
},
@@ -39,84 +30,122 @@ Discourse.ComposerController = Discourse.Controller.extend({
return Discourse.Category.list();
}.property(),
- save: function(force) {
- var composer = this.get('model'),
- composerController = this;
+ actions: {
- if( composer.get('cantSubmitPost') ) {
- this.set('view.showTitleTip', Date.now());
- this.set('view.showCategoryTip', Date.now());
- this.set('view.showReplyTip', Date.now());
- return;
- }
+ // Toggle the reply view
+ toggle: function() {
+ this.closeAutocomplete();
+ switch (this.get('model.composeState')) {
+ case Discourse.Composer.OPEN:
+ if (this.blank('model.reply') && this.blank('model.title')) {
+ this.close();
+ } else {
+ this.shrink();
+ }
+ break;
+ case Discourse.Composer.DRAFT:
+ this.set('model.composeState', Discourse.Composer.OPEN);
+ break;
+ case Discourse.Composer.SAVING:
+ this.close();
+ }
+ return false;
+ },
- composer.set('disableDrafts', true);
- // for now handle a very narrow use case
- // if we are replying to a topic AND not on the topic pop the window up
- if(!force && composer.get('replyingToTopic')) {
- var topic = this.get('topic');
- if (!topic || topic.get('id') !== composer.get('topic.id'))
- {
- var message = I18n.t("composer.posting_not_on_topic", {title: this.get('model.topic.title')});
+ togglePreview: function() {
+ this.get('model').togglePreview();
+ },
- var buttons = [{
- "label": I18n.t("composer.cancel"),
- "class": "cancel",
- "link": true
- }];
+ // Import a quote from the post
+ importQuote: function() {
+ this.get('model').importQuote();
+ },
+
+ cancel: function() {
+ this.cancelComposer();
+ },
+
+ save: function(force) {
+ var composer = this.get('model'),
+ composerController = this;
+
+ if( composer.get('cantSubmitPost') ) {
+ this.set('view.showTitleTip', Date.now());
+ this.set('view.showCategoryTip', Date.now());
+ this.set('view.showReplyTip', Date.now());
+ return;
+ }
+
+ composer.set('disableDrafts', true);
+
+ // for now handle a very narrow use case
+ // if we are replying to a topic AND not on the topic pop the window up
+ if(!force && composer.get('replyingToTopic')) {
+ var topic = this.get('topic');
+ if (!topic || topic.get('id') !== composer.get('topic.id'))
+ {
+ var message = I18n.t("composer.posting_not_on_topic", {title: this.get('model.topic.title')});
+
+ var buttons = [{
+ "label": I18n.t("composer.cancel"),
+ "class": "cancel",
+ "link": true
+ }];
+
+ if(topic) {
+ buttons.push({
+ "label": I18n.t("composer.reply_here") + "
" + topic.get('title') + "
",
+ "class": "btn btn-reply-here",
+ "callback": function(){
+ composer.set('topic', topic);
+ composer.set('post', null);
+ composerController.save(true);
+ }
+ });
+ }
- if(topic) {
buttons.push({
- "label": I18n.t("composer.reply_here") + "
" + topic.get('title') + "
",
- "class": "btn btn-reply-here",
+ "label": I18n.t("composer.reply_original") + "
" + this.get('model.topic.title') + "
",
+ "class": "btn-primary btn-reply-on-original",
"callback": function(){
- composer.set('topic', topic);
- composer.set('post', null);
composerController.save(true);
}
});
+
+ bootbox.dialog(message, buttons, {"classes": "reply-where-modal"});
+ return;
+ }
+ }
+
+ return composer.save({
+ imageSizes: this.get('view').imageSizes()
+ }).then(function(opts) {
+
+ // If we replied as a new topic successfully, remove the draft.
+ if (composerController.get('replyAsNewTopicDraft')) {
+ composerController.destroyDraft();
}
- buttons.push({
- "label": I18n.t("composer.reply_original") + "
" + this.get('model.topic.title') + "
",
- "class": "btn-primary btn-reply-on-original",
- "callback": function(){
- composerController.save(true);
- }
- });
+ opts = opts || {};
+ composerController.close();
- bootbox.dialog(message, buttons, {"classes": "reply-where-modal"});
- return;
- }
+ var currentUser = Discourse.User.current();
+ if (composer.get('creatingTopic')) {
+ currentUser.set('topic_count', currentUser.get('topic_count') + 1);
+ } else {
+ currentUser.set('reply_count', currentUser.get('reply_count') + 1);
+ }
+ Discourse.URL.routeTo(opts.post.get('url'));
+
+ }, function(error) {
+ composer.set('disableDrafts', false);
+ bootbox.alert(error);
+ });
}
-
- return composer.save({
- imageSizes: this.get('view').imageSizes()
- }).then(function(opts) {
-
- // If we replied as a new topic successfully, remove the draft.
- if (composerController.get('replyAsNewTopicDraft')) {
- composerController.destroyDraft();
- }
-
- opts = opts || {};
- composerController.close();
-
- var currentUser = Discourse.User.current();
- if (composer.get('creatingTopic')) {
- currentUser.set('topic_count', currentUser.get('topic_count') + 1);
- } else {
- currentUser.set('reply_count', currentUser.get('reply_count') + 1);
- }
- Discourse.URL.routeTo(opts.post.get('url'));
-
- }, function(error) {
- composer.set('disableDrafts', false);
- bootbox.alert(error);
- });
},
+
/**
Checks to see if a reply has been typed. This is signaled by a keyUp
event in a view.
@@ -230,7 +259,7 @@ Discourse.ComposerController = Discourse.Controller.extend({
} else {
opts.tested = true;
if (!opts.ignoreIfChanged) {
- this.cancel().then(function() { composerController.open(opts); },
+ this.cancelComposer().then(function() { composerController.open(opts); },
function() { return promise.reject(); });
}
return promise;
@@ -278,7 +307,7 @@ Discourse.ComposerController = Discourse.Controller.extend({
}
},
- cancel: function() {
+ cancelComposer: function() {
var composerController = this;
return Ember.Deferred.promise(function (promise) {
@@ -332,26 +361,6 @@ Discourse.ComposerController = Discourse.Controller.extend({
$('#wmd-input').autocomplete({ cancel: true });
},
- // Toggle the reply view
- toggle: function() {
- this.closeAutocomplete();
- switch (this.get('model.composeState')) {
- case Discourse.Composer.OPEN:
- if (this.blank('model.reply') && this.blank('model.title')) {
- this.close();
- } else {
- this.shrink();
- }
- break;
- case Discourse.Composer.DRAFT:
- this.set('model.composeState', Discourse.Composer.OPEN);
- break;
- case Discourse.Composer.SAVING:
- this.close();
- }
- return false;
- },
-
// ESC key hit
hitEsc: function() {
if (this.get('model.viewOpen')) {
diff --git a/app/assets/javascripts/discourse/controllers/composer_messages_controller.js b/app/assets/javascripts/discourse/controllers/composer_messages_controller.js
index 0b3e7fc3dbf..48371a4ae65 100644
--- a/app/assets/javascripts/discourse/controllers/composer_messages_controller.js
+++ b/app/assets/javascripts/discourse/controllers/composer_messages_controller.js
@@ -20,6 +20,18 @@ Discourse.ComposerMessagesController = Ember.ArrayController.extend({
this.reset();
},
+ actions: {
+ /**
+ Closes and hides a message.
+
+ @method closeMessage
+ @params {Object} message The message to dismiss
+ **/
+ closeMessage: function(message) {
+ this.removeObject(message);
+ }
+ },
+
/**
Displays a new message
@@ -37,16 +49,6 @@ Discourse.ComposerMessagesController = Ember.ArrayController.extend({
}
},
- /**
- Closes and hides a message.
-
- @method closeMessage
- @params {Object} message The message to dismiss
- **/
- closeMessage: function(message) {
- this.removeObject(message);
- },
-
/**
Resets all active messages. For example if composing a new post.
diff --git a/app/assets/javascripts/discourse/controllers/edit_category_controller.js b/app/assets/javascripts/discourse/controllers/edit_category_controller.js
index cfa7f39e2c3..5e0ebf52f08 100644
--- a/app/assets/javascripts/discourse/controllers/edit_category_controller.js
+++ b/app/assets/javascripts/discourse/controllers/edit_category_controller.js
@@ -39,18 +39,6 @@ Discourse.EditCategoryController = Discourse.ObjectController.extend(Discourse.M
this.set('controllers.modal.title', this.get('title'));
}.observes('title'),
- selectGeneral: function() {
- this.set('selectedTab', 'general');
- },
-
- selectSecurity: function() {
- this.set('selectedTab', 'security');
- },
-
- selectSettings: function() {
- this.set('selectedTab', 'settings');
- },
-
disabled: function() {
if (this.get('saving') || this.get('deleting')) return true;
if (!this.get('name')) return true;
@@ -103,83 +91,97 @@ Discourse.EditCategoryController = Discourse.ObjectController.extend(Discourse.M
return I18n.t('category.delete');
}.property(),
- showCategoryTopic: function() {
- this.send('closeModal');
- Discourse.URL.routeTo(this.get('topic_url'));
- return false;
- },
+ actions: {
- editPermissions: function(){
- this.set('editingPermissions', true);
- },
+ selectGeneral: function() {
+ this.set('selectedTab', 'general');
+ },
- addPermission: function(group, permission_id){
- this.get('model').addPermission({group_name: group + "", permission: Discourse.PermissionType.create({id: permission_id})});
- },
+ selectSecurity: function() {
+ this.set('selectedTab', 'security');
+ },
- removePermission: function(permission){
- this.get('model').removePermission(permission);
- },
+ selectSettings: function() {
+ this.set('selectedTab', 'settings');
+ },
- saveCategory: function() {
- var categoryController = this;
- this.set('saving', true);
+ showCategoryTopic: function() {
+ this.send('closeModal');
+ Discourse.URL.routeTo(this.get('topic_url'));
+ return false;
+ },
+
+ editPermissions: function(){
+ this.set('editingPermissions', true);
+ },
+
+ addPermission: function(group, permission_id){
+ this.get('model').addPermission({group_name: group + "", permission: Discourse.PermissionType.create({id: permission_id})});
+ },
+
+ removePermission: function(permission){
+ this.get('model').removePermission(permission);
+ },
+
+ saveCategory: function() {
+ var categoryController = this;
+ this.set('saving', true);
- if( this.get('isUncategorized') ) {
- $.when(
- Discourse.SiteSetting.update('uncategorized_color', this.get('color')),
- Discourse.SiteSetting.update('uncategorized_text_color', this.get('text_color')),
- Discourse.SiteSetting.update('uncategorized_name', this.get('name'))
- ).then(function(result) {
- // success
- categoryController.send('closeModal');
- // We can't redirect to the uncategorized category on save because the slug
- // might have changed.
- Discourse.URL.redirectTo("/categories");
- }, function(errors) {
- // errors
- if(errors.length === 0) errors.push(I18n.t("category.save_error"));
- categoryController.displayErrors(errors);
- categoryController.set('saving', false);
- });
- } else {
- this.get('model').save().then(function(result) {
- // success
- categoryController.send('closeModal');
- Discourse.URL.redirectTo("/category/" + Discourse.Category.slugFor(result.category));
- }, function(errors) {
- // errors
- if(errors.length === 0) errors.push(I18n.t("category.creation_error"));
- categoryController.displayErrors(errors);
- categoryController.set('saving', false);
- });
- }
- },
-
- deleteCategory: function() {
- var categoryController = this;
- this.set('deleting', true);
-
- $('#discourse-modal').modal('hide');
- bootbox.confirm(I18n.t("category.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
- if (result) {
- categoryController.get('model').destroy().then(function(){
+ if( this.get('isUncategorized') ) {
+ $.when(
+ Discourse.SiteSetting.update('uncategorized_color', this.get('color')),
+ Discourse.SiteSetting.update('uncategorized_text_color', this.get('text_color')),
+ Discourse.SiteSetting.update('uncategorized_name', this.get('name'))
+ ).then(function(result) {
// success
categoryController.send('closeModal');
+ // We can't redirect to the uncategorized category on save because the slug
+ // might have changed.
Discourse.URL.redirectTo("/categories");
- }, function(jqXHR){
- // error
- $('#discourse-modal').modal('show');
- categoryController.displayErrors([I18n.t("category.delete_error")]);
- categoryController.set('deleting', false);
+ }, function(errors) {
+ // errors
+ if(errors.length === 0) errors.push(I18n.t("category.save_error"));
+ categoryController.displayErrors(errors);
+ categoryController.set('saving', false);
});
} else {
- $('#discourse-modal').modal('show');
- categoryController.set('deleting', false);
+ this.get('model').save().then(function(result) {
+ // success
+ categoryController.send('closeModal');
+ Discourse.URL.redirectTo("/category/" + Discourse.Category.slugFor(result.category));
+ }, function(errors) {
+ // errors
+ if(errors.length === 0) errors.push(I18n.t("category.creation_error"));
+ categoryController.displayErrors(errors);
+ categoryController.set('saving', false);
+ });
}
- });
+ },
+
+ deleteCategory: function() {
+ var categoryController = this;
+ this.set('deleting', true);
+
+ $('#discourse-modal').modal('hide');
+ bootbox.confirm(I18n.t("category.delete_confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+ if (result) {
+ categoryController.get('model').destroy().then(function(){
+ // success
+ categoryController.send('closeModal');
+ Discourse.URL.redirectTo("/categories");
+ }, function(jqXHR){
+ // error
+ $('#discourse-modal').modal('show');
+ categoryController.displayErrors([I18n.t("category.delete_error")]);
+ categoryController.set('deleting', false);
+ });
+ } else {
+ $('#discourse-modal').modal('show');
+ categoryController.set('deleting', false);
+ }
+ });
+ }
}
-
});
diff --git a/app/assets/javascripts/discourse/controllers/edit_topic_auto_close_controller.js b/app/assets/javascripts/discourse/controllers/edit_topic_auto_close_controller.js
index 6301c2def93..1dec95afa1d 100644
--- a/app/assets/javascripts/discourse/controllers/edit_topic_auto_close_controller.js
+++ b/app/assets/javascripts/discourse/controllers/edit_topic_auto_close_controller.js
@@ -20,12 +20,14 @@ Discourse.EditTopicAutoCloseController = Discourse.ObjectController.extend(Disco
}
}.observes('details.auto_close_at'),
- saveAutoClose: function() {
- this.setAutoClose( parseFloat(this.get('auto_close_days')) );
- },
+ actions: {
+ saveAutoClose: function() {
+ this.setAutoClose( parseFloat(this.get('auto_close_days')) );
+ },
- removeAutoClose: function() {
- this.setAutoClose(null);
+ removeAutoClose: function() {
+ this.setAutoClose(null);
+ }
},
setAutoClose: function(days) {
diff --git a/app/assets/javascripts/discourse/controllers/flag_controller.js b/app/assets/javascripts/discourse/controllers/flag_controller.js
index a573161bba3..59c1a66e9de 100644
--- a/app/assets/javascripts/discourse/controllers/flag_controller.js
+++ b/app/assets/javascripts/discourse/controllers/flag_controller.js
@@ -13,10 +13,6 @@ Discourse.FlagController = Discourse.ObjectController.extend(Discourse.ModalFunc
this.set('selected', null);
},
- changePostActionType: function(action) {
- this.set('selected', action);
- },
-
submitEnabled: function() {
var selected = this.get('selected');
if (!selected) return false;
@@ -46,25 +42,31 @@ Discourse.FlagController = Discourse.ObjectController.extend(Discourse.ModalFunc
}
}.property('selected.is_custom_flag'),
- takeAction: function() {
- this.createFlag({takeAction: true});
- this.set('hidden', true);
- },
+ actions: {
+ takeAction: function() {
+ this.send('createFlag', {takeAction: true});
+ this.set('hidden', true);
+ },
- createFlag: function(opts) {
- var flagController = this;
- var postAction = this.get('actionByName.' + this.get('selected.name_key'));
- var params = this.get('selected.is_custom_flag') ? {message: this.get('message')} : {};
+ createFlag: function(opts) {
+ var flagController = this;
+ var postAction = this.get('actionByName.' + this.get('selected.name_key'));
+ var params = this.get('selected.is_custom_flag') ? {message: this.get('message')} : {};
- if (opts) params = $.extend(params, opts);
+ if (opts) params = $.extend(params, opts);
- $('#discourse-modal').modal('hide');
- postAction.act(params).then(function() {
- flagController.send('closeModal');
- }, function(errors) {
- $('#discourse-modal').modal('show');
- flagController.displayErrors(errors);
- });
+ $('#discourse-modal').modal('hide');
+ postAction.act(params).then(function() {
+ flagController.send('closeModal');
+ }, function(errors) {
+ $('#discourse-modal').modal('show');
+ flagController.displayErrors(errors);
+ });
+ },
+
+ changePostActionType: function(action) {
+ this.set('selected', action);
+ }
},
canDeleteSpammer: function() {
diff --git a/app/assets/javascripts/discourse/controllers/header_controller.js b/app/assets/javascripts/discourse/controllers/header_controller.js
index 3d36994931c..69413093bed 100644
--- a/app/assets/javascripts/discourse/controllers/header_controller.js
+++ b/app/assets/javascripts/discourse/controllers/header_controller.js
@@ -10,12 +10,6 @@ Discourse.HeaderController = Discourse.Controller.extend({
topic: null,
showExtraInfo: null,
- toggleStar: function() {
- var topic = this.get('topic');
- if (topic) topic.toggleStar();
- return false;
- },
-
categories: function() {
return Discourse.Category.list();
}.property(),
@@ -36,8 +30,16 @@ Discourse.HeaderController = Discourse.Controller.extend({
return Discourse.SiteSettings.enable_mobile_theme;
}.property(),
- toggleMobileView: function() {
- Discourse.Mobile.toggleMobileView();
+ actions: {
+ toggleStar: function() {
+ var topic = this.get('topic');
+ if (topic) topic.toggleStar();
+ return false;
+ },
+
+ toggleMobileView: function() {
+ Discourse.Mobile.toggleMobileView();
+ }
}
});
diff --git a/app/assets/javascripts/discourse/controllers/invite_controller.js b/app/assets/javascripts/discourse/controllers/invite_controller.js
index d8ad9bba363..e619914e3e4 100644
--- a/app/assets/javascripts/discourse/controllers/invite_controller.js
+++ b/app/assets/javascripts/discourse/controllers/invite_controller.js
@@ -25,22 +25,25 @@ Discourse.InviteController = Discourse.ObjectController.extend(Discourse.ModalFu
return I18n.t('topic.invite_reply.success', { email: this.get('email') });
}.property('email'),
- createInvite: function() {
- if (this.get('disabled')) return;
+ actions: {
+ createInvite: function() {
+ if (this.get('disabled')) return;
- var inviteController = this;
- this.set('saving', true);
- this.set('error', false);
- this.get('model').inviteUser(this.get('email')).then(function() {
- // Success
- inviteController.set('saving', false);
- return inviteController.set('finished', true);
- }, function() {
- // Failure
- inviteController.set('error', true);
- return inviteController.set('saving', false);
- });
- return false;
+ var inviteController = this;
+ this.set('saving', true);
+ this.set('error', false);
+ this.get('model').inviteUser(this.get('email')).then(function() {
+ // Success
+ inviteController.set('saving', false);
+ return inviteController.set('finished', true);
+ }, function() {
+ // Failure
+ inviteController.set('error', true);
+ return inviteController.set('saving', false);
+ });
+ return false;
+ }
}
+
});
diff --git a/app/assets/javascripts/discourse/controllers/list_controller.js b/app/assets/javascripts/discourse/controllers/list_controller.js
index 07bc684c4b3..edf9765fdeb 100644
--- a/app/assets/javascripts/discourse/controllers/list_controller.js
+++ b/app/assets/javascripts/discourse/controllers/list_controller.js
@@ -113,14 +113,16 @@ Discourse.ListController = Discourse.Controller.extend({
}.observes('filterMode', 'category'),
// Create topic button
- createTopic: function() {
- this.get('controllers.composer').open({
- categoryId: this.get('category.id'),
- action: Discourse.Composer.CREATE_TOPIC,
- draft: this.get('draft'),
- draftKey: this.get('draft_key'),
- draftSequence: this.get('draft_sequence')
- });
+ actions: {
+ createTopic: function() {
+ this.get('controllers.composer').open({
+ categoryId: this.get('category.id'),
+ action: Discourse.Composer.CREATE_TOPIC,
+ draft: this.get('draft'),
+ draftKey: this.get('draft_key'),
+ draftSequence: this.get('draft_sequence')
+ });
+ }
},
canEditCategory: function() {
diff --git a/app/assets/javascripts/discourse/controllers/list_topics_controller.js b/app/assets/javascripts/discourse/controllers/list_topics_controller.js
index 511d39669b7..ec202ce1122 100644
--- a/app/assets/javascripts/discourse/controllers/list_topics_controller.js
+++ b/app/assets/javascripts/discourse/controllers/list_topics_controller.js
@@ -27,32 +27,34 @@ Discourse.ListTopicsController = Discourse.ObjectController.extend({
}
}.observes('content.draft'),
- // Star a topic
- toggleStar: function(topic) {
- topic.toggleStar();
- },
+ actions: {
+ // Star a topic
+ toggleStar: function(topic) {
+ topic.toggleStar();
+ },
- // clear a pinned topic
- clearPin: function(topic) {
- topic.clearPin();
- },
+ // clear a pinned topic
+ clearPin: function(topic) {
+ topic.clearPin();
+ },
- toggleRankDetails: function() {
- this.toggleProperty('rankDetailsVisible');
- },
+ toggleRankDetails: function() {
+ this.toggleProperty('rankDetailsVisible');
+ },
- createTopic: function() {
- this.get('controllers.list').createTopic();
- },
+ createTopic: function() {
+ this.get('controllers.list').send('createTopic');
+ },
- // Show newly inserted topics
- showInserted: function(e) {
- var tracker = Discourse.TopicTrackingState.current();
+ // Show newly inserted topics
+ showInserted: function(e) {
+ var tracker = Discourse.TopicTrackingState.current();
- // Move inserted into topics
- this.get('content').loadBefore(tracker.get('newIncoming'));
- tracker.resetTracking();
- return false;
+ // Move inserted into topics
+ this.get('content').loadBefore(tracker.get('newIncoming'));
+ tracker.resetTracking();
+ return false;
+ }
},
allLoaded: function() {
diff --git a/app/assets/javascripts/discourse/controllers/merge_topic_controller.js b/app/assets/javascripts/discourse/controllers/merge_topic_controller.js
index 672654877ca..8483b19745c 100644
--- a/app/assets/javascripts/discourse/controllers/merge_topic_controller.js
+++ b/app/assets/javascripts/discourse/controllers/merge_topic_controller.js
@@ -46,7 +46,7 @@ Discourse.MergeTopicController = Discourse.ObjectController.extend(Discourse.Sel
promise.then(function(result) {
// Posts moved
mergeTopicController.send('closeModal');
- mergeTopicController.get('topicController').toggleMultiSelect();
+ mergeTopicController.get('topicController').send('toggleMultiSelect');
Em.run.next(function() { Discourse.URL.routeTo(result.url); });
}, function() {
// Error moving posts
diff --git a/app/assets/javascripts/discourse/controllers/preferences_controller.js b/app/assets/javascripts/discourse/controllers/preferences_controller.js
index 278c232e338..3a454035623 100644
--- a/app/assets/javascripts/discourse/controllers/preferences_controller.js
+++ b/app/assets/javascripts/discourse/controllers/preferences_controller.js
@@ -37,53 +37,54 @@ Discourse.PreferencesController = Discourse.ObjectController.extend({
{ name: I18n.t('user.new_topic_duration.after_n_weeks', { count: 1 }), value: 7 * 60 * 24 },
{ name: I18n.t('user.new_topic_duration.last_here'), value: -2 }],
- save: function() {
- var preferencesController = this;
- this.set('saving', true);
- this.set('saved', false);
-
- // Cook the bio for preview
- var model = this.get('model');
- return model.save().then(function() {
- // model was saved
- preferencesController.set('saving', false);
- if (Discourse.User.currentProp('id') === model.get('id')) {
- Discourse.User.currentProp('name', model.get('name'));
- }
-
- preferencesController.set('bio_cooked',
- Discourse.Markdown.cook(preferencesController.get('bio_raw')));
- preferencesController.set('saved', true);
- }, function() {
- // model failed to save
- preferencesController.set('saving', false);
- alert(I18n.t('generic_error'));
- });
- },
-
saveButtonText: function() {
return this.get('saving') ? I18n.t('saving') : I18n.t('save');
}.property('saving'),
- changePassword: function() {
- var preferencesController = this;
- if (!this.get('passwordProgress')) {
- this.set('passwordProgress', I18n.t("user.change_password.in_progress"));
- return this.get('model').changePassword().then(function() {
- // password changed
- preferencesController.setProperties({
- changePasswordProgress: false,
- passwordProgress: I18n.t("user.change_password.success")
- });
+ actions: {
+ save: function() {
+ var self = this;
+ this.set('saving', true);
+ this.set('saved', false);
+
+ // Cook the bio for preview
+ var model = this.get('model');
+ return model.save().then(function() {
+ // model was saved
+ self.set('saving', false);
+ if (Discourse.User.currentProp('id') === model.get('id')) {
+ Discourse.User.currentProp('name', model.get('name'));
+ }
+ self.set('bio_cooked', Discourse.Markdown.cook(self.get('bio_raw')));
+ self.set('saved', true);
}, function() {
- // password failed to change
- preferencesController.setProperties({
- changePasswordProgress: false,
- passwordProgress: I18n.t("user.change_password.error")
- });
+ // model failed to save
+ self.set('saving', false);
+ alert(I18n.t('generic_error'));
});
+ },
+
+ changePassword: function() {
+ var self = this;
+ if (!this.get('passwordProgress')) {
+ this.set('passwordProgress', I18n.t("user.change_password.in_progress"));
+ return this.get('model').changePassword().then(function() {
+ // password changed
+ self.setProperties({
+ changePasswordProgress: false,
+ passwordProgress: I18n.t("user.change_password.success")
+ });
+ }, function() {
+ // password failed to change
+ self.setProperties({
+ changePasswordProgress: false,
+ passwordProgress: I18n.t("user.change_password.error")
+ });
+ });
+ }
}
}
+
});
diff --git a/app/assets/javascripts/discourse/controllers/preferences_email_controller.js b/app/assets/javascripts/discourse/controllers/preferences_email_controller.js
index e07506f8676..36426f848ad 100644
--- a/app/assets/javascripts/discourse/controllers/preferences_email_controller.js
+++ b/app/assets/javascripts/discourse/controllers/preferences_email_controller.js
@@ -22,17 +22,16 @@ Discourse.PreferencesEmailController = Discourse.ObjectController.extend({
return I18n.t("user.change");
}.property('saving'),
- changeEmail: function() {
- var preferencesEmailController = this;
- this.set('saving', true);
- return this.get('content').changeEmail(this.get('newEmail')).then(function() {
- preferencesEmailController.set('success', true);
- }, function() {
- preferencesEmailController.setProperties({
- error: true,
- saving: false
+ actions: {
+ changeEmail: function() {
+ var self = this;
+ this.set('saving', true);
+ return this.get('content').changeEmail(this.get('newEmail')).then(function() {
+ self.set('success', true);
+ }, function() {
+ self.setProperties({ error: true, saving: false });
});
- });
+ }
}
});
diff --git a/app/assets/javascripts/discourse/controllers/preferences_username_controller.js b/app/assets/javascripts/discourse/controllers/preferences_username_controller.js
index 7fc6cebcaf0..d9ae9d74476 100644
--- a/app/assets/javascripts/discourse/controllers/preferences_username_controller.js
+++ b/app/assets/javascripts/discourse/controllers/preferences_username_controller.js
@@ -41,21 +41,24 @@ Discourse.PreferencesUsernameController = Discourse.ObjectController.extend({
return I18n.t("user.change");
}.property('saving'),
- changeUsername: function() {
- var preferencesUsernameController = this;
- return bootbox.confirm(I18n.t("user.change_username.confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
- if (result) {
- preferencesUsernameController.set('saving', true);
- preferencesUsernameController.get('content').changeUsername(preferencesUsernameController.get('newUsername')).then(function() {
- Discourse.URL.redirectTo("/users/" + preferencesUsernameController.get('newUsername').toLowerCase() + "/preferences");
- }, function() {
- // error
- preferencesUsernameController.set('error', true);
- preferencesUsernameController.set('saving', false);
- });
- }
- });
+ actions: {
+ changeUsername: function() {
+ var preferencesUsernameController = this;
+ return bootbox.confirm(I18n.t("user.change_username.confirm"), I18n.t("no_value"), I18n.t("yes_value"), function(result) {
+ if (result) {
+ preferencesUsernameController.set('saving', true);
+ preferencesUsernameController.get('content').changeUsername(preferencesUsernameController.get('newUsername')).then(function() {
+ Discourse.URL.redirectTo("/users/" + preferencesUsernameController.get('newUsername').toLowerCase() + "/preferences");
+ }, function() {
+ // error
+ preferencesUsernameController.set('error', true);
+ preferencesUsernameController.set('saving', false);
+ });
+ }
+ });
+ }
}
+
});
diff --git a/app/assets/javascripts/discourse/controllers/search_controller.js b/app/assets/javascripts/discourse/controllers/search_controller.js
index 215622ff1e7..d2dde8267f8 100644
--- a/app/assets/javascripts/discourse/controllers/search_controller.js
+++ b/app/assets/javascripts/discourse/controllers/search_controller.js
@@ -62,14 +62,20 @@ Discourse.SearchController = Em.ArrayController.extend(Discourse.Presence, {
}.property('typeFilter', 'loading'),
termChanged: function() {
- this.cancelType();
+ this.cancelTypeFilter();
}.observes('term'),
- moreOfType: function(type) {
- this.set('typeFilter', type);
+ actions: {
+ moreOfType: function(type) {
+ this.set('typeFilter', type);
+ },
+
+ cancelType: function() {
+ this.cancelTypeFilter();
+ }
},
- cancelType: function() {
+ cancelTypeFilter: function() {
this.set('typeFilter', null);
},
diff --git a/app/assets/javascripts/discourse/controllers/share_controller.js b/app/assets/javascripts/discourse/controllers/share_controller.js
index 4d513b3f039..344bb0343df 100644
--- a/app/assets/javascripts/discourse/controllers/share_controller.js
+++ b/app/assets/javascripts/discourse/controllers/share_controller.js
@@ -11,10 +11,12 @@ Discourse.ShareController = Discourse.Controller.extend({
needs: ['topic'],
// Close the share controller
- close: function() {
- this.set('link', '');
- this.set('postNumber', '');
- return false;
+ actions: {
+ close: function() {
+ this.set('link', '');
+ this.set('postNumber', '');
+ return false;
+ }
},
shareLinks: function() {
diff --git a/app/assets/javascripts/discourse/controllers/split_topic_controller.js b/app/assets/javascripts/discourse/controllers/split_topic_controller.js
index 7d2dd5993dd..01ad6094d5d 100644
--- a/app/assets/javascripts/discourse/controllers/split_topic_controller.js
+++ b/app/assets/javascripts/discourse/controllers/split_topic_controller.js
@@ -42,7 +42,7 @@ Discourse.SplitTopicController = Discourse.ObjectController.extend(Discourse.Sel
}).then(function(result) {
// Posts moved
self.send('closeModal');
- self.get('topicController').toggleMultiSelect();
+ self.get('topicController').send('toggleMultiSelect');
Em.run.next(function() { Discourse.URL.routeTo(result.url); });
}, function() {
// Error moving posts
diff --git a/app/assets/javascripts/discourse/controllers/topic_admin_menu_controller.js b/app/assets/javascripts/discourse/controllers/topic_admin_menu_controller.js
index 43d3083663d..e100e5d6f92 100644
--- a/app/assets/javascripts/discourse/controllers/topic_admin_menu_controller.js
+++ b/app/assets/javascripts/discourse/controllers/topic_admin_menu_controller.js
@@ -10,12 +10,14 @@ Discourse.TopicAdminMenuController = Discourse.ObjectController.extend({
menuVisible: false,
needs: ['modal'],
- show: function() {
- this.set('menuVisible', true);
- },
+ actions: {
+ show: function() {
+ this.set('menuVisible', true);
+ },
- hide: function() {
- this.set('menuVisible', false);
+ hide: function() {
+ this.set('menuVisible', false);
+ }
},
showRecover: Em.computed.and('deleted', 'details.can_recover')
diff --git a/app/assets/javascripts/discourse/controllers/topic_controller.js b/app/assets/javascripts/discourse/controllers/topic_controller.js
index e6a01bbe405..09a8c88a2b9 100644
--- a/app/assets/javascripts/discourse/controllers/topic_controller.js
+++ b/app/assets/javascripts/discourse/controllers/topic_controller.js
@@ -21,6 +21,209 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
this.set('selectedReplies', new Em.Set());
},
+ actions: {
+ jumpTop: function() {
+ Discourse.URL.routeTo(this.get('url'));
+ },
+
+ jumpBottom: function() {
+ Discourse.URL.routeTo(this.get('lastPostUrl'));
+ },
+
+ toggleSummary: function() {
+ this.toggleProperty('summaryCollapsed');
+ },
+
+ selectAll: function() {
+ var posts = this.get('postStream.posts');
+ var selectedPosts = this.get('selectedPosts');
+ if (posts) {
+ selectedPosts.addObjects(posts);
+ }
+ this.set('allPostsSelected', true);
+ },
+
+ deselectAll: function() {
+ this.get('selectedPosts').clear();
+ this.get('selectedReplies').clear();
+ this.set('allPostsSelected', false);
+ },
+
+ /**
+ Toggle a participant for filtering
+
+ @method toggleParticipant
+ **/
+ toggleParticipant: function(user) {
+ this.get('postStream').toggleParticipant(Em.get(user, 'username'));
+ },
+
+ editTopic: function() {
+ if (!this.get('details.can_edit')) return false;
+
+ this.setProperties({
+ editingTopic: true,
+ newTitle: this.get('title'),
+ newCategoryId: this.get('category_id')
+ });
+ return false;
+ },
+
+ // close editing mode
+ cancelEditingTopic: function() {
+ this.set('editingTopic', false);
+ },
+
+ toggleMultiSelect: function() {
+ this.toggleProperty('multiSelect');
+ },
+
+ finishedEditingTopic: function() {
+ var topicController = this;
+ if (this.get('editingTopic')) {
+
+ var topic = this.get('model');
+
+ // Topic title hasn't been sanitized yet, so the template shouldn't trust it.
+ this.set('topicSaving', true);
+
+ // manually update the titles & category
+ topic.setProperties({
+ title: this.get('newTitle'),
+ category_id: parseInt(this.get('newCategoryId'), 10),
+ fancy_title: this.get('newTitle')
+ });
+
+ // save the modifications
+ topic.save().then(function(result){
+ // update the title if it has been changed (cleaned up) server-side
+ var title = result.basic_topic.title;
+ var fancy_title = result.basic_topic.fancy_title;
+ topic.setProperties({
+ title: title,
+ fancy_title: fancy_title
+ });
+ topicController.set('topicSaving', false);
+ }, function(error) {
+ topicController.set('editingTopic', true);
+ topicController.set('topicSaving', false);
+ if (error && error.responseText) {
+ bootbox.alert($.parseJSON(error.responseText).errors[0]);
+ } else {
+ bootbox.alert(I18n.t('generic_error'));
+ }
+ });
+
+ // close editing mode
+ topicController.set('editingTopic', false);
+ }
+ },
+
+ toggledSelectedPost: function(post) {
+ this.performTogglePost(post);
+ },
+
+ toggledSelectedPostReplies: function(post) {
+ var selectedReplies = this.get('selectedReplies');
+ if (this.performTogglePost(post)) {
+ selectedReplies.addObject(post);
+ } else {
+ selectedReplies.removeObject(post);
+ }
+ },
+
+ deleteSelected: function() {
+ var self = this;
+ bootbox.confirm(I18n.t("post.delete.confirm", { count: this.get('selectedPostsCount')}), function(result) {
+ if (result) {
+
+ // If all posts are selected, it's the same thing as deleting the topic
+ if (self.get('allPostsSelected')) {
+ return self.deleteTopic();
+ }
+
+ var selectedPosts = self.get('selectedPosts'),
+ selectedReplies = self.get('selectedReplies'),
+ postStream = self.get('postStream'),
+ toRemove = new Ember.Set();
+
+
+ Discourse.Post.deleteMany(selectedPosts, selectedReplies);
+ postStream.get('posts').forEach(function (p) {
+ if (self.postSelected(p)) { toRemove.addObject(p); }
+ });
+
+ postStream.removePosts(toRemove);
+ self.send('toggleMultiSelect');
+ }
+ });
+ },
+
+ toggleVisibility: function() {
+ this.get('content').toggleStatus('visible');
+ },
+
+ toggleClosed: function() {
+ this.get('content').toggleStatus('closed');
+ },
+
+ togglePinned: function() {
+ this.get('content').toggleStatus('pinned');
+ },
+
+ toggleArchived: function() {
+ this.get('content').toggleStatus('archived');
+ },
+
+ convertToRegular: function() {
+ this.get('content').convertArchetype('regular');
+ },
+
+ // Toggle the star on the topic
+ toggleStar: function() {
+ this.get('content').toggleStar();
+ },
+
+
+ /**
+ Clears the pin from a topic for the currently logged in user
+
+ @method clearPin
+ **/
+ clearPin: function() {
+ this.get('content').clearPin();
+ },
+
+ resetRead: function() {
+ Discourse.ScreenTrack.current().reset();
+ this.unsubscribe();
+
+ var topicController = this;
+ this.get('model').resetRead().then(function() {
+ topicController.set('message', I18n.t("topic.read_position_reset"));
+ topicController.set('postStream.loaded', false);
+ });
+ },
+
+ replyAsNewTopic: function(post) {
+ var composerController = this.get('controllers.composer');
+ var promise = composerController.open({
+ action: Discourse.Composer.CREATE_TOPIC,
+ draftKey: Discourse.Composer.REPLY_AS_NEW_TOPIC_KEY
+ });
+ var postUrl = "" + location.protocol + "//" + location.host + (post.get('url'));
+ var postLink = "[" + (this.get('title')) + "](" + postUrl + ")";
+
+ promise.then(function() {
+ Discourse.Post.loadQuote(post.get('id')).then(function(q) {
+ composerController.appendText(I18n.t("post.continue_discussion", {
+ postLink: postLink
+ }) + "\n\n" + q);
+ });
+ });
+ }
+ },
+
jumpTopDisabled: function() {
return (this.get('progressPosition') === 1);
}.property('postStream.filteredPostsCount', 'progressPosition'),
@@ -78,7 +281,7 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
multiSelectChanged: function() {
// Deselect all posts when multi select is turned off
if (!this.get('multiSelect')) {
- this.deselectAll();
+ this.send('deselectAll');
}
}.observes('multiSelect'),
@@ -109,156 +312,6 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
return false;
},
- toggledSelectedPost: function(post) {
- var selectedPosts = this.get('selectedPosts');
- if (this.postSelected(post)) {
- this.deselectPost(post);
- return false;
- } else {
- selectedPosts.addObject(post);
-
- // If the user manually selects all posts, all posts are selected
- if (selectedPosts.length === this.get('posts_count')) {
- this.set('allPostsSelected', true);
- }
- return true;
- }
- },
-
- toggledSelectedPostReplies: function(post) {
- var selectedReplies = this.get('selectedReplies');
- if (this.toggledSelectedPost(post)) {
- selectedReplies.addObject(post);
- } else {
- selectedReplies.removeObject(post);
- }
- },
-
- selectAll: function() {
- var posts = this.get('postStream.posts');
- var selectedPosts = this.get('selectedPosts');
- if (posts) {
- selectedPosts.addObjects(posts);
- }
- this.set('allPostsSelected', true);
- },
-
- deselectAll: function() {
- this.get('selectedPosts').clear();
- this.get('selectedReplies').clear();
- this.set('allPostsSelected', false);
- },
-
- toggleMultiSelect: function() {
- this.toggleProperty('multiSelect');
- },
-
- toggleSummary: function() {
- this.toggleProperty('summaryCollapsed');
- },
-
- editTopic: function() {
- if (!this.get('details.can_edit')) return false;
-
- this.setProperties({
- editingTopic: true,
- newTitle: this.get('title'),
- newCategoryId: this.get('category_id')
- });
- return false;
- },
-
- // close editing mode
- cancelEditingTopic: function() {
- this.set('editingTopic', false);
- },
-
- finishedEditingTopic: function() {
- var topicController = this;
- if (this.get('editingTopic')) {
-
- var topic = this.get('model');
-
- // Topic title hasn't been sanitized yet, so the template shouldn't trust it.
- this.set('topicSaving', true);
-
- // manually update the titles & category
- topic.setProperties({
- title: this.get('newTitle'),
- category_id: parseInt(this.get('newCategoryId'), 10),
- fancy_title: this.get('newTitle')
- });
-
- // save the modifications
- topic.save().then(function(result){
- // update the title if it has been changed (cleaned up) server-side
- var title = result.basic_topic.title;
- var fancy_title = result.basic_topic.fancy_title;
- topic.setProperties({
- title: title,
- fancy_title: fancy_title
- });
- topicController.set('topicSaving', false);
- }, function(error) {
- topicController.set('editingTopic', true);
- topicController.set('topicSaving', false);
- if (error && error.responseText) {
- bootbox.alert($.parseJSON(error.responseText).errors[0]);
- } else {
- bootbox.alert(I18n.t('generic_error'));
- }
- });
-
- // close editing mode
- topicController.set('editingTopic', false);
- }
- },
-
- deleteSelected: function() {
- var self = this;
- bootbox.confirm(I18n.t("post.delete.confirm", { count: this.get('selectedPostsCount')}), function(result) {
- if (result) {
-
- // If all posts are selected, it's the same thing as deleting the topic
- if (self.get('allPostsSelected')) {
- return self.deleteTopic();
- }
-
- var selectedPosts = self.get('selectedPosts'),
- selectedReplies = self.get('selectedReplies'),
- postStream = self.get('postStream'),
- toRemove = new Ember.Set();
-
-
- Discourse.Post.deleteMany(selectedPosts, selectedReplies);
- postStream.get('posts').forEach(function (p) {
- if (self.postSelected(p)) { toRemove.addObject(p); }
- });
-
- postStream.removePosts(toRemove);
- self.toggleMultiSelect();
- }
- });
- },
-
- jumpTop: function() {
- Discourse.URL.routeTo(this.get('url'));
- },
-
- jumpBottom: function() {
- Discourse.URL.routeTo(this.get('lastPostUrl'));
- },
-
-
- /**
- Toggle a participant for filtering
-
- @method toggleParticipant
- **/
- toggleParticipant: function(user) {
- this.get('postStream').toggleParticipant(Em.get(user, 'username'));
- },
-
showFavoriteButton: function() {
return Discourse.User.current() && !this.get('isPrivateMessage');
}.property('isPrivateMessage'),
@@ -272,52 +325,6 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
this.get('content').destroy(Discourse.User.current());
},
- resetRead: function() {
- Discourse.ScreenTrack.current().reset();
- this.unsubscribe();
-
- var topicController = this;
- this.get('model').resetRead().then(function() {
- topicController.set('message', I18n.t("topic.read_position_reset"));
- topicController.set('postStream.loaded', false);
- });
- },
-
- toggleVisibility: function() {
- this.get('content').toggleStatus('visible');
- },
-
- toggleClosed: function() {
- this.get('content').toggleStatus('closed');
- },
-
- togglePinned: function() {
- this.get('content').toggleStatus('pinned');
- },
-
- toggleArchived: function() {
- this.get('content').toggleStatus('archived');
- },
-
- convertToRegular: function() {
- this.get('content').convertArchetype('regular');
- },
-
- // Toggle the star on the topic
- toggleStar: function() {
- this.get('content').toggleStar();
- },
-
-
- /**
- Clears the pin from a topic for the currently logged in user
-
- @method clearPin
- **/
- clearPin: function() {
- this.get('content').clearPin();
- },
-
// Receive notifications for this topic
subscribe: function() {
@@ -383,24 +390,6 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
return false;
},
- replyAsNewTopic: function(post) {
- var composerController = this.get('controllers.composer');
- var promise = composerController.open({
- action: Discourse.Composer.CREATE_TOPIC,
- draftKey: Discourse.Composer.REPLY_AS_NEW_TOPIC_KEY
- });
- var postUrl = "" + location.protocol + "//" + location.host + (post.get('url'));
- var postLink = "[" + (this.get('title')) + "](" + postUrl + ")";
-
- promise.then(function() {
- Discourse.Post.loadQuote(post.get('id')).then(function(q) {
- composerController.appendText(I18n.t("post.continue_discussion", {
- postLink: postLink
- }) + "\n\n" + q);
- });
- });
- },
-
// Topic related
reply: function() {
this.replyToPost();
@@ -470,6 +459,22 @@ Discourse.TopicController = Discourse.ObjectController.extend(Discourse.Selected
}
},
+ performTogglePost: function(post) {
+ var selectedPosts = this.get('selectedPosts');
+ if (this.postSelected(post)) {
+ this.deselectPost(post);
+ return false;
+ } else {
+ selectedPosts.addObject(post);
+
+ // If the user manually selects all posts, all posts are selected
+ if (selectedPosts.length === this.get('posts_count')) {
+ this.set('allPostsSelected', true);
+ }
+ return true;
+ }
+ },
+
removeAllowedUser: function(username) {
this.get('details').removeAllowedUser(username);
}
diff --git a/app/assets/javascripts/discourse/controllers/upload_selector_controller.js b/app/assets/javascripts/discourse/controllers/upload_selector_controller.js
index 6ffaff60601..707f7f0cdf9 100644
--- a/app/assets/javascripts/discourse/controllers/upload_selector_controller.js
+++ b/app/assets/javascripts/discourse/controllers/upload_selector_controller.js
@@ -11,8 +11,10 @@ Discourse.UploadSelectorController = Discourse.Controller.extend(Discourse.Modal
localSelected: true,
remoteSelected: Em.computed.not('localSelected'),
- selectLocal: function() { this.set('localSelected', true); },
- selectRemote: function() { this.set('localSelected', false); },
+ actions: {
+ selectLocal: function() { this.set('localSelected', true); },
+ selectRemote: function() { this.set('localSelected', false); }
+ },
localTitle: function() { return Discourse.UploadSelectorController.translate("local_title"); }.property(),
remoteTitle: function() { return Discourse.UploadSelectorController.translate("remote_title"); }.property(),
diff --git a/app/assets/javascripts/discourse/controllers/user_invited_controller.js b/app/assets/javascripts/discourse/controllers/user_invited_controller.js
index 460b08d6adf..4548bdb56d7 100644
--- a/app/assets/javascripts/discourse/controllers/user_invited_controller.js
+++ b/app/assets/javascripts/discourse/controllers/user_invited_controller.js
@@ -7,10 +7,14 @@
@module Discourse
**/
Discourse.UserInvitedController = Discourse.ObjectController.extend({
- rescind: function(invite) {
- invite.rescind();
- return false;
+
+ actions: {
+ rescind: function(invite) {
+ invite.rescind();
+ return false;
+ }
}
+
});
diff --git a/app/assets/javascripts/discourse/routes/application_route.js b/app/assets/javascripts/discourse/routes/application_route.js
index d28e6b09c5e..80fdd8687c7 100644
--- a/app/assets/javascripts/discourse/routes/application_route.js
+++ b/app/assets/javascripts/discourse/routes/application_route.js
@@ -8,7 +8,7 @@
**/
Discourse.ApplicationRoute = Em.Route.extend({
- events: {
+ actions: {
showLogin: function() {
Discourse.Route.showModal(this, 'login');
},
diff --git a/app/assets/javascripts/discourse/routes/list_categories_route.js b/app/assets/javascripts/discourse/routes/list_categories_route.js
index bc05096ca70..5ebd12d4dbb 100644
--- a/app/assets/javascripts/discourse/routes/list_categories_route.js
+++ b/app/assets/javascripts/discourse/routes/list_categories_route.js
@@ -10,7 +10,7 @@ Discourse.ListCategoriesRoute = Discourse.Route.extend({
redirect: function() { Discourse.redirectIfLoginRequired(this); },
- events: {
+ actions: {
createCategory: function() {
Discourse.Route.showModal(this, 'editCategory', Discourse.Category.create({
color: 'AB9364', text_color: 'FFFFFF', hotness: 5, group_permissions: [{group_name: "everyone", permission_type: 1}],
diff --git a/app/assets/javascripts/discourse/routes/preferences_routes.js b/app/assets/javascripts/discourse/routes/preferences_routes.js
index e337a43a81b..ca7d3aadbba 100644
--- a/app/assets/javascripts/discourse/routes/preferences_routes.js
+++ b/app/assets/javascripts/discourse/routes/preferences_routes.js
@@ -15,7 +15,7 @@ Discourse.PreferencesRoute = Discourse.RestrictedUserRoute.extend({
this.render('preferences', { into: 'user', outlet: 'userOutlet', controller: 'preferences' });
},
- events: {
+ actions: {
showAvatarSelector: function() {
Discourse.Route.showModal(this, 'avatarSelector');
// all the properties needed for displaying the avatar selector modal
diff --git a/app/assets/javascripts/discourse/routes/topic_route.js b/app/assets/javascripts/discourse/routes/topic_route.js
index fbe4253bad5..6865e340de1 100644
--- a/app/assets/javascripts/discourse/routes/topic_route.js
+++ b/app/assets/javascripts/discourse/routes/topic_route.js
@@ -10,7 +10,7 @@ Discourse.TopicRoute = Discourse.Route.extend({
redirect: function() { Discourse.redirectIfLoginRequired(this); },
- events: {
+ actions: {
// Modals that can pop up within a topic
showFlags: function(post) {
diff --git a/app/assets/javascripts/discourse/templates/header.js.handlebars b/app/assets/javascripts/discourse/templates/header.js.handlebars
index b0c49973705..c3790dde11c 100644
--- a/app/assets/javascripts/discourse/templates/header.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/header.js.handlebars
@@ -85,7 +85,7 @@
{{#if currentUser}}
- {{#linkTo 'userActivity.index' currentUser titleKey="current_user" class="icon"}}{{boundAvatar currentUser imageSize="medium" }}{{/linkTo}}
+ {{#link-to 'userActivity.index' currentUser titleKey="current_user" class="icon"}}{{boundAvatar currentUser imageSize="medium" }}{{/link-to}}
{{else}}
{{/if}}
@@ -139,7 +139,7 @@
{{#if categories}}
- {{#linkTo "list.categories"}}{{i18n filters.categories.title}}{{/linkTo}}
+ {{#link-to "list.categories"}}{{i18n filters.categories.title}}{{/link-to}}
{{#each categories}}
diff --git a/app/assets/javascripts/discourse/templates/list/topics.js.handlebars b/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
index e9a25630774..236787cd77f 100644
--- a/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/list/topics.js.handlebars
@@ -60,7 +60,7 @@
{{i18n topic.suggest_create_topic}}
{{/if}}
{{else}}
- {{#linkTo 'list.categories'}}{{i18n topic.browse_all_categories}}{{/linkTo}} {{i18n or}} {{#linkTo 'list.latest'}}{{i18n topic.view_latest_topics}}{{/linkTo}}
+ {{#link-to 'list.categories'}}{{i18n topic.browse_all_categories}}{{/link-to}} {{i18n or}} {{#link-to 'list.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}}
{{/if}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/mobile/list/topics.js.handlebars b/app/assets/javascripts/discourse/templates/mobile/list/topics.js.handlebars
index e6c731c9ef4..41a62dc2e54 100644
--- a/app/assets/javascripts/discourse/templates/mobile/list/topics.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/mobile/list/topics.js.handlebars
@@ -43,7 +43,7 @@
{{i18n topic.suggest_create_topic}}
{{/if}}
{{else}}
- {{#linkTo 'list.categories'}}{{i18n topic.browse_all_categories}}{{/linkTo}} {{i18n or}} {{#linkTo 'list.latest'}}{{i18n topic.view_latest_topics}}{{/linkTo}}
+ {{#link-to 'list.categories'}}{{i18n topic.browse_all_categories}}{{/link-to}} {{i18n or}} {{#link-to 'list.latest'}}{{i18n topic.view_latest_topics}}{{/link-to}}
{{/if}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/templates/user/activity.js.handlebars b/app/assets/javascripts/discourse/templates/user/activity.js.handlebars
index 03cd3c61dcc..c8d17d83921 100644
--- a/app/assets/javascripts/discourse/templates/user/activity.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/activity.js.handlebars
@@ -1,7 +1,7 @@
{{#if can_edit}}
- {{#linkTo "preferences" class="btn"}}{{i18n user.edit}}{{/linkTo}}
+ {{#link-to "preferences" class="btn"}}{{i18n user.edit}}{{/link-to}}
{{/if}}
{{#if privateMessageView}}
- {{#linkTo 'userPrivateMessages.index' model}}{{i18n user.messages.all}}{{/linkTo}}
+ {{#link-to 'userPrivateMessages.index' model}}{{i18n user.messages.all}}{{/link-to}}
- {{#linkTo 'userPrivateMessages.mine' model}}{{i18n user.messages.mine}}{{/linkTo}}
+ {{#link-to 'userPrivateMessages.mine' model}}{{i18n user.messages.mine}}{{/link-to}}
- {{#linkTo 'userPrivateMessages.unread' model}}{{i18n user.messages.unread}}{{/linkTo}}
+ {{#link-to 'userPrivateMessages.unread' model}}{{i18n user.messages.unread}}{{/link-to}}
{{else}}
@@ -48,7 +48,7 @@
{{i18n user.last_seen}}: {{date last_seen_at}}
{{/if}}
{{#if invited_by}}
- {{i18n user.invited_by}}: {{#linkTo 'userActivity' invited_by}}{{invited_by.username}}{{/linkTo}}
+ {{i18n user.invited_by}}: {{#link-to 'userActivity' invited_by}}{{invited_by.username}}{{/link-to}}
{{/if}}
{{#if email}}
{{i18n user.email.title}}: {{email}}
diff --git a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
index e08e0aee515..1148bbd9204 100644
--- a/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/preferences.js.handlebars
@@ -5,7 +5,7 @@
{{username}}
{{#if can_edit_username}}
- {{#linkTo "preferences.username" class="btn pad-left"}}
@@ -28,7 +28,7 @@
{{email}}
{{#if can_edit_email}}
- {{#linkTo "preferences.email" class="btn pad-left"}}
diff --git a/app/assets/javascripts/discourse/templates/user/user.js.handlebars b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
index bfa14de9446..c4925336405 100644
--- a/app/assets/javascripts/discourse/templates/user/user.js.handlebars
+++ b/app/assets/javascripts/discourse/templates/user/user.js.handlebars
@@ -12,19 +12,19 @@
{{/if}}
- {{#linkTo 'userActivity'}}{{i18n user.activity_stream}}{{/linkTo}}
+ {{#link-to 'userActivity'}}{{i18n user.activity_stream}}{{/link-to}}
{{#if canSeePrivateMessages}}
- {{#linkTo 'userPrivateMessages'}}{{i18n user.private_messages}}{{/linkTo}}
+ {{#link-to 'userPrivateMessages'}}{{i18n user.private_messages}}{{/link-to}}
{{/if}}
- {{#linkTo 'user.invited'}}{{i18n user.invited.title}}{{/linkTo}}
+ {{#link-to 'user.invited'}}{{i18n user.invited.title}}{{/link-to}}
{{#if can_edit}}
- {{#linkTo 'preferences'}}{{i18n user.preferences}}{{/linkTo}}
+ {{#link-to 'preferences'}}{{i18n user.preferences}}{{/link-to}}
{{/if}}
diff --git a/app/assets/javascripts/discourse/views/buttons/favorite_button.js b/app/assets/javascripts/discourse/views/buttons/favorite_button.js
index d04381cd2bc..535f399614f 100644
--- a/app/assets/javascripts/discourse/views/buttons/favorite_button.js
+++ b/app/assets/javascripts/discourse/views/buttons/favorite_button.js
@@ -14,7 +14,7 @@ Discourse.FavoriteButton = Discourse.ButtonView.extend({
shouldRerender: Discourse.View.renderIfChanged('controller.starred'),
click: function() {
- this.get('controller').toggleStar();
+ this.get('controller').send('toggleStar');
},
renderIcon: function(buffer) {
diff --git a/app/assets/javascripts/discourse/views/share_view.js b/app/assets/javascripts/discourse/views/share_view.js
index cb72a8a573a..3c4f0f3ce19 100644
--- a/app/assets/javascripts/discourse/views/share_view.js
+++ b/app/assets/javascripts/discourse/views/share_view.js
@@ -45,7 +45,7 @@ Discourse.ShareView = Discourse.View.extend({
// link is clicked (which is a click event) while the share dialog is showing.
if (shareView.$().has(e.target).length !== 0) { return; }
- shareView.get('controller').close();
+ shareView.get('controller').send('close');
return true;
});
@@ -76,7 +76,7 @@ Discourse.ShareView = Discourse.View.extend({
$('html').on('keydown.share-view', function(e){
if (e.keyCode === 27) {
- shareView.get('controller').close();
+ shareView.get('controller').send('close');
}
});
},
diff --git a/app/assets/javascripts/discourse/views/topic_admin_menu_view.js b/app/assets/javascripts/discourse/views/topic_admin_menu_view.js
index 39760f4a72d..8864afbb441 100644
--- a/app/assets/javascripts/discourse/views/topic_admin_menu_view.js
+++ b/app/assets/javascripts/discourse/views/topic_admin_menu_view.js
@@ -13,11 +13,11 @@ Discourse.TopicAdminMenuView = Discourse.View.extend({
},
didInsertElement: function() {
- var topicAdminMenuView = this;
+ var self = this;
$('html').on('mouseup.discourse-topic-admin-menu', function(e) {
var $target = $(e.target);
- if ($target.is('button') || topicAdminMenuView.$().has($target).length === 0) {
- topicAdminMenuView.get('controller').hide();
+ if ($target.is('button') || self.$().has($target).length === 0) {
+ self.get('controller').send('hide');
}
});
}
diff --git a/app/assets/javascripts/docs/yuidoc.json b/app/assets/javascripts/docs/yuidoc.json
index 39d6d36f3e1..292146820b8 100644
--- a/app/assets/javascripts/docs/yuidoc.json
+++ b/app/assets/javascripts/docs/yuidoc.json
@@ -3,7 +3,7 @@
"description": "This is the EmberJS client to access a Discourse Server",
"url": "http://www.discourse.org/",
"options": {
- "exclude": "external,external_production,defer",
+ "exclude": "development,production,defer",
"outdir": "./build"
}
}
\ No newline at end of file
diff --git a/app/assets/javascripts/main_include.js b/app/assets/javascripts/main_include.js
index 1ce1b7155f2..7aaea0faee7 100644
--- a/app/assets/javascripts/main_include.js
+++ b/app/assets/javascripts/main_include.js
@@ -1,7 +1,37 @@
//= require_tree ./discourse/ember
-// The rest of the externals
-//= require_tree ./external
+// The Vendored JS
+//= require LAB.js
+//= require Markdown.Converter.js
+//= require Markdown.Editor.js
+//= require Markdown.Sanitizer.js
+//= require better_markdown.js
+//= require bootbox.js
+//= require bootstrap-alert.js
+//= require bootstrap-button.js
+//= require bootstrap-dropdown.js
+//= require bootstrap-modal.js
+//= require bootstrap-transition.js
+//= require browser-update.js
+//= require chosen.jquery.js
+//= require ember-renderspeed.js
+//= require favcount.js
+//= require handlebars.js
+//= require jquery.ba-replacetext.js
+//= require jquery.ba-resize.min.js
+//= require jquery.color.js
+//= require jquery.cookie.js
+//= require jquery.fileupload.js
+//= require jquery.iframe-transport.js
+//= require jquery.putcursoratend.js
+//= require jquery.tagsinput.js
+//= require jquery.ui.widget.js
+//= require lodash.js
+//= require md5.js
+//= require modernizr.custom.95264.js
+//= require mousetrap.js
+//= require rsvp.js
+//= require show-html.js
//= require ./discourse/helpers/i18n_helpers
//= require ./discourse/mixins/ajax
@@ -39,4 +69,4 @@
//= require_tree ./discourse/templates
//= require_tree ./discourse/routes
-//= require ./external/browser-update.js
+//= require browser-update.js
diff --git a/app/assets/javascripts/main_include_admin.js b/app/assets/javascripts/main_include_admin.js
new file mode 100644
index 00000000000..b2c81ffd3f7
--- /dev/null
+++ b/app/assets/javascripts/main_include_admin.js
@@ -0,0 +1 @@
+//= require_tree ./admin
\ No newline at end of file
diff --git a/app/assets/javascripts/pagedown_custom.js b/app/assets/javascripts/pagedown_custom.js
index 643fc8fb1a3..e7a0c885a24 100644
--- a/app/assets/javascripts/pagedown_custom.js
+++ b/app/assets/javascripts/pagedown_custom.js
@@ -7,7 +7,7 @@ window.PagedownCustom = {
description: I18n.t("composer.quote_post_title"),
execute: function() {
// AWFUL but I can't figure out how to call a controller method from outside our app
- return Discourse.__container__.lookup('controller:composer').importQuote();
+ return Discourse.__container__.lookup('controller:composer').send('importQuote');
}
}
]
diff --git a/app/controllers/topics_controller.rb b/app/controllers/topics_controller.rb
index 8dddd4b00ac..1872e1ea553 100644
--- a/app/controllers/topics_controller.rb
+++ b/app/controllers/topics_controller.rb
@@ -29,6 +29,7 @@ class TopicsController < ApplicationController
return wordpress if params[:best].present?
opts = params.slice(:username_filters, :filter, :page, :post_number)
+
begin
@topic_view = TopicView.new(params[:id] || params[:topic_id], current_user, opts)
rescue Discourse::NotFound
diff --git a/config/application.rb b/config/application.rb
index 1a936197e12..e069fa36782 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -113,8 +113,8 @@ module Discourse
# ember stuff only used for asset precompliation, production variant plays up
config.ember.variant = :development
- config.ember.ember_location = "#{Rails.root}/app/assets/javascripts/external_production/ember.js"
- config.ember.handlebars_location = "#{Rails.root}/app/assets/javascripts/external/handlebars.js"
+ config.ember.ember_location = "#{Rails.root}/vendor/assets/javascripts/production/ember.js"
+ config.ember.handlebars_location = "#{Rails.root}/vendor/assets/javascripts/handlebars.js"
# Since we are using strong_parameters, we can disable and remove
# attr_accessible.
diff --git a/config/jshint.yml b/config/jshint.yml
index 588a527d82f..e424b255e36 100644
--- a/config/jshint.yml
+++ b/config/jshint.yml
@@ -13,9 +13,6 @@ paths:
- test/javascripts/**/*.js
exclude_paths:
- - app/assets/javascripts/external/*
- - app/assets/javascripts/external_production/*
- - app/assets/javascripts/external_development/*
- app/assets/javascripts/defer/*
- app/assets/javascripts/locales/i18n.js
diff --git a/lib/pretty_text.rb b/lib/pretty_text.rb
index 8a9603ae20c..6631acd6620 100644
--- a/lib/pretty_text.rb
+++ b/lib/pretty_text.rb
@@ -93,11 +93,11 @@ module PrettyText
ctx["helpers"] = Helpers.new
ctx_load(ctx,
- "app/assets/javascripts/external/md5.js",
- "app/assets/javascripts/external/lodash.js",
- "app/assets/javascripts/external/Markdown.Converter.js",
+ "vendor/assets/javascripts/md5.js",
+ "vendor/assets/javascripts/lodash.js",
+ "vendor/assets/javascripts/Markdown.Converter.js",
"lib/headless-ember.js",
- "app/assets/javascripts/external/rsvp.js",
+ "vendor/assets/javascripts/rsvp.js",
Rails.configuration.ember.handlebars_location)
ctx.eval("var Discourse = {}; Discourse.SiteSettings = #{SiteSetting.client_settings_json};")
@@ -107,7 +107,7 @@ module PrettyText
decorate_context(ctx)
ctx_load(ctx,
- "app/assets/javascripts/external/better_markdown.js",
+ "vendor/assets/javascripts/better_markdown.js",
"app/assets/javascripts/discourse/dialects/dialect.js",
"app/assets/javascripts/discourse/components/utilities.js",
"app/assets/javascripts/discourse/components/markdown.js")
diff --git a/test/javascripts/controllers/avatar_selector_controller_test.js b/test/javascripts/controllers/avatar_selector_controller_test.js
index 9bcc6ad17c1..680b8b62227 100644
--- a/test/javascripts/controllers/avatar_selector_controller_test.js
+++ b/test/javascripts/controllers/avatar_selector_controller_test.js
@@ -14,13 +14,13 @@ test("avatarTemplate", function() {
avatarSelector.get("gravatar_template"),
"we are using gravatar by default");
- avatarSelectorController.useUploadedAvatar();
+ avatarSelectorController.send('useUploadedAvatar');
equal(avatarSelectorController.get("avatarTemplate"),
avatarSelector.get("uploaded_avatar_template"),
"calling useUploadedAvatar switches to using the uploaded avatar");
- avatarSelectorController.useGravatar();
+ avatarSelectorController.send('useGravatar');
equal(avatarSelectorController.get("avatarTemplate"),
avatarSelector.get("gravatar_template"),
diff --git a/test/javascripts/controllers/topic_controller_test.js b/test/javascripts/controllers/topic_controller_test.js
index f45338c2433..81370496cd4 100644
--- a/test/javascripts/controllers/topic_controller_test.js
+++ b/test/javascripts/controllers/topic_controller_test.js
@@ -18,16 +18,16 @@ test("editingMode", function() {
ok(!topicController.get('editingTopic'), "we are not editing by default");
topicController.set('model.details.can_edit', false);
- topicController.editTopic();
+ topicController.send('editTopic');
ok(!topicController.get('editingTopic'), "calling editTopic doesn't enable editing unless the user can edit");
topicController.set('model.details.can_edit', true);
- topicController.editTopic();
+ topicController.send('editTopic');
ok(topicController.get('editingTopic'), "calling editTopic enables editing if the user can edit");
equal(topicController.get('newTitle'), topic.get('title'));
equal(topicController.get('newCategoryId'), topic.get('category_id'));
- topicController.cancelEditingTopic();
+ topicController.send('cancelEditingTopic');
ok(!topicController.get('editingTopic'), "cancelling edit mode reverts the property value");
});
@@ -43,12 +43,12 @@ test("toggledSelectedPost", function() {
equal(tc.get('selectedPostsCount'), 0, "there is a selected post count of 0");
ok(!tc.postSelected(post), "the post is not selected by default");
- tc.toggledSelectedPost(post);
+ tc.send('toggledSelectedPost', post);
present(tc.get('selectedPosts'), "there is a selectedPosts collection");
equal(tc.get('selectedPostsCount'), 1, "there is a selected post now");
ok(tc.postSelected(post), "the post is now selected");
- tc.toggledSelectedPost(post);
+ tc.send('toggledSelectedPost', post);
ok(!tc.postSelected(post), "the post is no longer selected");
});
@@ -61,10 +61,10 @@ test("selectAll", function() {
postStream.appendPost(post);
ok(!tc.postSelected(post), "the post is not selected by default");
- tc.selectAll();
+ tc.send('selectAll');
ok(tc.postSelected(post), "the post is now selected");
ok(tc.get('allPostsSelected'), "all posts are selected");
- tc.deselectAll();
+ tc.send('deselectAll');
ok(!tc.postSelected(post), "the post is deselected again");
ok(!tc.get('allPostsSelected'), "all posts are not selected");
@@ -80,10 +80,10 @@ test("Automating setting of allPostsSelected", function() {
postStream.appendPost(post);
ok(!tc.get('allPostsSelected'), "all posts are not selected by default");
- tc.toggledSelectedPost(post);
+ tc.send('toggledSelectedPost', post);
ok(tc.get('allPostsSelected'), "all posts are selected if we select the only post");
- tc.toggledSelectedPost(post);
+ tc.send('toggledSelectedPost', post);
ok(!tc.get('allPostsSelected'), "the posts are no longer automatically selected");
});
@@ -96,20 +96,20 @@ test("Select Replies when present", function() {
postStream = tc.get('postStream');
ok(!tc.postSelected(p3), "replies are not selected by default");
- tc.toggledSelectedPostReplies(p1);
+ tc.send('toggledSelectedPostReplies', p1);
ok(tc.postSelected(p1), "it selects the post");
ok(!tc.postSelected(p2), "it doesn't select a post that's not a reply");
ok(tc.postSelected(p3), "it selects a post that is a reply");
equal(tc.get('selectedPostsCount'), 2, "it has a selected posts count of two");
// If we deselected the post whose replies are selected...
- tc.toggledSelectedPost(p1);
+ tc.send('toggledSelectedPost', p1);
ok(!tc.postSelected(p1), "it deselects the post");
ok(!tc.postSelected(p3), "it deselects the replies too");
// If we deselect a reply, it should deselect the parent's replies selected attribute. Weird but what else would make sense?
- tc.toggledSelectedPostReplies(p1);
- tc.toggledSelectedPost(p3);
+ tc.send('toggledSelectedPostReplies', p1);
+ tc.send('toggledSelectedPost', p3);
ok(tc.postSelected(p1), "the post stays selected");
ok(!tc.postSelected(p3), "it deselects the replies too");
diff --git a/test/javascripts/jshint_all.js.erb b/test/javascripts/jshint_all.js.erb
index 34b7eea683e..05dbfaaa99f 100644
--- a/test/javascripts/jshint_all.js.erb
+++ b/test/javascripts/jshint_all.js.erb
@@ -184,7 +184,5 @@ var jsHintOpts = {
<%= jshint("#{Rails.root}/app/assets/javascripts/**/*.js",
"/app/assets/javascripts/",
[/external\//,
- /external_development\//,
- /external_production\//,
/defer\//,
/locales\//]) %>
diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js
index 3093140ca20..94a3597f7af 100644
--- a/test/javascripts/test_helper.js
+++ b/test/javascripts/test_helper.js
@@ -9,10 +9,10 @@
//= require ../../app/assets/javascripts/discourse/components/probes.js
// Externals we need to load first
-//= require ../../app/assets/javascripts/external_development/jquery-2.0.3.js
-//= require ../../app/assets/javascripts/external/jquery.ui.widget.js
-//= require ../../app/assets/javascripts/external/handlebars.js
-//= require ../../app/assets/javascripts/external_development/ember.js
+//= require development/jquery-2.0.3.js
+//= require jquery.ui.widget.js
+//= require handlebars.js
+//= require development/ember.js
//= require ../../app/assets/javascripts/locales/i18n
//= require ../../app/assets/javascripts/discourse/helpers/i18n_helpers
@@ -21,8 +21,36 @@
// Pagedown customizations
//= require ../../app/assets/javascripts/pagedown_custom.js
-// The rest of the externals
-//= require_tree ../../app/assets/javascripts/external
+// The rest of the vendored JS
+//= require LAB.js
+//= require Markdown.Converter.js
+//= require Markdown.Editor.js
+//= require Markdown.Sanitizer.js
+//= require better_markdown.js
+//= require bootbox.js
+//= require bootstrap-alert.js
+//= require bootstrap-button.js
+//= require bootstrap-dropdown.js
+//= require bootstrap-modal.js
+//= require bootstrap-transition.js
+//= require browser-update.js
+//= require chosen.jquery.js
+//= require ember-renderspeed.js
+//= require favcount.js
+//= require jquery.ba-replacetext.js
+//= require jquery.ba-resize.min.js
+//= require jquery.color.js
+//= require jquery.cookie.js
+//= require jquery.fileupload.js
+//= require jquery.iframe-transport.js
+//= require jquery.putcursoratend.js
+//= require jquery.tagsinput.js
+//= require lodash.js
+//= require md5.js
+//= require modernizr.custom.95264.js
+//= require mousetrap.js
+//= require rsvp.js
+//= require show-html.js
// Stuff we need to load first
//= require main_include
diff --git a/app/assets/javascripts/external/LAB.js b/vendor/assets/javascripts/LAB.js
similarity index 100%
rename from app/assets/javascripts/external/LAB.js
rename to vendor/assets/javascripts/LAB.js
diff --git a/app/assets/javascripts/external/Markdown.Converter.js b/vendor/assets/javascripts/Markdown.Converter.js
similarity index 100%
rename from app/assets/javascripts/external/Markdown.Converter.js
rename to vendor/assets/javascripts/Markdown.Converter.js
diff --git a/app/assets/javascripts/external/Markdown.Editor.js b/vendor/assets/javascripts/Markdown.Editor.js
similarity index 100%
rename from app/assets/javascripts/external/Markdown.Editor.js
rename to vendor/assets/javascripts/Markdown.Editor.js
diff --git a/app/assets/javascripts/external/Markdown.Sanitizer.js b/vendor/assets/javascripts/Markdown.Sanitizer.js
similarity index 100%
rename from app/assets/javascripts/external/Markdown.Sanitizer.js
rename to vendor/assets/javascripts/Markdown.Sanitizer.js
diff --git a/app/assets/javascripts/external/better_markdown.js b/vendor/assets/javascripts/better_markdown.js
similarity index 100%
rename from app/assets/javascripts/external/better_markdown.js
rename to vendor/assets/javascripts/better_markdown.js
diff --git a/app/assets/javascripts/external/bootbox.js b/vendor/assets/javascripts/bootbox.js
similarity index 100%
rename from app/assets/javascripts/external/bootbox.js
rename to vendor/assets/javascripts/bootbox.js
diff --git a/app/assets/javascripts/external/bootstrap-alert.js b/vendor/assets/javascripts/bootstrap-alert.js
similarity index 100%
rename from app/assets/javascripts/external/bootstrap-alert.js
rename to vendor/assets/javascripts/bootstrap-alert.js
diff --git a/app/assets/javascripts/external/bootstrap-button.js b/vendor/assets/javascripts/bootstrap-button.js
similarity index 100%
rename from app/assets/javascripts/external/bootstrap-button.js
rename to vendor/assets/javascripts/bootstrap-button.js
diff --git a/app/assets/javascripts/external/bootstrap-dropdown.js b/vendor/assets/javascripts/bootstrap-dropdown.js
similarity index 100%
rename from app/assets/javascripts/external/bootstrap-dropdown.js
rename to vendor/assets/javascripts/bootstrap-dropdown.js
diff --git a/app/assets/javascripts/external/bootstrap-modal.js b/vendor/assets/javascripts/bootstrap-modal.js
similarity index 100%
rename from app/assets/javascripts/external/bootstrap-modal.js
rename to vendor/assets/javascripts/bootstrap-modal.js
diff --git a/app/assets/javascripts/external/bootstrap-transition.js b/vendor/assets/javascripts/bootstrap-transition.js
similarity index 100%
rename from app/assets/javascripts/external/bootstrap-transition.js
rename to vendor/assets/javascripts/bootstrap-transition.js
diff --git a/app/assets/javascripts/external/browser-update.js b/vendor/assets/javascripts/browser-update.js
similarity index 100%
rename from app/assets/javascripts/external/browser-update.js
rename to vendor/assets/javascripts/browser-update.js
diff --git a/app/assets/javascripts/external/chosen.jquery.js b/vendor/assets/javascripts/chosen.jquery.js
similarity index 100%
rename from app/assets/javascripts/external/chosen.jquery.js
rename to vendor/assets/javascripts/chosen.jquery.js
diff --git a/app/assets/javascripts/external_production/ember.js b/vendor/assets/javascripts/development/ember.js
old mode 100644
new mode 100755
similarity index 74%
rename from app/assets/javascripts/external_production/ember.js
rename to vendor/assets/javascripts/development/ember.js
index c7527f51c78..6eca812245a
--- a/app/assets/javascripts/external_production/ember.js
+++ b/vendor/assets/javascripts/development/ember.js
@@ -1,3 +1,199 @@
+// ==========================================================================
+// Project: Ember - JavaScript Application Framework
+// Copyright: ©2011-2013 Tilde Inc. and contributors
+// Portions ©2006-2011 Strobe Inc.
+// Portions ©2008-2011 Apple Inc. All rights reserved.
+// License: Licensed under MIT license
+// See https://raw.github.com/emberjs/ember.js/master/LICENSE
+// ==========================================================================
+
+
+// Version: v1.0.0-rc.6-733-gd034d11
+// Last commit: d034d11 (2013-09-16 00:44:21 -0700)
+
+
+(function() {
+/*global __fail__*/
+
+/**
+Ember Debug
+
+@module ember
+@submodule ember-debug
+*/
+
+/**
+@class Ember
+*/
+
+if ('undefined' === typeof Ember) {
+ Ember = {};
+
+ if ('undefined' !== typeof window) {
+ window.Em = window.Ember = Em = Ember;
+ }
+}
+
+Ember.ENV = 'undefined' === typeof ENV ? {} : ENV;
+
+if (!('MANDATORY_SETTER' in Ember.ENV)) {
+ Ember.ENV.MANDATORY_SETTER = true; // default to true for debug dist
+}
+
+/**
+ Define an assertion that will throw an exception if the condition is not
+ met. Ember build tools will remove any calls to `Ember.assert()` when
+ doing a production build. Example:
+
+ ```javascript
+ // Test for truthiness
+ Ember.assert('Must pass a valid object', obj);
+ // Fail unconditionally
+ Ember.assert('This code path should never be run')
+ ```
+
+ @method assert
+ @param {String} desc A description of the assertion. This will become
+ the text of the Error thrown if the assertion fails.
+ @param {Boolean} test Must be truthy for the assertion to pass. If
+ falsy, an exception will be thrown.
+*/
+Ember.assert = function(desc, test) {
+ if (!test) {
+ Ember.Logger.assert(test, desc);
+ }
+
+ if (Ember.testing && !test) {
+ // when testing, ensure test failures when assertions fail
+ throw new Error("Assertion Failed: " + desc);
+ }
+};
+
+
+/**
+ Display a warning with the provided message. Ember build tools will
+ remove any calls to `Ember.warn()` when doing a production build.
+
+ @method warn
+ @param {String} message A warning to display.
+ @param {Boolean} test An optional boolean. If falsy, the warning
+ will be displayed.
+*/
+Ember.warn = function(message, test) {
+ if (!test) {
+ Ember.Logger.warn("WARNING: "+message);
+ if ('trace' in Ember.Logger) Ember.Logger.trace();
+ }
+};
+
+/**
+ Display a debug notice. Ember build tools will remove any calls to
+ `Ember.debug()` when doing a production build.
+
+ ```javascript
+ Ember.debug("I'm a debug notice!");
+ ```
+
+ @method debug
+ @param {String} message A debug message to display.
+*/
+Ember.debug = function(message) {
+ Ember.Logger.debug("DEBUG: "+message);
+};
+
+/**
+ Display a deprecation warning with the provided message and a stack trace
+ (Chrome and Firefox only). Ember build tools will remove any calls to
+ `Ember.deprecate()` when doing a production build.
+
+ @method deprecate
+ @param {String} message A description of the deprecation.
+ @param {Boolean} test An optional boolean. If falsy, the deprecation
+ will be displayed.
+*/
+Ember.deprecate = function(message, test) {
+ if (Ember.TESTING_DEPRECATION) { return; }
+
+ if (arguments.length === 1) { test = false; }
+ if (test) { return; }
+
+ if (Ember.ENV.RAISE_ON_DEPRECATION) { throw new Error(message); }
+
+ var error;
+
+ // When using new Error, we can't do the arguments check for Chrome. Alternatives are welcome
+ try { __fail__.fail(); } catch (e) { error = e; }
+
+ if (Ember.LOG_STACKTRACE_ON_DEPRECATION && error.stack) {
+ var stack, stackStr = '';
+ if (error['arguments']) {
+ // Chrome
+ stack = error.stack.replace(/^\s+at\s+/gm, '').
+ replace(/^([^\(]+?)([\n$])/gm, '{anonymous}($1)$2').
+ replace(/^Object.
\s*\(([^\)]+)\)/gm, '{anonymous}($1)').split('\n');
+ stack.shift();
+ } else {
+ // Firefox
+ stack = error.stack.replace(/(?:\n@:0)?\s+$/m, '').
+ replace(/^\(/gm, '{anonymous}(').split('\n');
+ }
+
+ stackStr = "\n " + stack.slice(2).join("\n ");
+ message = message + stackStr;
+ }
+
+ Ember.Logger.warn("DEPRECATION: "+message);
+};
+
+
+
+/**
+ Display a deprecation warning with the provided message and a stack trace
+ (Chrome and Firefox only) when the wrapped method is called.
+
+ Ember build tools will not remove calls to `Ember.deprecateFunc()`, though
+ no warnings will be shown in production.
+
+ @method deprecateFunc
+ @param {String} message A description of the deprecation.
+ @param {Function} func The function to be deprecated.
+ @return {Function} a new function that wrapped the original function with a deprecation warning
+*/
+Ember.deprecateFunc = function(message, func) {
+ return function() {
+ Ember.deprecate(message);
+ return func.apply(this, arguments);
+ };
+};
+
+
+// Inform the developer about the Ember Inspector if not installed.
+if (!Ember.testing) {
+ if (typeof window !== 'undefined' && window.chrome && window.addEventListener) {
+ window.addEventListener("load", function() {
+ if (document.body && document.body.dataset && !document.body.dataset.emberExtension) {
+ Ember.debug('For more advanced debugging, install the Ember Inspector from https://chrome.google.com/webstore/detail/ember-inspector/bmdblncegkenkacieihfhpjfppoconhi');
+ }
+ }, false);
+ }
+}
+
+})();
+
+// ==========================================================================
+// Project: Ember - JavaScript Application Framework
+// Copyright: ©2011-2013 Tilde Inc. and contributors
+// Portions ©2006-2011 Strobe Inc.
+// Portions ©2008-2011 Apple Inc. All rights reserved.
+// License: Licensed under MIT license
+// See https://raw.github.com/emberjs/ember.js/master/LICENSE
+// ==========================================================================
+
+
+// Version: v1.0.0-rc.6-733-gd034d11
+// Last commit: d034d11 (2013-09-16 00:44:21 -0700)
+
+
(function() {
var define, requireModule;
@@ -23,7 +219,6 @@ var define, requireModule;
deps = mod.deps;
callback = mod.callback;
reified = [];
- exports;
for (var i=0, l=deps.length; i size ? size : ends;
+ if (count <= 0) { count = 0; }
+
+ chunk = args.splice(0, size);
+ chunk = [start, count].concat(chunk);
+
+ start += size;
+ ends -= count;
+
+ ret = ret.concat(splice.apply(array, chunk));
+ }
+ return ret;
+ },
+
replace: function(array, idx, amt, objects) {
if (array.replace) {
return array.replace(idx, amt, objects);
} else {
- var args = concat.apply([idx, amt], objects);
- return array.splice.apply(array, args);
+ return utils._replace(array, idx, amt, objects);
}
},
@@ -1504,7 +1945,8 @@ get = function get(obj, keyName) {
obj = null;
}
-
+ Ember.assert("Cannot call get with "+ keyName +" key.", !!keyName);
+ Ember.assert("Cannot call get with '"+ keyName +"' on an undefined object.", obj !== undefined);
if (obj === null || keyName.indexOf('.') !== -1) {
return getPath(obj, keyName);
@@ -1606,7 +2048,6 @@ Ember.getWithDefault = function(root, key, defaultValue) {
Ember.get = get;
-Ember.getPath = Ember.deprecateFunc('getPath is deprecated since get now supports paths', Ember.get);
})();
@@ -1620,6 +2061,7 @@ Ember.getPath = Ember.deprecateFunc('getPath is deprecated since get now support
var o_create = Ember.create,
metaFor = Ember.meta,
META_KEY = Ember.META_KEY,
+ a_slice = [].slice,
/* listener flags */
ONCE = 1, SUSPENDED = 2;
@@ -1634,7 +2076,7 @@ var o_create = Ember.create,
{
listeners: { // variable name: `listenerSet`
"foo:changed": [ // variable name: `actions`
- [target, method, flags]
+ target, method, flags
]
}
}
@@ -1643,8 +2085,8 @@ var o_create = Ember.create,
function indexOf(array, target, method) {
var index = -1;
- for (var i = 0, l = array.length; i < l; i++) {
- if (target === array[i][0] && method === array[i][1]) { index = i; break; }
+ for (var i = 0, l = array.length; i < l; i += 3) {
+ if (target === array[i] && method === array[i+1]) { index = i; break; }
}
return index;
}
@@ -1677,14 +2119,14 @@ function actionsUnion(obj, eventName, otherActions) {
actions = meta && meta.listeners && meta.listeners[eventName];
if (!actions) { return; }
- for (var i = actions.length - 1; i >= 0; i--) {
- var target = actions[i][0],
- method = actions[i][1],
- flags = actions[i][2],
+ for (var i = actions.length - 3; i >= 0; i -= 3) {
+ var target = actions[i],
+ method = actions[i+1],
+ flags = actions[i+2],
actionIndex = indexOf(otherActions, target, method);
if (actionIndex === -1) {
- otherActions.push([target, method, flags]);
+ otherActions.push(target, method, flags);
}
}
}
@@ -1695,16 +2137,16 @@ function actionsDiff(obj, eventName, otherActions) {
diffActions = [];
if (!actions) { return; }
- for (var i = actions.length - 1; i >= 0; i--) {
- var target = actions[i][0],
- method = actions[i][1],
- flags = actions[i][2],
+ for (var i = actions.length - 3; i >= 0; i -= 3) {
+ var target = actions[i],
+ method = actions[i+1],
+ flags = actions[i+2],
actionIndex = indexOf(otherActions, target, method);
if (actionIndex !== -1) { continue; }
- otherActions.push([target, method, flags]);
- diffActions.push([target, method, flags]);
+ otherActions.push(target, method, flags);
+ diffActions.push(target, method, flags);
}
return diffActions;
@@ -1722,7 +2164,7 @@ function actionsDiff(obj, eventName, otherActions) {
@param {Boolean} once A flag whether a function should only be called once
*/
function addListener(obj, eventName, target, method, once) {
-
+ Ember.assert("You must pass at least an object and event name to Ember.addListener", !!obj && !!eventName);
if (!method && 'function' === typeof target) {
method = target;
@@ -1737,7 +2179,7 @@ function addListener(obj, eventName, target, method, once) {
if (actionIndex !== -1) { return; }
- actions.push([target, method, flags]);
+ actions.push(target, method, flags);
if ('function' === typeof obj.didAddListener) {
obj.didAddListener(eventName, target, method);
@@ -1757,7 +2199,7 @@ function addListener(obj, eventName, target, method, once) {
@param {Function|String} method A function or the name of a function to be called on `target`
*/
function removeListener(obj, eventName, target, method) {
-
+ Ember.assert("You must pass at least an object and event name to Ember.removeListener", !!obj && !!eventName);
if (!method && 'function' === typeof target) {
method = target;
@@ -1771,7 +2213,7 @@ function removeListener(obj, eventName, target, method) {
// action doesn't exist, give up silently
if (actionIndex === -1) { return; }
- actions.splice(actionIndex, 1);
+ actions.splice(actionIndex, 3);
if ('function' === typeof obj.didRemoveListener) {
obj.didRemoveListener(eventName, target, method);
@@ -1785,8 +2227,8 @@ function removeListener(obj, eventName, target, method) {
actions = meta && meta.listeners && meta.listeners[eventName];
if (!actions) { return; }
- for (var i = actions.length - 1; i >= 0; i--) {
- _removeListener(actions[i][0], actions[i][1]);
+ for (var i = actions.length - 3; i >= 0; i -= 3) {
+ _removeListener(actions[i], actions[i+1]);
}
}
}
@@ -1816,17 +2258,14 @@ function suspendListener(obj, eventName, target, method, callback) {
}
var actions = actionsFor(obj, eventName),
- actionIndex = indexOf(actions, target, method),
- action;
+ actionIndex = indexOf(actions, target, method);
if (actionIndex !== -1) {
- action = actions[actionIndex].slice(); // copy it, otherwise we're modifying a shared object
- action[2] |= SUSPENDED; // mark the action as suspended
- actions[actionIndex] = action; // replace the shared object with our copy
+ actions[actionIndex+2] |= SUSPENDED; // mark the action as suspended
}
function tryable() { return callback.call(target); }
- function finalizer() { if (action) { action[2] &= ~SUSPENDED; } }
+ function finalizer() { if (actionIndex !== -1) { actions[actionIndex+2] &= ~SUSPENDED; } }
return Ember.tryFinally(tryable, finalizer);
}
@@ -1836,7 +2275,7 @@ function suspendListener(obj, eventName, target, method, callback) {
Suspends multiple listeners during a callback.
-
+
@method suspendListeners
@for Ember
@param obj
@@ -1852,7 +2291,8 @@ function suspendListeners(obj, eventNames, target, method, callback) {
}
var suspendedActions = [],
- eventName, actions, action, i, l;
+ actionsList = [],
+ eventName, actions, i, l;
for (i=0, l=eventNames.length; i= 0; i--) { // looping in reverse for once listeners
- var action = actions[i];
- if (!action) { continue; }
- var target = action[0], method = action[1], flags = action[2];
+ for (var i = actions.length - 3; i >= 0; i -= 3) { // looping in reverse for once listeners
+ var target = actions[i], method = actions[i+1], flags = actions[i+2];
+ if (!method) { continue; }
if (flags & SUSPENDED) { continue; }
if (flags & ONCE) { removeListener(obj, eventName, target, method); }
if (!target) { target = obj; }
@@ -1970,15 +2409,40 @@ function listenersFor(obj, eventName) {
if (!actions) { return ret; }
- for (var i = 0, l = actions.length; i < l; i++) {
- var target = actions[i][0],
- method = actions[i][1];
+ for (var i = 0, l = actions.length; i < l; i += 3) {
+ var target = actions[i],
+ method = actions[i+1];
ret.push([target, method]);
}
return ret;
}
+/**
+ Define a property as a function that should be executed when
+ a specified event or events are triggered.
+
+ var Job = Ember.Object.extend({
+ logCompleted: Ember.on('completed', function(){
+ console.log('Job completed!');
+ })
+ });
+ var job = Job.create();
+ Ember.sendEvent(job, 'completed'); // Logs "Job completed!"
+
+ @method on
+ @for Ember
+ @param {String} eventNames*
+ @param {Function} func
+ @return func
+*/
+Ember.on = function(){
+ var func = a_slice.call(arguments, -1)[0],
+ events = a_slice.call(arguments, 0, -1);
+ func.__ember_listens__ = events;
+ return func;
+};
+
Ember.addListener = addListener;
Ember.removeListener = removeListener;
Ember._suspendListener = suspendListener;
@@ -2093,7 +2557,7 @@ var metaFor = Ember.meta,
@param {String} keyName The property key (or path) that will change.
@return {void}
*/
-var propertyWillChange = Ember.propertyWillChange = function(obj, keyName) {
+function propertyWillChange(obj, keyName) {
var m = metaFor(obj, false),
watching = m.watching[keyName] > 0 || keyName === 'length',
proto = m.proto,
@@ -2105,7 +2569,8 @@ var propertyWillChange = Ember.propertyWillChange = function(obj, keyName) {
dependentKeysWillChange(obj, keyName, m);
chainsWillChange(obj, keyName, m);
notifyBeforeObservers(obj, keyName);
-};
+}
+Ember.propertyWillChange = propertyWillChange;
/**
This function is called just after an object property has changed.
@@ -2113,7 +2578,7 @@ var propertyWillChange = Ember.propertyWillChange = function(obj, keyName) {
Normally you will not need to call this method directly but if for some
reason you can't directly watch a property you can invoke this method
- manually along with `Ember.propertyWilLChange()` which you should call just
+ manually along with `Ember.propertyWillChange()` which you should call just
before the property value changes.
@method propertyDidChange
@@ -2122,7 +2587,7 @@ var propertyWillChange = Ember.propertyWillChange = function(obj, keyName) {
@param {String} keyName The property key (or path) that will change.
@return {void}
*/
-var propertyDidChange = Ember.propertyDidChange = function(obj, keyName) {
+function propertyDidChange(obj, keyName) {
var m = metaFor(obj, false),
watching = m.watching[keyName] > 0 || keyName === 'length',
proto = m.proto,
@@ -2135,9 +2600,10 @@ var propertyDidChange = Ember.propertyDidChange = function(obj, keyName) {
if (!watching && keyName !== 'length') { return; }
dependentKeysDidChange(obj, keyName, m);
- chainsDidChange(obj, keyName, m);
+ chainsDidChange(obj, keyName, m, false);
notifyObservers(obj, keyName);
-};
+}
+Ember.propertyDidChange = propertyDidChange;
var WILL_SEEN, DID_SEEN;
@@ -2178,32 +2644,47 @@ function iterDeps(method, obj, depKey, seen, meta) {
}
}
-var chainsWillChange = function(obj, keyName, m, arg) {
- if (!m.hasOwnProperty('chainWatchers')) { return; } // nothing to do
-
- var nodes = m.chainWatchers;
-
- nodes = nodes[keyName];
- if (!nodes) { return; }
-
- for(var i = 0, l = nodes.length; i < l; i++) {
- nodes[i].willChange(arg);
+function chainsWillChange(obj, keyName, m) {
+ if (!(m.hasOwnProperty('chainWatchers') &&
+ m.chainWatchers[keyName])) {
+ return;
}
-};
-var chainsDidChange = function(obj, keyName, m, arg) {
- if (!m.hasOwnProperty('chainWatchers')) { return; } // nothing to do
+ var nodes = m.chainWatchers[keyName],
+ events = [],
+ i, l;
- var nodes = m.chainWatchers;
-
- nodes = nodes[keyName];
- if (!nodes) { return; }
-
- // looping in reverse because the chainWatchers array can be modified inside didChange
- for (var i = nodes.length - 1; i >= 0; i--) {
- nodes[i].didChange(arg);
+ for(i = 0, l = nodes.length; i < l; i++) {
+ nodes[i].willChange(events);
}
-};
+
+ for (i = 0, l = events.length; i < l; i += 2) {
+ propertyWillChange(events[i], events[i+1]);
+ }
+}
+
+function chainsDidChange(obj, keyName, m, suppressEvents) {
+ if (!(m.hasOwnProperty('chainWatchers') &&
+ m.chainWatchers[keyName])) {
+ return;
+ }
+
+ var nodes = m.chainWatchers[keyName],
+ events = suppressEvents ? null : [],
+ i, l;
+
+ for(i = 0, l = nodes.length; i < l; i++) {
+ nodes[i].didChange(events);
+ }
+
+ if (suppressEvents) {
+ return;
+ }
+
+ for (i = 0, l = events.length; i < l; i += 2) {
+ propertyDidChange(events[i], events[i+1]);
+ }
+}
Ember.overrideChains = function(obj, keyName, m) {
chainsDidChange(obj, keyName, m, true);
@@ -2213,20 +2694,24 @@ Ember.overrideChains = function(obj, keyName, m) {
@method beginPropertyChanges
@chainable
*/
-var beginPropertyChanges = Ember.beginPropertyChanges = function() {
+function beginPropertyChanges() {
deferred++;
-};
+}
+
+Ember.beginPropertyChanges = beginPropertyChanges;
/**
@method endPropertyChanges
*/
-var endPropertyChanges = Ember.endPropertyChanges = function() {
+function endPropertyChanges() {
deferred--;
if (deferred<=0) {
beforeObserverSet.clear();
observerSet.flush();
}
-};
+}
+
+Ember.endPropertyChanges = endPropertyChanges;
/**
Make a series of property changes together in an
@@ -2248,7 +2733,7 @@ Ember.changeProperties = function(cb, binding) {
tryFinally(cb, endPropertyChanges, binding);
};
-var notifyBeforeObservers = function(obj, keyName) {
+function notifyBeforeObservers(obj, keyName) {
if (obj.isDestroying) { return; }
var eventName = keyName + ':before', listeners, diff;
@@ -2259,9 +2744,9 @@ var notifyBeforeObservers = function(obj, keyName) {
} else {
sendEvent(obj, eventName, [obj, keyName]);
}
-};
+}
-var notifyObservers = function(obj, keyName) {
+function notifyObservers(obj, keyName) {
if (obj.isDestroying) { return; }
var eventName = keyName + ':change', listeners;
@@ -2271,7 +2756,7 @@ var notifyObservers = function(obj, keyName) {
} else {
sendEvent(obj, eventName, [obj, keyName]);
}
-};
+}
})();
@@ -2290,7 +2775,7 @@ var META_KEY = Ember.META_KEY,
/**
Sets the value of a property on an object, respecting computed properties
and notifying observers and other listeners of the change. If the
- property is not defined but the object implements the `unknownProperty`
+ property is not defined but the object implements the `setUnknownProperty`
method then that will be invoked as well.
If you plan to run on IE8 and older browsers then you should use this
@@ -2300,7 +2785,7 @@ var META_KEY = Ember.META_KEY,
On all newer browsers, you only need to use this method to set
properties if the property might not be defined on the object and you want
- to respect the `unknownProperty` handler. Otherwise you can ignore this
+ to respect the `setUnknownProperty` handler. Otherwise you can ignore this
method.
@method set
@@ -2312,18 +2797,20 @@ var META_KEY = Ember.META_KEY,
*/
var set = function set(obj, keyName, value, tolerant) {
if (typeof obj === 'string') {
-
+ Ember.assert("Path '" + obj + "' must be global if no obj is given.", IS_GLOBAL.test(obj));
value = keyName;
keyName = obj;
obj = null;
}
+ Ember.assert("Cannot call set with "+ keyName +" key.", !!keyName);
if (!obj || keyName.indexOf('.') !== -1) {
return setPath(obj, keyName, value, tolerant);
}
-
+ Ember.assert("You need to provide an object and key to `set`.", !!obj && keyName !== undefined);
+ Ember.assert('calling set on destroyed object', !obj.isDestroyed);
var meta = obj[META_KEY], desc = meta && meta.descs[keyName],
isUnknown, currentValue;
@@ -2399,7 +2886,6 @@ function setPath(root, path, value, tolerant) {
}
Ember.set = set;
-Ember.setPath = Ember.deprecateFunc('setPath is deprecated since set now supports paths', Ember.set);
/**
Error-tolerant form of `Ember.set`. Will not blow up if any part of the
@@ -2417,7 +2903,6 @@ Ember.setPath = Ember.deprecateFunc('setPath is deprecated since set now support
Ember.trySet = function(root, path, value) {
return set(root, path, value, true);
};
-Ember.trySetPath = Ember.deprecateFunc('trySetPath has been renamed to trySet', Ember.trySet);
})();
@@ -2629,14 +3114,14 @@ Map.create = function() {
Map.prototype = {
/**
This property will change as the number of objects in the map changes.
-
+
@property length
@type number
@default 0
*/
length: 0,
-
-
+
+
/**
Retrieve the value associated with a given key.
@@ -2835,7 +3320,7 @@ Ember.Descriptor = function() {};
//
var MANDATORY_SETTER_FUNCTION = Ember.MANDATORY_SETTER_FUNCTION = function(value) {
-
+ Ember.assert("You must use Ember.set() to access this property (of " + this + ")", false);
};
var DEFAULT_GETTER_FUNCTION = Ember.DEFAULT_GETTER_FUNCTION = function(name) {
@@ -2917,7 +3402,6 @@ Ember.defineProperty = function(obj, keyName, desc, data, meta) {
} else {
obj[keyName] = undefined; // make enumerable
}
- desc.setup(obj, keyName);
} else {
descs[keyName] = undefined; // shadow descriptor in proto
if (desc == null) {
@@ -2958,6 +3442,47 @@ Ember.defineProperty = function(obj, keyName, desc, data, meta) {
+(function() {
+var get = Ember.get;
+
+/**
+ To get multiple properties at once, call `Ember.getProperties`
+ with an object followed by a list of strings or an array:
+
+ ```javascript
+ Ember.getProperties(record, 'firstName', 'lastName', 'zipCode'); // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+ ```
+
+ is equivalent to:
+
+ ```javascript
+ Ember.getProperties(record, ['firstName', 'lastName', 'zipCode']); // { firstName: 'John', lastName: 'Doe', zipCode: '10011' }
+ ```
+
+ @method getProperties
+ @param obj
+ @param {String...|Array} list of keys to get
+ @return {Hash}
+*/
+Ember.getProperties = function(obj) {
+ var ret = {},
+ propertyNames = arguments,
+ i = 1;
+
+ if (arguments.length === 2 && Ember.typeOf(arguments[1]) === 'array') {
+ i = 0;
+ propertyNames = arguments[1];
+ }
+ for(var len = propertyNames.length; i < len; i++) {
+ ret[propertyNames[i]] = get(obj, propertyNames[i]);
+ }
+ return ret;
+};
+
+})();
+
+
+
(function() {
var changeProperties = Ember.changeProperties,
set = Ember.set;
@@ -2967,6 +3492,14 @@ var changeProperties = Ember.changeProperties,
a single `beginPropertyChanges` and `endPropertyChanges` batch, so
observers will be buffered.
+ ```javascript
+ anObject.setProperties({
+ firstName: "Stanley",
+ lastName: "Stuart",
+ age: "21"
+ })
+ ```
+
@method setProperties
@param self
@param {Object} hash
@@ -2995,13 +3528,11 @@ Ember.watchKey = function(obj, keyName) {
// can't watch length on Array - it is special...
if (keyName === 'length' && typeOf(obj) === 'array') { return; }
- var m = metaFor(obj), watching = m.watching, desc;
+ var m = metaFor(obj), watching = m.watching;
// activate watching first time
if (!watching[keyName]) {
watching[keyName] = 1;
- desc = m.descs[keyName];
- if (desc && desc.willWatch) { desc.willWatch(obj, keyName); }
if ('function' === typeof obj.willWatchProperty) {
obj.willWatchProperty(keyName);
@@ -3023,13 +3554,10 @@ Ember.watchKey = function(obj, keyName) {
Ember.unwatchKey = function(obj, keyName) {
- var m = metaFor(obj), watching = m.watching, desc;
+ var m = metaFor(obj), watching = m.watching;
if (watching[keyName] === 1) {
watching[keyName] = 0;
- desc = m.descs[keyName];
-
- if (desc && desc.didUnwatch) { desc.didUnwatch(obj, keyName); }
if ('function' === typeof obj.didUnwatchProperty) {
obj.didUnwatchProperty(keyName);
@@ -3048,6 +3576,7 @@ Ember.unwatchKey = function(obj, keyName) {
watching[keyName]--;
}
};
+
})();
@@ -3060,8 +3589,6 @@ var metaFor = Ember.meta, // utils.js
warn = Ember.warn,
watchKey = Ember.watchKey,
unwatchKey = Ember.unwatchKey,
- propertyWillChange = Ember.propertyWillChange,
- propertyDidChange = Ember.propertyDidChange,
FIRST_KEY = /^([^\.\*]+)/;
function firstKey(path) {
@@ -3116,10 +3643,6 @@ var removeChainWatcher = Ember.removeChainWatcher = function(obj, keyName, node)
unwatchKey(obj, keyName);
};
-function isProto(pvalue) {
- return metaFor(pvalue, false).proto === pvalue;
-}
-
// A ChainNode watches a single key on an object. If you provide a starting
// value for the key then the node won't actually watch it. For a root node
// pass null for parent and key and object for value.
@@ -3154,10 +3677,32 @@ var ChainNode = Ember._ChainNode = function(parent, key, value) {
var ChainNodePrototype = ChainNode.prototype;
+function lazyGet(obj, key) {
+ if (!obj) return undefined;
+
+ var meta = metaFor(obj, false);
+ // check if object meant only to be a prototype
+ if (meta.proto === obj) return undefined;
+
+ if (key === "@each") return get(obj, key);
+
+ // if a CP only return cached value
+ var desc = meta.descs[key];
+ if (desc && desc._cacheable) {
+ if (key in meta.cache) {
+ return meta.cache[key];
+ } else {
+ return undefined;
+ }
+ }
+
+ return get(obj, key);
+}
+
ChainNodePrototype.value = function() {
if (this._value === undefined && this._watching) {
var obj = this._parent.value();
- this._value = (obj && !isProto(obj)) ? get(obj, this._key) : undefined;
+ this._value = lazyGet(obj, this._key);
}
return this._value;
};
@@ -3277,42 +3822,50 @@ ChainNodePrototype.unchain = function(key, path) {
};
-ChainNodePrototype.willChange = function() {
+ChainNodePrototype.willChange = function(events) {
var chains = this._chains;
if (chains) {
for(var key in chains) {
if (!chains.hasOwnProperty(key)) { continue; }
- chains[key].willChange();
+ chains[key].willChange(events);
}
}
- if (this._parent) { this._parent.chainWillChange(this, this._key, 1); }
+ if (this._parent) { this._parent.chainWillChange(this, this._key, 1, events); }
};
-ChainNodePrototype.chainWillChange = function(chain, path, depth) {
+ChainNodePrototype.chainWillChange = function(chain, path, depth, events) {
if (this._key) { path = this._key + '.' + path; }
if (this._parent) {
- this._parent.chainWillChange(this, path, depth+1);
+ this._parent.chainWillChange(this, path, depth+1, events);
} else {
- if (depth > 1) { propertyWillChange(this.value(), path); }
+ if (depth > 1) {
+ events.push(this.value(), path);
+ }
path = 'this.' + path;
- if (this._paths[path] > 0) { propertyWillChange(this.value(), path); }
+ if (this._paths[path] > 0) {
+ events.push(this.value(), path);
+ }
}
};
-ChainNodePrototype.chainDidChange = function(chain, path, depth) {
+ChainNodePrototype.chainDidChange = function(chain, path, depth, events) {
if (this._key) { path = this._key + '.' + path; }
if (this._parent) {
- this._parent.chainDidChange(this, path, depth+1);
+ this._parent.chainDidChange(this, path, depth+1, events);
} else {
- if (depth > 1) { propertyDidChange(this.value(), path); }
+ if (depth > 1) {
+ events.push(this.value(), path);
+ }
path = 'this.' + path;
- if (this._paths[path] > 0) { propertyDidChange(this.value(), path); }
+ if (this._paths[path] > 0) {
+ events.push(this.value(), path);
+ }
}
};
-ChainNodePrototype.didChange = function(suppressEvent) {
+ChainNodePrototype.didChange = function(events) {
// invalidate my own value first.
if (this._watching) {
var obj = this._parent.value();
@@ -3334,14 +3887,25 @@ ChainNodePrototype.didChange = function(suppressEvent) {
if (chains) {
for(var key in chains) {
if (!chains.hasOwnProperty(key)) { continue; }
- chains[key].didChange(suppressEvent);
+ chains[key].didChange(events);
}
}
- if (suppressEvent) { return; }
+ // if no events are passed in then we only care about the above wiring update
+ if (events === null) { return; }
// and finally tell parent about my path changing...
- if (this._parent) { this._parent.chainDidChange(this, this._key, 1); }
+ if (this._parent) { this._parent.chainDidChange(this, this._key, 1, events); }
+};
+
+Ember.finishChains = function(obj) {
+ var m = metaFor(obj, false), chains = m.chains;
+ if (chains) {
+ if (chains.value() !== obj) {
+ m.chains = chains = chains.copy(obj);
+ }
+ chains.didChange(null);
+ }
};
})();
@@ -3536,6 +4100,7 @@ Ember.destroy = function (obj) {
@module ember-metal
*/
+Ember.warn("The CP_DEFAULT_CACHEABLE flag has been removed and computed properties are always cached by default. Use `volatile` if you don't want caching.", Ember.ENV.CP_DEFAULT_CACHEABLE !== false);
var get = Ember.get,
@@ -3623,6 +4188,81 @@ function removeDependentKeys(desc, obj, keyName, meta) {
//
/**
+ A computed property transforms an objects function into a property.
+
+ By default the function backing the computed property will only be called
+ once and the result will be cached. You can specify various properties
+ that your computed property is dependent on. This will force the cached
+ result to be recomputed if the dependencies are modified.
+
+ In the following example we declare a computed property (by calling
+ `.property()` on the fullName function) and setup the properties
+ dependencies (depending on firstName and lastName). The fullName function
+ will be called once (regardless of how many times it is accessed) as long
+ as it's dependencies have not been changed. Once firstName or lastName are updated
+ any future calls (or anything bound) to fullName will incorporate the new
+ values.
+
+ ```javascript
+ Person = Ember.Object.extend({
+ // these will be supplied by `create`
+ firstName: null,
+ lastName: null,
+
+ fullName: function() {
+ var firstName = this.get('firstName');
+ var lastName = this.get('lastName');
+
+ return firstName + ' ' + lastName;
+ }.property('firstName', 'lastName')
+ });
+
+ var tom = Person.create({
+ firstName: "Tom",
+ lastName: "Dale"
+ });
+
+ tom.get('fullName') // "Tom Dale"
+ ```
+
+ You can also define what Ember should do when setting a computed property.
+ If you try to set a computed property, it will be invoked with the key and
+ value you want to set it to. You can also accept the previous value as the
+ third parameter.
+
+ ```javascript
+
+ Person = Ember.Object.extend({
+ // these will be supplied by `create`
+ firstName: null,
+ lastName: null,
+
+ fullName: function(key, value, oldValue) {
+ // getter
+ if (arguments.length === 1) {
+ var firstName = this.get('firstName');
+ var lastName = this.get('lastName');
+
+ return firstName + ' ' + lastName;
+
+ // setter
+ } else {
+ var name = value.split(" ");
+
+ this.set('firstName', name[0]);
+ this.set('lastName', name[1]);
+
+ return value;
+ }
+ }.property('firstName', 'lastName')
+ });
+
+ var person = Person.create();
+ person.set('fullName', "Peter Wagenet");
+ person.get('firstName') // Peter
+ person.get('lastName') // Wagenet
+ ```
+
@class ComputedProperty
@namespace Ember
@extends Ember.Descriptor
@@ -3641,7 +4281,7 @@ ComputedProperty.prototype = new Ember.Descriptor();
var ComputedPropertyPrototype = ComputedProperty.prototype;
-/*
+/**
Properties are cacheable by default. Computed property will automatically
cache the return value of your function until one of the dependent keys changes.
@@ -3767,25 +4407,6 @@ ComputedPropertyPrototype.meta = function(meta) {
}
};
-/* impl descriptor API */
-ComputedPropertyPrototype.willWatch = function(obj, keyName) {
- // watch already creates meta for this instance
- var meta = obj[META_KEY];
-
- if (!(keyName in meta.cache)) {
- addDependentKeys(this, obj, keyName, meta);
- }
-};
-
-ComputedPropertyPrototype.didUnwatch = function(obj, keyName) {
- var meta = obj[META_KEY];
-
- if (!(keyName in meta.cache)) {
- // unwatch already creates meta for this instance
- removeDependentKeys(this, obj, keyName, meta);
- }
-};
-
/* impl descriptor API */
ComputedPropertyPrototype.didChange = function(obj, keyName) {
// _suspended is set via a CP.set to ensure we don't clear
@@ -3794,31 +4415,76 @@ ComputedPropertyPrototype.didChange = function(obj, keyName) {
var meta = metaFor(obj);
if (keyName in meta.cache) {
delete meta.cache[keyName];
- if (!meta.watching[keyName]) {
- removeDependentKeys(this, obj, keyName, meta);
- }
+ removeDependentKeys(this, obj, keyName, meta);
}
}
};
-/* impl descriptor API */
+function finishChains(chainNodes)
+{
+ for (var i=0, l=chainNodes.length; i 10) {
- console.log("Backburner: " + (new Date() - t2) + "ms");
- }
-
return ret;
},
@@ -4846,7 +5766,7 @@ define("backburner",
clearTimeout(debouncee[2]);
}
- var timer = window.setTimeout(function() {
+ var timer = global.setTimeout(function() {
if (!immediate) {
self.run.apply(self, args);
}
@@ -4915,8 +5835,8 @@ define("backburner",
function createAutorun(backburner) {
backburner.begin();
autorun = global.setTimeout(function() {
- backburner.end();
autorun = null;
+ backburner.end();
});
}
@@ -5484,7 +6404,7 @@ Ember.run.throttle = function() {
// Make sure it's not an autorun during testing
function checkAutoRun() {
if (!Ember.run.currentRunLoop) {
-
+ Ember.assert("You have turned on testing mode, which disabled the run-loop's autorun. You will need to wrap any code with asynchronous side-effects in an Ember.run", !Ember.testing);
}
}
@@ -5563,7 +6483,7 @@ Binding.prototype = {
This copies the Binding so it can be connected to another object.
@method copy
- @return {Ember.Binding}
+ @return {Ember.Binding} `this`
*/
copy: function () {
var copy = new Binding(this._to, this._from);
@@ -5648,7 +6568,7 @@ Binding.prototype = {
@return {Ember.Binding} `this`
*/
connect: function(obj) {
-
+ Ember.assert('Must pass a valid object to Ember.Binding.connect()', !!obj);
var fromPath = this._from, toPath = this._to;
Ember.trySet(obj, toPath, getWithGlobals(obj, fromPath));
@@ -5673,7 +6593,7 @@ Binding.prototype = {
@return {Ember.Binding} `this`
*/
disconnect: function(obj) {
-
+ Ember.assert('Must pass a valid object to Ember.Binding.disconnect()', !!obj);
var twoWay = !this._oneWay;
@@ -5771,7 +6691,7 @@ function mixinProperties(to, from) {
mixinProperties(Binding, {
- /**
+ /*
See `Ember.Binding.from`.
@method from
@@ -5782,7 +6702,7 @@ mixinProperties(Binding, {
return binding.from.apply(binding, arguments);
},
- /**
+ /*
See `Ember.Binding.to`.
@method to
@@ -5807,6 +6727,7 @@ mixinProperties(Binding, {
@param {Boolean} [flag] (Optional) passing nothing here will make the
binding `oneWay`. You can instead pass `false` to disable `oneWay`, making the
binding two way again.
+ @return {Ember.Binding} `this`
*/
oneWay: function(from, flag) {
var C = this, binding = new C(null, from);
@@ -6031,13 +6952,13 @@ function mixinProperties(mixinsMeta, mixin) {
}
}
-function concatenatedProperties(props, values, base) {
+function concatenatedMixinProperties(concatProp, props, values, base) {
var concats;
// reset before adding each new mixin to pickup concats from previous
- concats = values.concatenatedProperties || base.concatenatedProperties;
- if (props.concatenatedProperties) {
- concats = concats ? concats.concat(props.concatenatedProperties) : props.concatenatedProperties;
+ concats = values[concatProp] || base[concatProp];
+ if (props[concatProp]) {
+ concats = concats ? concats.concat(props[concatProp]) : props[concatProp];
}
return concats;
@@ -6104,7 +7025,28 @@ function applyConcatenatedProperties(obj, key, value, values) {
}
}
-function addNormalizedProperty(base, key, value, meta, descs, values, concats) {
+function applyMergedProperties(obj, key, value, values) {
+ var baseValue = values[key] || obj[key];
+
+ if (!baseValue) { return value; }
+
+ var newBase = Ember.merge({}, baseValue);
+ for (var prop in value) {
+ if (!value.hasOwnProperty(prop)) { continue; }
+
+ var propValue = value[prop];
+ if (isMethod(propValue)) {
+ // TODO: support for Computed Properties, etc?
+ newBase[prop] = giveMethodSuper(obj, prop, propValue, baseValue, {});
+ } else {
+ newBase[prop] = propValue;
+ }
+ }
+
+ return newBase;
+}
+
+function addNormalizedProperty(base, key, value, meta, descs, values, concats, mergings) {
if (value instanceof Ember.Descriptor) {
if (value === REQUIRED && descs[key]) { return CONTINUE; }
@@ -6117,11 +7059,14 @@ function addNormalizedProperty(base, key, value, meta, descs, values, concats) {
descs[key] = value;
values[key] = undefined;
} else {
- // impl super if needed...
- if (isMethod(value)) {
- value = giveMethodSuper(base, key, value, values, descs);
- } else if ((concats && a_indexOf.call(concats, key) >= 0) || key === 'concatenatedProperties') {
+ if ((concats && a_indexOf.call(concats, key) >= 0) ||
+ key === 'concatenatedProperties' ||
+ key === 'mergedProperties') {
value = applyConcatenatedProperties(base, key, value, values);
+ } else if ((mergings && a_indexOf.call(mergings, key) >= 0)) {
+ value = applyMergedProperties(base, key, value, values);
+ } else if (isMethod(value)) {
+ value = giveMethodSuper(base, key, value, values, descs);
}
descs[key] = undefined;
@@ -6130,7 +7075,7 @@ function addNormalizedProperty(base, key, value, meta, descs, values, concats) {
}
function mergeMixins(mixins, m, descs, values, base, keys) {
- var mixin, props, key, concats, meta;
+ var mixin, props, key, concats, mergings, meta;
function removeKeys(keyName) {
delete descs[keyName];
@@ -6139,19 +7084,21 @@ function mergeMixins(mixins, m, descs, values, base, keys) {
for(var i=0, l=mixins.length; i this.changingFrom ? 'green' : 'red';
- // logic
+ var color = obj.get(keyName) > this.changingFrom ? 'green' : 'red';
+ // logic
}
- }.observes('content.value')
+ }, 'content.value'),
+
+ friendsDidChange: Ember.observer(function(obj, keyName) {
+ // some logic
+ // obj.get(keyName) returns friends array
+ }, 'friends.@each.name')
});
```
+ Also available as `Function.prototype.observesBefore` if prototype extensions are
+ enabled.
+
@method beforeObserver
@for Ember
@param {Function} func
@@ -6628,6 +7648,52 @@ Ember.beforeObserver = function(func) {
+(function() {
+// Provides a way to register library versions with ember.
+
+Ember.libraries = function() {
+ var libraries = [];
+ var coreLibIndex = 0;
+
+ var getLibrary = function(name) {
+ for (var i = 0; i < libraries.length; i++) {
+ if (libraries[i].name === name) {
+ return libraries[i];
+ }
+ }
+ };
+
+ libraries.register = function(name, version) {
+ if (!getLibrary(name)) {
+ libraries.push({name: name, version: version});
+ }
+ };
+
+ libraries.registerCoreLibrary = function(name, version) {
+ if (!getLibrary(name)) {
+ libraries.splice(coreLibIndex++, 0, {name: name, version: version});
+ }
+ };
+
+ libraries.deRegister = function(name) {
+ var lib = getLibrary(name);
+ if (lib) libraries.splice(libraries.indexOf(lib), 1);
+ };
+
+ libraries.each = function (callback) {
+ libraries.forEach(function(lib) {
+ callback(lib.name, lib.version);
+ });
+ };
+ return libraries;
+}();
+
+Ember.libraries.registerCoreLibrary('Ember', Ember.VERSION);
+
+})();
+
+
+
(function() {
/**
Ember Metal
@@ -6695,6 +7761,7 @@ define("rsvp/async",
var browserGlobal = (typeof window !== 'undefined') ? window : {};
var BrowserMutationObserver = browserGlobal.MutationObserver || browserGlobal.WebKitMutationObserver;
var async;
+ var local = (typeof global !== 'undefined') ? global : this;
// old node
function useNextTick() {
@@ -6745,7 +7812,7 @@ define("rsvp/async",
function useSetTimeout() {
return function(callback, arg) {
- setTimeout(function() {
+ local.setTimeout(function() {
callback(arg);
}, 1);
};
@@ -7128,6 +8195,10 @@ define("rsvp/promise",
});
return thenPromise;
+ },
+
+ fail: function(fail) {
+ return this.then(null, fail);
}
};
@@ -7230,19 +8301,36 @@ define("rsvp/resolve",
__exports__.resolve = resolve;
});
+define("rsvp/rethrow",
+ ["exports"],
+ function(__exports__) {
+ "use strict";
+ var local = (typeof global === "undefined") ? this : global;
+
+ function rethrow(reason) {
+ local.setTimeout(function() {
+ throw reason;
+ });
+ throw reason;
+ }
+
+
+ __exports__.rethrow = rethrow;
+ });
define("rsvp",
- ["rsvp/events","rsvp/promise","rsvp/node","rsvp/all","rsvp/hash","rsvp/defer","rsvp/config","rsvp/resolve","rsvp/reject","exports"],
- function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __exports__) {
+ ["rsvp/events","rsvp/promise","rsvp/node","rsvp/all","rsvp/hash","rsvp/rethrow","rsvp/defer","rsvp/config","rsvp/resolve","rsvp/reject","exports"],
+ function(__dependency1__, __dependency2__, __dependency3__, __dependency4__, __dependency5__, __dependency6__, __dependency7__, __dependency8__, __dependency9__, __dependency10__, __exports__) {
"use strict";
var EventTarget = __dependency1__.EventTarget;
var Promise = __dependency2__.Promise;
var denodeify = __dependency3__.denodeify;
var all = __dependency4__.all;
var hash = __dependency5__.hash;
- var defer = __dependency6__.defer;
- var config = __dependency7__.config;
- var resolve = __dependency8__.resolve;
- var reject = __dependency9__.reject;
+ var rethrow = __dependency6__.rethrow;
+ var defer = __dependency7__.defer;
+ var config = __dependency8__.config;
+ var resolve = __dependency9__.resolve;
+ var reject = __dependency10__.reject;
function configure(name, value) {
config[name] = value;
@@ -7253,25 +8341,35 @@ define("rsvp",
__exports__.EventTarget = EventTarget;
__exports__.all = all;
__exports__.hash = hash;
+ __exports__.rethrow = rethrow;
__exports__.defer = defer;
__exports__.denodeify = denodeify;
__exports__.configure = configure;
__exports__.resolve = resolve;
__exports__.reject = reject;
});
-
})();
(function() {
+/**
+@private
+Public api for the container is still in flux.
+The public api, specified on the application namespace should be considered the stable api.
+// @module container
+*/
+
+/*
+ Flag to enable/disable model factory injections (disabled by default)
+ If model factory injections are enabled, models should not be
+ accessed globally (only through `container.lookupFactory('model:modelName'))`);
+*/
+Ember.MODEL_FACTORY_INJECTIONS = false || !!Ember.ENV.MODEL_FACTORY_INJECTIONS;
+
define("container",
[],
function() {
- /**
- A safe and simple inheriting object.
-
- @class InheritingDict
- */
+ // A safe and simple inheriting object.
function InheritingDict(parent) {
this.parent = parent;
this.dict = {};
@@ -7344,7 +8442,7 @@ define("container",
@method has
@param {String} key
- @returns {Boolean}
+ @return {Boolean}
*/
has: function(key) {
var dict = this.dict;
@@ -7378,20 +8476,25 @@ define("container",
}
};
- /**
- A lightweight container that helps to assemble and decouple components.
- @class Container
- */
+ // A lightweight container that helps to assemble and decouple components.
+ // Public api for the container is still in flux.
+ // The public api, specified on the application namespace should be considered the stable api.
function Container(parent) {
this.parent = parent;
this.children = [];
this.resolver = parent && parent.resolver || function() {};
+
this.registry = new InheritingDict(parent && parent.registry);
this.cache = new InheritingDict(parent && parent.cache);
+ this.factoryCache = new InheritingDict(parent && parent.cache);
this.typeInjections = new InheritingDict(parent && parent.typeInjections);
this.injections = {};
+
+ this.factoryTypeInjections = new InheritingDict(parent && parent.factoryTypeInjections);
+ this.factoryInjections = {};
+
this._options = new InheritingDict(parent && parent._options);
this._typeOptions = new InheritingDict(parent && parent._typeOptions);
}
@@ -7465,7 +8568,7 @@ define("container",
to correctly inherit from the current container.
@method child
- @returns {Container}
+ @return {Container}
*/
child: function() {
var container = new Container(this);
@@ -7479,7 +8582,7 @@ define("container",
as expected.
@method set
- @param {Object} obkect
+ @param {Object} object
@param {String} key
@param {any} value
*/
@@ -7514,7 +8617,7 @@ define("container",
factory = name;
fullName = type;
} else {
-
+ Ember.deprecate('register("'+type +'", "'+ name+'") is now deprecated in-favour of register("'+type+':'+name+'");', false);
fullName = type + ":" + name;
}
@@ -7535,6 +8638,7 @@ define("container",
container.unregister('model:user')
container.lookup('model:user') === undefined //=> true
+ ```
@method unregister
@param {String} fullName
@@ -7544,6 +8648,7 @@ define("container",
this.registry.remove(normalizedName);
this.cache.remove(normalizedName);
+ this.factoryCache.remove(normalizedName);
this._options.remove(normalizedName);
},
@@ -7577,7 +8682,7 @@ define("container",
@method resolve
@param {String} fullName
- @returns {Function} fullName's factory
+ @return {Function} fullName's factory
*/
resolve: function(fullName) {
return this.resolver(fullName) || this.registry.get(fullName);
@@ -7608,12 +8713,23 @@ define("container",
return fullName;
},
+ /**
+ @method makeToString
+
+ @param {any} factory
+ @param {string} fullName
+ @return {function} toString function
+ */
+ makeToString: function(factory, fullName) {
+ return factory.toString();
+ },
+
/**
Given a fullName return a corresponding instance.
The default behaviour is for lookup to return a singleton instance.
The singleton is scoped to the container, allowing multiple containers
- to all have there own locally scoped singletons.
+ to all have their own locally scoped singletons.
```javascript
var container = new Container();
@@ -7658,7 +8774,7 @@ define("container",
var value = instantiate(this, fullName);
- if (!value) { return; }
+ if (value === undefined) { return; }
if (isSingleton(this, fullName) && options.singleton !== false) {
this.cache.set(fullName, value);
@@ -7695,7 +8811,7 @@ define("container",
},
/**
- Allow registerying options for all factories of a type.
+ Allow registering options for all factories of a type.
```javascript
var container = new Container();
@@ -7736,7 +8852,7 @@ define("container",
this.optionsForType(type, options);
},
- /*
+ /**
@private
Used only via `injection`.
@@ -7775,20 +8891,10 @@ define("container",
typeInjection: function(type, property, fullName) {
if (this.parent) { illegalChildOperation('typeInjection'); }
- var injections = this.typeInjections.get(type);
-
- if (!injections) {
- injections = [];
- this.typeInjections.set(type, injections);
- }
-
- injections.push({
- property: property,
- fullName: fullName
- });
+ addTypeInjection(this.typeInjections, type, property, fullName);
},
- /*
+ /**
Defines injection rules.
These rules are used to inject dependencies onto objects when they
@@ -7796,8 +8902,8 @@ define("container",
Two forms of injections are possible:
- * Injecting one fullName on another fullName
- * Injecting one fullName on a type
+ * Injecting one fullName on another fullName
+ * Injecting one fullName on a type
Example:
@@ -7806,7 +8912,7 @@ define("container",
container.register('source:main', Source);
container.register('model:user', User);
- container.register('model:post', PostController);
+ container.register('model:post', Post);
// injecting one fullName on another fullName
// eg. each user model gets a post model
@@ -7839,8 +8945,104 @@ define("container",
return this.typeInjection(factoryName, property, injectionName);
}
- var injections = this.injections[factoryName] = this.injections[factoryName] || [];
- injections.push({ property: property, fullName: injectionName });
+ addInjection(this.injections, factoryName, property, injectionName);
+ },
+
+
+ /**
+ @private
+
+ Used only via `factoryInjection`.
+
+ Provides a specialized form of injection, specifically enabling
+ all factory of one type to be injected with a reference to another
+ object.
+
+ For example, provided each factory of type `model` needed a `store`.
+ one would do the following:
+
+ ```javascript
+ var container = new Container();
+
+ container.registerFactory('model:user', User);
+ container.register('store:main', SomeStore);
+
+ container.factoryTypeInjection('model', 'store', 'store:main');
+
+ var store = container.lookup('store:main');
+ var UserFactory = container.lookupFactory('model:user');
+
+ UserFactory.store instanceof SomeStore; //=> true
+ ```
+
+ @method factoryTypeInjection
+ @param {String} type
+ @param {String} property
+ @param {String} fullName
+ */
+ factoryTypeInjection: function(type, property, fullName) {
+ if (this.parent) { illegalChildOperation('factoryTypeInjection'); }
+
+ addTypeInjection(this.factoryTypeInjections, type, property, fullName);
+ },
+
+ /**
+ Defines factory injection rules.
+
+ Similar to regular injection rules, but are run against factories, via
+ `Container#lookupFactory`.
+
+ These rules are used to inject objects onto factories when they
+ are looked up.
+
+ Two forms of injections are possible:
+
+ * Injecting one fullName on another fullName
+ * Injecting one fullName on a type
+
+ Example:
+
+ ```javascript
+ var container = new Container();
+
+ container.register('store:main', Store);
+ container.register('store:secondary', OtherStore);
+ container.register('model:user', User);
+ container.register('model:post', Post);
+
+ // injecting one fullName on another type
+ container.factoryInjection('model', 'store', 'store:main');
+
+ // injecting one fullName on another fullName
+ container.factoryInjection('model:post', 'secondaryStore', 'store:secondary');
+
+ var UserFactory = container.lookupFactory('model:user');
+ var PostFactory = container.lookupFactory('model:post');
+ var store = container.lookup('store:main');
+
+ UserFactory.store instanceof Store; //=> true
+ UserFactory.secondaryStore instanceof OtherStore; //=> false
+
+ PostFactory.store instanceof Store; //=> true
+ PostFactory.secondaryStore instanceof OtherStore; //=> true
+
+ // and both models share the same source instance
+ UserFactory.store === PostFactory.store; //=> true
+ ```
+
+ @method factoryInjection
+ @param {String} factoryName
+ @param {String} property
+ @param {String} injectionName
+ */
+ factoryInjection: function(factoryName, property, injectionName) {
+ if (this.parent) { illegalChildOperation('injection'); }
+
+ if (factoryName.indexOf(':') === -1) {
+ return this.factoryTypeInjection(factoryName, property, injectionName);
+ }
+
+ addInjection(this.factoryInjections, factoryName, property, injectionName);
},
/**
@@ -7862,7 +9064,7 @@ define("container",
item.destroy();
});
- delete this.parent;
+ this.parent = undefined;
this.isDestroyed = true;
},
@@ -7898,7 +9100,7 @@ define("container",
injection = injections[i];
lookup = container.lookup(injection.fullName);
- if (lookup) {
+ if (lookup !== undefined) {
hash[injection.property] = lookup;
} else {
throw new Error('Attempting to inject an unknown injection: `' + injection.fullName + '`');
@@ -7925,32 +9127,83 @@ define("container",
function factoryFor(container, fullName) {
var name = container.normalize(fullName);
- return container.resolve(name);
+ var factory = container.resolve(name);
+ var injectedFactory;
+ var cache = container.factoryCache;
+ var type = fullName.split(":")[0];
+
+ if (factory === undefined) { return; }
+
+ if (cache.has(fullName)) {
+ return cache.get(fullName);
+ }
+
+ if (!factory || typeof factory.extend !== 'function' || (!Ember.MODEL_FACTORY_INJECTIONS && type === 'model')) {
+ // TODO: think about a 'safe' merge style extension
+ // for now just fallback to create time injection
+ return factory;
+ } else {
+
+ var injections = injectionsFor(container, fullName);
+ var factoryInjections = factoryInjectionsFor(container, fullName);
+
+ factoryInjections._toString = container.makeToString(factory, fullName);
+
+ injectedFactory = factory.extend(injections);
+ injectedFactory.reopenClass(factoryInjections);
+
+ cache.set(fullName, injectedFactory);
+
+ return injectedFactory;
+ }
+ }
+
+ function injectionsFor(container ,fullName) {
+ var splitName = fullName.split(":"),
+ type = splitName[0],
+ injections = [];
+
+ injections = injections.concat(container.typeInjections.get(type) || []);
+ injections = injections.concat(container.injections[fullName] || []);
+
+ injections = buildInjections(container, injections);
+ injections._debugContainerKey = fullName;
+ injections.container = container;
+
+ return injections;
+ }
+
+ function factoryInjectionsFor(container, fullName) {
+ var splitName = fullName.split(":"),
+ type = splitName[0],
+ factoryInjections = [];
+
+ factoryInjections = factoryInjections.concat(container.factoryTypeInjections.get(type) || []);
+ factoryInjections = factoryInjections.concat(container.factoryInjections[fullName] || []);
+
+ factoryInjections = buildInjections(container, factoryInjections);
+ factoryInjections._debugContainerKey = fullName;
+
+ return factoryInjections;
}
function instantiate(container, fullName) {
var factory = factoryFor(container, fullName);
- var splitName = fullName.split(":"),
- type = splitName[0],
- value;
-
if (option(container, fullName, 'instantiate') === false) {
return factory;
}
if (factory) {
- var injections = [];
- injections = injections.concat(container.typeInjections.get(type) || []);
- injections = injections.concat(container.injections[fullName] || []);
-
- var hash = buildInjections(container, injections);
- hash.container = container;
- hash._debugContainerKey = fullName;
-
- value = factory.create(hash);
-
- return value;
+ if (typeof factory.extend === 'function') {
+ // assume the factory was extendable and is already injected
+ return factory.create();
+ } else {
+ // assume the factory was extendable
+ // to create time injections
+ // TODO: support new'ing for instantiation and merge injections for pure JS Functions
+ return factory.create(injectionsFor(container, fullName));
+ }
}
}
@@ -7969,6 +9222,25 @@ define("container",
container.cache.dict = {};
}
+ function addTypeInjection(rules, type, property, fullName) {
+ var injections = rules.get(type);
+
+ if (!injections) {
+ injections = [];
+ rules.set(type, injections);
+ }
+
+ injections.push({
+ property: property,
+ fullName: fullName
+ });
+ }
+
+ function addInjection(rules, factoryName, property, injectionName) {
+ var injections = rules[factoryName] = rules[factoryName] || [];
+ injections.push({ property: property, fullName: injectionName });
+ }
+
return Container;
});
@@ -8104,6 +9376,7 @@ function _copy(obj, deep, seen, copies) {
// avoid cyclical loops
if (deep && (loc=indexOf(seen, obj))>=0) return copies[loc];
+ Ember.assert('Cannot clone an Ember.Object that does not implement Ember.Copyable', !(obj instanceof Ember.Object) || (Ember.Copyable && Ember.Copyable.detect(obj)));
// IMPORTANT: this specific test will detect a native array only. Any other
// object will need to implement Copyable.
@@ -8284,529 +9557,6 @@ Ember.Error.prototype = Ember.create(Error.prototype);
-(function() {
-/**
- Expose RSVP implementation
-
- @class RSVP
- @namespace Ember
- @constructor
-*/
-Ember.RSVP = requireModule('rsvp');
-
-})();
-
-
-
-(function() {
-/**
-@module ember
-@submodule ember-runtime
-*/
-
-var STRING_DASHERIZE_REGEXP = (/[ _]/g);
-var STRING_DASHERIZE_CACHE = {};
-var STRING_DECAMELIZE_REGEXP = (/([a-z])([A-Z])/g);
-var STRING_CAMELIZE_REGEXP = (/(\-|_|\.|\s)+(.)?/g);
-var STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
-var STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
-
-/**
- Defines the hash of localized strings for the current language. Used by
- the `Ember.String.loc()` helper. To localize, add string values to this
- hash.
-
- @property STRINGS
- @for Ember
- @type Hash
-*/
-Ember.STRINGS = {};
-
-/**
- Defines string helper methods including string formatting and localization.
- Unless `Ember.EXTEND_PROTOTYPES.String` is `false` these methods will also be
- added to the `String.prototype` as well.
-
- @class String
- @namespace Ember
- @static
-*/
-Ember.String = {
-
- /**
- Apply formatting options to the string. This will look for occurrences
- of "%@" in your string and substitute them with the arguments you pass into
- this method. If you want to control the specific order of replacement,
- you can add a number after the key as well to indicate which argument
- you want to insert.
-
- Ordered insertions are most useful when building loc strings where values
- you need to insert may appear in different orders.
-
- ```javascript
- "Hello %@ %@".fmt('John', 'Doe'); // "Hello John Doe"
- "Hello %@2, %@1".fmt('John', 'Doe'); // "Hello Doe, John"
- ```
-
- @method fmt
- @param {String} str The string to format
- @param {Array} formats An array of parameters to interpolate into string.
- @return {String} formatted string
- */
- fmt: function(str, formats) {
- // first, replace any ORDERED replacements.
- var idx = 0; // the current index for non-numerical replacements
- return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
- argIndex = (argIndex) ? parseInt(argIndex, 10) - 1 : idx++;
- s = formats[argIndex];
- return (s === null) ? '(null)' : (s === undefined) ? '' : Ember.inspect(s);
- }) ;
- },
-
- /**
- Formats the passed string, but first looks up the string in the localized
- strings hash. This is a convenient way to localize text. See
- `Ember.String.fmt()` for more information on formatting.
-
- Note that it is traditional but not required to prefix localized string
- keys with an underscore or other character so you can easily identify
- localized strings.
-
- ```javascript
- Ember.STRINGS = {
- '_Hello World': 'Bonjour le monde',
- '_Hello %@ %@': 'Bonjour %@ %@'
- };
-
- Ember.String.loc("_Hello World"); // 'Bonjour le monde';
- Ember.String.loc("_Hello %@ %@", ["John", "Smith"]); // "Bonjour John Smith";
- ```
-
- @method loc
- @param {String} str The string to format
- @param {Array} formats Optional array of parameters to interpolate into string.
- @return {String} formatted string
- */
- loc: function(str, formats) {
- str = Ember.STRINGS[str] || str;
- return Ember.String.fmt(str, formats) ;
- },
-
- /**
- Splits a string into separate units separated by spaces, eliminating any
- empty strings in the process. This is a convenience method for split that
- is mostly useful when applied to the `String.prototype`.
-
- ```javascript
- Ember.String.w("alpha beta gamma").forEach(function(key) {
- console.log(key);
- });
-
- // > alpha
- // > beta
- // > gamma
- ```
-
- @method w
- @param {String} str The string to split
- @return {String} split string
- */
- w: function(str) { return str.split(/\s+/); },
-
- /**
- Converts a camelized string into all lower case separated by underscores.
-
- ```javascript
- 'innerHTML'.decamelize(); // 'inner_html'
- 'action_name'.decamelize(); // 'action_name'
- 'css-class-name'.decamelize(); // 'css-class-name'
- 'my favorite items'.decamelize(); // 'my favorite items'
- ```
-
- @method decamelize
- @param {String} str The string to decamelize.
- @return {String} the decamelized string.
- */
- decamelize: function(str) {
- return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
- },
-
- /**
- Replaces underscores or spaces with dashes.
-
- ```javascript
- 'innerHTML'.dasherize(); // 'inner-html'
- 'action_name'.dasherize(); // 'action-name'
- 'css-class-name'.dasherize(); // 'css-class-name'
- 'my favorite items'.dasherize(); // 'my-favorite-items'
- ```
-
- @method dasherize
- @param {String} str The string to dasherize.
- @return {String} the dasherized string.
- */
- dasherize: function(str) {
- var cache = STRING_DASHERIZE_CACHE,
- hit = cache.hasOwnProperty(str),
- ret;
-
- if (hit) {
- return cache[str];
- } else {
- ret = Ember.String.decamelize(str).replace(STRING_DASHERIZE_REGEXP,'-');
- cache[str] = ret;
- }
-
- return ret;
- },
-
- /**
- Returns the lowerCamelCase form of a string.
-
- ```javascript
- 'innerHTML'.camelize(); // 'innerHTML'
- 'action_name'.camelize(); // 'actionName'
- 'css-class-name'.camelize(); // 'cssClassName'
- 'my favorite items'.camelize(); // 'myFavoriteItems'
- 'My Favorite Items'.camelize(); // 'myFavoriteItems'
- ```
-
- @method camelize
- @param {String} str The string to camelize.
- @return {String} the camelized string.
- */
- camelize: function(str) {
- return str.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
- return chr ? chr.toUpperCase() : '';
- }).replace(/^([A-Z])/, function(match, separator, chr) {
- return match.toLowerCase();
- });
- },
-
- /**
- Returns the UpperCamelCase form of a string.
-
- ```javascript
- 'innerHTML'.classify(); // 'InnerHTML'
- 'action_name'.classify(); // 'ActionName'
- 'css-class-name'.classify(); // 'CssClassName'
- 'my favorite items'.classify(); // 'MyFavoriteItems'
- ```
-
- @method classify
- @param {String} str the string to classify
- @return {String} the classified string
- */
- classify: function(str) {
- var parts = str.split("."),
- out = [];
-
- for (var i=0, l=parts.length; i Ember.TrackedArray instances. We use
+ // this to lazily recompute indexes for item property observers.
+ this.trackedArraysByGuid = {};
+
+ // This is used to coalesce item changes from property observers.
+ this.changedItems = {};
+}
+
+function ItemPropertyObserverContext (dependentArray, index, trackedArray) {
+ Ember.assert("Internal error: trackedArray is null or undefined", trackedArray);
+
+ this.dependentArray = dependentArray;
+ this.index = index;
+ this.item = dependentArray.objectAt(index);
+ this.trackedArray = trackedArray;
+ this.beforeObserver = null;
+ this.observer = null;
+
+ this.destroyed = false;
+}
+
+DependentArraysObserver.prototype = {
+ setValue: function (newValue) {
+ this.instanceMeta.setValue(newValue);
+ },
+ getValue: function () {
+ return this.instanceMeta.getValue();
+ },
+
+ setupObservers: function (dependentArray, dependentKey) {
+ Ember.assert("dependent array must be an `Ember.Array`", Ember.Array.detect(dependentArray));
+
+ this.dependentKeysByGuid[guidFor(dependentArray)] = dependentKey;
+
+ dependentArray.addArrayObserver(this, {
+ willChange: 'dependentArrayWillChange',
+ didChange: 'dependentArrayDidChange'
+ });
+
+ if (this.cp._itemPropertyKeys[dependentKey]) {
+ this.setupPropertyObservers(dependentKey, this.cp._itemPropertyKeys[dependentKey]);
+ }
+ },
+
+ teardownObservers: function (dependentArray, dependentKey) {
+ var itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey] || [];
+
+ delete this.dependentKeysByGuid[guidFor(dependentArray)];
+
+ this.teardownPropertyObservers(dependentKey, itemPropertyKeys);
+
+ dependentArray.removeArrayObserver(this, {
+ willChange: 'dependentArrayWillChange',
+ didChange: 'dependentArrayDidChange'
+ });
+ },
+
+ setupPropertyObservers: function (dependentKey, itemPropertyKeys) {
+ var dependentArray = get(this.instanceMeta.context, dependentKey),
+ length = get(dependentArray, 'length'),
+ observerContexts = new Array(length);
+
+ this.resetTransformations(dependentKey, observerContexts);
+
+ forEach(dependentArray, function (item, index) {
+ var observerContext = this.createPropertyObserverContext(dependentArray, index, this.trackedArraysByGuid[dependentKey]);
+ observerContexts[index] = observerContext;
+
+ forEach(itemPropertyKeys, function (propertyKey) {
+ addBeforeObserver(item, propertyKey, this, observerContext.beforeObserver);
+ addObserver(item, propertyKey, this, observerContext.observer);
+ }, this);
+ }, this);
+ },
+
+ teardownPropertyObservers: function (dependentKey, itemPropertyKeys) {
+ var dependentArrayObserver = this,
+ trackedArray = this.trackedArraysByGuid[dependentKey],
+ beforeObserver,
+ observer,
+ item;
+
+ if (!trackedArray) { return; }
+
+ trackedArray.apply(function (observerContexts, offset, operation) {
+ if (operation === Ember.TrackedArray.DELETE) { return; }
+
+ forEach(observerContexts, function (observerContext) {
+ observerContext.destroyed = true;
+ beforeObserver = observerContext.beforeObserver;
+ observer = observerContext.observer;
+ item = observerContext.item;
+
+ forEach(itemPropertyKeys, function (propertyKey) {
+ removeBeforeObserver(item, propertyKey, dependentArrayObserver, beforeObserver);
+ removeObserver(item, propertyKey, dependentArrayObserver, observer);
+ });
+ });
+ });
+ },
+
+ createPropertyObserverContext: function (dependentArray, index, trackedArray) {
+ var observerContext = new ItemPropertyObserverContext(dependentArray, index, trackedArray);
+
+ this.createPropertyObserver(observerContext);
+
+ return observerContext;
+ },
+
+ createPropertyObserver: function (observerContext) {
+ var dependentArrayObserver = this;
+
+ observerContext.beforeObserver = function (obj, keyName) {
+ return dependentArrayObserver.itemPropertyWillChange(obj, keyName, observerContext.dependentArray, observerContext);
+ };
+ observerContext.observer = function (obj, keyName) {
+ return dependentArrayObserver.itemPropertyDidChange(obj, keyName, observerContext.dependentArray, observerContext);
+ };
+ },
+
+ resetTransformations: function (dependentKey, observerContexts) {
+ this.trackedArraysByGuid[dependentKey] = new Ember.TrackedArray(observerContexts);
+ },
+
+ addTransformation: function (dependentKey, index, newItems) {
+ var trackedArray = this.trackedArraysByGuid[dependentKey];
+ if (trackedArray) {
+ trackedArray.addItems(index, newItems);
+ }
+ },
+
+ removeTransformation: function (dependentKey, index, removedCount) {
+ var trackedArray = this.trackedArraysByGuid[dependentKey];
+
+ if (trackedArray) {
+ return trackedArray.removeItems(index, removedCount);
+ }
+
+ return [];
+ },
+
+ updateIndexes: function (trackedArray, array) {
+ var length = get(array, 'length');
+ // OPTIMIZE: we could stop updating once we hit the object whose observer
+ // fired; ie partially apply the transformations
+ trackedArray.apply(function (observerContexts, offset, operation) {
+ // we don't even have observer contexts for removed items, even if we did,
+ // they no longer have any index in the array
+ if (operation === Ember.TrackedArray.DELETE) { return; }
+ if (operation === Ember.TrackedArray.RETAIN && observerContexts.length === length && offset === 0) {
+ // If we update many items we don't want to walk the array each time: we
+ // only need to update the indexes at most once per run loop.
+ return;
+ }
+
+ forEach(observerContexts, function (context, index) {
+ context.index = index + offset;
+ });
+ });
+ },
+
+ dependentArrayWillChange: function (dependentArray, index, removedCount, addedCount) {
+ var removedItem = this.callbacks.removedItem,
+ changeMeta,
+ guid = guidFor(dependentArray),
+ dependentKey = this.dependentKeysByGuid[guid],
+ itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey] || [],
+ item,
+ itemIndex,
+ sliceIndex,
+ observerContexts;
+
+ observerContexts = this.removeTransformation(dependentKey, index, removedCount);
+
+ function removeObservers(propertyKey) {
+ observerContexts[sliceIndex].destroyed = true;
+ removeBeforeObserver(item, propertyKey, this, observerContexts[sliceIndex].beforeObserver);
+ removeObserver(item, propertyKey, this, observerContexts[sliceIndex].observer);
+ }
+
+ for (sliceIndex = removedCount - 1; sliceIndex >= 0; --sliceIndex) {
+ itemIndex = index + sliceIndex;
+ item = dependentArray.objectAt(itemIndex);
+
+ forEach(itemPropertyKeys, removeObservers, this);
+
+ changeMeta = createChangeMeta(dependentArray, item, itemIndex, this.instanceMeta.propertyName, this.cp);
+ this.setValue( removedItem.call(
+ this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
+ }
+ },
+
+ dependentArrayDidChange: function (dependentArray, index, removedCount, addedCount) {
+ var addedItem = this.callbacks.addedItem,
+ guid = guidFor(dependentArray),
+ dependentKey = this.dependentKeysByGuid[guid],
+ observerContexts = new Array(addedCount),
+ itemPropertyKeys = this.cp._itemPropertyKeys[dependentKey],
+ changeMeta,
+ observerContext;
+
+ forEach(dependentArray.slice(index, index + addedCount), function (item, sliceIndex) {
+ if (itemPropertyKeys) {
+ observerContext =
+ observerContexts[sliceIndex] =
+ this.createPropertyObserverContext(dependentArray, index + sliceIndex, this.trackedArraysByGuid[dependentKey]);
+ forEach(itemPropertyKeys, function (propertyKey) {
+ addBeforeObserver(item, propertyKey, this, observerContext.beforeObserver);
+ addObserver(item, propertyKey, this, observerContext.observer);
+ }, this);
+ }
+
+ changeMeta = createChangeMeta(dependentArray, item, index + sliceIndex, this.instanceMeta.propertyName, this.cp);
+ this.setValue( addedItem.call(
+ this.instanceMeta.context, this.getValue(), item, changeMeta, this.instanceMeta.sugarMeta));
+ }, this);
+
+ this.addTransformation(dependentKey, index, observerContexts);
+ },
+
+ itemPropertyWillChange: function (obj, keyName, array, observerContext) {
+ var guid = guidFor(obj);
+
+ if (!this.changedItems[guid]) {
+ this.changedItems[guid] = {
+ array: array,
+ observerContext: observerContext,
+ obj: obj,
+ previousValues: {}
+ };
+ }
+
+ this.changedItems[guid].previousValues[keyName] = get(obj, keyName);
+ },
+
+ itemPropertyDidChange: function(obj, keyName, array, observerContext) {
+ Ember.run.once(this, 'flushChanges');
+ },
+
+ flushChanges: function() {
+ var changedItems = this.changedItems, key, c, changeMeta;
+
+ for (key in changedItems) {
+ c = changedItems[key];
+ if (c.observerContext.destroyed) { continue; }
+
+ this.updateIndexes(c.observerContext.trackedArray, c.observerContext.dependentArray);
+
+ changeMeta = createChangeMeta(c.array, c.obj, c.observerContext.index, this.instanceMeta.propertyName, this.cp, c.previousValues);
+ this.setValue(
+ this.callbacks.removedItem.call(this.instanceMeta.context, this.getValue(), c.obj, changeMeta, this.instanceMeta.sugarMeta));
+ this.setValue(
+ this.callbacks.addedItem.call(this.instanceMeta.context, this.getValue(), c.obj, changeMeta, this.instanceMeta.sugarMeta));
+ }
+ this.changedItems = {};
+ }
+};
+
+function createChangeMeta(dependentArray, item, index, propertyName, property, previousValues) {
+ var meta = {
+ arrayChanged: dependentArray,
+ index: index,
+ item: item,
+ propertyName: propertyName,
+ property: property
+ };
+
+ if (previousValues) {
+ // previous values only available for item property changes
+ meta.previousValues = previousValues;
+ }
+
+ return meta;
+}
+
+function addItems (dependentArray, callbacks, cp, propertyName, meta) {
+ forEach(dependentArray, function (item, index) {
+ meta.setValue( callbacks.addedItem.call(
+ this, meta.getValue(), item, createChangeMeta(dependentArray, item, index, propertyName, cp), meta.sugarMeta));
+ }, this);
+}
+
+function reset(cp, propertyName) {
+ var callbacks = cp._callbacks(),
+ meta;
+
+ if (cp._hasInstanceMeta(this, propertyName)) {
+ meta = cp._instanceMeta(this, propertyName);
+ meta.setValue(cp.resetValue(meta.getValue()));
+ } else {
+ meta = cp._instanceMeta(this, propertyName);
+ }
+
+ if (cp.options.initialize) {
+ cp.options.initialize.call(this, meta.getValue(), { property: cp, propertyName: propertyName }, meta.sugarMeta);
+ }
+}
+
+function ReduceComputedPropertyInstanceMeta(context, propertyName, initialValue) {
+ this.context = context;
+ this.propertyName = propertyName;
+ this.cache = metaFor(context).cache;
+
+ this.dependentArrays = {};
+ this.sugarMeta = {};
+
+ this.initialValue = initialValue;
+}
+
+ReduceComputedPropertyInstanceMeta.prototype = {
+ getValue: function () {
+ if (this.propertyName in this.cache) {
+ return this.cache[this.propertyName];
+ } else {
+ return this.initialValue;
+ }
+ },
+
+ setValue: function(newValue) {
+ // This lets sugars force a recomputation, handy for very simple
+ // implementations of eg max.
+ if (newValue !== undefined) {
+ this.cache[this.propertyName] = newValue;
+ } else {
+ delete this.cache[this.propertyName];
+ }
+ }
+};
+
+/**
+ A computed property whose dependent keys are arrays and which is updated with
+ "one at a time" semantics.
+
+ @class ReduceComputedProperty
+ @namespace Ember
+ @extends Ember.ComputedProperty
+ @constructor
+*/
+function ReduceComputedProperty(options) {
+ var cp = this;
+
+ this.options = options;
+ this._instanceMetas = {};
+
+ this._dependentKeys = null;
+ // A map of dependentKey -> [itemProperty, ...] that tracks what properties of
+ // items in the array we must track to update this property.
+ this._itemPropertyKeys = {};
+ this._previousItemPropertyKeys = {};
+
+ this.readOnly();
+ this.cacheable();
+
+ this.recomputeOnce = function(propertyName) {
+ // What we really want to do is coalesce by .
+ // We need a form of `scheduleOnce` that accepts an arbitrary token to
+ // coalesce by, in addition to the target and method.
+ Ember.run.once(this, recompute, propertyName);
+ };
+ var recompute = function(propertyName) {
+ var dependentKeys = cp._dependentKeys,
+ meta = cp._instanceMeta(this, propertyName),
+ callbacks = cp._callbacks();
+
+ reset.call(this, cp, propertyName);
+
+ forEach(cp._dependentKeys, function (dependentKey) {
+ var dependentArray = get(this, dependentKey),
+ previousDependentArray = meta.dependentArrays[dependentKey];
+
+ if (dependentArray === previousDependentArray) {
+ // The array may be the same, but our item property keys may have
+ // changed, so we set them up again. We can't easily tell if they've
+ // changed: the array may be the same object, but with different
+ // contents.
+ if (cp._previousItemPropertyKeys[dependentKey]) {
+ delete cp._previousItemPropertyKeys[dependentKey];
+ meta.dependentArraysObserver.setupPropertyObservers(dependentKey, cp._itemPropertyKeys[dependentKey]);
+ }
+ } else {
+ meta.dependentArrays[dependentKey] = dependentArray;
+
+ if (previousDependentArray) {
+ meta.dependentArraysObserver.teardownObservers(previousDependentArray, dependentKey);
+ }
+
+ if (dependentArray) {
+ meta.dependentArraysObserver.setupObservers(dependentArray, dependentKey);
+ }
+ }
+ }, this);
+
+ forEach(cp._dependentKeys, function(dependentKey) {
+ var dependentArray = get(this, dependentKey);
+ if (dependentArray) {
+ addItems.call(this, dependentArray, callbacks, cp, propertyName, meta);
+ }
+ }, this);
+ };
+
+ this.func = function (propertyName) {
+ Ember.assert("Computed reduce values require at least one dependent key", cp._dependentKeys);
+
+ recompute.call(this, propertyName);
+
+ return cp._instanceMeta(this, propertyName).getValue();
+ };
+}
+
+Ember.ReduceComputedProperty = ReduceComputedProperty;
+ReduceComputedProperty.prototype = o_create(ComputedProperty.prototype);
+
+function defaultCallback(computedValue) {
+ return computedValue;
+}
+
+ReduceComputedProperty.prototype._callbacks = function () {
+ if (!this.callbacks) {
+ var options = this.options;
+ this.callbacks = {
+ removedItem: options.removedItem || defaultCallback,
+ addedItem: options.addedItem || defaultCallback
+ };
+ }
+ return this.callbacks;
+};
+
+ReduceComputedProperty.prototype._hasInstanceMeta = function (context, propertyName) {
+ var guid = guidFor(context),
+ key = guid + ':' + propertyName;
+
+ return !!this._instanceMetas[key];
+};
+
+ReduceComputedProperty.prototype._instanceMeta = function (context, propertyName) {
+ var guid = guidFor(context),
+ key = guid + ':' + propertyName,
+ meta = this._instanceMetas[key];
+
+ if (!meta) {
+ meta = this._instanceMetas[key] = new ReduceComputedPropertyInstanceMeta(context, propertyName, this.initialValue());
+ meta.dependentArraysObserver = new DependentArraysObserver(this._callbacks(), this, meta, context, propertyName, meta.sugarMeta);
+ }
+
+ return meta;
+};
+
+ReduceComputedProperty.prototype.initialValue = function () {
+ switch (typeof this.options.initialValue) {
+ case 'undefined':
+ throw new Error("reduce computed properties require an initial value: did you forget to pass one to Ember.reduceComputed?");
+ case 'function':
+ return this.options.initialValue();
+ default:
+ return this.options.initialValue;
+ }
+};
+
+ReduceComputedProperty.prototype.resetValue = function (value) {
+ return this.initialValue();
+};
+
+ReduceComputedProperty.prototype.itemPropertyKey = function (dependentArrayKey, itemPropertyKey) {
+ this._itemPropertyKeys[dependentArrayKey] = this._itemPropertyKeys[dependentArrayKey] || [];
+ this._itemPropertyKeys[dependentArrayKey].push(itemPropertyKey);
+};
+
+ReduceComputedProperty.prototype.clearItemPropertyKeys = function (dependentArrayKey) {
+ if (this._itemPropertyKeys[dependentArrayKey]) {
+ this._previousItemPropertyKeys[dependentArrayKey] = this._itemPropertyKeys[dependentArrayKey];
+ this._itemPropertyKeys[dependentArrayKey] = [];
+ }
+};
+
+ReduceComputedProperty.prototype.property = function () {
+ var cp = this,
+ args = a_slice.call(arguments),
+ propertyArgs = [],
+ match,
+ dependentArrayKey,
+ itemPropertyKey;
+
+ forEach(a_slice.call(arguments), function (dependentKey) {
+ if (doubleEachPropertyPattern.test(dependentKey)) {
+ throw new Error("Nested @each properties not supported: " + dependentKey);
+ } else if (match = eachPropertyPattern.exec(dependentKey)) {
+ dependentArrayKey = match[1];
+ itemPropertyKey = match[2];
+ cp.itemPropertyKey(dependentArrayKey, itemPropertyKey);
+ propertyArgs.push(dependentArrayKey);
+ } else {
+ propertyArgs.push(dependentKey);
+ }
+ });
+
+ return ComputedProperty.prototype.property.apply(this, propertyArgs);
+};
+
+/**
+ Creates a computed property which operates on dependent arrays and
+ is updated with "one at a time" semantics. When items are added or
+ removed from the dependent array(s) a reduce computed only operates
+ on the change instead of re-evaluating the entire array.
+
+ If there are more than one arguments the first arguments are
+ considered to be dependent property keys. The last argument is
+ required to be an options object. The options object can have the
+ following four properties.
+
+ `initialValue` - A value or function that will be used as the initial
+ value for the computed. If this property is a function the result of calling
+ the function will be used as the initial value. This property is required.
+
+ `initialize` - An optional initialize function. Typically this will be used
+ to set up state on the instanceMeta object.
+
+ `removedItem` - A function that is called each time an element is removed
+ from the array.
+
+ `addedItem` - A function that is called each time an element is added to
+ the array.
+
+
+ The `initialize` function has the following signature:
+
+ ```javascript
+ function (initialValue, changeMeta, instanceMeta)
+ ```
+
+ `initialValue` - The value of the `initialValue` property from the
+ options object.
+
+ `changeMeta` - An object which contains meta information about the
+ computed. It contains the following properties:
+
+ - `property` the computed property
+ - `propertyName` the name of the property on the object
+
+ `instanceMeta` - An object that can be used to store meta
+ information needed for calculating your computed. For example a
+ unique computed might use this to store the number of times a given
+ element is found in the dependent array.
+
+
+ The `removedItem` and `addedItem` functions both have the following signature:
+
+ ```javascript
+ function (accumulatedValue, item, changeMeta, instanceMeta)
+ ```
+
+ `accumulatedValue` - The value returned from the last time
+ `removedItem` or `addedItem` was called or `initialValue`.
+
+ `item` - the element added or removed from the array
+
+ `changeMeta` - An object which contains meta information about the
+ change. It contains the following properties:
+
+ - `property` the computed property
+ - `propertyName` the name of the property on the object
+ - `index` the index of the added or removed item
+ - `item` the added or removed item: this is exactly the same as
+ the second arg
+ - `arrayChanged` the array that triggered the change. Can be
+ useful when depending on multiple arrays.
+
+ For property changes triggered on an item property change (when
+ depKey is something like `someArray.@each.someProperty`),
+ `changeMeta` will also contain the following property:
+
+ - `previousValues` an object whose keys are the properties that changed on
+ the item, and whose values are the item's previous values.
+
+ `previousValues` is important Ember coalesces item property changes via
+ Ember.run.once. This means that by the time removedItem gets called, item has
+ the new values, but you may need the previous value (eg for sorting &
+ filtering).
+
+ `instanceMeta` - An object that can be used to store meta
+ information needed for calculating your computed. For example a
+ unique computed might use this to store the number of times a given
+ element is found in the dependent array.
+
+ The `removedItem` and `addedItem` functions should return the accumulated
+ value. It is acceptable to not return anything (ie return undefined)
+ to invalidate the computation. This is generally not a good idea for
+ arrayComputed but it's used in eg max and min.
+
+ Example
+
+ ```javascript
+ Ember.computed.max = function (dependentKey) {
+ return Ember.reduceComputed.call(null, dependentKey, {
+ initialValue: -Infinity,
+
+ addedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+ return Math.max(accumulatedValue, item);
+ },
+
+ removedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+ if (item < accumulatedValue) {
+ return accumulatedValue;
+ }
+ }
+ });
+ };
+ ```
+
+ Dependent keys may refer to `@self` to observe changes to the object itself,
+ which must be array-like, rather than a property of the object. This is
+ mostly useful for array proxies, to ensure objects are retrieved via
+ `objectAtContent`. This is how you could sort items by properties defined on an item controller.
+
+ Example
+
+ ```javascript
+ App.PeopleController = Ember.ArrayController.extend({
+ itemController: 'person',
+
+ sortedPeople: Ember.computed.sort('@self.@each.reversedName', function(personA, personB) {
+ // `reversedName` isn't defined on Person, but we have access to it via
+ // the item controller App.PersonController. If we'd used
+ // `content.@each.reversedName` above, we would be getting the objects
+ // directly and not have access to `reversedName`.
+ //
+ var reversedNameA = get(personA, 'reversedName'),
+ reversedNameB = get(personB, 'reversedName');
+
+ return Ember.compare(reversedNameA, reversedNameB);
+ })
+ });
+
+ App.PersonController = Ember.ObjectController.extend({
+ reversedName: function () {
+ return reverse(get(this, 'name'));
+ }.property('name')
+ })
+ ```
+
+ @method reduceComputed
+ @for Ember
+ @param {String} [dependentKeys*]
+ @param {Object} options
+ @return {Ember.ComputedProperty}
+*/
+Ember.reduceComputed = function (options) {
+ var args;
+
+ if (arguments.length > 1) {
+ args = a_slice.call(arguments, 0, -1);
+ options = a_slice.call(arguments, -1)[0];
+ }
+
+ if (typeof options !== "object") {
+ throw new Error("Reduce Computed Property declared without an options hash");
+ }
+
+ if (Ember.isNone(options.initialValue)) {
+ throw new Error("Reduce Computed Property declared without an initial value");
+ }
+
+ var cp = new ReduceComputedProperty(options);
+
+ if (args) {
+ cp.property.apply(cp, args);
+ }
+
+ return cp;
+};
+
+})();
+
+
+
+(function() {
+var ReduceComputedProperty = Ember.ReduceComputedProperty,
+ a_slice = [].slice,
+ o_create = Ember.create,
+ forEach = Ember.EnumerableUtils.forEach;
+
+function ArrayComputedProperty() {
+ var cp = this;
+
+ ReduceComputedProperty.apply(this, arguments);
+
+ this.func = (function(reduceFunc) {
+ return function (propertyName) {
+ if (!cp._hasInstanceMeta(this, propertyName)) {
+ // When we recompute an array computed property, we need already
+ // retrieved arrays to be updated; we can't simply empty the cache and
+ // hope the array is re-retrieved.
+ forEach(cp._dependentKeys, function(dependentKey) {
+ Ember.addObserver(this, dependentKey, function() {
+ cp.recomputeOnce.call(this, propertyName);
+ });
+ }, this);
+ }
+
+ return reduceFunc.apply(this, arguments);
+ };
+ })(this.func);
+
+ return this;
+}
+Ember.ArrayComputedProperty = ArrayComputedProperty;
+ArrayComputedProperty.prototype = o_create(ReduceComputedProperty.prototype);
+ArrayComputedProperty.prototype.initialValue = function () {
+ return Ember.A();
+};
+ArrayComputedProperty.prototype.resetValue = function (array) {
+ array.clear();
+ return array;
+};
+
+/**
+ Creates a computed property which operates on dependent arrays and
+ is updated with "one at a time" semantics. When items are added or
+ removed from the dependent array(s) an array computed only operates
+ on the change instead of re-evaluating the entire array. This should
+ return an array, if you'd like to use "one at a time" semantics and
+ compute some value other then an array look at
+ `Ember.reduceComputed`.
+
+ If there are more than one arguments the first arguments are
+ considered to be dependent property keys. The last argument is
+ required to be an options object. The options object can have the
+ following three properties.
+
+ `initialize` - An optional initialize function. Typically this will be used
+ to set up state on the instanceMeta object.
+
+ `removedItem` - A function that is called each time an element is
+ removed from the array.
+
+ `addedItem` - A function that is called each time an element is
+ added to the array.
+
+
+ The `initialize` function has the following signature:
+
+ ```javascript
+ function (array, changeMeta, instanceMeta)
+ ```
+
+ `array` - The initial value of the arrayComputed, an empty array.
+
+ `changeMeta` - An object which contains meta information about the
+ computed. It contains the following properties:
+
+ - `property` the computed property
+ - `propertyName` the name of the property on the object
+
+ `instanceMeta` - An object that can be used to store meta
+ information needed for calculating your computed. For example a
+ unique computed might use this to store the number of times a given
+ element is found in the dependent array.
+
+
+ The `removedItem` and `addedItem` functions both have the following signature:
+
+ ```javascript
+ function (accumulatedValue, item, changeMeta, instanceMeta)
+ ```
+
+ `accumulatedValue` - The value returned from the last time
+ `removedItem` or `addedItem` was called or an empty array.
+
+ `item` - the element added or removed from the array
+
+ `changeMeta` - An object which contains meta information about the
+ change. It contains the following properties:
+
+ - `property` the computed property
+ - `propertyName` the name of the property on the object
+ - `index` the index of the added or removed item
+ - `item` the added or removed item: this is exactly the same as
+ the second arg
+ - `arrayChanged` the array that triggered the change. Can be
+ useful when depending on multiple arrays.
+
+ For property changes triggered on an item property change (when
+ depKey is something like `someArray.@each.someProperty`),
+ `changeMeta` will also contain the following property:
+
+ - `previousValues` an object whose keys are the properties that changed on
+ the item, and whose values are the item's previous values.
+
+ `previousValues` is important Ember coalesces item property changes via
+ Ember.run.once. This means that by the time removedItem gets called, item has
+ the new values, but you may need the previous value (eg for sorting &
+ filtering).
+
+ `instanceMeta` - An object that can be used to store meta
+ information needed for calculating your computed. For example a
+ unique computed might use this to store the number of times a given
+ element is found in the dependent array.
+
+ The `removedItem` and `addedItem` functions should return the accumulated
+ value. It is acceptable to not return anything (ie return undefined)
+ to invalidate the computation. This is generally not a good idea for
+ arrayComputed but it's used in eg max and min.
+
+ Example
+
+ ```javascript
+ Ember.computed.map = function(dependentKey, callback) {
+ var options = {
+ addedItem: function(array, item, changeMeta, instanceMeta) {
+ var mapped = callback(item);
+ array.insertAt(changeMeta.index, mapped);
+ return array;
+ },
+ removedItem: function(array, item, changeMeta, instanceMeta) {
+ array.removeAt(changeMeta.index, 1);
+ return array;
+ }
+ };
+
+ return Ember.arrayComputed(dependentKey, options);
+ };
+ ```
+
+ @method arrayComputed
+ @for Ember
+ @param {String} [dependentKeys*]
+ @param {Object} options
+ @return {Ember.ComputedProperty}
+*/
+Ember.arrayComputed = function (options) {
+ var args;
+
+ if (arguments.length > 1) {
+ args = a_slice.call(arguments, 0, -1);
+ options = a_slice.call(arguments, -1)[0];
+ }
+
+ if (typeof options !== "object") {
+ throw new Error("Array Computed Property declared without an options hash");
+ }
+
+ var cp = new ArrayComputedProperty(options);
+
+ if (args) {
+ cp.property.apply(cp, args);
+ }
+
+ return cp;
+};
+
+})();
+
+
+
+(function() {
+/**
+@module ember
+@submodule ember-runtime
+*/
+
+var get = Ember.get,
+ set = Ember.set,
+ guidFor = Ember.guidFor,
+ merge = Ember.merge,
+ a_slice = [].slice,
+ forEach = Ember.EnumerableUtils.forEach,
+ map = Ember.EnumerableUtils.map;
+
+/**
+ A computed property that calculates the maximum value in the
+ dependent array. This will return `-Infinity` when the dependent
+ array is empty.
+
+ Example
+
+ ```javascript
+ App.Person = Ember.Object.extend({
+ childAges: Ember.computed.mapBy('children', 'age'),
+ maxChildAge: Ember.computed.max('childAges')
+ });
+
+ var lordByron = App.Person.create({children: []});
+ lordByron.get('maxChildAge'); // -Infinity
+ lordByron.get('children').pushObject({name: 'Augusta Ada Byron', age: 7});
+ lordByron.get('maxChildAge'); // 7
+ lordByron.get('children').pushObjects([{name: 'Allegra Byron', age: 5}, {name: 'Elizabeth Medora Leigh', age: 8}]);
+ lordByron.get('maxChildAge'); // 8
+ ```
+
+ @method computed.max
+ @for Ember
+ @param {String} dependentKey
+ @return {Ember.ComputedProperty} computes the largest value in the dependentKey's array
+*/
+Ember.computed.max = function (dependentKey) {
+ return Ember.reduceComputed.call(null, dependentKey, {
+ initialValue: -Infinity,
+
+ addedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+ return Math.max(accumulatedValue, item);
+ },
+
+ removedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+ if (item < accumulatedValue) {
+ return accumulatedValue;
+ }
+ }
+ });
+};
+
+/**
+ A computed property that calculates the minimum value in the
+ dependent array. This will return `Infinity` when the dependent
+ array is empty.
+
+ Example
+
+ ```javascript
+ App.Person = Ember.Object.extend({
+ childAges: Ember.computed.mapBy('children', 'age'),
+ minChildAge: Ember.computed.min('childAges')
+ });
+
+ var lordByron = App.Person.create({children: []});
+ lordByron.get('minChildAge'); // Infinity
+ lordByron.get('children').pushObject({name: 'Augusta Ada Byron', age: 7});
+ lordByron.get('minChildAge'); // 7
+ lordByron.get('children').pushObjects([{name: 'Allegra Byron', age: 5}, {name: 'Elizabeth Medora Leigh', age: 8}]);
+ lordByron.get('minChildAge'); // 5
+ ```
+
+ @method computed.min
+ @for Ember
+ @param {String} dependentKey
+ @return {Ember.ComputedProperty} computes the smallest value in the dependentKey's array
+*/
+Ember.computed.min = function (dependentKey) {
+ return Ember.reduceComputed.call(null, dependentKey, {
+ initialValue: Infinity,
+
+ addedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+ return Math.min(accumulatedValue, item);
+ },
+
+ removedItem: function (accumulatedValue, item, changeMeta, instanceMeta) {
+ if (item > accumulatedValue) {
+ return accumulatedValue;
+ }
+ }
+ });
+};
+
+/**
+ Returns an array mapped via the callback
+
+ The callback method you provide should have the following signature:
+
+ ```javascript
+ function(item);
+ ```
+
+ - `item` is the current item in the iteration.
+
+ Example
+
+ ```javascript
+ App.Hampster = Ember.Object.extend({
+ excitingChores: Ember.computed.map('chores', function(chore) {
+ return chore.toUpperCase() + '!';
+ })
+ });
+
+ var hampster = App.Hampster.create({chores: ['cook', 'clean', 'write more unit tests']});
+ hampster.get('excitingChores'); // ['COOK!', 'CLEAN!', 'WRITE MORE UNIT TESTS!']
+ ```
+
+ @method computed.map
+ @for Ember
+ @param {String} dependentKey
+ @param {Function} callback
+ @return {Ember.ComputedProperty} an array mapped via the callback
+*/
+Ember.computed.map = function(dependentKey, callback) {
+ var options = {
+ addedItem: function(array, item, changeMeta, instanceMeta) {
+ var mapped = callback.call(this, item);
+ array.insertAt(changeMeta.index, mapped);
+ return array;
+ },
+ removedItem: function(array, item, changeMeta, instanceMeta) {
+ array.removeAt(changeMeta.index, 1);
+ return array;
+ }
+ };
+
+ return Ember.arrayComputed(dependentKey, options);
+};
+
+/**
+ Returns an array mapped to the specified key.
+
+ Example
+
+ ```javascript
+ App.Person = Ember.Object.extend({
+ childAges: Ember.computed.mapBy('children', 'age')
+ });
+
+ var lordByron = App.Person.create({children: []});
+ lordByron.get('childAges'); // []
+ lordByron.get('children').pushObject({name: 'Augusta Ada Byron', age: 7});
+ lordByron.get('childAges'); // [7]
+ lordByron.get('children').pushObjects([{name: 'Allegra Byron', age: 5}, {name: 'Elizabeth Medora Leigh', age: 8}]);
+ lordByron.get('childAges'); // [7, 5, 8]
+ ```
+
+ @method computed.mapBy
+ @for Ember
+ @param {String} dependentKey
+ @param {String} propertyKey
+ @return {Ember.ComputedProperty} an array mapped to the specified key
+*/
+Ember.computed.mapBy = function(dependentKey, propertyKey) {
+ var callback = function(item) { return get(item, propertyKey); };
+ return Ember.computed.map(dependentKey + '.@each.' + propertyKey, callback);
+};
+
+/**
+ @method computed.mapProperty
+ @for Ember
+ @deprecated Use `Ember.computed.mapBy` instead
+ @param dependentKey
+ @param propertyKey
+*/
+Ember.computed.mapProperty = Ember.computed.mapBy;
+
+/**
+ Filters the array by the callback.
+
+ The callback method you provide should have the following signature:
+
+ ```javascript
+ function(item);
+ ```
+
+ - `item` is the current item in the iteration.
+
+ Example
+
+ ```javascript
+ App.Hampster = Ember.Object.extend({
+ remainingChores: Ember.computed.filter('chores', function(chore) {
+ return !chore.done;
+ })
+ });
+
+ var hampster = App.Hampster.create({chores: [
+ {name: 'cook', done: true},
+ {name: 'clean', done: true},
+ {name: 'write more unit tests', done: false}
+ ]});
+ hampster.get('remainingChores'); // [{name: 'write more unit tests', done: false}]
+ ```
+
+ @method computed.filter
+ @for Ember
+ @param {String} dependentKey
+ @param {Function} callback
+ @return {Ember.ComputedProperty} the filtered array
+*/
+Ember.computed.filter = function(dependentKey, callback) {
+ var options = {
+ initialize: function (array, changeMeta, instanceMeta) {
+ instanceMeta.filteredArrayIndexes = new Ember.SubArray();
+ },
+
+ addedItem: function(array, item, changeMeta, instanceMeta) {
+ var match = !!callback.call(this, item),
+ filterIndex = instanceMeta.filteredArrayIndexes.addItem(changeMeta.index, match);
+
+ if (match) {
+ array.insertAt(filterIndex, item);
+ }
+
+ return array;
+ },
+
+ removedItem: function(array, item, changeMeta, instanceMeta) {
+ var filterIndex = instanceMeta.filteredArrayIndexes.removeItem(changeMeta.index);
+
+ if (filterIndex > -1) {
+ array.removeAt(filterIndex);
+ }
+
+ return array;
+ }
+ };
+
+ return Ember.arrayComputed(dependentKey, options);
+};
+
+/**
+ Filters the array by the property and value
+
+ Example
+
+ ```javascript
+ App.Hampster = Ember.Object.extend({
+ remainingChores: Ember.computed.filterBy('chores', 'done', false)
+ });
+
+ var hampster = App.Hampster.create({chores: [
+ {name: 'cook', done: true},
+ {name: 'clean', done: true},
+ {name: 'write more unit tests', done: false}
+ ]});
+ hampster.get('remainingChores'); // [{name: 'write more unit tests', done: false}]
+ ```
+
+ @method computed.filterBy
+ @for Ember
+ @param {String} dependentKey
+ @param {String} propertyKey
+ @param {String} value
+ @return {Ember.ComputedProperty} the filtered array
+*/
+Ember.computed.filterBy = function(dependentKey, propertyKey, value) {
+ var callback;
+
+ if (arguments.length === 2) {
+ callback = function(item) {
+ return get(item, propertyKey);
+ };
+ } else {
+ callback = function(item) {
+ return get(item, propertyKey) === value;
+ };
+ }
+
+ return Ember.computed.filter(dependentKey + '.@each.' + propertyKey, callback);
+};
+
+/**
+ @method computed.filterProperty
+ @for Ember
+ @param dependentKey
+ @param propertyKey
+ @param value
+ @deprecated Use `Ember.computed.filterBy` instead
+*/
+Ember.computed.filterProperty = Ember.computed.filterBy;
+
+/**
+ A computed property which returns a new array with all the unique
+ elements from one or more dependent arrays.
+
+ Example
+
+ ```javascript
+ App.Hampster = Ember.Object.extend({
+ uniqueFruits: Ember.computed.uniq('fruits')
+ });
+
+ var hampster = App.Hampster.create({fruits: [
+ 'banana',
+ 'grape',
+ 'kale',
+ 'banana'
+ ]});
+ hampster.get('uniqueFruits'); // ['banana', 'grape', 'kale']
+ ```
+
+ @method computed.uniq
+ @for Ember
+ @param {String} propertyKey*
+ @return {Ember.ComputedProperty} computes a new array with all the
+ unique elements from the dependent array
+*/
+Ember.computed.uniq = function() {
+ var args = a_slice.call(arguments);
+ args.push({
+ initialize: function(array, changeMeta, instanceMeta) {
+ instanceMeta.itemCounts = {};
+ },
+
+ addedItem: function(array, item, changeMeta, instanceMeta) {
+ var guid = guidFor(item);
+
+ if (!instanceMeta.itemCounts[guid]) {
+ instanceMeta.itemCounts[guid] = 1;
+ } else {
+ ++instanceMeta.itemCounts[guid];
+ }
+ array.addObject(item);
+ return array;
+ },
+ removedItem: function(array, item, _, instanceMeta) {
+ var guid = guidFor(item),
+ itemCounts = instanceMeta.itemCounts;
+
+ if (--itemCounts[guid] === 0) {
+ array.removeObject(item);
+ }
+ return array;
+ }
+ });
+ return Ember.arrayComputed.apply(null, args);
+};
+
+/**
+ Alias for [Ember.computed.uniq](/api/#method_computed_uniq).
+
+ @method computed.union
+ @for Ember
+ @param {String} propertyKey*
+ @return {Ember.ComputedProperty} computes a new array with all the
+ unique elements from the dependent array
+*/
+Ember.computed.union = Ember.computed.uniq;
+
+/**
+ A computed property which returns a new array with all the duplicated
+ elements from two or more dependeny arrays.
+
+ Example
+
+ ```javascript
+ var obj = Ember.Object.createWithMixins({
+ adaFriends: ['Charles Babbage', 'John Hobhouse', 'William King', 'Mary Somerville'],
+ charlesFriends: ['William King', 'Mary Somerville', 'Ada Lovelace', 'George Peacock'],
+ friendsInCommon: Ember.computed.intersect('adaFriends', 'charlesFriends')
+ });
+
+ obj.get('friendsInCommon'); // ['William King', 'Mary Somerville']
+ ```
+
+ @method computed.intersect
+ @for Ember
+ @param {String} propertyKey*
+ @return {Ember.ComputedProperty} computes a new array with all the
+ duplicated elements from the dependent arrays
+*/
+Ember.computed.intersect = function () {
+ var getDependentKeyGuids = function (changeMeta) {
+ return map(changeMeta.property._dependentKeys, function (dependentKey) {
+ return guidFor(dependentKey);
+ });
+ };
+
+ var args = a_slice.call(arguments);
+ args.push({
+ initialize: function (array, changeMeta, instanceMeta) {
+ instanceMeta.itemCounts = {};
+ },
+
+ addedItem: function(array, item, changeMeta, instanceMeta) {
+ var itemGuid = guidFor(item),
+ dependentGuids = getDependentKeyGuids(changeMeta),
+ dependentGuid = guidFor(changeMeta.arrayChanged),
+ numberOfDependentArrays = changeMeta.property._dependentKeys.length,
+ itemCounts = instanceMeta.itemCounts;
+
+ if (!itemCounts[itemGuid]) { itemCounts[itemGuid] = {}; }
+ if (itemCounts[itemGuid][dependentGuid] === undefined) { itemCounts[itemGuid][dependentGuid] = 0; }
+
+ if (++itemCounts[itemGuid][dependentGuid] === 1 &&
+ numberOfDependentArrays === Ember.keys(itemCounts[itemGuid]).length) {
+
+ array.addObject(item);
+ }
+ return array;
+ },
+ removedItem: function(array, item, changeMeta, instanceMeta) {
+ var itemGuid = guidFor(item),
+ dependentGuids = getDependentKeyGuids(changeMeta),
+ dependentGuid = guidFor(changeMeta.arrayChanged),
+ numberOfDependentArrays = changeMeta.property._dependentKeys.length,
+ numberOfArraysItemAppearsIn,
+ itemCounts = instanceMeta.itemCounts;
+
+ if (itemCounts[itemGuid][dependentGuid] === undefined) { itemCounts[itemGuid][dependentGuid] = 0; }
+ if (--itemCounts[itemGuid][dependentGuid] === 0) {
+ delete itemCounts[itemGuid][dependentGuid];
+ numberOfArraysItemAppearsIn = Ember.keys(itemCounts[itemGuid]).length;
+
+ if (numberOfArraysItemAppearsIn === 0) {
+ delete itemCounts[itemGuid];
+ }
+ array.removeObject(item);
+ }
+ return array;
+ }
+ });
+ return Ember.arrayComputed.apply(null, args);
+};
+
+/**
+ A computed property which returns a new array with all the
+ properties from the first dependent array that are not in the second
+ dependent array.
+
+ Example
+
+ ```javascript
+ App.Hampster = Ember.Object.extend({
+ likes: ['banana', 'grape', 'kale'],
+ wants: Ember.computed.setDiff('likes', 'fruits')
+ });
+
+ var hampster = App.Hampster.create({fruits: [
+ 'grape',
+ 'kale',
+ ]});
+ hampster.get('wants'); // ['banana']
+ ```
+
+ @method computed.setDiff
+ @for Ember
+ @param {String} setAProperty
+ @param {String} setBProperty
+ @return {Ember.ComputedProperty} computes a new array with all the
+ items from the first dependent array that are not in the second
+ dependent array
+*/
+Ember.computed.setDiff = function (setAProperty, setBProperty) {
+ if (arguments.length !== 2) {
+ throw new Error("setDiff requires exactly two dependent arrays.");
+ }
+ return Ember.arrayComputed.call(null, setAProperty, setBProperty, {
+ addedItem: function (array, item, changeMeta, instanceMeta) {
+ var setA = get(this, setAProperty),
+ setB = get(this, setBProperty);
+
+ if (changeMeta.arrayChanged === setA) {
+ if (!setB.contains(item)) {
+ array.addObject(item);
+ }
+ } else {
+ array.removeObject(item);
+ }
+ return array;
+ },
+
+ removedItem: function (array, item, changeMeta, instanceMeta) {
+ var setA = get(this, setAProperty),
+ setB = get(this, setBProperty);
+
+ if (changeMeta.arrayChanged === setB) {
+ if (setA.contains(item)) {
+ array.addObject(item);
+ }
+ } else {
+ array.removeObject(item);
+ }
+ return array;
+ }
+ });
+};
+
+function binarySearch(array, item, low, high) {
+ var mid, midItem, res, guidMid, guidItem;
+
+ if (arguments.length < 4) { high = get(array, 'length'); }
+ if (arguments.length < 3) { low = 0; }
+
+ if (low === high) {
+ return low;
+ }
+
+ mid = low + Math.floor((high - low) / 2);
+ midItem = array.objectAt(mid);
+
+ guidMid = _guidFor(midItem);
+ guidItem = _guidFor(item);
+
+ if (guidMid === guidItem) {
+ return mid;
+ }
+
+ res = this.order(midItem, item);
+ if (res === 0) {
+ res = guidMid < guidItem ? -1 : 1;
+ }
+
+
+ if (res < 0) {
+ return this.binarySearch(array, item, mid+1, high);
+ } else if (res > 0) {
+ return this.binarySearch(array, item, low, mid);
+ }
+
+ return mid;
+
+ function _guidFor(item) {
+ if (Ember.ObjectProxy.detectInstance(item)) {
+ return guidFor(get(item, 'content'));
+ }
+ return guidFor(item);
+ }
+}
+
+/**
+ A computed property which returns a new array with all the
+ properties from the first dependent array sorted based on a property
+ or sort function.
+
+ The callback method you provide should have the following signature:
+
+ ```javascript
+ function(itemA, itemB);
+ ```
+
+ - `itemA` the first item to compare.
+ - `itemB` the second item to compare.
+
+ This function should return `-1` when `itemA` should come before
+ `itemB`. It should return `1` when `itemA` should come after
+ `itemB`. If the `itemA` and `itemB` are equal this function should return `0`.
+
+ Example
+
+ ```javascript
+ var ToDoList = Ember.Object.extend({
+ todosSorting: ['name'],
+ sortedTodos: Ember.computed.sort('todos', 'todosSorting'),
+ priorityTodos: Ember.computed.sort('todos', function(a, b){
+ if (a.priority > b.priority) {
+ return 1;
+ } else if (a.priority < b.priority) {
+ return -1;
+ }
+ return 0;
+ }),
+ });
+ var todoList = ToDoList.create({todos: [
+ {name: 'Unit Test', priority: 2},
+ {name: 'Documentation', priority: 3},
+ {name: 'Release', priority: 1}
+ ]});
+
+ todoList.get('sortedTodos'); // [{name:'Documentation', priority:3}, {name:'Release', priority:1}, {name:'Unit Test', priority:2}]
+ todoList.get('priroityTodos'); // [{name:'Release', priority:1}, {name:'Unit Test', priority:2}, {name:'Documentation', priority:3}]
+ ```
+
+ @method computed.sort
+ @for Ember
+ @param {String} dependentKey
+ @param {String or Function} sortDefinition a dependent key to an
+ array of sort properties or a function to use when sorting
+ @return {Ember.ComputedProperty} computes a new sorted array based
+ on the sort property array or callback function
+*/
+Ember.computed.sort = function (itemsKey, sortDefinition) {
+ Ember.assert("Ember.computed.sort requires two arguments: an array key to sort and either a sort properties key or sort function", arguments.length === 2);
+
+ var initFn, sortPropertiesKey;
+
+ if (typeof sortDefinition === 'function') {
+ initFn = function (array, changeMeta, instanceMeta) {
+ instanceMeta.order = sortDefinition;
+ instanceMeta.binarySearch = binarySearch;
+ };
+ } else {
+ sortPropertiesKey = sortDefinition;
+ initFn = function (array, changeMeta, instanceMeta) {
+ function setupSortProperties() {
+ var sortPropertyDefinitions = get(this, sortPropertiesKey),
+ sortProperty,
+ sortProperties = instanceMeta.sortProperties = [],
+ sortPropertyAscending = instanceMeta.sortPropertyAscending = {},
+ idx,
+ asc;
+
+ Ember.assert("Cannot sort: '" + sortPropertiesKey + "' is not an array.", Ember.isArray(sortPropertyDefinitions));
+
+ changeMeta.property.clearItemPropertyKeys(itemsKey);
+
+ forEach(sortPropertyDefinitions, function (sortPropertyDefinition) {
+ if ((idx = sortPropertyDefinition.indexOf(':')) !== -1) {
+ sortProperty = sortPropertyDefinition.substring(0, idx);
+ asc = sortPropertyDefinition.substring(idx+1).toLowerCase() !== 'desc';
+ } else {
+ sortProperty = sortPropertyDefinition;
+ asc = true;
+ }
+
+ sortProperties.push(sortProperty);
+ sortPropertyAscending[sortProperty] = asc;
+ changeMeta.property.itemPropertyKey(itemsKey, sortProperty);
+ });
+
+ sortPropertyDefinitions.addObserver('@each', this, updateSortPropertiesOnce);
+ }
+
+ function updateSortPropertiesOnce() {
+ Ember.run.once(this, updateSortProperties, changeMeta.propertyName);
+ }
+
+ function updateSortProperties(propertyName) {
+ setupSortProperties.call(this);
+ changeMeta.property.recomputeOnce.call(this, propertyName);
+ }
+
+ Ember.addObserver(this, sortPropertiesKey, updateSortPropertiesOnce);
+
+ setupSortProperties.call(this);
+
+
+ instanceMeta.order = function (itemA, itemB) {
+ var sortProperty, result, asc;
+ for (var i = 0; i < this.sortProperties.length; ++i) {
+ sortProperty = this.sortProperties[i];
+ result = Ember.compare(get(itemA, sortProperty), get(itemB, sortProperty));
+
+ if (result !== 0) {
+ asc = this.sortPropertyAscending[sortProperty];
+ return asc ? result : (-1 * result);
+ }
+ }
+
+ return 0;
+ };
+
+ instanceMeta.binarySearch = binarySearch;
+ };
+ }
+
+ return Ember.arrayComputed.call(null, itemsKey, {
+ initialize: initFn,
+
+ addedItem: function (array, item, changeMeta, instanceMeta) {
+ var index = instanceMeta.binarySearch(array, item);
+ array.insertAt(index, item);
+ return array;
+ },
+
+ removedItem: function (array, item, changeMeta, instanceMeta) {
+ var proxyProperties, index, searchItem;
+
+ if (changeMeta.previousValues) {
+ proxyProperties = merge({ content: item }, changeMeta.previousValues);
+
+ searchItem = Ember.ObjectProxy.create(proxyProperties);
+ } else {
+ searchItem = item;
+ }
+
+ index = instanceMeta.binarySearch(array, searchItem);
+ array.removeAt(index);
+ return array;
+ }
+ });
+};
+
+})();
+
+
+
+(function() {
+/**
+ Expose RSVP implementation
+
+ Documentation can be found here: https://github.com/tildeio/rsvp.js/blob/master/README.md
+
+ @class RSVP
+ @namespace Ember
+ @constructor
+*/
+Ember.RSVP = requireModule('rsvp');
+
+})();
+
+
+
+(function() {
+/**
+@module ember
+@submodule ember-runtime
+*/
+
+var STRING_DASHERIZE_REGEXP = (/[ _]/g);
+var STRING_DASHERIZE_CACHE = {};
+var STRING_DECAMELIZE_REGEXP = (/([a-z])([A-Z])/g);
+var STRING_CAMELIZE_REGEXP = (/(\-|_|\.|\s)+(.)?/g);
+var STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
+var STRING_UNDERSCORE_REGEXP_2 = (/\-|\s+/g);
+
+/**
+ Defines the hash of localized strings for the current language. Used by
+ the `Ember.String.loc()` helper. To localize, add string values to this
+ hash.
+
+ @property STRINGS
+ @for Ember
+ @type Hash
+*/
+Ember.STRINGS = {};
+
+/**
+ Defines string helper methods including string formatting and localization.
+ Unless `Ember.EXTEND_PROTOTYPES.String` is `false` these methods will also be
+ added to the `String.prototype` as well.
+
+ @class String
+ @namespace Ember
+ @static
+*/
+Ember.String = {
+
+ /**
+ Apply formatting options to the string. This will look for occurrences
+ of "%@" in your string and substitute them with the arguments you pass into
+ this method. If you want to control the specific order of replacement,
+ you can add a number after the key as well to indicate which argument
+ you want to insert.
+
+ Ordered insertions are most useful when building loc strings where values
+ you need to insert may appear in different orders.
+
+ ```javascript
+ "Hello %@ %@".fmt('John', 'Doe'); // "Hello John Doe"
+ "Hello %@2, %@1".fmt('John', 'Doe'); // "Hello Doe, John"
+ ```
+
+ @method fmt
+ @param {String} str The string to format
+ @param {Array} formats An array of parameters to interpolate into string.
+ @return {String} formatted string
+ */
+ fmt: function(str, formats) {
+ // first, replace any ORDERED replacements.
+ var idx = 0; // the current index for non-numerical replacements
+ return str.replace(/%@([0-9]+)?/g, function(s, argIndex) {
+ argIndex = (argIndex) ? parseInt(argIndex, 10) - 1 : idx++;
+ s = formats[argIndex];
+ return (s === null) ? '(null)' : (s === undefined) ? '' : Ember.inspect(s);
+ }) ;
+ },
+
+ /**
+ Formats the passed string, but first looks up the string in the localized
+ strings hash. This is a convenient way to localize text. See
+ `Ember.String.fmt()` for more information on formatting.
+
+ Note that it is traditional but not required to prefix localized string
+ keys with an underscore or other character so you can easily identify
+ localized strings.
+
+ ```javascript
+ Ember.STRINGS = {
+ '_Hello World': 'Bonjour le monde',
+ '_Hello %@ %@': 'Bonjour %@ %@'
+ };
+
+ Ember.String.loc("_Hello World"); // 'Bonjour le monde';
+ Ember.String.loc("_Hello %@ %@", ["John", "Smith"]); // "Bonjour John Smith";
+ ```
+
+ @method loc
+ @param {String} str The string to format
+ @param {Array} formats Optional array of parameters to interpolate into string.
+ @return {String} formatted string
+ */
+ loc: function(str, formats) {
+ str = Ember.STRINGS[str] || str;
+ return Ember.String.fmt(str, formats) ;
+ },
+
+ /**
+ Splits a string into separate units separated by spaces, eliminating any
+ empty strings in the process. This is a convenience method for split that
+ is mostly useful when applied to the `String.prototype`.
+
+ ```javascript
+ Ember.String.w("alpha beta gamma").forEach(function(key) {
+ console.log(key);
+ });
+
+ // > alpha
+ // > beta
+ // > gamma
+ ```
+
+ @method w
+ @param {String} str The string to split
+ @return {String} split string
+ */
+ w: function(str) { return str.split(/\s+/); },
+
+ /**
+ Converts a camelized string into all lower case separated by underscores.
+
+ ```javascript
+ 'innerHTML'.decamelize(); // 'inner_html'
+ 'action_name'.decamelize(); // 'action_name'
+ 'css-class-name'.decamelize(); // 'css-class-name'
+ 'my favorite items'.decamelize(); // 'my favorite items'
+ ```
+
+ @method decamelize
+ @param {String} str The string to decamelize.
+ @return {String} the decamelized string.
+ */
+ decamelize: function(str) {
+ return str.replace(STRING_DECAMELIZE_REGEXP, '$1_$2').toLowerCase();
+ },
+
+ /**
+ Replaces underscores, spaces, or camelCase with dashes.
+
+ ```javascript
+ 'innerHTML'.dasherize(); // 'inner-html'
+ 'action_name'.dasherize(); // 'action-name'
+ 'css-class-name'.dasherize(); // 'css-class-name'
+ 'my favorite items'.dasherize(); // 'my-favorite-items'
+ ```
+
+ @method dasherize
+ @param {String} str The string to dasherize.
+ @return {String} the dasherized string.
+ */
+ dasherize: function(str) {
+ var cache = STRING_DASHERIZE_CACHE,
+ hit = cache.hasOwnProperty(str),
+ ret;
+
+ if (hit) {
+ return cache[str];
+ } else {
+ ret = Ember.String.decamelize(str).replace(STRING_DASHERIZE_REGEXP,'-');
+ cache[str] = ret;
+ }
+
+ return ret;
+ },
+
+ /**
+ Returns the lowerCamelCase form of a string.
+
+ ```javascript
+ 'innerHTML'.camelize(); // 'innerHTML'
+ 'action_name'.camelize(); // 'actionName'
+ 'css-class-name'.camelize(); // 'cssClassName'
+ 'my favorite items'.camelize(); // 'myFavoriteItems'
+ 'My Favorite Items'.camelize(); // 'myFavoriteItems'
+ ```
+
+ @method camelize
+ @param {String} str The string to camelize.
+ @return {String} the camelized string.
+ */
+ camelize: function(str) {
+ return str.replace(STRING_CAMELIZE_REGEXP, function(match, separator, chr) {
+ return chr ? chr.toUpperCase() : '';
+ }).replace(/^([A-Z])/, function(match, separator, chr) {
+ return match.toLowerCase();
+ });
+ },
+
+ /**
+ Returns the UpperCamelCase form of a string.
+
+ ```javascript
+ 'innerHTML'.classify(); // 'InnerHTML'
+ 'action_name'.classify(); // 'ActionName'
+ 'css-class-name'.classify(); // 'CssClassName'
+ 'my favorite items'.classify(); // 'MyFavoriteItems'
+ ```
+
+ @method classify
+ @param {String} str the string to classify
+ @return {String} the classified string
+ */
+ classify: function(str) {
+ var parts = str.split("."),
+ out = [];
+
+ for (var i=0, l=parts.length; i true
+ controller.get('isSettled') //=> false
+ controller.get('isRejected') //=> false
+ controller.get('isFulfilled') //=> false
+ ```
+
+ When the the $.getJSON completes, and the promise is fulfilled
+ with json, the life cycle attributes will update accordingly.
+
+ ```javascript
+ controller.get('isPending') //=> false
+ controller.get('isSettled') //=> true
+ controller.get('isRejected') //=> false
+ controller.get('isFulfilled') //=> true
+ ```
+
+ As the controller is an ObjectController, and the json now its content,
+ all the json properties will be available directly from the controller.
+
+ ```javascript
+ // Assuming the following json:
+ {
+ firstName: 'Stefan',
+ lastName: 'Penner'
+ }
+
+ // both properties will accessible on the controller
+ controller.get('firstName') //=> 'Stefan'
+ controller.get('lastName') //=> 'Penner'
+ ```
+
+ If the controller is backing a template, the attributes are
+ bindable from within that template
+
+ ```handlebars
+ {{#if isPending}}
+ loading...
+ {{else}}
+ firstName: {{firstName}}
+ lastName: {{lastName}}
+ {{/if}}
+ ```
+ @class Ember.PromiseProxyMixin
+*/
+Ember.PromiseProxyMixin = Ember.Mixin.create({
+ reason: null,
+ isPending: not('isSettled').readOnly(),
+ isSettled: or('isRejected', 'isFulfilled').readOnly(),
+ isRejected: false,
+ isFulfilled: false,
+
+ promise: Ember.computed(function(key, promise) {
+ if (arguments.length === 2) {
+ promise = resolve(promise);
+ installPromise(this, promise);
+ return promise;
+ } else {
+ throw new Error("PromiseProxy's promise must be set");
+ }
+ }),
+
+ then: function(fulfill, reject) {
+ return get(this, 'promise').then(fulfill, reject);
+ }
+});
+
+
+})();
+
+
+
+(function() {
+
+})();
+
+
+
+(function() {
+var get = Ember.get,
+ forEach = Ember.EnumerableUtils.forEach,
+ RETAIN = 'r',
+ INSERT = 'i',
+ DELETE = 'd';
+
+/**
+ An `Ember.TrackedArray` tracks array operations. It's useful when you want to
+ lazily compute the indexes of items in an array after they've been shifted by
+ subsequent operations.
+
+ @class TrackedArray
+ @namespace Ember
+ @param {array} [items=[]] The array to be tracked. This is used just to get
+ the initial items for the starting state of retain:n.
+*/
+Ember.TrackedArray = function (items) {
+ if (arguments.length < 1) { items = []; }
+
+ var length = get(items, 'length');
+
+ if (length) {
+ this._content = [new ArrayOperation(RETAIN, length, items)];
+ } else {
+ this._content = [];
+ }
+};
+
+Ember.TrackedArray.RETAIN = RETAIN;
+Ember.TrackedArray.INSERT = INSERT;
+Ember.TrackedArray.DELETE = DELETE;
+
+Ember.TrackedArray.prototype = {
+
+ /**
+ Track that `newItems` were added to the tracked array at `index`.
+
+ @method addItems
+ @param index
+ @param newItems
+ */
+ addItems: function (index, newItems) {
+ var count = get(newItems, 'length'),
+ match = this._findArrayOperation(index),
+ arrayOperation = match.operation,
+ arrayOperationIndex = match.index,
+ arrayOperationRangeStart = match.rangeStart,
+ composeIndex,
+ splitIndex,
+ splitItems,
+ splitArrayOperation,
+ newArrayOperation;
+
+ newArrayOperation = new ArrayOperation(INSERT, count, newItems);
+
+ if (arrayOperation) {
+ if (!match.split) {
+ // insert left of arrayOperation
+ this._content.splice(arrayOperationIndex, 0, newArrayOperation);
+ composeIndex = arrayOperationIndex;
+ } else {
+ this._split(arrayOperationIndex, index - arrayOperationRangeStart, newArrayOperation);
+ composeIndex = arrayOperationIndex + 1;
+ }
+ } else {
+ // insert at end
+ this._content.push(newArrayOperation);
+ composeIndex = arrayOperationIndex;
+ }
+
+ this._composeInsert(composeIndex);
+ },
+
+ /**
+ Track that `count` items were removed at `index`.
+
+ @method removeItems
+ @param index
+ @param count
+ */
+ removeItems: function (index, count) {
+ var match = this._findArrayOperation(index),
+ arrayOperation = match.operation,
+ arrayOperationIndex = match.index,
+ arrayOperationRangeStart = match.rangeStart,
+ newArrayOperation,
+ composeIndex;
+
+ newArrayOperation = new ArrayOperation(DELETE, count);
+ if (!match.split) {
+ // insert left of arrayOperation
+ this._content.splice(arrayOperationIndex, 0, newArrayOperation);
+ composeIndex = arrayOperationIndex;
+ } else {
+ this._split(arrayOperationIndex, index - arrayOperationRangeStart, newArrayOperation);
+ composeIndex = arrayOperationIndex + 1;
+ }
+
+ return this._composeDelete(composeIndex);
+ },
+
+ /**
+ Apply all operations, reducing them to retain:n, for `n`, the number of
+ 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}`
+*
+
+ @method apply
+ @param {function} callback
+ */
+ apply: function (callback) {
+ var items = [],
+ offset = 0;
+
+ forEach(this._content, function (arrayOperation) {
+ callback(arrayOperation.items, offset, arrayOperation.operation);
+
+ if (arrayOperation.operation !== DELETE) {
+ offset += arrayOperation.count;
+ items = items.concat(arrayOperation.items);
+ }
+ });
+
+ this._content = [new ArrayOperation(RETAIN, items.length, items)];
+ },
+
+ /**
+ Return an ArrayOperationMatch for the operation that contains the item at `index`.
+
+ @method _findArrayOperation
+
+ @param {number} index the index of the item whose operation information
+ should be returned.
+ @private
+ */
+ _findArrayOperation: function (index) {
+ var arrayOperationIndex,
+ len,
+ split = false,
+ arrayOperation,
+ arrayOperationRangeStart,
+ arrayOperationRangeEnd;
+
+ // OPTIMIZE: we could search these faster if we kept a balanced tree.
+ // find leftmost arrayOperation to the right of `index`
+ for (arrayOperationIndex = arrayOperationRangeStart = 0, len = this._content.length; arrayOperationIndex < len; ++arrayOperationIndex) {
+ arrayOperation = this._content[arrayOperationIndex];
+
+ if (arrayOperation.operation === DELETE) { continue; }
+
+ arrayOperationRangeEnd = arrayOperationRangeStart + arrayOperation.count - 1;
+
+ if (index === arrayOperationRangeStart) {
+ break;
+ } else if (index > arrayOperationRangeStart && index <= arrayOperationRangeEnd) {
+ split = true;
+ break;
+ } else {
+ arrayOperationRangeStart = arrayOperationRangeEnd + 1;
+ }
+ }
+
+ return new ArrayOperationMatch(arrayOperation, arrayOperationIndex, split, arrayOperationRangeStart);
+ },
+
+ _split: function (arrayOperationIndex, splitIndex, newArrayOperation) {
+ var arrayOperation = this._content[arrayOperationIndex],
+ splitItems = arrayOperation.items.slice(splitIndex),
+ splitArrayOperation = new ArrayOperation(arrayOperation.operation, splitItems.length, splitItems);
+
+ // truncate LHS
+ arrayOperation.count = splitIndex;
+ arrayOperation.items = arrayOperation.items.slice(0, splitIndex);
+
+ this._content.splice(arrayOperationIndex + 1, 0, newArrayOperation, splitArrayOperation);
+ },
+
+ // TODO: unify _composeInsert, _composeDelete
+ // see SubArray for a better implementation.
+ _composeInsert: function (index) {
+ var newArrayOperation = this._content[index],
+ leftArrayOperation = this._content[index-1], // may be undefined
+ rightArrayOperation = this._content[index+1], // may be undefined
+ leftOp = leftArrayOperation && leftArrayOperation.operation,
+ rightOp = rightArrayOperation && rightArrayOperation.operation;
+
+ if (leftOp === INSERT) {
+ // merge left
+ leftArrayOperation.count += newArrayOperation.count;
+ leftArrayOperation.items = leftArrayOperation.items.concat(newArrayOperation.items);
+
+ if (rightOp === INSERT) {
+ // also merge right
+ leftArrayOperation.count += rightArrayOperation.count;
+ leftArrayOperation.items = leftArrayOperation.items.concat(rightArrayOperation.items);
+ this._content.splice(index, 2);
+ } else {
+ // only merge left
+ this._content.splice(index, 1);
+ }
+ } else if (rightOp === INSERT) {
+ // merge right
+ newArrayOperation.count += rightArrayOperation.count;
+ newArrayOperation.items = newArrayOperation.items.concat(rightArrayOperation.items);
+ this._content.splice(index + 1, 1);
+ }
+ },
+
+ _composeDelete: function (index) {
+ var arrayOperation = this._content[index],
+ deletesToGo = arrayOperation.count,
+ leftArrayOperation = this._content[index-1], // may be undefined
+ leftOp = leftArrayOperation && leftArrayOperation.operation,
+ nextArrayOperation,
+ nextOp,
+ nextCount,
+ removedItems = [];
+
+ if (leftOp === DELETE) {
+ arrayOperation = leftArrayOperation;
+ index -= 1;
+ }
+
+ for (var i = index + 1; deletesToGo > 0; ++i) {
+ nextArrayOperation = this._content[i];
+ nextOp = nextArrayOperation.operation;
+ nextCount = nextArrayOperation.count;
+
+ if (nextOp === DELETE) {
+ arrayOperation.count += nextCount;
+ continue;
+ }
+
+ if (nextCount > deletesToGo) {
+ removedItems = removedItems.concat(nextArrayOperation.items.splice(0, deletesToGo));
+ nextArrayOperation.count -= deletesToGo;
+
+ // In the case where we truncate the last arrayOperation, we don't need to
+ // remove it; also the deletesToGo reduction is not the entirety of
+ // nextCount
+ i -= 1;
+ nextCount = deletesToGo;
+
+ deletesToGo = 0;
+ } else {
+ removedItems = removedItems.concat(nextArrayOperation.items);
+ deletesToGo -= nextCount;
+ }
+
+ if (nextOp === INSERT) {
+ arrayOperation.count -= nextCount;
+ }
+ }
+
+ if (arrayOperation.count > 0) {
+ this._content.splice(index+1, i-1-index);
+ } else {
+ // The delete operation can go away; it has merely reduced some other
+ // operation, as in D:3 I:4
+ this._content.splice(index, 1);
+ }
+
+ return removedItems;
+ }
+};
+
+function ArrayOperation (operation, count, items) {
+ this.operation = operation; // RETAIN | INSERT | DELETE
+ this.count = count;
+ this.items = items;
+}
+
+/**
+ Internal data structure used to include information when looking up operations
+ by item index.
+
+ @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
+ require a split for a new operation type.
+ @property {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`.
+*/
+function ArrayOperationMatch(operation, index, split, rangeStart) {
+ this.operation = operation;
+ this.index = index;
+ this.split = split;
+ this.rangeStart = rangeStart;
+}
+
+})();
+
+
+
+(function() {
+var get = Ember.get,
+ forEach = Ember.EnumerableUtils.forEach,
+ RETAIN = 'r',
+ FILTER = 'f';
+
+function Operation (type, count) {
+ this.type = type;
+ this.count = count;
+}
+
+/**
+ An `Ember.SubArray` tracks an array in a way similar to, but more specialized
+ than, `Ember.TrackedArray`. It is useful for keeping track of the indexes of
+ items within a filtered array.
+
+ @class SubArray
+ @namespace Ember
+*/
+Ember.SubArray = function (length) {
+ if (arguments.length < 1) { length = 0; }
+
+ if (length > 0) {
+ this._operations = [new Operation(RETAIN, length)];
+ } else {
+ this._operations = [];
+ }
+};
+
+Ember.SubArray.prototype = {
+ /**
+ Track that an item was added to the tracked array.
+
+ @method addItem
+
+ @param {number} index The index of the item in the tracked array.
+ @param {boolean} match `true` iff the item is included in the subarray.
+
+ @return {number} The index of the item in the subarray.
+ */
+ addItem: function(index, match) {
+ var returnValue = -1,
+ itemType = match ? RETAIN : FILTER,
+ self = this;
+
+ this._findOperation(index, function(operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
+ var newOperation, splitOperation;
+
+ if (itemType === operation.type) {
+ ++operation.count;
+ } else if (index === rangeStart) {
+ // insert to the left of `operation`
+ self._operations.splice(operationIndex, 0, new Operation(itemType, 1));
+ } else {
+ newOperation = new Operation(itemType, 1);
+ splitOperation = new Operation(operation.type, rangeEnd - index + 1);
+ operation.count = index - rangeStart;
+
+ self._operations.splice(operationIndex + 1, 0, newOperation, splitOperation);
+ }
+
+ if (match) {
+ if (operation.type === RETAIN) {
+ returnValue = seenInSubArray + (index - rangeStart);
+ } else {
+ returnValue = seenInSubArray;
+ }
+ }
+
+ self._composeAt(operationIndex);
+ }, function(seenInSubArray) {
+ self._operations.push(new Operation(itemType, 1));
+
+ if (match) {
+ returnValue = seenInSubArray;
+ }
+
+ self._composeAt(self._operations.length-1);
+ });
+
+ return returnValue;
+ },
+
+ /**
+ Track that an item was removed from the tracked array.
+
+ @method removeItem
+
+ @param {number} index The index of the item in the tracked array.
+
+ @return {number} The index of the item in the subarray, or `-1` if the item
+ was not in the subarray.
+ */
+ removeItem: function(index) {
+ var returnValue = -1,
+ self = this;
+
+ this._findOperation(index, function (operation, operationIndex, rangeStart, rangeEnd, seenInSubArray) {
+ if (operation.type === RETAIN) {
+ returnValue = seenInSubArray + (index - rangeStart);
+ }
+
+ if (operation.count > 1) {
+ --operation.count;
+ } else {
+ self._operations.splice(operationIndex, 1);
+ self._composeAt(operationIndex);
+ }
+ });
+
+ return returnValue;
+ },
+
+
+ _findOperation: function (index, foundCallback, notFoundCallback) {
+ var operationIndex,
+ len,
+ operation,
+ rangeStart,
+ rangeEnd,
+ seenInSubArray = 0;
+
+ // OPTIMIZE: change to balanced tree
+ // find leftmost operation to the right of `index`
+ for (operationIndex = rangeStart = 0, len = this._operations.length; operationIndex < len; rangeStart = rangeEnd + 1, ++operationIndex) {
+ operation = this._operations[operationIndex];
+ rangeEnd = rangeStart + operation.count - 1;
+
+ if (index >= rangeStart && index <= rangeEnd) {
+ foundCallback(operation, operationIndex, rangeStart, rangeEnd, seenInSubArray);
+ return;
+ } else if (operation.type === RETAIN) {
+ seenInSubArray += operation.count;
+ }
+ }
+
+ notFoundCallback(seenInSubArray);
+ },
+
+ _composeAt: function(index) {
+ var op = this._operations[index],
+ otherOp;
+
+ if (!op) {
+ // Composing out of bounds is a no-op, as when removing the last operation
+ // in the list.
+ return;
+ }
+
+ if (index > 0) {
+ otherOp = this._operations[index-1];
+ if (otherOp.type === op.type) {
+ op.count += otherOp.count;
+ this._operations.splice(index-1, 1);
+ }
+ }
+
+ if (index < this._operations.length-1) {
+ otherOp = this._operations[index+1];
+ if (otherOp.type === op.type) {
+ op.count += otherOp.count;
+ this._operations.splice(index+1, 1);
+ }
+ }
+ }
+};
})();
@@ -11641,6 +15337,8 @@ var set = Ember.set, get = Ember.get,
generateGuid = Ember.generateGuid,
meta = Ember.meta,
rewatch = Ember.rewatch,
+ finishChains = Ember.finishChains,
+ sendEvent = Ember.sendEvent,
destroy = Ember.destroy,
schedule = Ember.run.schedule,
Mixin = Ember.Mixin,
@@ -11671,7 +15369,7 @@ function makeCtor() {
}
o_defineProperty(this, GUID_KEY, undefinedDescriptor);
o_defineProperty(this, '_super', undefinedDescriptor);
- var m = meta(this);
+ var m = meta(this), proto = m.proto;
m.proto = this;
if (initMixins) {
// capture locally so we can clear the closed over variable
@@ -11689,6 +15387,7 @@ function makeCtor() {
for (var i = 0, l = props.length; i < l; i++) {
var properties = props[i];
+ Ember.assert("Ember.Object.create no longer supports mixing in other definitions, use createWithMixins instead.", !(properties instanceof Ember.Mixin));
for (var keyName in properties) {
if (!properties.hasOwnProperty(keyName)) { continue; }
@@ -11708,7 +15407,9 @@ function makeCtor() {
var desc = m.descs[keyName];
-
+ Ember.assert("Ember.Object.create no longer supports defining computed properties.", !(value instanceof Ember.ComputedProperty));
+ Ember.assert("Ember.Object.create no longer supports defining methods that call _super.", !(typeof value === 'function' && value.toString().indexOf('._super') !== -1));
+ Ember.assert("`actions` must be provided at extend time, not at create time, when Ember.ActionHandler is used (i.e. views, controllers & routes).", !((keyName === 'actions') && Ember.ActionHandler.detect(this)));
if (concatenatedProperties && indexOf(concatenatedProperties, keyName) >= 0) {
var baseValue = this[keyName];
@@ -11738,19 +15439,11 @@ function makeCtor() {
}
}
}
-
finishPartial(this, m);
- var hasChains = (typeof m.chains) !== "undefined";
- delete m.proto;
-
- if (hasChains) {
- if (m.chains.value() !== this) {
- m.chains = m.chains.copy(this);
- }
- m.chains.didChange(true);
- }
-
this.init.apply(this, arguments);
+ m.proto = proto;
+ finishChains(this);
+ sendEvent(this, "init");
};
Class.toString = Mixin.prototype.toString;
@@ -11794,8 +15487,6 @@ CoreObject.PrototypeMixin = Mixin.create({
return this;
},
- isInstance: true,
-
/**
An overridable method called when objects are instantiated. By default,
does nothing unless it is overridden during class definition.
@@ -11884,7 +15575,10 @@ CoreObject.PrototypeMixin = Mixin.create({
are also concatenated, in addition to `classNames`.
This feature is available for you to use throughout the Ember object model,
- although typical app developers are likely to use it infrequently.
+ although typical app developers are likely to use it infrequently. Since
+ it changes expectations about behavior of properties, you should properly
+ document its usage in each individual concatenated property (to not
+ mislead your users to think they can override the property in a subclass).
@property concatenatedProperties
@type Array
@@ -11938,6 +15632,8 @@ CoreObject.PrototypeMixin = Mixin.create({
/**
Override to implement teardown.
+
+ @method willDestroy
*/
willDestroy: Ember.K,
@@ -12101,12 +15797,65 @@ var ClassMixin = Mixin.create({
return new C();
},
+ /**
+
+ Augments a constructor's prototype with additional
+ properties and functions:
+
+ ```javascript
+ MyObject = Ember.Object.extend({
+ name: 'an object'
+ });
+
+ o = MyObject.create();
+ o.get('name'); // 'an object'
+
+ MyObject.reopen({
+ say: function(msg){
+ console.log(msg);
+ }
+ })
+
+ o2 = MyObject.create();
+ o2.say("hello"); // logs "hello"
+
+ o.say("goodbye"); // logs "goodbye"
+ ```
+
+ To add functions and properties to the constructor itself,
+ see `reopenClass`
+
+ @method reopen
+ */
reopen: function() {
this.willReopen();
reopen.apply(this.PrototypeMixin, arguments);
return this;
},
+ /**
+ Augments a constructor's own properties and functions:
+
+ ```javascript
+ MyObject = Ember.Object.extend({
+ name: 'an object'
+ });
+
+
+ MyObject.reopenClass({
+ canBuild: false
+ });
+
+ MyObject.canBuild; // false
+ o = MyObject.create();
+ ```
+
+ To add functions and properties to instances of
+ a constructor by extending the constructor's prototype
+ see `reopen`
+
+ @method reopenClass
+ */
reopenClass: function() {
reopen.apply(this.ClassMixin, arguments);
applyMixin(this, arguments, false);
@@ -12156,6 +15905,7 @@ var ClassMixin = Mixin.create({
metaForProperty: function(key) {
var desc = meta(this.proto(), false).descs[key];
+ Ember.assert("metaForProperty() could not find a computed property with key '"+key+"'.", !!desc && desc instanceof Ember.ComputedProperty);
return desc._meta || {};
},
@@ -12357,7 +16107,7 @@ function findNamespaces() {
}
if (isNamespace) {
-
+ Ember.deprecate("Namespaces should not begin with lowercase.", /^[A-Z]/.test(prop));
obj[NAME_KEY] = prop;
}
}
@@ -12384,6 +16134,8 @@ function classToString() {
if (this[NAME_KEY]) {
ret = this[NAME_KEY];
+ } else if (this._toString) {
+ ret = this._toString;
} else {
var str = superClassString(this);
if (str) {
@@ -12573,6 +16325,7 @@ Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray,/** @scope Ember.Array
_contentDidChange: Ember.observer(function() {
var content = get(this, 'content');
+ Ember.assert("Can't set ArrayProxy's content to itself", content !== this);
this._setupContent();
}, 'content'),
@@ -12602,6 +16355,7 @@ Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray,/** @scope Ember.Array
var arrangedContent = get(this, 'arrangedContent'),
len = arrangedContent ? get(arrangedContent, 'length') : 0;
+ Ember.assert("Can't set ArrayProxy's content to itself", arrangedContent !== this);
this._setupArrangedContent();
@@ -12646,7 +16400,7 @@ Ember.ArrayProxy = Ember.Object.extend(Ember.MutableArray,/** @scope Ember.Array
_replace: function(idx, amt, objects) {
var content = get(this, 'content');
-
+ Ember.assert('The content property of '+ this.constructor + ' should be set before modifying it', content);
if (content) this.replaceContent(idx, amt, objects);
return this;
},
@@ -12778,7 +16532,9 @@ var get = Ember.get,
removeBeforeObserver = Ember.removeBeforeObserver,
removeObserver = Ember.removeObserver,
propertyWillChange = Ember.propertyWillChange,
- propertyDidChange = Ember.propertyDidChange;
+ propertyDidChange = Ember.propertyDidChange,
+ meta = Ember.meta,
+ defineProperty = Ember.defineProperty;
function contentPropertyWillChange(content, contentKey) {
var key = contentKey.slice(8); // remove "content."
@@ -12869,7 +16625,7 @@ Ember.ObjectProxy = Ember.Object.extend(/** @scope Ember.ObjectProxy.prototype *
*/
content: null,
_contentDidChange: Ember.observer(function() {
-
+ Ember.assert("Can't set ObjectProxy's content to itself", this.get('content') !== this);
}, 'content'),
isTruthy: Ember.computed.bool('content'),
@@ -12896,29 +16652,19 @@ Ember.ObjectProxy = Ember.Object.extend(/** @scope Ember.ObjectProxy.prototype *
},
setUnknownProperty: function (key, value) {
- var content = get(this, 'content');
+ var m = meta(this);
+ if (m.proto === this) {
+ // if marked as prototype then just defineProperty
+ // rather than delegate
+ defineProperty(this, key, null, value);
+ return value;
+ }
+ var content = get(this, 'content');
+ Ember.assert(fmt("Cannot delegate set('%@', %@) to the 'content' property of object proxy %@: its 'content' is undefined.", [key, value, this]), content);
return set(content, key, value);
}
-});
-Ember.ObjectProxy.reopenClass({
- create: function () {
- var mixin, prototype, i, l, properties, keyName;
- if (arguments.length) {
- prototype = this.proto();
- for (i = 0, l = arguments.length; i < l; i++) {
- properties = arguments[i];
- for (keyName in properties) {
- if (!properties.hasOwnProperty(keyName) || keyName in prototype) { continue; }
- if (!mixin) mixin = {};
- mixin[keyName] = null;
- }
- }
- if (mixin) this._initMixins([mixin]);
- }
- return this._super.apply(this, arguments);
- }
});
})();
@@ -12933,7 +16679,8 @@ Ember.ObjectProxy.reopenClass({
var set = Ember.set, get = Ember.get, guidFor = Ember.guidFor;
-var forEach = Ember.EnumerableUtils.forEach;
+var forEach = Ember.EnumerableUtils.forEach,
+ indexOf = Ember.ArrayPolyfills.indexOf;
var EachArray = Ember.Object.extend(Ember.Array, {
@@ -12965,7 +16712,7 @@ function addObserverForContentKey(content, keyName, proxy, idx, loc) {
while(--loc>=idx) {
var item = content.objectAt(loc);
if (item) {
-
+ Ember.assert('When using @each to observe the array ' + content + ', the array must return an object', Ember.typeOf(item) === 'instance' || Ember.typeOf(item) === 'object');
Ember.addBeforeObserver(item, keyName, proxy, 'contentKeyWillChange');
Ember.addObserver(item, keyName, proxy, 'contentKeyDidChange');
@@ -12991,7 +16738,7 @@ function removeObserverForContentKey(content, keyName, proxy, idx, loc) {
guid = guidFor(item);
indicies = objects[guid];
- indicies[indicies.indexOf(loc)] = null;
+ indicies[indexOf.call(indicies, loc)] = null;
}
}
}
@@ -13140,7 +16887,7 @@ Ember.EachProxy = Ember.Object.extend({
*/
-var get = Ember.get, set = Ember.set;
+var get = Ember.get, set = Ember.set, replace = Ember.EnumerableUtils._replace;
// Add Ember.Array to Array.prototype. Remove methods with native
// implementations and supply some more optimized versions of generic methods
@@ -13162,7 +16909,7 @@ var NativeArray = Ember.Mixin.create(Ember.MutableArray, Ember.Observable, Ember
// primitive for array support.
replace: function(idx, amt, objects) {
- if (this.isFrozen) throw Ember.FROZEN_ERROR ;
+ if (this.isFrozen) throw Ember.FROZEN_ERROR;
// if we replaced exactly the same number of items, then pass only the
// replaced range. Otherwise, pass the full remaining array length
@@ -13171,14 +16918,13 @@ var NativeArray = Ember.Mixin.create(Ember.MutableArray, Ember.Observable, Ember
this.arrayContentWillChange(idx, amt, len);
if (!objects || objects.length === 0) {
- this.splice(idx, amt) ;
+ this.splice(idx, amt);
} else {
- var args = [idx, amt].concat(objects) ;
- this.splice.apply(this,args) ;
+ replace(this, idx, amt, objects);
}
this.arrayContentDidChange(idx, amt, len);
- return this ;
+ return this;
},
// If you ask for an unknown property, then try to collect the value
@@ -13255,7 +17001,26 @@ Ember.NativeArray = NativeArray;
/**
Creates an `Ember.NativeArray` from an Array like object.
- Does not modify the original object.
+ Does not modify the original object. Ember.A is not needed if
+ `Ember.EXTEND_PROTOTYPES` is `true` (the default value). However,
+ it is recommended that you use Ember.A when creating addons for
+ ember or when you can not garentee that `Ember.EXTEND_PROTOTYPES`
+ will be `true`.
+
+ Example
+
+ ```js
+ var Pagination = Ember.CollectionView.extend({
+ tagName: 'ul',
+ classNames: ['pagination'],
+ init: function() {
+ this._super();
+ if (!this.get('content')) {
+ this.set('content', Ember.A([]));
+ }
+ }
+ });
+ ```
@method A
@for Ember
@@ -13268,7 +17033,17 @@ Ember.A = function(arr) {
/**
Activates the mixin on the Array.prototype if not already applied. Calling
- this method more than once is safe.
+ this method more than once is safe. This will be called when ember is loaded
+ unless you have `Ember.EXTEND_PROTOTYPES` or `Ember.EXTEND_PROTOTYPES.Array`
+ set to `false`.
+
+ Example
+
+ ```js
+ if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.Array) {
+ Ember.NativeArray.activate();
+ }
+ ```
@method activate
@for Ember.NativeArray
@@ -13363,8 +17138,8 @@ var get = Ember.get, set = Ember.set, guidFor = Ember.guidFor, isNone = Ember.is
When using `Ember.Set`, you can observe the `"[]"` property to be
alerted whenever the content changes. You can also add an enumerable
observer to the set to be notified of specific objects that are added and
- removed from the set. See `Ember.Enumerable` for more information on
- enumerables.
+ removed from the set. See [Ember.Enumerable](/api/classes/Ember.Enumerable.html)
+ for more information on enumerables.
This is often unhelpful. If you are filtering sets of objects, for instance,
it is very inefficient to re-filter all of the items each time the set
@@ -13779,6 +17554,20 @@ 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.
+
+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(...);
+});
+```
+
+
@method onLoad
@for Ember
@param name {String} name of hook
@@ -13796,6 +17585,10 @@ 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.
+
@method runLoadHooks
@for Ember
@param name {String} name of hook
@@ -13834,39 +17627,18 @@ var get = Ember.get;
compose Ember's controller layer: `Ember.Controller`,
`Ember.ArrayController`, and `Ember.ObjectController`.
- Within an `Ember.Router`-managed application single shared instaces of every
- Controller object in your application's namespace will be added to the
- application's `Ember.Router` instance. See `Ember.Application#initialize`
- for additional information.
-
- ## Views
-
- By default a controller instance will be the rendering context
- for its associated `Ember.View.` This connection is made during calls to
- `Ember.ControllerMixin#connectOutlet`.
-
- Within the view's template, the `Ember.View` instance can be accessed
- through the controller with `{{view}}`.
-
- ## Target Forwarding
-
- By default a controller will target your application's `Ember.Router`
- instance. Calls to `{{action}}` within the template of a controller's view
- are forwarded to the router. See `Ember.Handlebars.helpers.action` for
- additional information.
-
@class ControllerMixin
@namespace Ember
*/
-Ember.ControllerMixin = Ember.Mixin.create({
+Ember.ControllerMixin = Ember.Mixin.create(Ember.ActionHandler, {
/* ducktype as a controller */
isController: true,
/**
- The object to which events from the view should be sent.
+ The object to which actions from the view should be sent.
For example, when a Handlebars template uses the `{{action}}` helper,
- it will attempt to send the event to the view's controller's `target`.
+ it will attempt to send the action to the view's controller's `target`.
By default, a controller's `target` is set to the router after it is
instantiated by `Ember.Application#initialize`.
@@ -13884,16 +17656,16 @@ Ember.ControllerMixin = Ember.Mixin.create({
model: Ember.computed.alias('content'),
- send: function(actionName) {
- var args = [].slice.call(arguments, 1), target;
+ deprecatedSendHandles: function(actionName) {
+ return !!this[actionName];
+ },
- if (this[actionName]) {
-
- this[actionName].apply(this, args);
- } else if (target = get(this, 'target')) {
-
- target.send.apply(target, arguments);
- }
+ deprecatedSend: function(actionName) {
+ var args = [].slice.call(arguments, 1);
+ Ember.assert('' + this + " has the action " + actionName + " but it is not a function", typeof this[actionName] === 'function');
+ Ember.deprecate('Action handlers implemented directly on controllers are deprecated in favor of action handlers on an `actions` object (' + actionName + ' on ' + this + ')', false);
+ this[actionName].apply(this, args);
+ return;
}
});
@@ -13942,6 +17714,29 @@ var get = Ember.get, set = Ember.set, forEach = Ember.EnumerableUtils.forEach;
songsController.get('firstObject'); // {trackNumber: 1, title: 'Dear Prudence'}
```
+ If you add or remove the properties to sort by or change the sort direction the content
+ sort order will be automatically updated.
+
+ ```javascript
+ songsController.set('sortProperties', ['title']);
+ songsController.get('firstObject'); // {trackNumber: 2, title: 'Back in the U.S.S.R.'}
+
+ songsController.toggleProperty('sortAscending');
+ songsController.get('firstObject'); // {trackNumber: 4, title: 'Ob-La-Di, Ob-La-Da'}
+ ```
+
+ SortableMixin works by sorting the arrangedContent array, which is the array that
+ arrayProxy displays. Due to the fact that the underlying 'content' array is not changed, that
+ array will not display the sorted list:
+
+ ```javascript
+ songsController.get('content').get('firstObject'); // Returns the unsorted original content
+ songsController.get('firstObject'); // Returns the sorted content.
+ ```
+
+ Although the sorted content can also be accessed through the arrangedContent property,
+ it is preferable to use the proxied class and not the arrangedContent array directly.
+
@class SortableMixin
@namespace Ember
@uses Ember.MutableEnumerable
@@ -13951,6 +17746,9 @@ Ember.SortableMixin = Ember.Mixin.create(Ember.MutableEnumerable, {
/**
Specifies which properties dictate the arrangedContent's sort order.
+ When specifying multiple properties the sorting will use properties
+ from the `sortProperties` array prioritized from first to last.
+
@property {Array} sortProperties
*/
sortProperties: null,
@@ -13964,7 +17762,7 @@ Ember.SortableMixin = Ember.Mixin.create(Ember.MutableEnumerable, {
/**
The function used to compare two values. You can override this if you
- want to do custom comparisons.Functions must be of the type expected by
+ want to do custom comparisons. Functions must be of the type expected by
Array#sort, i.e.
return 0 if the two parameters are equal,
return a negative value if the first parameter is smaller than the second or
@@ -13990,6 +17788,7 @@ Ember.SortableMixin = Ember.Mixin.create(Ember.MutableEnumerable, {
sortAscending = get(this, 'sortAscending'),
sortFunction = get(this, 'sortFunction');
+ Ember.assert("you need to define `sortProperties`", !!sortProperties);
forEach(sortProperties, function(propertyName) {
if (result === 0) {
@@ -14020,6 +17819,13 @@ Ember.SortableMixin = Ember.Mixin.create(Ember.MutableEnumerable, {
isSorted: Ember.computed.bool('sortProperties'),
+ /**
+ Overrides the default arrangedContent from arrayProxy in order to sort by sortFunction.
+ Also sets up observers for each sortProperty on each item in the content Array.
+
+ @property arrangedContent
+ */
+
arrangedContent: Ember.computed('content', 'sortProperties.@each', function(key, value) {
var content = get(this, 'content'),
isSorted = get(this, 'isSorted'),
@@ -14337,28 +18143,36 @@ Ember.ArrayController = Ember.ArrayProxy.extend(Ember.ControllerMixin,
},
init: function() {
- if (!this.get('content')) { Ember.defineProperty(this, 'content', undefined, Ember.A()); }
this._super();
+
this.set('_subControllers', Ember.A());
},
+ content: Ember.computed(function () {
+ return Ember.A();
+ }),
+
controllerAt: function(idx, object, controllerClass) {
var container = get(this, 'container'),
subControllers = get(this, '_subControllers'),
- subController = subControllers[idx];
+ subController = subControllers[idx],
+ factory, fullName;
- if (!subController) {
- subController = container.lookup("controller:" + controllerClass, { singleton: false });
- subControllers[idx] = subController;
- }
+ if (subController) { return subController; }
- if (!subController) {
+ fullName = "controller:" + controllerClass;
+
+ if (!container.has(fullName)) {
throw new Error('Could not resolve itemController: "' + controllerClass + '"');
}
- subController.set('target', this);
- subController.set('parentController', get(this, 'parentController') || this);
- subController.set('content', object);
+ subController = container.lookupFactory(fullName).create({
+ target: this,
+ parentController: get(this, 'parentController') || this,
+ content: object
+ });
+
+ subControllers[idx] = subController;
return subController;
},
@@ -14388,12 +18202,11 @@ Ember.ArrayController = Ember.ArrayProxy.extend(Ember.ControllerMixin,
*/
/**
- `Ember.ObjectController` is part of Ember's Controller layer. A single shared
- instance of each `Ember.ObjectController` subclass in your application's
- namespace will be created at application initialization and be stored on your
- application's `Ember.Router` instance.
+ `Ember.ObjectController` is part of Ember's Controller layer. It is intended
+ to wrap a single object, proxying unhandled attempts to `get` and `set` to the underlying
+ content object, and to forward unhandled action attempts to its `target`.
- `Ember.ObjectController` derives its functionality from its superclass
+ `Ember.ObjectController` derives this functionality from its superclass
`Ember.ObjectProxy` and the `Ember.ControllerMixin` mixin.
@class ObjectController
@@ -14431,7 +18244,7 @@ Ember Runtime
*/
var jQuery = Ember.imports.jQuery;
-
+Ember.assert("Ember Views require jQuery 1.7, 1.8, 1.9, 1.10, or 2.0", jQuery && (jQuery().jquery.match(/^((1\.(7|8|9|10))|2.0)(\.\d+)?(pre|rc\d?)?/) || Ember.ENV.FORCE_JQUERY));
/**
Alias for jQuery
@@ -14575,7 +18388,7 @@ var setInnerHTML = function(element, html) {
} else {
// Firefox versions < 11 do not have support for element.outerHTML.
var outerHTML = element.outerHTML || new XMLSerializer().serializeToString(element);
-
+ Ember.assert("Can't set innerHTML on "+element.tagName+" in this browser", outerHTML);
var startTag = outerHTML.match(new RegExp("<"+tagName+"([^>]*)>", 'i'))[0],
endTag = '';
@@ -14677,9 +18490,14 @@ function escapeAttribute(value) {
final representation. `Ember.RenderBuffer` will generate HTML which can be pushed
to the DOM.
+ ```javascript
+ var buffer = Ember.RenderBuffer('div');
+ ```
+
@class RenderBuffer
@namespace Ember
@constructor
+ @param {String} tagName tag name (such as 'div' or 'p') used for the buffer
*/
Ember.RenderBuffer = function(tagName) {
return new Ember._RenderBuffer(tagName);
@@ -15226,11 +19044,13 @@ Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.pro
rootElement = Ember.$(get(this, 'rootElement'));
-
-
+ Ember.assert(fmt('You cannot use the same root element (%@) multiple times in an Ember.Application', [rootElement.selector || rootElement[0].tagName]), !rootElement.is('.ember-application'));
+ Ember.assert('You cannot make a new Ember.Application using a root element that is a descendent of an existing Ember.Application', !rootElement.closest('.ember-application').length);
+ Ember.assert('You cannot make a new Ember.Application using a root element that is an ancestor of an existing Ember.Application', !rootElement.find('.ember-application').length);
rootElement.addClass('ember-application');
+ Ember.assert('Unable to add "ember-application" class to rootElement. Make sure you set rootElement to the body or an element in the body.', rootElement.is('.ember-application'));
for (event in events) {
if (events.hasOwnProperty(event)) {
@@ -15316,7 +19136,9 @@ Ember.EventDispatcher = Ember.Object.extend(/** @scope Ember.EventDispatcher.pro
var handler = object[eventName];
if (Ember.typeOf(handler) === 'function') {
- result = handler.call(object, evt, view);
+ result = Ember.run(function() {
+ return handler.call(object, evt, view);
+ });
// Do not preventDefault in eventManagers.
evt.stopPropagation();
}
@@ -15424,6 +19246,7 @@ var get = Ember.get, set = Ember.set;
var guidFor = Ember.guidFor;
var a_forEach = Ember.EnumerableUtils.forEach;
var a_addObject = Ember.EnumerableUtils.addObject;
+var meta = Ember.meta;
var childViewsProperty = Ember.computed(function() {
var childViews = this._childViews, ret = Ember.A(), view = this;
@@ -15441,7 +19264,7 @@ var childViewsProperty = Ember.computed(function() {
ret.replace = function (idx, removedCount, addedViews) {
if (view instanceof Ember.ContainerView) {
-
+ Ember.deprecate("Manipulating an Ember.ContainerView through its childViews property is deprecated. Please use the ContainerView instance itself as an Ember.MutableArray.");
return view.replace(idx, removedCount, addedViews);
}
throw new Error("childViews is immutable");
@@ -15450,6 +19273,7 @@ var childViewsProperty = Ember.computed(function() {
return ret;
});
+Ember.warn("The VIEW_PRESERVES_CONTEXT flag has been removed and the functionality can no longer be disabled.", Ember.ENV.VIEW_PRESERVES_CONTEXT !== false);
/**
Global hash of shared templates. This will automatically be populated
@@ -15463,7 +19287,13 @@ var childViewsProperty = Ember.computed(function() {
Ember.TEMPLATES = {};
/**
- `Ember.CoreView` is
+ `Ember.CoreView` is an abstract class that exists to give view-like behavior
+ to both Ember's main view class `Ember.View` and other classes like
+ `Ember._SimpleMetamorphView` that don't need the fully functionaltiy of
+ `Ember.View`.
+
+ Unless you have specific needs for `CoreView`, you will use `Ember.View`
+ in your applications.
@class CoreView
@namespace Ember
@@ -15471,7 +19301,7 @@ Ember.TEMPLATES = {};
@uses Ember.Evented
*/
-Ember.CoreView = Ember.Object.extend(Ember.Evented, {
+Ember.CoreView = Ember.Object.extend(Ember.Evented, Ember.ActionHandler, {
isView: true,
states: states,
@@ -15586,6 +19416,18 @@ Ember.CoreView = Ember.Object.extend(Ember.Evented, {
}
},
+ deprecatedSendHandles: function(actionName) {
+ return !!this[actionName];
+ },
+
+ deprecatedSend: function(actionName) {
+ var args = [].slice.call(arguments, 1);
+ Ember.assert('' + this + " has the action " + actionName + " but it is not a function", typeof this[actionName] === 'function');
+ Ember.deprecate('Action handlers implemented directly on views are deprecated in favor of action handlers on an `actions` object (' + actionName + ' on ' + this + ')', false);
+ this[actionName].apply(this, args);
+ return;
+ },
+
has: function(name) {
return Ember.typeOf(this[name]) === 'function' || this._super(name);
},
@@ -15687,7 +19529,7 @@ var EMPTY_ARRAY = [];
The default HTML tag name used for a view's DOM representation is `div`. This
can be customized by setting the `tagName` property. The following view
-class:
+ class:
```javascript
ParagraphView = Ember.View.extend({
@@ -15813,7 +19655,7 @@ class:
```javascript
// Applies 'enabled' class when isEnabled is true and 'disabled' when isEnabled is false
- Ember.View.create({
+ Ember.View.extend({
classNameBindings: ['isEnabled:enabled:disabled']
isEnabled: true
});
@@ -15836,7 +19678,7 @@ class:
```javascript
// Applies no class when isEnabled is true and class 'disabled' when isEnabled is false
- Ember.View.create({
+ Ember.View.extend({
classNameBindings: ['isEnabled::disabled']
isEnabled: true
});
@@ -15861,8 +19703,8 @@ class:
will be removed.
Both `classNames` and `classNameBindings` are concatenated properties. See
- `Ember.Object` documentation for more information about concatenated
- properties.
+ [Ember.Object](/api/classes/Ember.Object.html) documentation for more
+ information about concatenated properties.
## HTML Attributes
@@ -15922,7 +19764,7 @@ class:
Updates to the the property of an attribute binding will result in automatic
update of the HTML attribute in the view's rendered HTML representation.
- `attributeBindings` is a concatenated property. See `Ember.Object`
+ `attributeBindings` is a concatenated property. See [Ember.Object](/api/classes/Ember.Object.html)
documentation for more information about concatenated properties.
## Templates
@@ -15965,9 +19807,6 @@ class:
Using a value for `templateName` that does not have a Handlebars template
with a matching `data-template-name` attribute will throw an error.
- Assigning a value to both `template` and `templateName` properties will throw
- an error.
-
For views classes that may have a template later defined (e.g. as the block
portion of a `{{view}}` Handlebars helper call in another template or in
a subclass), you can provide a `defaultTemplate` property set to compiled
@@ -16073,7 +19912,8 @@ class:
```
- See `Handlebars.helpers.yield` for more information.
+ See [Ember.Handlebars.helpers.yield](/api/classes/Ember.Handlebars.helpers.html#method_yield)
+ for more information.
## Responding to Browser Events
@@ -16130,7 +19970,7 @@ class:
},
eventManager: Ember.Object.create({
mouseEnter: function(event, view) {
- // takes presedence over AView#mouseEnter
+ // takes precedence over AView#mouseEnter
}
})
});
@@ -16170,7 +20010,7 @@ class:
### Handlebars `{{action}}` Helper
- See `Handlebars.helpers.action`.
+ See [Handlebars.helpers.action](/api/classes/Ember.Handlebars.helpers.html#method_action).
### Event Names
@@ -16225,8 +20065,8 @@ class:
## Handlebars `{{view}}` Helper
Other `Ember.View` instances can be included as part of a view's template by
- using the `{{view}}` Handlebars helper. See `Handlebars.helpers.view` for
- additional information.
+ using the `{{view}}` Handlebars helper. See [Ember.Handlebars.helpers.view](/api/classes/Ember.Handlebars.helpers.html#method_view)
+ for additional information.
@class View
@namespace Ember
@@ -16301,6 +20141,7 @@ Ember.View = Ember.CoreView.extend(
var templateName = get(this, 'templateName'),
template = this.templateForName(templateName, 'template');
+ Ember.assert("You specified the templateName " + templateName + " for " + this + ", but it did not exist.", !templateName || template);
return template || get(this, 'defaultTemplate');
}).property('templateName'),
@@ -16335,13 +20176,19 @@ Ember.View = Ember.CoreView.extend(
var layoutName = get(this, 'layoutName'),
layout = this.templateForName(layoutName, 'layout');
+ Ember.assert("You specified the layoutName " + layoutName + " for " + this + ", but it did not exist.", !layoutName || layout);
return layout || get(this, 'defaultLayout');
}).property('layoutName'),
+ _yield: function(context, options) {
+ var template = get(this, 'template');
+ if (template) { template(context, options); }
+ },
+
templateForName: function(name, type) {
if (!name) { return; }
-
+ Ember.assert("templateNames are not allowed to contain periods: "+name, name.indexOf('.') === -1);
// the defaultContainer is deprecated
var container = this.container || (Ember.Container && Ember.Container.defaultContainer);
@@ -16369,14 +20216,6 @@ Ember.View = Ember.CoreView.extend(
}
}).volatile(),
- /**
- The parent context for this template.
- */
- parentContext: function() {
- var parentView = get(this, '_parentView');
- return parentView && get(parentView, '_context');
- },
-
/**
@private
@@ -16474,7 +20313,7 @@ Ember.View = Ember.CoreView.extend(
@deprecated
*/
nearestInstanceOf: function(klass) {
-
+ Ember.deprecate("nearestInstanceOf is deprecated and will be removed from future releases. Use nearestOfType.");
var view = get(this, 'parentView');
while (view) {
@@ -16610,6 +20449,7 @@ Ember.View = Ember.CoreView.extend(
// is the view's controller by default. A hash of data is also passed that provides
// the template with access to the view and render buffer.
+ Ember.assert('template must be a function. Did you mean to call Ember.Handlebars.compile("...") or specify templateName instead?', typeof template === 'function');
// The template should write directly to the render buffer instead
// of returning a string.
output = template(context, { data: data });
@@ -16880,7 +20720,8 @@ Ember.View = Ember.CoreView.extend(
// Schedule the DOM element to be created and appended to the given
// element after bindings have synchronized.
this._insertElementLater(function() {
-
+ Ember.assert("You tried to append to (" + target + ") but that isn't in the DOM", Ember.$(target).length > 0);
+ Ember.assert("You cannot append to an existing Ember.View. Consider using Ember.ContainerView instead.", !Ember.$(target).is('.ember-view') && !Ember.$(target).parents().is('.ember-view'));
this.$().appendTo(target);
});
@@ -16901,7 +20742,8 @@ Ember.View = Ember.CoreView.extend(
@return {Ember.View} received
*/
replaceIn: function(target) {
-
+ Ember.assert("You tried to replace in (" + target + ") but that isn't in the DOM", Ember.$(target).length > 0);
+ Ember.assert("You cannot replace an existing Ember.View. Consider using Ember.ContainerView instead.", !Ember.$(target).is('.ember-view') && !Ember.$(target).parents().is('.ember-view'));
this._insertElementLater(function() {
Ember.$(target).empty();
@@ -17164,8 +21006,7 @@ Ember.View = Ember.CoreView.extend(
*/
_elementDidChange: Ember.observer(function() {
this.forEachChildView(function(view) {
- var meta = Ember.meta(view);
- delete meta.cache['element'];
+ delete meta(view).cache.element;
});
}, 'element'),
@@ -17260,7 +21101,7 @@ Ember.View = Ember.CoreView.extend(
visually challenged users navigate rich web applications.
The full list of valid WAI-ARIA roles is available at:
- http://www.w3.org/TR/wai-aria/roles#roles_categorization
+ [http://www.w3.org/TR/wai-aria/roles#roles_categorization](http://www.w3.org/TR/wai-aria/roles#roles_categorization)
@property ariaRole
@type String
@@ -17286,7 +21127,7 @@ Ember.View = Ember.CoreView.extend(
```javascript
// Applies the 'high' class to the view element
- Ember.View.create({
+ Ember.View.extend({
classNameBindings: ['priority']
priority: 'high'
});
@@ -17297,7 +21138,7 @@ Ember.View = Ember.CoreView.extend(
```javascript
// Applies the 'is-urgent' class to the view element
- Ember.View.create({
+ Ember.View.extend({
classNameBindings: ['isUrgent']
isUrgent: true
});
@@ -17308,7 +21149,7 @@ Ember.View = Ember.CoreView.extend(
```javascript
// Applies the 'urgent' class to the view element
- Ember.View.create({
+ Ember.View.extend({
classNameBindings: ['isUrgent:urgent']
isUrgent: true
});
@@ -17329,7 +21170,7 @@ Ember.View = Ember.CoreView.extend(
```javascript
// Applies the type attribute to the element
// with the value "button", like
- Ember.View.create({
+ Ember.View.extend({
attributeBindings: ['type'],
type: 'button'
});
@@ -17340,7 +21181,7 @@ Ember.View = Ember.CoreView.extend(
```javascript
// Renders something like
- Ember.View.create({
+ Ember.View.extend({
attributeBindings: ['enabled'],
enabled: true
});
@@ -17372,17 +21213,11 @@ Ember.View = Ember.CoreView.extend(
// setup child views. be sure to clone the child views array first
this._childViews = this._childViews.slice();
+ Ember.assert("Only arrays are allowed for 'classNameBindings'", Ember.typeOf(this.classNameBindings) === 'array');
this.classNameBindings = Ember.A(this.classNameBindings.slice());
+ Ember.assert("Only arrays are allowed for 'classNames'", Ember.typeOf(this.classNames) === 'array');
this.classNames = Ember.A(this.classNames.slice());
-
- var viewController = get(this, 'viewController');
- if (viewController) {
- viewController = get(viewController);
- if (viewController) {
- set(viewController, 'view', this);
- }
- }
},
appendChild: function(view, options) {
@@ -17493,22 +21328,26 @@ Ember.View = Ember.CoreView.extend(
act as a child of the parent.
@method createChildView
- @param {Class} viewClass
+ @param {Class|String} viewClass
@param {Hash} [attrs] Attributes to add
@return {Ember.View} new instance
*/
createChildView: function(view, attrs) {
+ if (!view) {
+ throw new TypeError("createChildViews first argument must exist");
+ }
+
if (view.isView && view._parentView === this && view.container === this.container) {
return view;
}
attrs = attrs || {};
attrs._parentView = this;
- attrs.container = this.container;
if (Ember.CoreView.detect(view)) {
attrs.templateData = attrs.templateData || get(this, 'templateData');
+ attrs.container = this.container;
view = view.create(attrs);
// don't set the property on a virtual view, as they are invisible to
@@ -17516,14 +21355,24 @@ Ember.View = Ember.CoreView.extend(
if (view.viewName) {
set(get(this, 'concreteView'), view.viewName, view);
}
- } else {
+ } else if ('string' === typeof view) {
+ var fullName = 'view:' + view;
+ var View = this.container.lookupFactory(fullName);
+ Ember.assert("Could not find view: '" + fullName + "'", !!View);
+
+ attrs.templateData = get(this, 'templateData');
+ view = View.create(attrs);
+ } else {
+ Ember.assert('You must pass instance or subclass of View', view.isView);
+ attrs.container = this.container;
+
+ if (!get(view, 'templateData')) {
+ attrs.templateData = get(this, 'templateData');
+ }
Ember.setProperties(view, attrs);
- if (!get(view, 'templateData')) {
- set(view, 'templateData', get(this, 'templateData'));
- }
}
return view;
@@ -17732,7 +21581,7 @@ Ember.View.reopenClass({
Parse a path and return an object which holds the parsed properties.
- For example a path like "content.isEnabled:enabled:disabled" wil return the
+ For example a path like "content.isEnabled:enabled:disabled" will return the
following object:
```javascript
@@ -17953,10 +21802,18 @@ Ember.merge(preRender, {
var viewCollection = view.viewHierarchyCollection();
viewCollection.trigger('willInsertElement');
- // after createElement, the view will be in the hasElement state.
+
fn.call(view);
- viewCollection.transitionTo('inDOM', false);
- viewCollection.trigger('didInsertElement');
+
+ // We transition to `inDOM` if the element exists in the DOM
+ var element = view.get('element');
+ while (element = element.parentNode) {
+ if (element === document) {
+ viewCollection.transitionTo('inDOM', false);
+ viewCollection.trigger('didInsertElement');
+ }
+ }
+
},
renderToBufferIfNeeded: function(view, buffer) {
@@ -18033,7 +21890,7 @@ 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.");
},
renderToBufferIfNeeded: function (view, buffer) {
@@ -18160,7 +22017,7 @@ Ember.merge(inDOM, {
// Register the view for event handling. This hash is used by
// Ember.EventDispatcher to dispatch incoming events.
if (!view.isVirtual) {
-
+ Ember.assert("Attempted to register a view with an id already in use: "+view.elementId, !Ember.View.views[view.elementId]);
Ember.View.views[view.elementId] = view;
}
@@ -18470,7 +22327,7 @@ Ember.ContainerView = Ember.View.extend(Ember.MutableArray, {
replace: function(idx, removedCount, addedViews) {
var addedCount = addedViews ? get(addedViews, 'length') : 0;
var self = this;
-
+ Ember.assert("You can't add a child to a container that is already a child of another view", Ember.A(addedViews).every(function(item) { return !get(item, '_parentView') || get(item, '_parentView') === self; }));
this.arrayContentWillChange(idx, removedCount, addedCount);
this.childViewsWillChange(this._childViews, idx, removedCount);
@@ -18495,7 +22352,7 @@ Ember.ContainerView = Ember.View.extend(Ember.MutableArray, {
length: Ember.computed(function () {
return this._childViews.length;
- }),
+ }).volatile(),
/**
@private
@@ -18572,7 +22429,10 @@ Ember.ContainerView = Ember.View.extend(Ember.MutableArray, {
initializeViews: function(views, parentView, templateData) {
forEach(views, function(view) {
set(view, '_parentView', parentView);
- set(view, 'container', parentView && parentView.container);
+
+ if (!view.container && parentView) {
+ set(view, 'container', parentView.container);
+ }
if (!get(view, 'templateData')) {
set(view, 'templateData', templateData);
@@ -18592,7 +22452,7 @@ Ember.ContainerView = Ember.View.extend(Ember.MutableArray, {
_currentViewDidChange: Ember.observer(function() {
var currentView = get(this, 'currentView');
if (currentView) {
-
+ Ember.assert("You tried to set a current view that already has a parent. Make sure you don't have multiple outlets in the same view.", !get(currentView, '_parentView'));
this.pushObject(currentView);
}
}, 'currentView'),
@@ -18822,11 +22682,6 @@ var get = Ember.get, set = Ember.set, fmt = Ember.String.fmt;
manipulated. Instead, add, remove, replace items from its `content` property.
This will trigger appropriate changes to its rendered HTML.
- ## Use in templates via the `{{collection}}` `Ember.Handlebars` helper
-
- `Ember.Handlebars` provides a helper specifically for adding
- `CollectionView`s to templates. See `Ember.Handlebars.collection` for more
- details
@class CollectionView
@namespace Ember
@@ -18871,12 +22726,25 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie
*/
itemViewClass: Ember.View,
+ /**
+ Setup a CollectionView
+
+ @method init
+ */
init: function() {
var ret = this._super();
this._contentDidChange();
return ret;
},
+ /**
+ @private
+
+ Invoked when the content property is about to change. Notifies observers that the
+ entire array content will change.
+
+ @method _contentWillChange
+ */
_contentWillChange: Ember.beforeObserver(function() {
var content = this.get('content');
@@ -18907,10 +22775,22 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie
this.arrayDidChange(content, 0, null, len);
}, 'content'),
- _assertArrayLike: function(content) {
+ /**
+ @private
+ Ensure that the content implements Ember.Array
+
+ @method _assertArrayLike
+ */
+ _assertArrayLike: function(content) {
+ Ember.assert(fmt("an Ember.CollectionView's content must implement Ember.Array. You passed %@", [content]), Ember.Array.detect(content));
},
+ /**
+ Removes the content and content observers.
+
+ @method destroy
+ */
destroy: function() {
if (!this._super()) { return; }
@@ -18924,6 +22804,19 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie
return this;
},
+ /**
+ Called when a mutation to the underlying content array will occur.
+
+ This method will remove any views that are no longer in the underlying
+ content array.
+
+ Invokes whenever the content array itself will change.
+
+ @method arrayWillChange
+ @param {Array} content the managed collection of objects
+ @param {Number} start the index at which the changes will occurr
+ @param {Number} removed number of object to be removed from content
+ */
arrayWillChange: function(content, start, removedCount) {
// If the contents were empty before and this template collection has an
// empty view remove it now.
@@ -18969,16 +22862,20 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie
@param {Number} added number of object added to content
*/
arrayDidChange: function(content, start, removed, added) {
- var itemViewClass = get(this, 'itemViewClass'),
- addedViews = [], view, item, idx, len;
-
- if ('string' === typeof itemViewClass) {
- itemViewClass = get(itemViewClass);
- }
-
+ var addedViews = [], view, item, idx, len, itemViewClass,
+ emptyView;
len = content ? get(content, 'length') : 0;
+
if (len) {
+ itemViewClass = get(this, 'itemViewClass');
+
+ if ('string' === typeof itemViewClass) {
+ itemViewClass = get(itemViewClass) || itemViewClass;
+ }
+
+ Ember.assert(fmt("itemViewClass must be a subclass of Ember.View, not %@", [itemViewClass]), 'string' === typeof itemViewClass || Ember.View.detect(itemViewClass));
+
for (idx = start; idx < start+added; idx++) {
item = content.objectAt(idx);
@@ -18990,27 +22887,50 @@ Ember.CollectionView = Ember.ContainerView.extend(/** @scope Ember.CollectionVie
addedViews.push(view);
}
} else {
- var emptyView = get(this, 'emptyView');
+ emptyView = get(this, 'emptyView');
+
if (!emptyView) { return; }
- var isClass = Ember.CoreView.detect(emptyView);
+ if ('string' === typeof emptyView) {
+ emptyView = get(emptyView) || emptyView;
+ }
emptyView = this.createChildView(emptyView);
addedViews.push(emptyView);
set(this, 'emptyView', emptyView);
- if (isClass) { this._createdEmptyView = emptyView; }
+ if (Ember.CoreView.detect(emptyView)) {
+ this._createdEmptyView = emptyView;
+ }
}
+
this.replace(start, 0, addedViews);
},
+ /**
+ Instantiates a view to be added to the childViews array during view
+ initialization. You generally will not call this method directly unless
+ you are overriding `createChildViews()`. Note that this method will
+ automatically configure the correct settings on the new view instance to
+ act as a child of the parent.
+
+ The tag name for the view will be set to the tagName of the viewClass
+ passed in.
+
+ @method createChildView
+ @param {Class} viewClass
+ @param {Hash} [attrs] Attributes to add
+ @return {Ember.View} new instance
+ */
createChildView: function(view, attrs) {
view = this._super(view, attrs);
var itemTagName = get(view, 'tagName');
- var tagName = (itemTagName === null || itemTagName === undefined) ? Ember.CollectionView.CONTAINER_MAP[get(this, 'tagName')] : itemTagName;
- set(view, 'tagName', tagName);
+ if (itemTagName === null || itemTagName === undefined) {
+ itemTagName = Ember.CollectionView.CONTAINER_MAP[get(this, 'tagName')];
+ set(view, 'tagName', itemTagName);
+ }
return view;
}
@@ -19070,7 +22990,7 @@ var get = Ember.get, set = Ember.set, isNone = Ember.isNone;
```html
{{person.title}}
-
+
{{person.signature}}
```
@@ -19092,15 +23012,18 @@ var get = Ember.get, set = Ember.set, isNone = Ember.isNone;
If you want to customize the component, in order to
handle events or actions, you implement a subclass
of `Ember.Component` named after the name of the
- component.
+ component. Note that `Component` needs to be appended to the name of
+ your subclass like `AppProfileComponent`.
For example, you could implement the action
`hello` for the `app-profile` component:
- ```js
+ ```javascript
App.AppProfileComponent = Ember.Component.extend({
- hello: function(name) {
- console.log("Hello", name)
+ actions: {
+ hello: function(name) {
+ console.log("Hello", name);
+ }
}
});
```
@@ -19132,60 +23055,122 @@ Ember.Component = Ember.View.extend(Ember.TargetActionSupport, {
this._super();
set(this, 'context', this);
set(this, 'controller', this);
- set(this, 'templateData', {keywords: {}});
},
+ // during render, isolate keywords
+ cloneKeywords: function() {
+ return {
+ view: this,
+ controller: this
+ };
+ },
+
+ _yield: function(context, options) {
+ var view = options.data.view,
+ parentView = this._parentView,
+ template = get(this, 'template');
+
+ if (template) {
+ Ember.assert("A Component must have a parent view in order to yield.", parentView);
+
+ view.appendChild(Ember.View, {
+ isVirtual: true,
+ tagName: '',
+ _contextView: parentView,
+ template: template,
+ context: get(parentView, 'context'),
+ controller: get(parentView, 'controller'),
+ templateData: { keywords: parentView.cloneKeywords() }
+ });
+ }
+ },
+
+ /**
+ If the component is currently inserted into the DOM of a parent view, this
+ property will point to the controller of the parent view.
+
+ @property targetObject
+ @type Ember.Controller
+ @default null
+ */
targetObject: Ember.computed(function(key) {
var parentView = get(this, '_parentView');
return parentView ? get(parentView, 'controller') : null;
}).property('_parentView'),
/**
- Sends an action to component's controller. A component inherits its
- controller from the context in which it is used.
+ Sends an action to component's controller. A component inherits its
+ controller from the context in which it is used.
- By default, calling `sendAction()` will send an action with the name
- of the component's `action` property.
+ By default, calling `sendAction()` will send an action with the name
+ of the component's `action` property.
- For example, if the component had a property `action` with the value
- `"addItem"`, calling `sendAction()` would send the `addItem` action
- to the component's controller.
+ For example, if the component had a property `action` with the value
+ `"addItem"`, calling `sendAction()` would send the `addItem` action
+ to the component's controller.
- If you provide an argument to `sendAction()`, that key will be used to look
- up the action name.
+ If you provide the `action` argument to `sendAction()`, that key will
+ be used to look up the action name.
- For example, if the component had a property `playing` with the value
- `didStartPlaying`, calling `sendAction('playing')` would send the
- `didStartPlaying` action to the component's controller.
+ For example, if the component had a property `playing` with the value
+ `didStartPlaying`, calling `sendAction('playing')` would send the
+ `didStartPlaying` action to the component's controller.
- Whether or not you are using the default action or a named action, if
- the action name is not defined on the component, calling `sendAction()`
- does not have any effect.
+ Whether or not you are using the default action or a named action, if
+ the action name is not defined on the component, calling `sendAction()`
+ does not have any effect.
- For example, if you call `sendAction()` on a component that does not have
- an `action` property defined, no action will be sent to the controller,
- nor will an exception be raised.
+ For example, if you call `sendAction()` on a component that does not have
+ an `action` property defined, no action will be sent to the controller,
+ nor will an exception be raised.
- @param [action] {String} the action to trigger
+ You can send a context object with the action by supplying the `context`
+ argument. The context will be supplied as the first argument in the
+ target's action method. Example:
+
+ ```javascript
+ App.MyTreeComponent = Ember.Component.extend({
+ click: function() {
+ this.sendAction('didClickTreeNode', this.get('node'));
+ }
+ });
+
+ App.CategoriesController = Ember.Controller.extend({
+ actions: {
+ didClickCategory: function(category) {
+ //Do something with the node/category that was clicked
+ }
+ }
+ });
+ ```
+
+ ```handlebars
+ {{! categories.hbs}}
+ {{my-tree didClickTreeNode='didClickCategory'}}
+ ```
+
+ @method sendAction
+ @param [action] {String} the action to trigger
+ @param [context] {*} a context to send with the action
*/
- sendAction: function(action) {
+ sendAction: function(action, context) {
var actionName;
// 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');
} 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');
}
-
// If no action name for that action could be found, just abort.
if (actionName === undefined) { return; }
this.triggerAction({
- action: actionName
+ action: actionName,
+ actionContext: context
});
}
});
@@ -19288,9 +23273,10 @@ define("metamorph",
var K = function() {},
guid = 0,
document = this.document,
+ disableRange = ('undefined' === typeof ENV ? {} : ENV).DISABLE_RANGE_API,
// Feature-detect the W3C range API, the extended check is for IE9 which only partially supports ranges
- supportsRange = false,
+ supportsRange = (!disableRange) && document && ('createRange' in document) && (typeof Range !== 'undefined') && Range.prototype.createContextualFragment,
// Internet Explorer prior to 9 does not allow setting innerHTML if the first element
// is a "zero-scope" element. This problem can be worked around by making
@@ -19397,6 +23383,14 @@ define("metamorph",
range.insertNode(fragment);
};
+ /**
+ * @public
+ *
+ * Remove this object (including starting and ending
+ * placeholders).
+ *
+ * @method remove
+ */
removeFunc = function() {
// get a range for the current metamorph object including
// the starting and ending placeholders.
@@ -19437,7 +23431,7 @@ define("metamorph",
};
} else {
- /**
+ /*
* This code is mostly taken from jQuery, with one exception. In jQuery's case, we
* have some HTML and we need to figure out how to convert it into some nodes.
*
@@ -19491,12 +23485,12 @@ define("metamorph",
}
};
- /**
+ /*
* Given a parent node and some HTML, generate a set of nodes. Return the first
* node, which will allow us to traverse the rest using nextSibling.
*
* We need to do this because innerHTML in IE does not really parse the nodes.
- **/
+ */
var firstNodeFor = function(parentNode, html) {
var arr = wrapMap[parentNode.tagName.toLowerCase()] || wrapMap._default;
var depth = arr[0], start = arr[1], end = arr[2];
@@ -19529,7 +23523,7 @@ define("metamorph",
return element;
};
- /**
+ /*
* In some cases, Internet Explorer can create an anonymous node in
* the hierarchy with no tagName. You can create this scenario via:
*
@@ -19539,7 +23533,7 @@ define("metamorph",
*
* If our script markers are inside such a node, we need to find that
* node and use *it* as the marker.
- **/
+ */
var realNode = function(start) {
while (start.parentNode.tagName === "") {
start = start.parentNode;
@@ -19548,7 +23542,7 @@ define("metamorph",
return start;
};
- /**
+ /*
* When automatically adding a tbody, Internet Explorer inserts the
* tbody immediately before the first
. Other browsers create it
* before the first node, no matter what.
@@ -19575,7 +23569,8 @@ define("metamorph",
*
* This code reparents the first script tag by making it the tbody's
* first child.
- **/
+ *
+ */
var fixParentage = function(start, end) {
if (start.parentNode !== end.parentNode) {
end.parentNode.insertBefore(start, end.parentNode.firstChild);
@@ -19755,7 +23750,8 @@ if (!Handlebars && typeof require === 'function') {
Handlebars = require('handlebars');
}
-
+Ember.assert("Ember Handlebars requires Handlebars version 1.0.0. 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.0, 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
@@ -19812,7 +23808,7 @@ function makeBindings(options) {
## Custom view helper example
- Assuming a view subclass named `App.CalenderView` were defined, a helper
+ Assuming a view subclass named `App.CalendarView` were defined, a helper
for rendering instances of this view could be registered as follows:
```javascript
@@ -19841,20 +23837,11 @@ function makeBindings(options) {
@param {String} dependentKeys*
*/
Ember.Handlebars.helper = function(name, value) {
- if (Ember.Component.detect(value)) {
-
-
- var proto = value.proto();
- if (!proto.layoutName && !proto.templateName) {
- value.reopen({
- layoutName: 'components/' + name
- });
- }
- }
+ Ember.assert("You tried to register a component named '" + name + "', but component names must include a '-'", !Ember.Component.detect(value) || name.match(/-/));
if (Ember.View.detect(value)) {
Ember.Handlebars.registerHelper(name, 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);
makeBindings(options);
return Ember.Handlebars.helpers.view.call(this, value, options);
});
@@ -19903,7 +23890,6 @@ if (Handlebars.JavaScriptCompiler) {
Ember.Handlebars.JavaScriptCompiler.prototype.namespace = "Ember.Handlebars";
-
Ember.Handlebars.JavaScriptCompiler.prototype.initializeBuffer = function() {
return "''";
};
@@ -20005,7 +23991,10 @@ if (Handlebars.compile) {
var environment = new Ember.Handlebars.Compiler().compile(ast, options);
var templateSpec = new Ember.Handlebars.JavaScriptCompiler().compile(environment, options, undefined, true);
- return Ember.Handlebars.template(templateSpec);
+ var template = Ember.Handlebars.template(templateSpec);
+ template.isMethod = false; //Make sure we don't wrap templates with ._super
+
+ return template;
};
}
@@ -20089,7 +24078,6 @@ var handlebarsGet = Ember.Handlebars.get = function(root, path, options) {
}
return value;
};
-Ember.Handlebars.getPath = Ember.deprecateFunc('`Ember.Handlebars.getPath` has been changed to `Ember.Handlebars.get` for consistency.', Ember.Handlebars.get);
Ember.Handlebars.resolveParams = function(context, params, options) {
var resolvedParams = [], types = options.types, param, type;
@@ -20268,59 +24256,101 @@ Ember.Handlebars.registerBoundHelper = function(name, fn) {
numProperties = properties.length,
options = arguments[arguments.length - 1],
normalizedProperties = [],
+ types = options.types,
data = options.data,
hash = options.hash,
view = data.view,
currentContext = (options.contexts && options.contexts[0]) || this,
- normalized,
- pathRoot, path, prefixPathForDependentKeys = '',
- loc, hashOption;
+ prefixPathForDependentKeys = '',
+ loc, len, hashOption,
+ boundOption, property,
+ normalizedValue = Ember._SimpleHandlebarsView.prototype.normalizedValue;
+ Ember.assert("registerBoundHelper-generated helpers do not support use with Handlebars blocks.", !options.fn);
// Detect bound options (e.g. countBinding="otherCount")
- hash.boundOptions = {};
+ var boundOptions = hash.boundOptions = {};
for (hashOption in hash) {
- if (!hash.hasOwnProperty(hashOption)) { continue; }
-
- if (Ember.IS_BINDING.test(hashOption) && typeof hash[hashOption] === 'string') {
+ if (Ember.IS_BINDING.test(hashOption)) {
// Lop off 'Binding' suffix.
- hash.boundOptions[hashOption.slice(0, -7)] = hash[hashOption];
+ boundOptions[hashOption.slice(0, -7)] = hash[hashOption];
}
}
// Expose property names on data.properties object.
+ var watchedProperties = [];
data.properties = [];
for (loc = 0; loc < numProperties; ++loc) {
data.properties.push(properties[loc]);
- normalizedProperties.push(normalizePath(currentContext, properties[loc], data));
+ if (types[loc] === 'ID') {
+ var normalizedProp = normalizePath(currentContext, properties[loc], data);
+ normalizedProperties.push(normalizedProp);
+ watchedProperties.push(normalizedProp);
+ } else {
+ normalizedProperties.push(null);
+ }
}
+ // Handle case when helper invocation is preceded by `unbound`, e.g.
+ // {{unbound myHelper foo}}
if (data.isUnbound) {
return evaluateUnboundHelper(this, fn, normalizedProperties, options);
}
- if (dependentKeys.length === 0) {
- return evaluateMultiPropertyBoundHelper(currentContext, fn, normalizedProperties, options);
- }
-
-
- normalized = normalizedProperties[0];
-
- pathRoot = normalized.root;
- path = normalized.path;
-
- var bindView = new Ember._SimpleHandlebarsView(
- path, pathRoot, !options.hash.unescaped, options.data
- );
+ var bindView = new Ember._SimpleHandlebarsView(null, null, !options.hash.unescaped, options.data);
+ // Override SimpleHandlebarsView's method for generating the view's content.
bindView.normalizedValue = function() {
- var value = Ember._SimpleHandlebarsView.prototype.normalizedValue.call(bindView);
- return fn.call(view, value, options);
+ var args = [], boundOption;
+
+ // Copy over bound hash options.
+ for (boundOption in boundOptions) {
+ if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
+ property = normalizePath(currentContext, boundOptions[boundOption], data);
+ bindView.path = property.path;
+ bindView.pathRoot = property.root;
+ hash[boundOption] = normalizedValue.call(bindView);
+ }
+
+ for (loc = 0; loc < numProperties; ++loc) {
+ property = normalizedProperties[loc];
+ if (property) {
+ bindView.path = property.path;
+ bindView.pathRoot = property.root;
+ args.push(normalizedValue.call(bindView));
+ } else {
+ args.push(properties[loc]);
+ }
+ }
+ args.push(options);
+
+ // Run the supplied helper function.
+ return fn.apply(currentContext, args);
};
view.appendChild(bindView);
- view.registerObserver(pathRoot, path, bindView, bindView.rerender);
+ // Assemble list of watched properties that'll re-render this helper.
+ for (boundOption in boundOptions) {
+ if (boundOptions.hasOwnProperty(boundOption)) {
+ watchedProperties.push(normalizePath(currentContext, boundOptions[boundOption], data));
+ }
+ }
+
+ // Observe each property.
+ for (loc = 0, len = watchedProperties.length; loc < len; ++loc) {
+ property = watchedProperties[loc];
+ view.registerObserver(property.root, property.path, bindView, bindView.rerender);
+ }
+
+ if (types[0] !== 'ID' || normalizedProperties.length === 0) {
+ return;
+ }
+
+ // Add dependent key observers to the first param
+ var normalized = normalizedProperties[0],
+ pathRoot = normalized.root,
+ path = normalized.path;
if(!Ember.isEmpty(path)) {
prefixPathForDependentKeys = path + '.';
@@ -20334,68 +24364,6 @@ Ember.Handlebars.registerBoundHelper = function(name, fn) {
Ember.Handlebars.registerHelper(name, helper);
};
-/**
- @private
-
- Renders the unbound form of an otherwise bound helper function.
-
- @method evaluateMultiPropertyBoundHelper
- @param {Function} fn
- @param {Object} context
- @param {Array} normalizedProperties
- @param {String} options
-*/
-function evaluateMultiPropertyBoundHelper(context, fn, normalizedProperties, options) {
- var numProperties = normalizedProperties.length,
- data = options.data,
- view = data.view,
- hash = options.hash,
- boundOptions = hash.boundOptions,
- watchedProperties,
- boundOption, bindView, loc, property, len;
-
- bindView = new Ember._SimpleHandlebarsView(null, null, !hash.unescaped, data);
- bindView.normalizedValue = function() {
- var args = [], boundOption;
-
- // Copy over bound options.
- for (boundOption in boundOptions) {
- if (!boundOptions.hasOwnProperty(boundOption)) { continue; }
- property = normalizePath(context, boundOptions[boundOption], data);
- bindView.path = property.path;
- bindView.pathRoot = property.root;
- hash[boundOption] = Ember._SimpleHandlebarsView.prototype.normalizedValue.call(bindView);
- }
-
- for (loc = 0; loc < numProperties; ++loc) {
- property = normalizedProperties[loc];
- bindView.path = property.path;
- bindView.pathRoot = property.root;
- args.push(Ember._SimpleHandlebarsView.prototype.normalizedValue.call(bindView));
- }
- args.push(options);
- return fn.apply(context, args);
- };
-
- view.appendChild(bindView);
-
- // Assemble list of watched properties that'll re-render this helper.
- watchedProperties = [];
- for (boundOption in boundOptions) {
- if (boundOptions.hasOwnProperty(boundOption)) {
- watchedProperties.push(normalizePath(context, boundOptions[boundOption], data));
- }
- }
- watchedProperties = watchedProperties.concat(normalizedProperties);
-
- // Observe each property.
- for (loc = 0, len = watchedProperties.length; loc < len; ++loc) {
- property = watchedProperties[loc];
- view.registerObserver(property.root, property.path, bindView, bindView.rerender);
- }
-
-}
-
/**
@private
@@ -20445,19 +24413,19 @@ Ember.Handlebars.template = function(spec) {
(function() {
/**
- * Mark a string as safe for unescaped output with Handlebars. If you
- * return HTML from a Handlebars helper, use this function to
- * ensure Handlebars does not escape the HTML.
- *
- * ```javascript
- * Ember.String.htmlSafe('someString
')
- * ```
- *
- * @method htmlSafe
- * @for Ember.String
- * @static
- * @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
- */
+ Mark a string as safe for unescaped output with Handlebars. If you
+ return HTML from a Handlebars helper, use this function to
+ ensure Handlebars does not escape the HTML.
+
+ ```javascript
+ Ember.String.htmlSafe('someString
')
+ ```
+
+ @method htmlSafe
+ @for Ember.String
+ @static
+ @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
+*/
Ember.String.htmlSafe = function(str) {
return new Handlebars.SafeString(str);
};
@@ -20467,18 +24435,18 @@ var htmlSafe = Ember.String.htmlSafe;
if (Ember.EXTEND_PROTOTYPES === true || Ember.EXTEND_PROTOTYPES.String) {
/**
- * Mark a string as being safe for unescaped output with Handlebars.
- *
- * ```javascript
- * 'someString
'.htmlSafe()
- * ```
- *
- * See `Ember.String.htmlSafe`.
- *
- * @method htmlSafe
- * @for String
- * @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
- */
+ Mark a string as being safe for unescaped output with Handlebars.
+
+ ```javascript
+ 'someString
'.htmlSafe()
+ ```
+
+ See [Ember.String.htmlSafe](/api/classes/Ember.String.html#method_htmlSafe).
+
+ @method htmlSafe
+ @for String
+ @return {Handlebars.SafeString} a string that will not be html escaped by Handlebars
+ */
String.prototype.htmlSafe = function() {
return htmlSafe(this);
};
@@ -20554,19 +24522,21 @@ var DOMManager = {
view.clearRenderedChildren();
var buffer = view.renderToBuffer();
- view.propertyWillChange('element');
+ view.invokeRecursively(function(view) {
+ view.propertyWillChange('element');
+ });
view.triggerRecursively('willInsertElement');
morph.replaceWith(buffer.string());
view.transitionTo('inDOM');
- view.propertyDidChange('element');
+ view.invokeRecursively(function(view) {
+ view.propertyDidChange('element');
+ });
view.triggerRecursively('didInsertElement');
notifyMutationListeners();
});
-
-
},
empty: function(view) {
@@ -20592,7 +24562,7 @@ Ember._Metamorph = Ember.Mixin.create({
init: function() {
this._super();
this.morph = Metamorph();
-
+ Ember.deprecate('Supplying a tagName to Metamorph views is unreliable and is deprecated. You may be setting the tagName on a Handlebars helper that creates a Metamorph.', !this.tagName);
},
beforeRender: function(buffer) {
@@ -20656,6 +24626,8 @@ function SimpleHandlebarsView(path, pathRoot, isEscaped, templateData) {
this.morph = Metamorph();
this.state = 'preRender';
this.updateId = null;
+ this._parentView = null;
+ this.buffer = null;
}
Ember._SimpleHandlebarsView = SimpleHandlebarsView;
@@ -20669,7 +24641,11 @@ SimpleHandlebarsView.prototype = {
Ember.run.cancel(this.updateId);
this.updateId = null;
}
+ if (this._parentView) {
+ this._parentView.removeChild(this);
+ }
this.morph = null;
+ this.state = 'destroyed';
},
propertyWillChange: Ember.K,
@@ -20724,7 +24700,7 @@ SimpleHandlebarsView.prototype = {
rerender: function() {
switch(this.state) {
case 'preRender':
- case 'destroying':
+ case 'destroyed':
break;
case 'inBuffer':
throw new Ember.Error("Something you did tried to replace an {{expression}} before it was inserted into the DOM.");
@@ -21115,7 +25091,7 @@ function simpleBind(property, options) {
@return {String} HTML string
*/
EmberHandlebars.registerHelper('_triageMustache', function(property, fn) {
-
+ Ember.assert("You cannot pass more than one argument to the _triageMustache helper", arguments.length <= 2);
if (helpers[property]) {
return helpers[property].call(this, fn);
}
@@ -21149,7 +25125,7 @@ EmberHandlebars.registerHelper('_triageMustache', function(property, fn) {
@return {String} HTML string
*/
EmberHandlebars.registerHelper('bind', function(property, options) {
-
+ Ember.assert("You cannot pass more than one argument to the bind helper", arguments.length <= 2);
var context = (options.contexts && options.contexts[0]) || this;
@@ -21205,10 +25181,12 @@ EmberHandlebars.registerHelper('with', function(context, options) {
if (arguments.length === 4) {
var keywordName, path, rootPath, normalized;
+ 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];
keywordName = arguments[2];
path = arguments[0];
+ Ember.assert("You must pass a block to the with helper", options.fn && options.fn !== Handlebars.VM.noop);
if (Ember.isGlobalPath(path)) {
Ember.bind(options.data.keywords, keywordName, path);
@@ -21229,15 +25207,15 @@ EmberHandlebars.registerHelper('with', function(context, options) {
return bind.call(this, path, options, 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);
return helpers.bind.call(options.contexts[0], context, options);
}
});
/**
- See `boundIf`
+ See [boundIf](/api/classes/Ember.Handlebars.helpers.html#method_boundIf)
@method if
@for Ember.Handlebars.helpers
@@ -21246,8 +25224,8 @@ EmberHandlebars.registerHelper('with', function(context, options) {
@return {String} HTML string
*/
EmberHandlebars.registerHelper('if', function(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);
return helpers.boundIf.call(options.contexts[0], context, options);
});
@@ -21260,8 +25238,8 @@ EmberHandlebars.registerHelper('if', function(context, options) {
@return {String} HTML string
*/
EmberHandlebars.registerHelper('unless', function(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);
var fn = options.fn, inverse = options.inverse;
@@ -21272,11 +25250,11 @@ EmberHandlebars.registerHelper('unless', function(context, options) {
});
/**
- `bindAttr` allows you to create a binding between DOM element attributes and
+ `bind-attr` allows you to create a binding between DOM element attributes and
Ember objects. For example:
```handlebars
-
+ {{yield}} {{input value=value}}
+
+ ```
+
+ Result:
+
+ ```html
+
+ First name:
```
@method yield
@@ -22784,25 +26872,19 @@ var get = Ember.get, set = Ember.set;
@return {String} HTML string
*/
Ember.Handlebars.registerHelper('yield', function(options) {
- var currentView = options.data.view, view = currentView, template;
+ var view = options.data.view;
while (view && !get(view, 'layout')) {
- view = get(view, 'parentView');
+ if (view._contextView) {
+ view = view._contextView;
+ } else {
+ view = get(view, 'parentView');
+ }
}
+ Ember.assert("You called yield in a template that was not a layout", !!view);
- template = get(view, 'template');
-
- var keywords = view._parentView.cloneKeywords();
-
- currentView.appendChild(Ember.View, {
- isVirtual: true,
- tagName: '',
- template: template,
- context: get(view._parentView, 'context'),
- controller: get(view._parentView, 'controller'),
- templateData: {keywords: keywords}
- });
+ view._yield(this, options);
});
})();
@@ -22821,11 +26903,11 @@ Ember.Handlebars.registerHelper('yield', function(options) {
```html
```
- Take note that `welcome` is a string and not an object
+ Take note that `"welcome"` is a string and not an object
reference.
@method loc
@@ -22862,26 +26944,12 @@ Ember.Handlebars.registerHelper('loc', function(str) {
var set = Ember.set, get = Ember.get;
/**
- The `Ember.Checkbox` view class renders a checkbox
- [input](https://developer.mozilla.org/en/HTML/Element/Input) element. It
- allows for binding an Ember property (`checked`) to the status of the
- checkbox.
+ The internal class used to create text inputs when the `{{input}}`
+ helper is used with `type` of `checkbox`.
- Example:
+ See Handlebars.helpers.input for usage details.
- ```handlebars
- {{view Ember.Checkbox checkedBinding="receiveEmail"}}
- ```
-
- You can add a `label` tag yourself in the template where the `Ember.Checkbox`
- is being used.
-
- ```handlebars
-
- {{view Ember.Checkbox classNames="applicaton-specific-checkbox"}}
- Some Title
-
- ```
+ ## Direct manipulation of `checked`
The `checked` attribute of an `Ember.Checkbox` object should always be set
through the Ember object or by interacting with its rendered element
@@ -22892,8 +26960,8 @@ var set = Ember.set, get = Ember.get;
## Layout and LayoutName properties
Because HTML `input` elements are self closing `layout` and `layoutName`
- properties will not be applied. See `Ember.View`'s layout section for more
- information.
+ properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+ layout section for more information.
@class Checkbox
@namespace Ember
@@ -22948,14 +27016,11 @@ var get = Ember.get, set = Ember.set;
Ember.TextSupport = Ember.Mixin.create({
value: "",
- attributeBindings: ['placeholder', 'disabled', 'maxlength', 'tabindex'],
+ attributeBindings: ['placeholder', 'disabled', 'maxlength', 'tabindex', 'readonly'],
placeholder: null,
disabled: false,
maxlength: null,
- insertNewline: Ember.K,
- cancel: Ember.K,
-
init: function() {
this._super();
this.on("focusOut", this, this._elementValueDidChange);
@@ -22966,120 +27031,6 @@ Ember.TextSupport = Ember.Mixin.create({
this.on("keyUp", this, this.interpretKeyEvents);
},
- interpretKeyEvents: function(event) {
- var map = Ember.TextSupport.KEY_EVENTS;
- var method = map[event.keyCode];
-
- this._elementValueDidChange();
- if (method) { return this[method](event); }
- },
-
- _elementValueDidChange: function() {
- set(this, 'value', this.$().val());
- }
-
-});
-
-Ember.TextSupport.KEY_EVENTS = {
- 13: 'insertNewline',
- 27: 'cancel'
-};
-
-})();
-
-
-
-(function() {
-/**
-@module ember
-@submodule ember-handlebars
-*/
-
-var get = Ember.get, set = Ember.set;
-
-/**
- The `Ember.TextField` view class renders a text
- [input](https://developer.mozilla.org/en/HTML/Element/Input) element. It
- allows for binding Ember properties to the text field contents (`value`),
- live-updating as the user inputs text.
-
- Example:
-
- ```handlebars
- {{view Ember.TextField valueBinding="firstName"}}
- ```
-
- ## Layout and LayoutName properties
-
- Because HTML `input` elements are self closing `layout` and `layoutName`
- properties will not be applied. See `Ember.View`'s layout section for more
- information.
-
- ## HTML Attributes
-
- By default `Ember.TextField` provides support for `type`, `value`, `size`,
- `pattern`, `placeholder`, `disabled`, `maxlength` and `tabindex` attributes
- on a text field. If you need to support more attributes have a look at the
- `attributeBindings` property in `Ember.View`'s HTML Attributes section.
-
- To globally add support for additional attributes you can reopen
- `Ember.TextField` or `Ember.TextSupport`.
-
- ```javascript
- Ember.TextSupport.reopen({
- attributeBindings: ["required"]
- })
- ```
-
- @class TextField
- @namespace Ember
- @extends Ember.View
- @uses Ember.TextSupport
-*/
-Ember.TextField = Ember.View.extend(Ember.TextSupport,
- /** @scope Ember.TextField.prototype */ {
-
- classNames: ['ember-text-field'],
- tagName: "input",
- attributeBindings: ['type', 'value', 'size', 'pattern', 'name'],
-
- /**
- The `value` attribute of the input element. As the user inputs text, this
- property is updated live.
-
- @property value
- @type String
- @default ""
- */
- value: "",
-
- /**
- The `type` attribute of the input element.
-
- @property type
- @type String
- @default "text"
- */
- type: "text",
-
- /**
- The `size` of the text field in characters.
-
- @property size
- @type String
- @default null
- */
- size: null,
-
- /**
- The `pattern` the pattern attribute of input element.
-
- @property pattern
- @type String
- @default null
- */
- pattern: null,
-
/**
The action to be sent when the user presses the return key.
@@ -23124,31 +27075,109 @@ Ember.TextField = Ember.View.extend(Ember.TextSupport,
*/
bubbles: false,
- insertNewline: function(event) {
- sendAction('enter', this, event);
+ interpretKeyEvents: function(event) {
+ var map = Ember.TextSupport.KEY_EVENTS;
+ var method = map[event.keyCode];
+
+ this._elementValueDidChange();
+ if (method) { return this[method](event); }
},
+ _elementValueDidChange: function() {
+ set(this, 'value', this.$().val());
+ },
+
+ /**
+ The action to be sent when the user inserts a new line.
+
+ Called by the `Ember.TextSupport` mixin on keyUp if keycode matches 13.
+ Uses sendAction to send the `enter` action to the controller.
+
+ @method insertNewLine
+ @param {Event} event
+ */
+ insertNewline: function(event) {
+ sendAction('enter', this, event);
+ sendAction('insert-newline', this, event);
+ },
+
+ /**
+ Called when the user hits escape.
+
+ Called by the `Ember.TextSupport` mixin on keyUp if keycode matches 13.
+ Uses sendAction to send the `enter` action to the controller.
+
+ @method cancel
+ @param {Event} event
+ */
+ cancel: function(event) {
+ sendAction('escape-press', this, event);
+ },
+
+ /**
+ Called when the text area is focused.
+
+ @method focusIn
+ @param {Event} event
+ */
+ focusIn: function(event) {
+ sendAction('focus-in', this, event);
+ },
+
+ /**
+ Called when the text area is blurred.
+
+ @method focusOut
+ @param {Event} event
+ */
+ focusOut: function(event) {
+ sendAction('focus-out', this, event);
+ },
+
+ /**
+ The action to be sent when the user presses a key. Enabled by setting
+ the `onEvent` property to `keyPress`.
+
+ Uses sendAction to send the `keyPress` action to the controller.
+
+ @method keyPress
+ @param {Event} event
+ */
keyPress: function(event) {
- sendAction('keyPress', this, event);
+ sendAction('key-press', this, event);
}
+
});
+Ember.TextSupport.KEY_EVENTS = {
+ 13: 'insertNewline',
+ 27: 'cancel'
+};
+
+// In principle, this shouldn't be necessary, but the legacy
+// sectionAction semantics for TextField are different from
+// the component semantics so this method normalizes them.
function sendAction(eventName, view, event) {
- var action = get(view, 'action'),
- on = get(view, 'onEvent');
+ var action = get(view, eventName),
+ on = get(view, 'onEvent'),
+ value = get(view, 'value');
- if (action && on === eventName) {
- var controller = get(view, 'controller'),
- value = get(view, 'value'),
- bubbles = get(view, 'bubbles');
+ // back-compat support for keyPress as an event name even though
+ // it's also a method name that consumes the event (and therefore
+ // incompatible with sendAction semantics).
+ if (on === eventName || (on === 'keyPress' && eventName === 'key-press')) {
+ view.sendAction('action', value);
+ }
- controller.send(action, value, view);
+ view.sendAction(eventName, value);
- if (!bubbles) {
+ if (action || on === eventName) {
+ if(!get(view, 'bubbles')) {
event.stopPropagation();
}
}
}
+
})();
@@ -23162,6 +27191,81 @@ function sendAction(eventName, view, event) {
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](api/classes/Ember.Handlebars.helpers.html#method_input) for usage details.
+
+ ## Layout and LayoutName properties
+
+ Because HTML `input` elements are self closing `layout` and `layoutName`
+ properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+ layout section for more information.
+
+ @class TextField
+ @namespace Ember
+ @extends Ember.Component
+ @uses Ember.TextSupport
+*/
+Ember.TextField = Ember.Component.extend(Ember.TextSupport,
+ /** @scope Ember.TextField.prototype */ {
+
+ classNames: ['ember-text-field'],
+ tagName: "input",
+ attributeBindings: ['type', 'value', 'size', 'pattern', 'name'],
+
+ /**
+ The `value` attribute of the input element. As the user inputs text, this
+ property is updated live.
+
+ @property value
+ @type String
+ @default ""
+ */
+ value: "",
+
+ /**
+ The `type` attribute of the input element.
+
+ @property type
+ @type String
+ @default "text"
+ */
+ type: "text",
+
+ /**
+ The `size` of the text field in characters.
+
+ @property size
+ @type String
+ @default null
+ */
+ size: null,
+
+ /**
+ The `pattern` the pattern attribute of input element.
+
+ @property pattern
+ @type String
+ @default null
+ */
+ pattern: null
+});
+
+})();
+
+
+
+(function() {
+/*
+@module ember
+@submodule ember-handlebars
+*/
+
+var get = Ember.get, set = Ember.set;
+
+/*
@class Button
@namespace Ember
@extends Ember.View
@@ -23178,7 +27282,7 @@ Ember.Button = Ember.View.extend(Ember.TargetActionSupport, {
attributeBindings: ['type', 'disabled', 'href', 'tabindex'],
- /**
+ /*
@private
Overrides `TargetActionSupport`'s `targetObject` computed
@@ -23272,7 +27376,7 @@ Ember.Button = Ember.View.extend(Ember.TargetActionSupport, {
},
init: function() {
-
+ Ember.deprecate("Ember.Button is deprecated and will be removed from future releases. Consider using the `{{action}}` helper.");
this._super();
}
});
@@ -23290,39 +27394,23 @@ Ember.Button = Ember.View.extend(Ember.TargetActionSupport, {
var get = Ember.get, set = Ember.set;
/**
- The `Ember.TextArea` view class renders a
- [textarea](https://developer.mozilla.org/en/HTML/Element/textarea) element.
- It allows for binding Ember properties to the text area contents (`value`),
- live-updating as the user inputs text.
+ The internal class used to create textarea element when the `{{textarea}}`
+ helper is used.
+
+ See [handlebars.helpers.textarea](/api/classes/Ember.Handlebars.helpers.html#method_textarea) for usage details.
## Layout and LayoutName properties
Because HTML `textarea` elements do not contain inner HTML the `layout` and
- `layoutName` properties will not be applied. See `Ember.View`'s layout
- section for more information.
-
- ## HTML Attributes
-
- By default `Ember.TextArea` provides support for `rows`, `cols`,
- `placeholder`, `disabled`, `maxlength` and `tabindex` attributes on a
- textarea. If you need to support more attributes have a look at the
- `attributeBindings` property in `Ember.View`'s HTML Attributes section.
-
- To globally add support for additional attributes you can reopen
- `Ember.TextArea` or `Ember.TextSupport`.
-
- ```javascript
- Ember.TextSupport.reopen({
- attributeBindings: ["required"]
- })
- ```
+ `layoutName` properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+ layout section for more information.
@class TextArea
@namespace Ember
- @extends Ember.View
+ @extends Ember.Component
@uses Ember.TextSupport
*/
-Ember.TextArea = Ember.View.extend(Ember.TextSupport, {
+Ember.TextArea = Ember.Component.extend(Ember.TextSupport, {
classNames: ['ember-text-area'],
tagName: "textarea",
@@ -23438,7 +27526,7 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
`content` property. The underlying data object of the selected `` is
stored in the `Element.Select`'s `value` property.
- ### `content` as an array of Strings
+ ## The Content Property (array of strings)
The simplest version of an `Ember.Select` takes an array of strings as its
`content` property. The string will be used as both the `value` property and
@@ -23447,11 +27535,13 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
Example:
```javascript
- App.names = ["Yehuda", "Tom"];
+ App.ApplicationController = Ember.Controller.extend({
+ names: ["Yehuda", "Tom"]
+ });
```
```handlebars
- {{view Ember.Select contentBinding="App.names"}}
+ {{view Ember.Select contentBinding="names"}}
```
Would result in the following HTML:
@@ -23467,16 +27557,16 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
`value` property directly or as a binding:
```javascript
- App.names = Ember.Object.create({
- selected: 'Tom',
- content: ["Yehuda", "Tom"]
+ App.ApplicationController = Ember.Controller.extend({
+ selectedName: 'Tom',
+ names: ["Yehuda", "Tom"]
});
```
```handlebars
{{view Ember.Select
- contentBinding="App.names.content"
- valueBinding="App.names.selected"
+ contentBinding="names"
+ valueBinding="selectedName"
}}
```
@@ -23490,9 +27580,9 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
```
A user interacting with the rendered `` to choose "Yehuda" would
- update the value of `App.names.selected` to "Yehuda".
+ update the value of `selectedName` to "Yehuda".
- ### `content` as an Array of Objects
+ ## The Content Property (array of Objects)
An `Ember.Select` can also take an array of JavaScript or Ember objects as
its `content` property.
@@ -23507,15 +27597,17 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
element's text. Both paths must reference each object itself as `content`:
```javascript
- App.programmers = [
- Ember.Object.create({firstName: "Yehuda", id: 1}),
- Ember.Object.create({firstName: "Tom", id: 2})
- ];
+ App.ApplicationController = Ember.Controller.extend({
+ programmers: [
+ {firstName: "Yehuda", id: 1},
+ {firstName: "Tom", id: 2}
+ ]
+ });
```
```handlebars
{{view Ember.Select
- contentBinding="App.programmers"
+ contentBinding="programmers"
optionValuePath="content.id"
optionLabelPath="content.firstName"}}
```
@@ -23534,22 +27626,23 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
`valueBinding` option:
```javascript
- App.programmers = [
- Ember.Object.create({firstName: "Yehuda", id: 1}),
- Ember.Object.create({firstName: "Tom", id: 2})
- ];
-
- App.currentProgrammer = Ember.Object.create({
- id: 2
+ App.ApplicationController = Ember.Controller.extend({
+ programmers: [
+ {firstName: "Yehuda", id: 1},
+ {firstName: "Tom", id: 2}
+ ],
+ currentProgrammer: {
+ id: 2
+ }
});
```
```handlebars
{{view Ember.Select
- contentBinding="App.programmers"
+ contentBinding="programmers"
optionValuePath="content.id"
optionLabelPath="content.firstName"
- valueBinding="App.currentProgrammer.id"}}
+ valueBinding="currentProgrammer.id"}}
```
Would result in the following HTML with a selected option:
@@ -23562,7 +27655,7 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
```
Interacting with the rendered element by selecting the first option
- ('Yehuda') will update the `id` value of `App.currentProgrammer`
+ ('Yehuda') will update the `id` of `currentProgrammer`
to match the `value` property of the newly selected ``.
Alternatively, you can control selection through the underlying objects
@@ -23572,21 +27665,21 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
element:
```javascript
- App.controller = Ember.Object.create({
+ App.ApplicationController = Ember.Controller.extend({
selectedPerson: null,
- content: [
- Ember.Object.create({firstName: "Yehuda", id: 1}),
- Ember.Object.create({firstName: "Tom", id: 2})
+ programmers: [
+ {firstName: "Yehuda", id: 1},
+ {firstName: "Tom", id: 2}
]
});
```
```handlebars
{{view Ember.Select
- contentBinding="App.controller.content"
+ contentBinding="programmers"
optionValuePath="content.id"
optionLabelPath="content.firstName"
- selectionBinding="App.controller.selectedPerson"}}
+ selectionBinding="selectedPerson"}}
```
Would result in the following HTML with a selected option:
@@ -23599,19 +27692,19 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
```
Interacting with the rendered element by selecting the first option
- ('Yehuda') will update the `selectedPerson` value of `App.controller`
- to match the content object of the newly selected ` `. In this
- case it is the first object in the `App.controller.content`
+ ('Yehuda') will update the `selectedPerson` to match the object of
+ the newly selected ` `. In this case it is the first object
+ in the `programmers`
- ### Supplying a Prompt
+ ## Supplying a Prompt
A `null` value for the `Ember.Select`'s `value` or `selection` property
results in there being no ` ` with a `selected` attribute:
```javascript
- App.controller = Ember.Object.create({
- selected: null,
- content: [
+ App.ApplicationController = Ember.Controller.extend({
+ selectedProgrammer: null,
+ programmers: [
"Yehuda",
"Tom"
]
@@ -23620,8 +27713,8 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
``` handlebars
{{view Ember.Select
- contentBinding="App.controller.content"
- valueBinding="App.controller.selected"
+ contentBinding="programmers"
+ valueBinding="selectedProgrammer"
}}
```
@@ -23634,16 +27727,16 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
```
- Although `App.controller.selected` is `null` and no ` `
+ Although `selectedProgrammer` is `null` and no ` `
has a `selected` attribute the rendered HTML will display the
first item as though it were selected. You can supply a string
value for the `Ember.Select` to display when there is no selection
with the `prompt` option:
```javascript
- App.controller = Ember.Object.create({
- selected: null,
- content: [
+ App.ApplicationController = Ember.Controller.extend({
+ selectedProgrammer: null,
+ programmers: [
"Yehuda",
"Tom"
]
@@ -23652,8 +27745,8 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
```handlebars
{{view Ember.Select
- contentBinding="App.controller.content"
- valueBinding="App.controller.selected"
+ contentBinding="programmers"
+ valueBinding="selectedProgrammer"
prompt="Please select a name"
}}
```
@@ -23683,7 +27776,7 @@ helpers = this.merge(helpers, Ember.Handlebars.helpers); data = data || {};
var buffer = '', stack1, hashTypes, hashContexts, escapeExpression=this.escapeExpression, self=this;
function program1(depth0,data) {
-
+
var buffer = '', hashTypes, hashContexts;
data.buffer.push(" ");
hashTypes = {};
@@ -23694,7 +27787,7 @@ function program1(depth0,data) {
}
function program3(depth0,data) {
-
+
var stack1, hashTypes, hashContexts;
hashTypes = {};
hashContexts = {};
@@ -23703,7 +27796,7 @@ function program3(depth0,data) {
else { data.buffer.push(''); }
}
function program4(depth0,data) {
-
+
var hashContexts, hashTypes;
hashContexts = {'contentBinding': depth0,'labelBinding': depth0};
hashTypes = {'contentBinding': "ID",'labelBinding': "ID"};
@@ -23714,7 +27807,7 @@ function program4(depth0,data) {
}
function program6(depth0,data) {
-
+
var stack1, hashTypes, hashContexts;
hashTypes = {};
hashContexts = {};
@@ -23723,7 +27816,7 @@ function program6(depth0,data) {
else { data.buffer.push(''); }
}
function program7(depth0,data) {
-
+
var hashContexts, hashTypes;
hashContexts = {'contentBinding': depth0};
hashTypes = {'contentBinding': "STRING"};
@@ -23741,7 +27834,7 @@ function program7(depth0,data) {
stack1 = helpers['if'].call(depth0, "view.optionGroupPath", {hash:{},inverse:self.program(6, program6, data),fn:self.program(3, program3, data),contexts:[depth0],types:["ID"],hashContexts:hashContexts,hashTypes:hashTypes,data:data});
if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
return buffer;
-
+
}),
attributeBindings: ['multiple', 'disabled', 'tabindex', 'name'],
@@ -23755,6 +27848,14 @@ function program7(depth0,data) {
*/
multiple: false,
+ /**
+ The `disabled` attribute of the select element. Indicates whether
+ the element is disabled from interactions.
+
+ @property multiple
+ @type Boolean
+ @default false
+ */
disabled: false,
/**
@@ -23821,7 +27922,7 @@ function program7(depth0,data) {
prompt: null,
/**
- The path of the option labels. See `content`.
+ The path of the option labels. See [content](/api/classes/Ember.Select.html#property_content).
@property optionLabelPath
@type String
@@ -23830,7 +27931,7 @@ function program7(depth0,data) {
optionLabelPath: 'content',
/**
- The path of the option values. See `content`.
+ The path of the option values. See [content](/api/classes/Ember.Select.html#property_content).
@property optionValuePath
@type String
@@ -24011,6 +28112,11 @@ function program7(depth0,data) {
(function() {
+/**
+@module ember
+@submodule ember-handlebars-compiler
+*/
+
function normalizeHash(hash, hashTypes) {
for (var prop in hash) {
if (hashTypes[prop] === 'ID') {
@@ -24021,16 +28127,145 @@ function normalizeHash(hash, hashTypes) {
}
/**
- * `{{input}}` inserts a new instance of either Ember.TextField or
- * Ember.Checkbox, depending on the `type` option passed in. If no `type`
- * is supplied it defaults to Ember.TextField.
- *
- * @method input
- * @for Ember.Handlebars.helpers
- * @param {Hash} options
- */
-Ember.Handlebars.registerHelper('input', function(options) {
+ The `{{input}}` helper inserts an HTML `
+ {{outputWrittenWords}}
+
+ ```
+
+ Would result in the following HTML:
+
+ ```html
+
+
+ <-- the following div will be updated in real time as you type -->
+
+
+ Lots of text that IS bound
+
+ ```
+
+ Finally, this example really shows the power and ease of Ember when two
+ properties are bound to eachother via `Ember.computed.alias`. Type into
+ either text area box and they'll both stay in sync. Note that
+ `Ember.computed.alias` costs more in terms of performance, so only use it when
+ your really binding in both directions:
+
+ ```javascript
+ App.ApplicationController = Ember.Controller.extend({
+ writtenWords: "Lots of text that IS bound",
+ twoWayWrittenWords: Ember.computed.alias("writtenWords")
+ });
+ ```
+
+ ```handlebars
+ {{textarea value=writtenWords}}
+ {{textarea value=twoWayWrittenWords}}
+ ```
+
+ ```html
+
+
+ <-- both updated in real time -->
+
+
+ ```
+
+ ## Extension
+
+ Internally, `{{textarea}}` creates an instance of `Ember.TextArea`, passing
+ arguments from the helper to `Ember.TextArea`'s `create` method. You can
+ 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
+ `Ember.TextSupport` and adding it to the `attributeBindings` concatenated
+ property:
+
+ ```javascript
+ Ember.TextArea.reopen({
+ attributeBindings: ['required']
+ });
+ ```
+
+ Keep in mind when writing `Ember.TextArea` subclasses that `Ember.TextArea`
+ itself extends `Ember.Component`, meaning that it does NOT inherit
+ the `controller` of the parent view.
+
+ See more about [Ember components](api/classes/Ember.Component.html)
+
+ @method textarea
+ @for Ember.Handlebars.helpers
+ @param {Hash} options
+*/
+Ember.Handlebars.registerHelper('textarea', function(options) {
+ Ember.assert('You can only pass attributes to the `textarea` helper, not arguments', arguments.length < 2);
var hash = options.hash,
types = options.hashTypes;
@@ -24114,6 +28488,11 @@ Ember.Handlebars.bootstrap = function(ctx) {
templateName = script.attr('data-template-name') || script.attr('id') || 'application',
template = compile(script.html());
+ // Check if template of same name already exists
+ if (Ember.TEMPLATES[templateName] !== undefined) {
+ throw new Error('Template named "' + templateName + '" already exists.');
+ }
+
// For templates which have a name, we save them and then remove them from the DOM
Ember.TEMPLATES[templateName] = template;
@@ -24137,18 +28516,22 @@ function registerComponents(container) {
}
}
+
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;
- var className = name.replace(/-/g, '_');
- var Component = container.lookupFactory('component:' + className) || container.lookupFactory('component:' + name);
- var View = Component || Ember.Component.extend();
+ container.injection(fullName, 'layout', 'template:components/' + name);
- View.reopen({
- layoutName: 'components/' + name
- });
+ var Component = container.lookupFactory(fullName);
- Ember.Handlebars.helper(name, View);
+ if (!Component) {
+ container.register(fullName, Ember.Component);
+ Component = container.lookupFactory(fullName);
+ }
+
+ Ember.Handlebars.helper(name, Component);
}
/*
@@ -24163,21 +28546,16 @@ function registerComponent(container, name) {
*/
Ember.onLoad('Ember.Application', function(Application) {
- if (Application.initializer) {
- Application.initializer({
- name: 'domTemplates',
- initialize: bootstrap
- });
+ Application.initializer({
+ name: 'domTemplates',
+ initialize: bootstrap
+ });
- Application.initializer({
- name: 'registerComponents',
- after: 'domTemplates',
- initialize: registerComponents
- });
- } else {
- // for ember-old-router
- Ember.onLoad('application', bootstrap);
- }
+ Application.initializer({
+ name: 'registerComponents',
+ after: 'domTemplates',
+ initialize: registerComponents
+ });
});
})();
@@ -24301,7 +28679,7 @@ define("route-recognizer",
results.push(new StarSegment(match[1]));
names.push(match[1]);
types.stars++;
- } else if (segment === "") {
+ } else if(segment === "") {
results.push(new EpsilonSegment());
} else {
results.push(new StaticSegment(segment));
@@ -24450,19 +28828,31 @@ define("route-recognizer",
return nextStates;
}
- function findHandler(state, path) {
+ function findHandler(state, path, queryParams) {
var handlers = state.handlers, regex = state.regex;
var captures = path.match(regex), currentCapture = 1;
var result = [];
for (var i=0, l=handlers.length; i 0) {
+ currentResult.queryParams = activeQueryParams;
+ }
+ result.push(currentResult);
}
return result;
@@ -24517,7 +28907,11 @@ define("route-recognizer",
regex += segment.regex();
}
- handlers.push({ handler: route.handler, names: names });
+ var handler = { handler: route.handler, names: names };
+ if(route.queryParams) {
+ handler.queryParams = route.queryParams;
+ }
+ handlers.push(handler);
}
if (isEmpty) {
@@ -24569,12 +28963,61 @@ define("route-recognizer",
if (output.charAt(0) !== '/') { output = '/' + output; }
+ if (params && params.queryParams) {
+ output += this.generateQueryString(params.queryParams, route.handlers);
+ }
+
return output;
},
+ generateQueryString: function(params, handlers) {
+ var pairs = [], allowedParams = [];
+ for(var i=0; i < handlers.length; i++) {
+ var currentParamList = handlers[i].queryParams;
+ if(currentParamList) {
+ allowedParams.push.apply(allowedParams, currentParamList);
+ }
+ }
+ for(var key in params) {
+ if (params.hasOwnProperty(key)) {
+ if(!~allowedParams.indexOf(key)) {
+ throw 'Query param "' + key + '" is not specified as a valid param for this route';
+ }
+ var value = params[key];
+ var pair = encodeURIComponent(key);
+ if(value !== true) {
+ pair += "=" + encodeURIComponent(value);
+ }
+ pairs.push(pair);
+ }
+ }
+
+ if (pairs.length === 0) { return ''; }
+
+ return "?" + pairs.join("&");
+ },
+
+ parseQueryString: function(queryString) {
+ var pairs = queryString.split("&"), queryParams = {};
+ for(var i=0; i < pairs.length; i++) {
+ var pair = pairs[i].split('='),
+ key = decodeURIComponent(pair[0]),
+ value = pair[1] ? decodeURIComponent(pair[1]) : true;
+ queryParams[key] = value;
+ }
+ return queryParams;
+ },
+
recognize: function(path) {
var states = [ this.rootState ],
- pathLen, i, l;
+ pathLen, i, l, queryStart, queryParams = {};
+
+ queryStart = path.indexOf('?');
+ if (~queryStart) {
+ var queryString = path.substr(queryStart + 1, path.length);
+ path = path.substr(0, queryStart);
+ queryParams = this.parseQueryString(queryString);
+ }
// DEBUG GROUP path
@@ -24602,7 +29045,7 @@ define("route-recognizer",
var state = solutions[0];
if (state && state.handlers) {
- return findHandler(state, path);
+ return findHandler(state, path, queryParams);
}
}
};
@@ -24627,12 +29070,25 @@ define("route-recognizer",
if (callback.length === 0) { throw new Error("You must have an argument in the function passed to `to`"); }
this.matcher.addChild(this.path, target, callback, this.delegate);
}
+ return this;
+ },
+
+ withQueryParams: function() {
+ if (arguments.length === 0) { throw new Error("you must provide arguments to the withQueryParams method"); }
+ for (var i = 0; i < arguments.length; i++) {
+ if (typeof arguments[i] !== "string") {
+ throw new Error('you should call withQueryParams with a list of strings, e.g. withQueryParams("foo", "bar")');
+ }
+ }
+ var queryParams = [].slice.call(arguments);
+ this.matcher.addQueryParams(this.path, queryParams);
}
};
function Matcher(target) {
this.routes = {};
this.children = {};
+ this.queryParams = {};
this.target = target;
}
@@ -24641,6 +29097,10 @@ define("route-recognizer",
this.routes[path] = handler;
},
+ addQueryParams: function(path, params) {
+ this.queryParams[path] = params;
+ },
+
addChild: function(path, target, callback, delegate) {
var matcher = new Matcher(target);
this.children[path] = matcher;
@@ -24667,23 +29127,26 @@ define("route-recognizer",
};
}
- function addRoute(routeArray, path, handler) {
+ function addRoute(routeArray, path, handler, queryParams) {
var len = 0;
for (var i=0, l=routeArray.length; i 0) {
+ var err = 'You supplied the params ';
+ err += missingParams.map(function(param) {
+ return '"' + param + "=" + queryParams[param] + '"';
+ }).join(' and ');
+
+ err += ' which are not valid for the "' + handlerName + '" handler or its parents';
+
+ throw new Error(err);
+ }
+
return this.recognizer.generate(handlerName, params);
},
isActive: function(handlerName) {
- var contexts = slice.call(arguments, 1);
+ var partitionedArgs = extractQueryParams(slice.call(arguments, 1)),
+ contexts = partitionedArgs[0],
+ queryParams = partitionedArgs[1],
+ activeQueryParams = {},
+ effectiveQueryParams = {};
var targetHandlerInfos = this.targetHandlerInfos,
found = false, names, object, handlerInfo, handlerObj;
@@ -25021,20 +29530,25 @@ define("router",
if (!targetHandlerInfos) { return false; }
var recogHandlers = this.recognizer.handlersFor(targetHandlerInfos[targetHandlerInfos.length - 1].name);
-
for (var i=targetHandlerInfos.length-1; i>=0; i--) {
handlerInfo = targetHandlerInfos[i];
if (handlerInfo.name === handlerName) { found = true; }
if (found) {
- if (contexts.length === 0) { break; }
+ var recogHandler = recogHandlers[i];
- if (handlerInfo.isDynamic) {
+ merge(activeQueryParams, handlerInfo.queryParams);
+ if (queryParams !== false) {
+ merge(effectiveQueryParams, handlerInfo.queryParams);
+ mergeSomeKeys(effectiveQueryParams, queryParams, recogHandler.queryParams);
+ }
+
+ if (handlerInfo.isDynamic && contexts.length > 0) {
object = contexts.pop();
if (isParam(object)) {
- var recogHandler = recogHandlers[i], name = recogHandler.names[0];
- if (object.toString() !== this.currentParams[name]) { return false; }
+ var name = recogHandler.names[0];
+ if ("" + object !== this.currentParams[name]) { return false; }
} else if (handlerInfo.context !== object) {
return false;
}
@@ -25042,12 +29556,13 @@ define("router",
}
}
- return contexts.length === 0 && found;
+
+ return contexts.length === 0 && found && queryParamsEqual(activeQueryParams, effectiveQueryParams);
},
trigger: function(name) {
var args = slice.call(arguments);
- trigger(this.currentHandlerInfos, false, args);
+ trigger(this, this.currentHandlerInfos, false, args);
},
/**
@@ -25065,7 +29580,7 @@ define("router",
a shared pivot parent route and other data necessary to perform
a transition.
*/
- function getMatchPoint(router, handlers, objects, inputParams) {
+ function getMatchPoint(router, handlers, objects, inputParams, queryParams) {
var matchPoint = handlers.length,
providedModels = {}, i,
@@ -25120,6 +29635,12 @@ define("router",
}
}
+ // If there is an old handler, see if query params are the same. If there isn't an old handler,
+ // hasChanged will already be true here
+ if(oldHandlerInfo && !queryParamsEqual(oldHandlerInfo.queryParams, handlerObj.queryParams)) {
+ hasChanged = true;
+ }
+
if (hasChanged) { matchPoint = i; }
}
@@ -25144,8 +29665,8 @@ define("router",
}
} else if (activeTransition) {
// Use model from previous transition attempt, preferably the resolved one.
- return (paramName && activeTransition.providedModels[handlerName]) ||
- activeTransition.resolvedModels[handlerName];
+ return activeTransition.resolvedModels[handlerName] ||
+ (paramName && activeTransition.providedModels[handlerName]);
}
}
@@ -25153,6 +29674,28 @@ define("router",
return (typeof object === "string" || object instanceof String || !isNaN(object));
}
+
+
+ /**
+ @private
+
+ This method takes a handler name and returns a list of query params
+ that are valid to pass to the handler or its parents
+
+ @param {Router} router
+ @param {String} handlerName
+ @return {Array[String]} a list of query parameters
+ */
+ function queryParamsForHandler(router, handlerName) {
+ var handlers = router.recognizer.handlersFor(handlerName),
+ queryParams = [];
+
+ for (var i = 0; i < handlers.length; i++) {
+ queryParams.push.apply(queryParams, handlers[i].queryParams || []);
+ }
+
+ return queryParams;
+ }
/**
@private
@@ -25164,13 +29707,17 @@ define("router",
@param {Array[Object]} objects
@return {Object} a serialized parameter hash
*/
- function paramsForHandler(router, handlerName, objects) {
+ function paramsForHandler(router, handlerName, objects, queryParams) {
var handlers = router.recognizer.handlersFor(handlerName),
params = {},
- matchPoint = getMatchPoint(router, handlers, objects).matchPoint,
+ handlerInfos = generateHandlerInfosWithQueryParams(router, handlers, queryParams),
+ matchPoint = getMatchPoint(router, handlerInfos, objects).matchPoint,
+ mergedQueryParams = {},
object, handlerObj, handler, names, i;
+ params.queryParams = {};
+
for (i=0; i 0) {
+ handlerInfo.queryParams = activeQueryParams;
+ }
+
+ handlerInfos.push(handlerInfo);
+ }
+
+ return handlerInfos;
+ }
+
+ /**
+ @private
+ */
+ function createQueryParamTransition(router, queryParams) {
+ var currentHandlers = router.currentHandlerInfos,
+ currentHandler = currentHandlers[currentHandlers.length - 1],
+ name = currentHandler.name;
+
+ log(router, "Attempting query param transition");
+
+ return createNamedTransition(router, [name, queryParams]);
+ }
+
/**
@private
*/
function createNamedTransition(router, args) {
- var handlers = router.recognizer.handlersFor(args[0]);
+ var partitionedArgs = extractQueryParams(args),
+ pureArgs = partitionedArgs[0],
+ queryParams = partitionedArgs[1],
+ handlers = router.recognizer.handlersFor(pureArgs[0]),
+ handlerInfos = generateHandlerInfosWithQueryParams(router, handlers, queryParams);
- log(router, "Attempting transition to " + args[0]);
- return performTransition(router, handlers, slice.call(args, 1), router.currentParams);
+ log(router, "Attempting transition to " + pureArgs[0]);
+
+ return performTransition(router, handlerInfos, slice.call(pureArgs, 1), router.currentParams, queryParams);
}
/**
@private
*/
function createURLTransition(router, url) {
-
var results = router.recognizer.recognize(url),
- currentHandlerInfos = router.currentHandlerInfos;
+ currentHandlerInfos = router.currentHandlerInfos,
+ queryParams = {};
log(router, "Attempting URL transition to " + url);
@@ -25224,7 +29837,11 @@ define("router",
return errorTransition(router, new Router.UnrecognizedURLError(url));
}
- return performTransition(router, results, [], {});
+ for(var i = 0; i < results.length; i++) {
+ merge(queryParams, results[i].queryParams);
+ }
+
+ return performTransition(router, results, [], {}, queryParams);
}
@@ -25291,10 +29908,6 @@ define("router",
eachHandler(partition.entered, function(handlerInfo) {
handlerEnteredOrUpdated(transition, currentHandlerInfos, handlerInfo, true);
});
-
- if (router.didTransition) {
- router.didTransition(handlerInfos);
- }
}
/**
@@ -25312,13 +29925,14 @@ define("router",
checkAbort(transition);
setContext(handler, context);
+ setQueryParams(handler, handlerInfo.queryParams);
- if (handler.setup) { handler.setup(context); }
+ if (handler.setup) { handler.setup(context, handlerInfo.queryParams); }
checkAbort(transition);
} catch(e) {
if (!(e instanceof Router.TransitionAborted)) {
// Trigger the `error` event starting from this failed handler.
- trigger(currentHandlerInfos.concat(handlerInfo), true, ['error', e, transition]);
+ trigger(transition.router, currentHandlerInfos.concat(handlerInfo), true, ['error', e, transition]);
}
// Propagate the error so that the transition promise will reject.
@@ -25344,6 +29958,29 @@ define("router",
}
}
+ /**
+ @private
+
+ determines if two queryparam objects are the same or not
+ **/
+ function queryParamsEqual(a, b) {
+ a = a || {};
+ b = b || {};
+ var checkedKeys = [], key;
+ for(key in a) {
+ if (!a.hasOwnProperty(key)) { continue; }
+ if(b[key] !== a[key]) { return false; }
+ checkedKeys.push(key);
+ }
+ for(key in b) {
+ if (!b.hasOwnProperty(key)) { continue; }
+ if (~checkedKeys.indexOf(key)) { continue; }
+ // b has a key not in a
+ return false;
+ }
+ return true;
+ }
+
/**
@private
@@ -25393,19 +30030,21 @@ define("router",
unchanged: []
};
- var handlerChanged, contextChanged, i, l;
+ var handlerChanged, contextChanged, queryParamsChanged, i, l;
for (i=0, l=newHandlers.length; i 0 && array[len - 1] && array[len - 1].hasOwnProperty('queryParams')) {
+ queryParams = array[len - 1].queryParams;
+ head = slice.call(array, 0, len - 1);
+ return [head, queryParams];
+ } else {
+ return [array, null];
+ }
+ }
+
/**
@private
Creates, begins, and returns a Transition.
*/
- function performTransition(router, recogHandlers, providedModelsArray, params, data) {
+ function performTransition(router, recogHandlers, providedModelsArray, params, queryParams, data) {
- var matchPointResults = getMatchPoint(router, recogHandlers, providedModelsArray, params),
+ var matchPointResults = getMatchPoint(router, recogHandlers, providedModelsArray, params, queryParams),
targetName = recogHandlers[recogHandlers.length - 1].handler,
- wasTransitioning = false;
+ wasTransitioning = false,
+ currentHandlerInfos = router.currentHandlerInfos;
// Check if there's already a transition underway.
if (router.activeTransition) {
- if (transitionsIdentical(router.activeTransition, targetName, providedModelsArray)) {
+ if (transitionsIdentical(router.activeTransition, targetName, providedModelsArray, queryParams)) {
return router.activeTransition;
}
router.activeTransition.abort();
@@ -25482,6 +30150,7 @@ define("router",
transition.providedModelsArray = providedModelsArray;
transition.params = matchPointResults.params;
transition.data = data || {};
+ transition.queryParams = queryParams;
router.activeTransition = transition;
var handlerInfos = generateHandlerInfos(router, recogHandlers);
@@ -25489,7 +30158,7 @@ define("router",
// Fire 'willTransition' event on current handlers, but don't fire it
// if a transition was already underway.
if (!wasTransitioning) {
- trigger(router.currentHandlerInfos, true, ['willTransition', transition]);
+ trigger(router, currentHandlerInfos, true, ['willTransition', transition]);
}
log(router, transition.sequence, "Beginning validation for transition to " + transition.targetName);
@@ -25502,7 +30171,20 @@ define("router",
checkAbort(transition);
try {
- finalizeTransition(transition, handlerInfos);
+ log(router, transition.sequence, "Validation succeeded, finalizing transition;");
+
+ // Don't overwrite contexts / update URL if this was a noop transition.
+ if (!currentHandlerInfos || !currentHandlerInfos.length ||
+ !router.recognizer.hasRoute(currentHandlerInfos[currentHandlerInfos.length - 1].name) ||
+ currentHandlerInfos.length !== matchPointResults.matchPoint) {
+ finalizeTransition(transition, handlerInfos);
+ }
+
+ if (router.didTransition) {
+ router.didTransition(handlerInfos);
+ }
+
+ log(router, transition.sequence, "TRANSITION COMPLETE.");
// Resolve with the final handler.
deferred.resolve(handlerInfos[handlerInfos.length - 1].handler);
@@ -25535,11 +30217,16 @@ define("router",
var handlerObj = recogHandlers[i],
isDynamic = handlerObj.isDynamic || (handlerObj.names && handlerObj.names.length);
- handlerInfos.push({
+
+ var handlerInfo = {
isDynamic: !!isDynamic,
name: handlerObj.handler,
handler: router.getHandler(handlerObj.handler)
- });
+ };
+ if(handlerObj.queryParams) {
+ handlerInfo.queryParams = handlerObj.queryParams;
+ }
+ handlerInfos.push(handlerInfo);
}
return handlerInfos;
}
@@ -25547,7 +30234,7 @@ define("router",
/**
@private
*/
- function transitionsIdentical(oldTransition, targetName, providedModelsArray) {
+ function transitionsIdentical(oldTransition, targetName, providedModelsArray, queryParams) {
if (oldTransition.targetName !== targetName) { return false; }
@@ -25557,6 +30244,11 @@ define("router",
for (var i = 0, len = oldModels.length; i < len; ++i) {
if (oldModels[i] !== providedModelsArray[i]) { return false; }
}
+
+ if(!queryParamsEqual(oldTransition.queryParams, queryParams)) {
+ return false;
+ }
+
return true;
}
@@ -25570,13 +30262,12 @@ define("router",
var router = transition.router,
seq = transition.sequence,
- handlerName = handlerInfos[handlerInfos.length - 1].name;
-
- log(router, seq, "Validation succeeded, finalizing transition;");
+ handlerName = handlerInfos[handlerInfos.length - 1].name,
+ i;
// Collect params for URL.
var objects = [], providedModels = transition.providedModelsArray.slice();
- for (var i = handlerInfos.length - 1; i>=0; --i) {
+ for (i = handlerInfos.length - 1; i>=0; --i) {
var handlerInfo = handlerInfos[i];
if (handlerInfo.isDynamic) {
var providedModel = providedModels.pop();
@@ -25584,12 +30275,18 @@ define("router",
}
}
- var params = paramsForHandler(router, handlerName, objects);
+ var newQueryParams = {};
+ for (i = handlerInfos.length - 1; i>=0; --i) {
+ merge(newQueryParams, handlerInfos[i].queryParams);
+ }
+ router.currentQueryParams = newQueryParams;
+
+
+ var params = paramsForHandler(router, handlerName, objects, transition.queryParams);
- transition.providedModelsArray = [];
- transition.providedContexts = {};
router.currentParams = params;
+
var urlMethod = transition.urlMethod;
if (urlMethod) {
var url = router.recognizer.generate(handlerName, params);
@@ -25603,7 +30300,6 @@ define("router",
}
setupContexts(transition, handlerInfos);
- log(router, seq, "TRANSITION COMPLETE.");
}
/**
@@ -25632,7 +30328,9 @@ define("router",
// We're before the match point, so don't run any hooks,
// just use the already resolved context from the handler.
- transition.resolvedModels[handlerInfo.name] = handlerInfo.handler.context;
+ transition.resolvedModels[handlerInfo.name] =
+ transition.providedModels[handlerInfo.name] ||
+ handlerInfo.handler.context;
return proceed();
}
@@ -25643,8 +30341,8 @@ define("router",
.then(handleAbort)
.then(afterModel)
.then(handleAbort)
- .then(proceed)
- .then(null, handleError);
+ .then(null, handleError)
+ .then(proceed);
function handleAbort(result) {
if (transition.isAborted) {
@@ -25669,11 +30367,7 @@ define("router",
// An error was thrown / promise rejected, so fire an
// `error` event from this handler info up to root.
- trigger(handlerInfos.slice(0, index + 1), true, ['error', reason, transition]);
-
- if (handler.error) {
- handler.error(reason, transition);
- }
+ trigger(router, handlerInfos.slice(0, index + 1), true, ['error', reason, transition]);
// Propagate the original error.
return RSVP.reject(reason);
@@ -25683,13 +30377,20 @@ define("router",
log(router, seq, handlerName + ": calling beforeModel hook");
- var p = handler.beforeModel && handler.beforeModel(transition);
+ var args;
+
+ if (handlerInfo.queryParams) {
+ args = [handlerInfo.queryParams, transition];
+ } else {
+ args = [transition];
+ }
+
+ var p = handler.beforeModel && handler.beforeModel.apply(handler, args);
return (p instanceof Transition) ? null : p;
}
function model() {
log(router, seq, handlerName + ": resolving model");
-
var p = getModel(handlerInfo, transition, handlerParams[handlerName], index >= matchPoint);
return (p instanceof Transition) ? null : p;
}
@@ -25704,7 +30405,15 @@ define("router",
transition.resolvedModels[handlerInfo.name] = context;
- var p = handler.afterModel && handler.afterModel(context, transition);
+ var args;
+
+ if (handlerInfo.queryParams) {
+ args = [context, handlerInfo.queryParams, transition];
+ } else {
+ args = [context, transition];
+ }
+
+ var p = handler.afterModel && handler.afterModel.apply(handler, args);
return (p instanceof Transition) ? null : p;
}
@@ -25735,9 +30444,8 @@ define("router",
or use one of the models provided to `transitionTo`.
*/
function getModel(handlerInfo, transition, handlerParams, needsUpdate) {
-
var handler = handlerInfo.handler,
- handlerName = handlerInfo.name;
+ handlerName = handlerInfo.name, args;
if (!needsUpdate && handler.hasOwnProperty('context')) {
return handler.context;
@@ -25748,7 +30456,13 @@ define("router",
return typeof providedModel === 'function' ? providedModel() : providedModel;
}
- return handler.model && handler.model(handlerParams || {}, transition);
+ if (handlerInfo.queryParams) {
+ args = [handlerParams || {}, handlerInfo.queryParams, transition];
+ } else {
+ args = [handlerParams || {}, transition, handlerInfo.queryParams];
+ }
+
+ return handler.model && handler.model.apply(handler, args);
}
/**
@@ -25781,10 +30495,12 @@ define("router",
// Normalize blank transitions to root URL transitions.
var name = args[0] || '/';
- if (name.charAt(0) === '/') {
+ if(args.length === 1 && args[0].hasOwnProperty('queryParams')) {
+ return createQueryParamTransition(router, args[0]);
+ } else if (name.charAt(0) === '/') {
return createURLTransition(router, name);
} else {
- return createNamedTransition(router, args);
+ return createNamedTransition(router, slice.call(args));
}
}
@@ -25862,21 +30578,21 @@ DSL.prototype = {
if (callback) {
var dsl = new DSL(name);
callback.call(dsl);
- this.push(options.path, name, dsl.generate());
+ this.push(options.path, name, dsl.generate(), options.queryParams);
} else {
- this.push(options.path, name);
+ this.push(options.path, name, null, options.queryParams);
}
},
- push: function(url, name, callback) {
+ push: function(url, name, callback, queryParams) {
var parts = name.split('.');
if (url === "" || url === "/" || parts[parts.length-1] === "index") { this.explicitIndex = true; }
- this.matches.push([url, name, callback]);
+ this.matches.push([url, name, callback, queryParams]);
},
route: function(name, options) {
-
+ Ember.assert("You must use `this.resource` to nest", typeof options !== 'function');
options = options || {};
@@ -25888,7 +30604,7 @@ DSL.prototype = {
name = this.parent + "." + name;
}
- this.push(options.path, name);
+ this.push(options.path, name, null, options.queryParams);
},
generate: function() {
@@ -25901,7 +30617,12 @@ DSL.prototype = {
return function(match) {
for (var i=0, l=dslMatches.length; i " + routeName, { fullName: routeName });
+ }
+ }
+
+ if (name === 'application') {
+ // Inject default `error` handler.
+ // Note: `events` is deprecated, but we'll let the
+ // deprecation warnings be handled at event-handling time rather
+ // than duplicating that logic here.
+ var actions = handler._actions || handler.events;
+ if (!actions) { actions = handler._actions = {}; }
+ actions.error = actions.error || Ember.Router._defaultErrorHandler;
+ }
+
+ handler.routeName = name;
+ return handler;
+ };
+ },
+
+ _setupRouter: function(router, location) {
+ var lastURL, emberRouter = this;
+
+ router.getHandler = this._getHandlerFunction();
+
+ var doUpdateURL = function() {
+ location.setURL(lastURL);
+ };
+
+ router.updateURL = function(path) {
+ lastURL = path;
+ Ember.run.once(doUpdateURL);
+ };
+
+ if (location.replaceURL) {
+ var doReplaceURL = function() {
+ location.replaceURL(lastURL);
+ };
+
+ router.replaceURL = function(path) {
+ lastURL = path;
+ Ember.run.once(doReplaceURL);
+ };
+ }
+
+ router.didTransition = function(infos) {
+ emberRouter.didTransition(infos);
+ };
+ },
+
+ _doTransition: function(method, args) {
+ // Normalize blank route to root URL.
+ args = [].slice.call(args);
+ args[0] = args[0] || '/';
+
+ var passedName = args[0], name, self = this,
+ isQueryParamsOnly = false;
+
+ if (Ember.FEATURES.isEnabled("query-params")) {
+ isQueryParamsOnly = (args.length === 1 && args[0].hasOwnProperty('queryParams'));
+ }
+
+ if (!isQueryParamsOnly && passedName.charAt(0) === '/') {
+ name = passedName;
+ } else if (!isQueryParamsOnly) {
+ if (!this.router.hasRoute(passedName)) {
+ name = args[0] = passedName + '.index';
+ } else {
+ name = passedName;
+ }
+
+ Ember.assert("The route " + passedName + " was not found", this.router.hasRoute(name));
+ }
+
+ var transitionPromise = this.router[method].apply(this.router, args);
+
+ // Don't schedule loading state entry if user has already aborted the transition.
+ if (this.router.activeTransition) {
+ this._scheduleLoadingStateEntry();
+ }
+
+ transitionPromise.then(function(route) {
+ self._transitionCompleted(route);
+ }, function(error) {
+ if (error.name === "UnrecognizedURLError") {
+ Ember.assert("The URL '" + error.message + "' did not match any routes in your application");
+ }
+ });
+
+ // We want to return the configurable promise object
+ // so that callers of this function can use `.method()` on it,
+ // which obviously doesn't exist for normal RSVP promises.
+ return transitionPromise;
+ },
+
+ _scheduleLoadingStateEntry: function() {
+ if (this._loadingStateActive) { return; }
+ this._shouldEnterLoadingState = true;
+ Ember.run.scheduleOnce('routerTransitions', this, this._enterLoadingState);
+ },
+
+ _enterLoadingState: function() {
+ if (this._loadingStateActive || !this._shouldEnterLoadingState) { return; }
+
+ var loadingRoute = this.router.getHandler('loading');
+ if (loadingRoute) {
+ if (loadingRoute.enter) { loadingRoute.enter(); }
+ if (loadingRoute.setup) { loadingRoute.setup(); }
+ this._loadingStateActive = true;
+ }
+ },
+
+ _exitLoadingState: function () {
+ this._shouldEnterLoadingState = false;
+ if (!this._loadingStateActive) { return; }
+
+ var loadingRoute = this.router.getHandler('loading');
+ if (loadingRoute && loadingRoute.exit) { loadingRoute.exit(); }
+ this._loadingStateActive = false;
+ },
+
+ _transitionCompleted: function(route) {
+ this.notifyPropertyChange('url');
+ this._exitLoadingState();
}
});
-function getHandlerFunction(router) {
- var seen = {}, container = router.container,
- DefaultRoute = container.resolve('route:basic');
+function triggerEvent(handlerInfos, ignoreFailure, args) {
+ var name = args.shift();
- return function(name) {
- var routeName = 'route:' + name,
- handler = container.lookup(routeName);
+ if (!handlerInfos) {
+ if (ignoreFailure) { return; }
+ throw new Error("Could not trigger event '" + name + "'. There are no active handlers");
+ }
- if (seen[name]) { return handler; }
+ var eventWasHandled = false;
- seen[name] = true;
+ for (var i=handlerInfos.length-1; i>=0; i--) {
+ var handlerInfo = handlerInfos[i],
+ handler = handlerInfo.handler;
- if (!handler) {
- if (name === 'loading') { return {}; }
-
- container.register(routeName, DefaultRoute.extend());
- handler = container.lookup(routeName);
-
- if (get(router, 'namespace.LOG_ACTIVE_GENERATION')) {
- Ember.Logger.info("generated -> " + routeName, { fullName: routeName });
+ if (handler._actions && handler._actions[name]) {
+ if (handler._actions[name].apply(handler, args) === true) {
+ eventWasHandled = true;
+ } else {
+ return;
+ }
+ } else if (handler.events && handler.events[name]) {
+ Ember.deprecate('Action handlers contained in an `events` object are deprecated in favor of putting them in an `actions` object (' + name + ' on ' + handler + ')', false);
+ if (handler.events[name].apply(handler, args) === true) {
+ eventWasHandled = true;
+ } else {
+ return;
}
}
-
- if (name === 'application') {
- // Inject default `error` handler.
- handler.events = handler.events || {};
- handler.events.error = handler.events.error || defaultErrorHandler;
- }
-
- handler.routeName = name;
- return handler;
- };
-}
-
-function defaultErrorHandler(error, transition) {
- Ember.Logger.error('Error while loading route:', error);
-
- // Using setTimeout allows us to escape from the Promise's try/catch block
- setTimeout(function() { throw error; });
-}
-
-
-function routePath(handlerInfos) {
- var path = [];
-
- for (var i=1, l=handlerInfos.length; i 0 ? !Ember.isNone(arguments[0]) : true);
var namePassed = !!name;
@@ -26984,14 +32071,21 @@ Ember.Route = Ember.Object.extend({
name = this.routeName;
}
+ options = options || {};
name = name ? name.replace(/\//g, '.') : this.routeName;
+ var viewName = options.view || this.viewName || name;
+ var templateName = this.templateName || name;
var container = this.container,
- view = container.lookup('view:' + name),
- template = container.lookup('template:' + name);
+ view = container.lookup('view:' + viewName),
+ template = view ? view.get('template') : null;
+
+ if (!template) {
+ template = container.lookup('template:' + templateName);
+ }
if (!view && !template) {
-
+ Ember.assert("Could not find \"" + name + "\" template or view.", !namePassed);
if (get(this.router, 'namespace.LOG_VIEW_LOOKUPS')) {
Ember.Logger.info("Could not find \"" + name + "\" template or view. Nothing will be rendered", { fullName: 'template:' + name });
}
@@ -27019,7 +32113,7 @@ Ember.Route = Ember.Object.extend({
```js
App.ApplicationRoute = App.Route.extend({
- events: {
+ actions: {
showModal: function(evt) {
this.render(evt.modalName, {
outlet: 'modal',
@@ -27052,6 +32146,11 @@ Ember.Route = Ember.Object.extend({
this.teardownViews();
},
+ /**
+ @private
+
+ @method teardownViews
+ */
teardownViews: function() {
// Tear down the top level view
if (this.teardownTopLevelView) { this.teardownTopLevelView(); }
@@ -27102,6 +32201,7 @@ function normalizeOptions(route, name, template, options) {
options.template = template;
options.LOG_VIEW_LOOKUPS = get(route.router, 'namespace.LOG_VIEW_LOOKUPS');
+ Ember.assert("An outlet ("+options.outlet+") was specified but was not found.", options.outlet === 'main' || options.into);
var controller = options.controller, namedController;
@@ -27110,7 +32210,7 @@ function normalizeOptions(route, name, template, options) {
} else if (namedController = route.container.lookup('controller:' + name)) {
controller = namedController;
} else {
- controller = route.routeName;
+ controller = route.controllerName || route.routeName;
}
if (typeof controller === 'string') {
@@ -27188,24 +32288,45 @@ function generateOutletTeardown(parentView, outlet) {
Ember.onLoad('Ember.Handlebars', function() {
var handlebarsResolve = Ember.Handlebars.resolveParams,
map = Ember.ArrayPolyfills.map,
- get = Ember.get;
+ get = Ember.get,
+ handlebarsGet = Ember.Handlebars.get;
function resolveParams(context, params, options) {
- var resolved = handlebarsResolve(context, params, options);
- return map.call(resolved, unwrap);
+ return map.call(resolvePaths(context, params, options), function(path, i) {
+ if (null === path) {
+ // Param was string/number, not a path, so just return raw string/number.
+ return params[i];
+ } else {
+ return handlebarsGet(context, path, options);
+ }
+ });
+ }
- function unwrap(object, i) {
- if (params[i] === 'controller') { return object; }
+ function resolvePaths(context, params, options) {
+ var resolved = handlebarsResolve(context, params, options),
+ types = options.types;
+
+ return map.call(resolved, function(object, i) {
+ if (types[i] === 'ID') {
+ return unwrap(object, params[i]);
+ } else {
+ return null;
+ }
+ });
+
+ function unwrap(object, path) {
+ if (path === 'controller') { return path; }
if (Ember.ControllerMixin.detect(object)) {
- return unwrap(get(object, 'model'));
+ return unwrap(get(object, 'model'), path ? path + '.model' : 'model');
} else {
- return object;
+ return path;
}
}
}
Ember.Router.resolveParams = resolveParams;
+ Ember.Router.resolvePaths = resolvePaths;
});
})();
@@ -27222,6 +32343,7 @@ var get = Ember.get, set = Ember.set, fmt = Ember.String.fmt;
Ember.onLoad('Ember.Handlebars', function(Handlebars) {
var resolveParams = Ember.Router.resolveParams,
+ resolvePaths = Ember.Router.resolvePaths,
isSimpleClick = Ember.ViewUtils.isSimpleClick;
function fullRouteName(router, name) {
@@ -27232,19 +32354,12 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
return name;
}
- function resolvedPaths(options) {
- var types = options.options.types.slice(1),
+ function getResolvedPaths(options) {
+
+ var types = options.options.types,
data = options.options.data;
- return resolveParams(options.context, options.params, { types: types, data: data });
- }
-
- function createPath(path) {
- var fullPath = 'paramsContext';
- if (path !== '') {
- fullPath += '.' + path;
- }
- return fullPath;
+ return resolvePaths(options.context, options.params, { types: types, data: data });
}
/**
@@ -27253,17 +32368,16 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
a supplied route by name.
Instances of `LinkView` will most likely be created through
- the `linkTo` Handlebars helper, but properties of this class
+ the `link-to` Handlebars helper, but properties of this class
can be overridden to customize application-wide behavior.
@class LinkView
@namespace Ember
@extends Ember.View
- @see {Handlebars.helpers.linkTo}
+ @see {Handlebars.helpers.link-to}
**/
var LinkView = Ember.LinkView = Ember.View.extend({
tagName: 'a',
- namedRoute: null,
currentWhen: null,
/**
@@ -27274,6 +32388,14 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
**/
title: null,
+ /**
+ Sets the `rel` attribute of the `LinkView`'s HTML element.
+
+ @property rel
+ @default null
+ **/
+ rel: null,
+
/**
The CSS class to apply to `LinkView`'s element when its `active`
property is `true`.
@@ -27314,11 +32436,30 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
@default false
**/
replace: false,
- attributeBindings: ['href', 'title'],
+
+ /**
+ By default the `{{link-to}}` helper will bind to the `href` and
+ `title` attributes. It's discourage that you override these defaults,
+ however you can push onto the array if needed.
+
+ @property attributeBindings
+ @type Array | String
+ @default ['href', 'title', 'rel']
+ **/
+ attributeBindings: ['href', 'title', 'rel'],
+
+ /**
+ By default the `{{link-to}}` helper will bind to the `active`, `loading`, and
+ `disabled` classes. It is discouraged to override these directly.
+
+ @property classNameBindings
+ @type Array
+ @default ['active', 'loading', 'disabled']
+ **/
classNameBindings: ['active', 'loading', 'disabled'],
/**
- By default the `{{linkTo}}` helper responds to the `click` event. You
+ By default the `{{link-to}}` helper responds to the `click` event. You
can override this globally by setting this property to your custom
event name.
@@ -27343,6 +32484,28 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
@event click
**/
+ /**
+ An overridable method called when LinkView objects are instantiated.
+
+ Example:
+
+ ```javascript
+ App.MyLinkView = Ember.LinkView.extend({
+ init: function() {
+ this._super();
+ Ember.Logger.log('Event is ' + this.get('eventName'));
+ }
+ });
+ ```
+
+ NOTE: If you do override `init` for a framework class like `Ember.View` or
+ `Ember.ArrayController`, be sure to call `this._super()` in your
+ `init` declaration! If you don't, Ember may not have an opportunity to
+ do important setup work, and you'll see strange behavior in your
+ application.
+
+ @method init
+ */
init: function() {
this._super.apply(this, arguments);
@@ -27350,27 +32513,57 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
var eventName = get(this, 'eventName');
this.on(eventName, this, this._invoke);
- var params = this.parameters.params,
- length = params.length,
- context = this.parameters.context,
- self = this,
- path, paths = Ember.A([]), i;
-
- set(this, 'paramsContext', context);
+ var helperParameters = this.parameters,
+ templateContext = helperParameters.context,
+ paths = getResolvedPaths(helperParameters),
+ length = paths.length,
+ path, i;
for(i=0; i < length; i++) {
- paths.pushObject(createPath(params[i]));
+ path = paths[i];
+ if (null === path) {
+ // A literal value was provided, not a path, so nothing to observe.
+ continue;
+ }
+
+ var normalizedPath =
+ Ember.Handlebars.normalizePath(templateContext, path, helperParameters.options.data);
+ this.registerObserver(normalizedPath.root, normalizedPath.path, this, this._paramsChanged);
}
- var observer = function(object, path) {
- this.notifyPropertyChange('routeArgs');
- };
- for(i=0; i < length; i++) {
- this.registerObserver(this, paths[i], this, observer);
+ if (Ember.FEATURES.isEnabled("query-params")) {
+ var queryParams = get(this, '_potentialQueryParams') || [];
+
+ for(i=0; i < queryParams.length; i++) {
+ this.registerObserver(this, queryParams[i], this, this._queryParamsChanged);
+ }
}
},
+ /**
+ @private
+
+ This method is invoked by observers installed during `init` that fire
+ whenever the params change
+ @method _paramsChanged
+ */
+ _paramsChanged: function() {
+ this.notifyPropertyChange('resolvedParams');
+ },
+
+
+ /**
+ @private
+
+ This method is invoked by observers installed during `init` that fire
+ whenever the query params change
+ */
+ _queryParamsChanged: function (object, path) {
+ this.notifyPropertyChange('queryParams');
+ },
+
+
/**
@private
@@ -27394,7 +32587,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
disabled: Ember.computed(function(key, value) {
if (value !== undefined) { this.set('_isDisabled', value); }
- return value ? this.get('disabledClass') : false;
+ return value ? get(this, 'disabledClass') : false;
}),
/**
@@ -27408,33 +32601,44 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
@property active
**/
active: Ember.computed(function() {
+ if (get(this, 'loading')) { return false; }
+
var router = get(this, 'router'),
- params = resolvedPaths(this.parameters),
- currentWhen = this.currentWhen || get(this, 'namedRoute'),
+ routeArgs = get(this, 'routeArgs'),
+ contexts = routeArgs.slice(1),
+ resolvedParams = get(this, 'resolvedParams'),
+ currentWhen = this.currentWhen || resolvedParams[0],
currentWithIndex = currentWhen + '.index',
- isActive = router.isActive.apply(router, [currentWhen].concat(params)) ||
- router.isActive.apply(router, [currentWithIndex].concat(params));
+ isActive = router.isActive.apply(router, [currentWhen].concat(contexts)) ||
+ router.isActive.apply(router, [currentWithIndex].concat(contexts));
if (isActive) { return get(this, 'activeClass'); }
- }).property('namedRoute', 'router.url'),
+ }).property('resolvedParams', 'routeArgs', 'router.url'),
+ /**
+ Accessed as a classname binding to apply the `LinkView`'s `loadingClass`
+ CSS `class` to the element when the link is loading.
+
+ A `LinkView` is considered loading when it has at least one
+ parameter whose value is currently null or undefined. During
+ this time, clicking the link will perform no transition and
+ emit a warning that the link is still in a loading state.
+
+ @property loading
+ **/
loading: Ember.computed(function() {
if (!get(this, 'routeArgs')) { return get(this, 'loadingClass'); }
}).property('routeArgs'),
/**
- Accessed as a classname binding to apply the `LinkView`'s `activeClass`
- CSS `class` to the element when the link is active.
+ @private
- A `LinkView` is considered active when its `currentWhen` property is `true`
- or the application's current route is the route the `LinkView` would trigger
- transitions into.
+ Returns the application's main router from the container.
- @property active
+ @property router
**/
-
router: Ember.computed(function() {
- return this.get('controller').container.lookup('router:main');
+ return get(this, 'controller').container.lookup('router:main');
}),
/**
@@ -27454,43 +32658,103 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
if (get(this, '_isDisabled')) { return false; }
if (get(this, 'loading')) {
- Ember.Logger.warn("This linkTo is in an inactive loading state because at least one of its parameters' presently has a null/undefined value, or the provided route name is invalid.");
+ Ember.Logger.warn("This link-to is in an inactive loading state because at least one of its parameters presently has a null/undefined value, or the provided route name is invalid.");
return false;
}
var router = get(this, 'router'),
routeArgs = get(this, 'routeArgs');
- if (this.get('replace')) {
+ if (get(this, 'replace')) {
router.replaceWith.apply(router, routeArgs);
} else {
router.transitionTo.apply(router, routeArgs);
}
},
+ /**
+ @private
+
+ Computed property that returns the resolved parameters.
+
+ @property
+ @return {Array}
+ */
+ resolvedParams: Ember.computed(function() {
+ var parameters = this.parameters,
+ options = parameters.options,
+ types = options.types,
+ data = options.data;
+
+ return resolveParams(parameters.context, parameters.params, { types: types, data: data });
+ }).property(),
+
+ /**
+ @private
+
+ Computed property that returns the current route name and
+ any dynamic segments.
+
+ @property
+ @return {Array} An array with the route name and any dynamic segments
+ */
routeArgs: Ember.computed(function() {
+ var resolvedParams = get(this, 'resolvedParams').slice(0),
+ router = get(this, 'router'),
+ namedRoute = resolvedParams[0];
- var router = get(this, 'router'),
- namedRoute = get(this, 'namedRoute'), routeName;
+ if (!namedRoute) { return; }
- if (!namedRoute && this.namedRouteBinding) {
- // The present value of namedRoute is falsy, but since it's a binding
- // and could be valid later, don't treat as error.
- return;
+ namedRoute = fullRouteName(router, namedRoute);
+ resolvedParams[0] = namedRoute;
+
+ Ember.assert(fmt("The attempt to link-to route '%@' failed. The router did not find '%@' in its possible routes: '%@'", [namedRoute, namedRoute, Ember.keys(router.router.recognizer.names).join("', '")]), router.hasRoute(namedRoute));
+
+ for (var i = 1, len = resolvedParams.length; i < len; ++i) {
+ var param = resolvedParams[i];
+ if (param === null || typeof param === 'undefined') {
+ // If contexts aren't present, consider the linkView unloaded.
+ return;
+ }
}
+
+ if (Ember.FEATURES.isEnabled("query-params")) {
+ var queryParams = get(this, 'queryParams');
+
+ if (queryParams || queryParams === false) { resolvedParams.push({queryParams: queryParams}); }
+ }
+
+ return resolvedParams;
+ }).property('resolvedParams', 'queryParams', 'router.url'),
+
+
+ _potentialQueryParams: Ember.computed(function () {
+ var namedRoute = get(this, 'resolvedParams')[0];
+ if (!namedRoute) { return null; }
+ var router = get(this, 'router');
+
namedRoute = fullRouteName(router, namedRoute);
+ return router.router.queryParamsForHandler(namedRoute);
+ }).property('resolvedParams'),
- var resolvedContexts = resolvedPaths(this.parameters), paramsPresent = true;
- for (var i = 0, l = resolvedContexts.length; i < l; ++i) {
- var context = resolvedContexts[i];
+ queryParams: Ember.computed(function () {
+ var self = this,
+ queryParams = null,
+ allowedQueryParams = get(this, '_potentialQueryParams');
- // If contexts aren't present, consider the linkView unloaded.
- if (context === null || typeof context === 'undefined') { return; }
- }
+ if (!allowedQueryParams) { return null; }
+ allowedQueryParams.forEach(function (param) {
+ var value = get(self, param);
+ if (typeof value !== 'undefined') {
+ queryParams = queryParams || {};
+ queryParams[param] = value;
+ }
+ });
- return [ namedRoute ].concat(resolvedContexts);
- }).property('namedRoute'),
+
+ return queryParams;
+ }).property('_potentialQueryParams.[]'),
/**
Sets the element's `href` attribute to the url for
@@ -27502,7 +32766,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
@property href
**/
href: Ember.computed(function() {
- if (this.get('tagName') !== 'a') { return false; }
+ if (get(this, 'tagName') !== 'a') { return false; }
var router = get(this, 'router'),
routeArgs = get(this, 'routeArgs');
@@ -27511,7 +32775,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
}).property('routeArgs'),
/**
- The default href value to use while a linkTo is loading.
+ The default href value to use while a link-to is loading.
Only applies when tagName is 'a'
@property loadingHref
@@ -27524,16 +32788,16 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
LinkView.toString = function() { return "LinkView"; };
/**
- The `{{linkTo}}` helper renders a link to the supplied
+ The `{{link-to}}` helper renders a link to the supplied
`routeName` passing an optionally supplied model to the
route as its `model` context of the route. The block
- for `{{linkTo}}` becomes the innerHTML of the rendered
+ for `{{link-to}}` becomes the innerHTML of the rendered
element:
```handlebars
- {{#linkTo 'photoGallery'}}
+ {{#link-to 'photoGallery'}}
Great Hamster Photos
- {{/linkTo}}
+ {{/link-to}}
```
```html
@@ -27543,14 +32807,14 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```
### Supplying a tagName
- By default `{{linkTo}}` renders an `` element. This can
- be overridden for a single use of `{{linkTo}}` by supplying
+ By default `{{link-to}}` renders an ` ` element. This can
+ be overridden for a single use of `{{link-to}}` by supplying
a `tagName` option:
```handlebars
- {{#linkTo 'photoGallery' tagName="li"}}
+ {{#link-to 'photoGallery' tagName="li"}}
Great Hamster Photos
- {{/linkTo}}
+ {{/link-to}}
```
```html
@@ -27561,25 +32825,62 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
To override this option for your entire application, see
"Overriding Application-wide Defaults".
-
+
+ ### Disabling the `link-to` heper
+ By default `{{link-to}}` is enabled.
+ any passed value to `disabled` helper property will disable the `link-to` helper.
+
+ static use: the `disabled` option:
+
+ ```handlebars
+ {{#link-to 'photoGallery' disabled=true}}
+ Great Hamster Photos
+ {{/link-to}}
+ ```
+
+ dynamic use: the `disabledWhen` option:
+
+ ```handlebars
+ {{#link-to 'photoGallery' disabledWhen=controller.someProperty}}
+ Great Hamster Photos
+ {{/link-to}}
+ ```
+
+ any passed value to `disabled` will disable it except `undefined`.
+ to ensure that only `true` disable the `link-to` helper you can
+ override the global behaviour of `Ember.LinkView`.
+
+ ```javascript
+ Ember.LinkView.reopen({
+ disabled: Ember.computed(function(key, value) {
+ if (value !== undefined) {
+ this.set('_isDisabled', value === true);
+ }
+ return value === true ? get(this, 'disabledClass') : false;
+ })
+ });
+ ```
+
+ see "Overriding Application-wide Defaults" for more.
+
### Handling `href`
- `{{linkTo}}` will use your application's Router to
+ `{{link-to}}` will use your application's Router to
fill the element's `href` property with a url that
matches the path to the supplied `routeName` for your
routers's configured `Location` scheme, which defaults
to Ember.HashLocation.
### Handling current route
- `{{linkTo}}` will apply a CSS class name of 'active'
+ `{{link-to}}` will apply a CSS class name of 'active'
when the application's current route matches
the supplied routeName. For example, if the application's
current route is 'photoGallery.recent' the following
- use of `{{linkTo}}`:
+ use of `{{link-to}}`:
```handlebars
- {{#linkTo 'photoGallery.recent'}}
+ {{#link-to 'photoGallery.recent'}}
Great Hamster Photos from the last week
- {{/linkTo}}
+ {{/link-to}}
```
will result in
@@ -27591,13 +32892,13 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```
The CSS class name used for active classes can be customized
- for a single use of `{{linkTo}}` by passing an `activeClass`
+ for a single use of `{{link-to}}` by passing an `activeClass`
option:
```handlebars
- {{#linkTo 'photoGallery.recent' activeClass="current-url"}}
+ {{#link-to 'photoGallery.recent' activeClass="current-url"}}
Great Hamster Photos from the last week
- {{/linkTo}}
+ {{/link-to}}
```
```html
@@ -27617,13 +32918,13 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```javascript
App.Router.map(function() {
this.resource("photoGallery", {path: "hamster-photos/:photo_id"});
- })
+ });
```
```handlebars
- {{#linkTo 'photoGallery' aPhoto}}
+ {{#link-to 'photoGallery' aPhoto}}
{{aPhoto.title}}
- {{/linkTo}}
+ {{/link-to}}
```
```html
@@ -27649,9 +32950,9 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
This argument will become the model context of the linked route:
```handlebars
- {{#linkTo 'photoGallery.comment' aPhoto comment}}
+ {{#link-to 'photoGallery.comment' aPhoto comment}}
{{comment.body}}
- {{/linkTo}}
+ {{/link-to}}
```
```html
@@ -27660,8 +32961,50 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```
+ ### Supplying an explicit dynamic segment value
+ If you don't have a model object available to pass to `{{link-to}}`,
+ an optional string or integer argument can be passed for routes whose
+ paths contain dynamic segments. This argument will become the value
+ of the dynamic segment:
+
+ ```javascript
+ App.Router.map(function() {
+ this.resource("photoGallery", {path: "hamster-photos/:photo_id"});
+ });
+ ```
+
+ ```handlebars
+ {{#link-to 'photoGallery' aPhotoId}}
+ {{aPhoto.title}}
+ {{/link-to}}
+ ```
+
+ ```html
+
+ Tomster
+
+ ```
+
+ When transitioning into the linked route, the `model` hook will
+ be triggered with parameters including this passed identifier.
+
+ ### Overriding attributes
+ You can override any given property of the Ember.LinkView
+ that is generated by the `{{link-to}}` helper by passing
+ key/value pairs, like so:
+
+ ```handlebars
+ {{#link-to aPhoto tagName='li' title='Following this link will change your life' classNames=['pic', 'sweet']}}
+ Uh-mazing!
+ {{/link-to}}
+ ```
+
+ See [Ember.LinkView](/api/classes/Ember.LinkView.html) for a
+ complete list of overrideable properties. Be sure to also
+ check out inherited properties of `LinkView`.
+
### Overriding Application-wide Defaults
- ``{{linkTo}}`` creates an instance of Ember.LinkView
+ ``{{link-to}}`` creates an instance of Ember.LinkView
for rendering. To override options for your entire
application, reopen Ember.LinkView and supply the
desired values:
@@ -27682,28 +33025,18 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
});
```
- @method linkTo
+ @method link-to
@for Ember.Handlebars.helpers
@param {String} routeName
@param {Object} [context]*
+ @param [options] {Object} Handlebars key/value pairs of options, you can override any property of Ember.LinkView
@return {String} HTML string
+ @see {Ember.LinkView}
*/
- Ember.Handlebars.registerHelper('linkTo', function(name) {
+ Ember.Handlebars.registerHelper('link-to', function(name) {
var options = [].slice.call(arguments, -1)[0],
- params = [].slice.call(arguments, 1, -1);
-
- var hash = options.hash;
-
- if (options.types[0] === "ID") {
- if (Ember.ENV.HELPER_PARAM_LOOKUPS) {
- hash.namedRouteBinding = name;
- } else {
-
- hash.namedRoute = name;
- }
- } else {
- hash.namedRoute = name;
- }
+ params = [].slice.call(arguments, 0, -1),
+ hash = options.hash;
hash.disabledBinding = hash.disabledWhen;
@@ -27715,6 +33048,18 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
return Ember.Handlebars.helpers.view.call(this, LinkView, options);
});
+
+ /**
+ See [link-to](/api/classes/Ember.Handlebars.helpers.html#method_link-to)
+
+ @method linkTo
+ @for Ember.Handlebars.helpers
+ @deprecated
+ @param {String} routeName
+ @param {Object} [context]*
+ @return {String} HTML string
+ */
+ Ember.Handlebars.registerHelper('linkTo', Ember.Handlebars.helpers['link-to']);
});
@@ -27764,8 +33109,8 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
You can create custom named outlets for more control.
``` handlebars
- {{outlet favoritePost}}
- {{outlet posts}}
+ {{outlet 'favoritePost'}}
+ {{outlet 'posts'}}
```
Then you can define what template is rendered into each outlet in your
@@ -27799,6 +33144,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
@for Ember.Handlebars.helpers
@param {String} property the property on the controller
that holds the view for this outlet
+ @return {String} HTML string
*/
Handlebars.registerHelper('outlet', function(property, options) {
var outletSource, outletContainerClass;
@@ -27809,7 +33155,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
}
outletSource = options.data.view;
- while (!(outletSource.get('template.isTop'))) {
+ while (!outletSource.get('template.isTop')) {
outletSource = outletSource.get('_parentView');
}
@@ -27836,33 +33182,79 @@ var get = Ember.get, set = Ember.set;
Ember.onLoad('Ember.Handlebars', function(Handlebars) {
/**
- Renders the named template in the current context with the same-named
- controller.
+ Calling ``{{render}}`` from within a template will insert another
+ template that matches the provided name. The inserted template will
+ access its properties on its own controller (rather than the controller
+ of the parent template).
- If a view class with the same name exists, the view class will be used.
+ If a view class with the same name exists, the view class also will be used.
+
+ Note: A given controller may only be used *once* in your app in this manner.
+ A singleton instance of the controller will be created for you.
- The optional second argument is a property path that will be bound
- to the `model` property of the controller.
+ Example:
+
+ ```javascript
+ App.NavigationController = Ember.Controller.extend({
+ who: "world"
+ });
+ ```
+
+ ```handelbars
+
+ Hello, {{who}}.
+ ```
+
+ ```handelbars
+
+ My great app
+ {{render navigaton}}
+ ```
+
+ ```html
+ My great app
+
+ Hello, world.
+
+ ```
+
+ Optionally you may provide a second argument: a property path
+ that will be bound to the `model` property of the controller.
If a `model` property path is specified, then a new instance of the
- controller will be created.
+ controller will be created and `{{render}}` can be used multiple times
+ with the same name.
- If no `model` property path is provided, then the helper will use the
- singleton instance of the controller. A given controller may only be used
- one time in your app in this manner.
+ For example if you had this `author` template.
- The default target for `{{action}}`s in the rendered template is the
- controller.
+ ```handlebars
+
+ Written by {{firstName}} {{lastName}}.
+ Total Posts: {{postCount}}
+
+ ```
+
+ You could render it inside the `post` template using the `render` helper.
+
+ ```handlebars
+
+
{{title}}
+
{{body}}
+ {{render "author" author}}
+
+ click me
+
```
And application code
@@ -28084,7 +33479,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```
If you need the default handler to trigger you should either register your
- own event handler, or use event methods on your view class. See `Ember.View`
+ own event handler, or use event methods on your view class. See [Ember.View](/api/classes/Ember.View.html)
'Responding to Browser Events' for more information.
### Specifying DOM event type
@@ -28094,7 +33489,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```handlebars
@@ -28116,7 +33511,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```handlebars
@@ -28124,6 +33519,16 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
This way the `{{action}}` will fire when clicking with the alt key pressed down.
+ Alternatively, supply "any" to the `allowedKeys` option to accept any combination of modifier keys.
+
+ ```handlebars
+
+ ```
+
### Specifying a Target
There are several possible target objects for `{{action}}` helpers:
@@ -28138,7 +33543,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```handlebars
@@ -28152,7 +33557,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```handlebars
@@ -28183,7 +33588,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```handlebars
```
- Take note that `welcome` is a string and not an object
+ Take note that `"welcome"` is a string and not an object
reference.
@method loc
@@ -23060,26 +26727,12 @@ Ember.Handlebars.registerHelper('loc', function(str) {
var set = Ember.set, get = Ember.get;
/**
- The `Ember.Checkbox` view class renders a checkbox
- [input](https://developer.mozilla.org/en/HTML/Element/Input) element. It
- allows for binding an Ember property (`checked`) to the status of the
- checkbox.
+ The internal class used to create text inputs when the `{{input}}`
+ helper is used with `type` of `checkbox`.
- Example:
+ See Handlebars.helpers.input for usage details.
- ```handlebars
- {{view Ember.Checkbox checkedBinding="receiveEmail"}}
- ```
-
- You can add a `label` tag yourself in the template where the `Ember.Checkbox`
- is being used.
-
- ```handlebars
-
- {{view Ember.Checkbox classNames="applicaton-specific-checkbox"}}
- Some Title
-
- ```
+ ## Direct manipulation of `checked`
The `checked` attribute of an `Ember.Checkbox` object should always be set
through the Ember object or by interacting with its rendered element
@@ -23090,8 +26743,8 @@ var set = Ember.set, get = Ember.get;
## Layout and LayoutName properties
Because HTML `input` elements are self closing `layout` and `layoutName`
- properties will not be applied. See `Ember.View`'s layout section for more
- information.
+ properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+ layout section for more information.
@class Checkbox
@namespace Ember
@@ -23146,14 +26799,11 @@ var get = Ember.get, set = Ember.set;
Ember.TextSupport = Ember.Mixin.create({
value: "",
- attributeBindings: ['placeholder', 'disabled', 'maxlength', 'tabindex'],
+ attributeBindings: ['placeholder', 'disabled', 'maxlength', 'tabindex', 'readonly'],
placeholder: null,
disabled: false,
maxlength: null,
- insertNewline: Ember.K,
- cancel: Ember.K,
-
init: function() {
this._super();
this.on("focusOut", this, this._elementValueDidChange);
@@ -23164,120 +26814,6 @@ Ember.TextSupport = Ember.Mixin.create({
this.on("keyUp", this, this.interpretKeyEvents);
},
- interpretKeyEvents: function(event) {
- var map = Ember.TextSupport.KEY_EVENTS;
- var method = map[event.keyCode];
-
- this._elementValueDidChange();
- if (method) { return this[method](event); }
- },
-
- _elementValueDidChange: function() {
- set(this, 'value', this.$().val());
- }
-
-});
-
-Ember.TextSupport.KEY_EVENTS = {
- 13: 'insertNewline',
- 27: 'cancel'
-};
-
-})();
-
-
-
-(function() {
-/**
-@module ember
-@submodule ember-handlebars
-*/
-
-var get = Ember.get, set = Ember.set;
-
-/**
- The `Ember.TextField` view class renders a text
- [input](https://developer.mozilla.org/en/HTML/Element/Input) element. It
- allows for binding Ember properties to the text field contents (`value`),
- live-updating as the user inputs text.
-
- Example:
-
- ```handlebars
- {{view Ember.TextField valueBinding="firstName"}}
- ```
-
- ## Layout and LayoutName properties
-
- Because HTML `input` elements are self closing `layout` and `layoutName`
- properties will not be applied. See `Ember.View`'s layout section for more
- information.
-
- ## HTML Attributes
-
- By default `Ember.TextField` provides support for `type`, `value`, `size`,
- `pattern`, `placeholder`, `disabled`, `maxlength` and `tabindex` attributes
- on a text field. If you need to support more attributes have a look at the
- `attributeBindings` property in `Ember.View`'s HTML Attributes section.
-
- To globally add support for additional attributes you can reopen
- `Ember.TextField` or `Ember.TextSupport`.
-
- ```javascript
- Ember.TextSupport.reopen({
- attributeBindings: ["required"]
- })
- ```
-
- @class TextField
- @namespace Ember
- @extends Ember.View
- @uses Ember.TextSupport
-*/
-Ember.TextField = Ember.View.extend(Ember.TextSupport,
- /** @scope Ember.TextField.prototype */ {
-
- classNames: ['ember-text-field'],
- tagName: "input",
- attributeBindings: ['type', 'value', 'size', 'pattern', 'name'],
-
- /**
- The `value` attribute of the input element. As the user inputs text, this
- property is updated live.
-
- @property value
- @type String
- @default ""
- */
- value: "",
-
- /**
- The `type` attribute of the input element.
-
- @property type
- @type String
- @default "text"
- */
- type: "text",
-
- /**
- The `size` of the text field in characters.
-
- @property size
- @type String
- @default null
- */
- size: null,
-
- /**
- The `pattern` the pattern attribute of input element.
-
- @property pattern
- @type String
- @default null
- */
- pattern: null,
-
/**
The action to be sent when the user presses the return key.
@@ -23322,31 +26858,109 @@ Ember.TextField = Ember.View.extend(Ember.TextSupport,
*/
bubbles: false,
- insertNewline: function(event) {
- sendAction('enter', this, event);
+ interpretKeyEvents: function(event) {
+ var map = Ember.TextSupport.KEY_EVENTS;
+ var method = map[event.keyCode];
+
+ this._elementValueDidChange();
+ if (method) { return this[method](event); }
},
+ _elementValueDidChange: function() {
+ set(this, 'value', this.$().val());
+ },
+
+ /**
+ The action to be sent when the user inserts a new line.
+
+ Called by the `Ember.TextSupport` mixin on keyUp if keycode matches 13.
+ Uses sendAction to send the `enter` action to the controller.
+
+ @method insertNewLine
+ @param {Event} event
+ */
+ insertNewline: function(event) {
+ sendAction('enter', this, event);
+ sendAction('insert-newline', this, event);
+ },
+
+ /**
+ Called when the user hits escape.
+
+ Called by the `Ember.TextSupport` mixin on keyUp if keycode matches 13.
+ Uses sendAction to send the `enter` action to the controller.
+
+ @method cancel
+ @param {Event} event
+ */
+ cancel: function(event) {
+ sendAction('escape-press', this, event);
+ },
+
+ /**
+ Called when the text area is focused.
+
+ @method focusIn
+ @param {Event} event
+ */
+ focusIn: function(event) {
+ sendAction('focus-in', this, event);
+ },
+
+ /**
+ Called when the text area is blurred.
+
+ @method focusOut
+ @param {Event} event
+ */
+ focusOut: function(event) {
+ sendAction('focus-out', this, event);
+ },
+
+ /**
+ The action to be sent when the user presses a key. Enabled by setting
+ the `onEvent` property to `keyPress`.
+
+ Uses sendAction to send the `keyPress` action to the controller.
+
+ @method keyPress
+ @param {Event} event
+ */
keyPress: function(event) {
- sendAction('keyPress', this, event);
+ sendAction('key-press', this, event);
}
+
});
+Ember.TextSupport.KEY_EVENTS = {
+ 13: 'insertNewline',
+ 27: 'cancel'
+};
+
+// In principle, this shouldn't be necessary, but the legacy
+// sectionAction semantics for TextField are different from
+// the component semantics so this method normalizes them.
function sendAction(eventName, view, event) {
- var action = get(view, 'action'),
- on = get(view, 'onEvent');
+ var action = get(view, eventName),
+ on = get(view, 'onEvent'),
+ value = get(view, 'value');
- if (action && on === eventName) {
- var controller = get(view, 'controller'),
- value = get(view, 'value'),
- bubbles = get(view, 'bubbles');
+ // back-compat support for keyPress as an event name even though
+ // it's also a method name that consumes the event (and therefore
+ // incompatible with sendAction semantics).
+ if (on === eventName || (on === 'keyPress' && eventName === 'key-press')) {
+ view.sendAction('action', value);
+ }
- controller.send(action, value, view);
+ view.sendAction(eventName, value);
- if (!bubbles) {
+ if (action || on === eventName) {
+ if(!get(view, 'bubbles')) {
event.stopPropagation();
}
}
}
+
})();
@@ -23360,6 +26974,81 @@ function sendAction(eventName, view, event) {
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](api/classes/Ember.Handlebars.helpers.html#method_input) for usage details.
+
+ ## Layout and LayoutName properties
+
+ Because HTML `input` elements are self closing `layout` and `layoutName`
+ properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+ layout section for more information.
+
+ @class TextField
+ @namespace Ember
+ @extends Ember.Component
+ @uses Ember.TextSupport
+*/
+Ember.TextField = Ember.Component.extend(Ember.TextSupport,
+ /** @scope Ember.TextField.prototype */ {
+
+ classNames: ['ember-text-field'],
+ tagName: "input",
+ attributeBindings: ['type', 'value', 'size', 'pattern', 'name'],
+
+ /**
+ The `value` attribute of the input element. As the user inputs text, this
+ property is updated live.
+
+ @property value
+ @type String
+ @default ""
+ */
+ value: "",
+
+ /**
+ The `type` attribute of the input element.
+
+ @property type
+ @type String
+ @default "text"
+ */
+ type: "text",
+
+ /**
+ The `size` of the text field in characters.
+
+ @property size
+ @type String
+ @default null
+ */
+ size: null,
+
+ /**
+ The `pattern` the pattern attribute of input element.
+
+ @property pattern
+ @type String
+ @default null
+ */
+ pattern: null
+});
+
+})();
+
+
+
+(function() {
+/*
+@module ember
+@submodule ember-handlebars
+*/
+
+var get = Ember.get, set = Ember.set;
+
+/*
@class Button
@namespace Ember
@extends Ember.View
@@ -23376,7 +27065,7 @@ Ember.Button = Ember.View.extend(Ember.TargetActionSupport, {
attributeBindings: ['type', 'disabled', 'href', 'tabindex'],
- /**
+ /*
@private
Overrides `TargetActionSupport`'s `targetObject` computed
@@ -23470,7 +27159,7 @@ Ember.Button = Ember.View.extend(Ember.TargetActionSupport, {
},
init: function() {
- Ember.deprecate("Ember.Button is deprecated and will be removed from future releases. Consider using the `{{action}}` helper.");
+
this._super();
}
});
@@ -23488,39 +27177,23 @@ Ember.Button = Ember.View.extend(Ember.TargetActionSupport, {
var get = Ember.get, set = Ember.set;
/**
- The `Ember.TextArea` view class renders a
- [textarea](https://developer.mozilla.org/en/HTML/Element/textarea) element.
- It allows for binding Ember properties to the text area contents (`value`),
- live-updating as the user inputs text.
+ The internal class used to create textarea element when the `{{textarea}}`
+ helper is used.
+
+ See [handlebars.helpers.textarea](/api/classes/Ember.Handlebars.helpers.html#method_textarea) for usage details.
## Layout and LayoutName properties
Because HTML `textarea` elements do not contain inner HTML the `layout` and
- `layoutName` properties will not be applied. See `Ember.View`'s layout
- section for more information.
-
- ## HTML Attributes
-
- By default `Ember.TextArea` provides support for `rows`, `cols`,
- `placeholder`, `disabled`, `maxlength` and `tabindex` attributes on a
- textarea. If you need to support more attributes have a look at the
- `attributeBindings` property in `Ember.View`'s HTML Attributes section.
-
- To globally add support for additional attributes you can reopen
- `Ember.TextArea` or `Ember.TextSupport`.
-
- ```javascript
- Ember.TextSupport.reopen({
- attributeBindings: ["required"]
- })
- ```
+ `layoutName` properties will not be applied. See [Ember.View](/api/classes/Ember.View.html)'s
+ layout section for more information.
@class TextArea
@namespace Ember
- @extends Ember.View
+ @extends Ember.Component
@uses Ember.TextSupport
*/
-Ember.TextArea = Ember.View.extend(Ember.TextSupport, {
+Ember.TextArea = Ember.Component.extend(Ember.TextSupport, {
classNames: ['ember-text-area'],
tagName: "textarea",
@@ -23636,7 +27309,7 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
`content` property. The underlying data object of the selected `` is
stored in the `Element.Select`'s `value` property.
- ### `content` as an array of Strings
+ ## The Content Property (array of strings)
The simplest version of an `Ember.Select` takes an array of strings as its
`content` property. The string will be used as both the `value` property and
@@ -23645,11 +27318,13 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
Example:
```javascript
- App.names = ["Yehuda", "Tom"];
+ App.ApplicationController = Ember.Controller.extend({
+ names: ["Yehuda", "Tom"]
+ });
```
```handlebars
- {{view Ember.Select contentBinding="App.names"}}
+ {{view Ember.Select contentBinding="names"}}
```
Would result in the following HTML:
@@ -23665,16 +27340,16 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
`value` property directly or as a binding:
```javascript
- App.names = Ember.Object.create({
- selected: 'Tom',
- content: ["Yehuda", "Tom"]
+ App.ApplicationController = Ember.Controller.extend({
+ selectedName: 'Tom',
+ names: ["Yehuda", "Tom"]
});
```
```handlebars
{{view Ember.Select
- contentBinding="App.names.content"
- valueBinding="App.names.selected"
+ contentBinding="names"
+ valueBinding="selectedName"
}}
```
@@ -23688,9 +27363,9 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
```
A user interacting with the rendered `` to choose "Yehuda" would
- update the value of `App.names.selected` to "Yehuda".
+ update the value of `selectedName` to "Yehuda".
- ### `content` as an Array of Objects
+ ## The Content Property (array of Objects)
An `Ember.Select` can also take an array of JavaScript or Ember objects as
its `content` property.
@@ -23705,15 +27380,17 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
element's text. Both paths must reference each object itself as `content`:
```javascript
- App.programmers = [
- Ember.Object.create({firstName: "Yehuda", id: 1}),
- Ember.Object.create({firstName: "Tom", id: 2})
- ];
+ App.ApplicationController = Ember.Controller.extend({
+ programmers: [
+ {firstName: "Yehuda", id: 1},
+ {firstName: "Tom", id: 2}
+ ]
+ });
```
```handlebars
{{view Ember.Select
- contentBinding="App.programmers"
+ contentBinding="programmers"
optionValuePath="content.id"
optionLabelPath="content.firstName"}}
```
@@ -23732,22 +27409,23 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
`valueBinding` option:
```javascript
- App.programmers = [
- Ember.Object.create({firstName: "Yehuda", id: 1}),
- Ember.Object.create({firstName: "Tom", id: 2})
- ];
-
- App.currentProgrammer = Ember.Object.create({
- id: 2
+ App.ApplicationController = Ember.Controller.extend({
+ programmers: [
+ {firstName: "Yehuda", id: 1},
+ {firstName: "Tom", id: 2}
+ ],
+ currentProgrammer: {
+ id: 2
+ }
});
```
```handlebars
{{view Ember.Select
- contentBinding="App.programmers"
+ contentBinding="programmers"
optionValuePath="content.id"
optionLabelPath="content.firstName"
- valueBinding="App.currentProgrammer.id"}}
+ valueBinding="currentProgrammer.id"}}
```
Would result in the following HTML with a selected option:
@@ -23760,7 +27438,7 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
```
Interacting with the rendered element by selecting the first option
- ('Yehuda') will update the `id` value of `App.currentProgrammer`
+ ('Yehuda') will update the `id` of `currentProgrammer`
to match the `value` property of the newly selected ``.
Alternatively, you can control selection through the underlying objects
@@ -23770,21 +27448,21 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
element:
```javascript
- App.controller = Ember.Object.create({
+ App.ApplicationController = Ember.Controller.extend({
selectedPerson: null,
- content: [
- Ember.Object.create({firstName: "Yehuda", id: 1}),
- Ember.Object.create({firstName: "Tom", id: 2})
+ programmers: [
+ {firstName: "Yehuda", id: 1},
+ {firstName: "Tom", id: 2}
]
});
```
```handlebars
{{view Ember.Select
- contentBinding="App.controller.content"
+ contentBinding="programmers"
optionValuePath="content.id"
optionLabelPath="content.firstName"
- selectionBinding="App.controller.selectedPerson"}}
+ selectionBinding="selectedPerson"}}
```
Would result in the following HTML with a selected option:
@@ -23797,19 +27475,19 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
```
Interacting with the rendered element by selecting the first option
- ('Yehuda') will update the `selectedPerson` value of `App.controller`
- to match the content object of the newly selected ` `. In this
- case it is the first object in the `App.controller.content`
+ ('Yehuda') will update the `selectedPerson` to match the object of
+ the newly selected ` `. In this case it is the first object
+ in the `programmers`
- ### Supplying a Prompt
+ ## Supplying a Prompt
A `null` value for the `Ember.Select`'s `value` or `selection` property
results in there being no ` ` with a `selected` attribute:
```javascript
- App.controller = Ember.Object.create({
- selected: null,
- content: [
+ App.ApplicationController = Ember.Controller.extend({
+ selectedProgrammer: null,
+ programmers: [
"Yehuda",
"Tom"
]
@@ -23818,8 +27496,8 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
``` handlebars
{{view Ember.Select
- contentBinding="App.controller.content"
- valueBinding="App.controller.selected"
+ contentBinding="programmers"
+ valueBinding="selectedProgrammer"
}}
```
@@ -23832,16 +27510,16 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
```
- Although `App.controller.selected` is `null` and no ` `
+ Although `selectedProgrammer` is `null` and no ` `
has a `selected` attribute the rendered HTML will display the
first item as though it were selected. You can supply a string
value for the `Ember.Select` to display when there is no selection
with the `prompt` option:
```javascript
- App.controller = Ember.Object.create({
- selected: null,
- content: [
+ App.ApplicationController = Ember.Controller.extend({
+ selectedProgrammer: null,
+ programmers: [
"Yehuda",
"Tom"
]
@@ -23850,8 +27528,8 @@ Ember.SelectOptgroup = Ember.CollectionView.extend({
```handlebars
{{view Ember.Select
- contentBinding="App.controller.content"
- valueBinding="App.controller.selected"
+ contentBinding="programmers"
+ valueBinding="selectedProgrammer"
prompt="Please select a name"
}}
```
@@ -23881,7 +27559,7 @@ helpers = this.merge(helpers, Ember.Handlebars.helpers); data = data || {};
var buffer = '', stack1, hashTypes, hashContexts, escapeExpression=this.escapeExpression, self=this;
function program1(depth0,data) {
-
+
var buffer = '', hashTypes, hashContexts;
data.buffer.push(" ");
hashTypes = {};
@@ -23892,7 +27570,7 @@ function program1(depth0,data) {
}
function program3(depth0,data) {
-
+
var stack1, hashTypes, hashContexts;
hashTypes = {};
hashContexts = {};
@@ -23901,7 +27579,7 @@ function program3(depth0,data) {
else { data.buffer.push(''); }
}
function program4(depth0,data) {
-
+
var hashContexts, hashTypes;
hashContexts = {'contentBinding': depth0,'labelBinding': depth0};
hashTypes = {'contentBinding': "ID",'labelBinding': "ID"};
@@ -23912,7 +27590,7 @@ function program4(depth0,data) {
}
function program6(depth0,data) {
-
+
var stack1, hashTypes, hashContexts;
hashTypes = {};
hashContexts = {};
@@ -23921,7 +27599,7 @@ function program6(depth0,data) {
else { data.buffer.push(''); }
}
function program7(depth0,data) {
-
+
var hashContexts, hashTypes;
hashContexts = {'contentBinding': depth0};
hashTypes = {'contentBinding': "STRING"};
@@ -23939,7 +27617,7 @@ function program7(depth0,data) {
stack1 = helpers['if'].call(depth0, "view.optionGroupPath", {hash:{},inverse:self.program(6, program6, data),fn:self.program(3, program3, data),contexts:[depth0],types:["ID"],hashContexts:hashContexts,hashTypes:hashTypes,data:data});
if(stack1 || stack1 === 0) { data.buffer.push(stack1); }
return buffer;
-
+
}),
attributeBindings: ['multiple', 'disabled', 'tabindex', 'name'],
@@ -23953,6 +27631,14 @@ function program7(depth0,data) {
*/
multiple: false,
+ /**
+ The `disabled` attribute of the select element. Indicates whether
+ the element is disabled from interactions.
+
+ @property multiple
+ @type Boolean
+ @default false
+ */
disabled: false,
/**
@@ -24019,7 +27705,7 @@ function program7(depth0,data) {
prompt: null,
/**
- The path of the option labels. See `content`.
+ The path of the option labels. See [content](/api/classes/Ember.Select.html#property_content).
@property optionLabelPath
@type String
@@ -24028,7 +27714,7 @@ function program7(depth0,data) {
optionLabelPath: 'content',
/**
- The path of the option values. See `content`.
+ The path of the option values. See [content](/api/classes/Ember.Select.html#property_content).
@property optionValuePath
@type String
@@ -24209,6 +27895,11 @@ function program7(depth0,data) {
(function() {
+/**
+@module ember
+@submodule ember-handlebars-compiler
+*/
+
function normalizeHash(hash, hashTypes) {
for (var prop in hash) {
if (hashTypes[prop] === 'ID') {
@@ -24219,16 +27910,145 @@ function normalizeHash(hash, hashTypes) {
}
/**
- * `{{input}}` inserts a new instance of either Ember.TextField or
- * Ember.Checkbox, depending on the `type` option passed in. If no `type`
- * is supplied it defaults to Ember.TextField.
- *
- * @method input
- * @for Ember.Handlebars.helpers
- * @param {Hash} options
- */
+
+ The `{{input}}` helper inserts an HTML `
+ {{outputWrittenWords}}
+
+ ```
+
+ Would result in the following HTML:
+
+ ```html
+
+
+ <-- the following div will be updated in real time as you type -->
+
+
+ Lots of text that IS bound
+
+ ```
+
+ Finally, this example really shows the power and ease of Ember when two
+ properties are bound to eachother via `Ember.computed.alias`. Type into
+ either text area box and they'll both stay in sync. Note that
+ `Ember.computed.alias` costs more in terms of performance, so only use it when
+ your really binding in both directions:
+
+ ```javascript
+ App.ApplicationController = Ember.Controller.extend({
+ writtenWords: "Lots of text that IS bound",
+ twoWayWrittenWords: Ember.computed.alias("writtenWords")
+ });
+ ```
+
+ ```handlebars
+ {{textarea value=writtenWords}}
+ {{textarea value=twoWayWrittenWords}}
+ ```
+
+ ```html
+
+
+ <-- both updated in real time -->
+
+
+ ```
+
+ ## Extension
+
+ Internally, `{{textarea}}` creates an instance of `Ember.TextArea`, passing
+ arguments from the helper to `Ember.TextArea`'s `create` method. You can
+ 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
+ `Ember.TextSupport` and adding it to the `attributeBindings` concatenated
+ property:
+
+ ```javascript
+ Ember.TextArea.reopen({
+ attributeBindings: ['required']
+ });
+ ```
+
+ Keep in mind when writing `Ember.TextArea` subclasses that `Ember.TextArea`
+ itself extends `Ember.Component`, meaning that it does NOT inherit
+ the `controller` of the parent view.
+
+ See more about [Ember components](api/classes/Ember.Component.html)
+
+ @method textarea
+ @for Ember.Handlebars.helpers
+ @param {Hash} options
+*/
Ember.Handlebars.registerHelper('textarea', function(options) {
- Ember.assert('You can only pass attributes to the `textarea` helper, not arguments', arguments.length < 2);
+
var hash = options.hash,
types = options.hashTypes;
@@ -24312,6 +28271,11 @@ Ember.Handlebars.bootstrap = function(ctx) {
templateName = script.attr('data-template-name') || script.attr('id') || 'application',
template = compile(script.html());
+ // Check if template of same name already exists
+ if (Ember.TEMPLATES[templateName] !== undefined) {
+ throw new Error('Template named "' + templateName + '" already exists.');
+ }
+
// For templates which have a name, we save them and then remove them from the DOM
Ember.TEMPLATES[templateName] = template;
@@ -24335,18 +28299,22 @@ function registerComponents(container) {
}
}
+
function registerComponent(container, name) {
- Ember.assert("You provided a template named 'components/" + name + "', but custom components must include a '-'", name.match(/-/));
- var className = name.replace(/-/g, '_');
- var Component = container.lookupFactory('component:' + className) || container.lookupFactory('component:' + name);
- var View = Component || Ember.Component.extend();
- View.reopen({
- layoutName: 'components/' + name
- });
+ var fullName = 'component:' + name;
- Ember.Handlebars.helper(name, View);
+ 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);
}
/*
@@ -24361,21 +28329,16 @@ function registerComponent(container, name) {
*/
Ember.onLoad('Ember.Application', function(Application) {
- if (Application.initializer) {
- Application.initializer({
- name: 'domTemplates',
- initialize: bootstrap
- });
+ Application.initializer({
+ name: 'domTemplates',
+ initialize: bootstrap
+ });
- Application.initializer({
- name: 'registerComponents',
- after: 'domTemplates',
- initialize: registerComponents
- });
- } else {
- // for ember-old-router
- Ember.onLoad('application', bootstrap);
- }
+ Application.initializer({
+ name: 'registerComponents',
+ after: 'domTemplates',
+ initialize: registerComponents
+ });
});
})();
@@ -24499,7 +28462,7 @@ define("route-recognizer",
results.push(new StarSegment(match[1]));
names.push(match[1]);
types.stars++;
- } else if (segment === "") {
+ } else if(segment === "") {
results.push(new EpsilonSegment());
} else {
results.push(new StaticSegment(segment));
@@ -24648,19 +28611,31 @@ define("route-recognizer",
return nextStates;
}
- function findHandler(state, path) {
+ function findHandler(state, path, queryParams) {
var handlers = state.handlers, regex = state.regex;
var captures = path.match(regex), currentCapture = 1;
var result = [];
for (var i=0, l=handlers.length; i 0) {
+ currentResult.queryParams = activeQueryParams;
+ }
+ result.push(currentResult);
}
return result;
@@ -24715,7 +28690,11 @@ define("route-recognizer",
regex += segment.regex();
}
- handlers.push({ handler: route.handler, names: names });
+ var handler = { handler: route.handler, names: names };
+ if(route.queryParams) {
+ handler.queryParams = route.queryParams;
+ }
+ handlers.push(handler);
}
if (isEmpty) {
@@ -24767,12 +28746,61 @@ define("route-recognizer",
if (output.charAt(0) !== '/') { output = '/' + output; }
+ if (params && params.queryParams) {
+ output += this.generateQueryString(params.queryParams, route.handlers);
+ }
+
return output;
},
+ generateQueryString: function(params, handlers) {
+ var pairs = [], allowedParams = [];
+ for(var i=0; i < handlers.length; i++) {
+ var currentParamList = handlers[i].queryParams;
+ if(currentParamList) {
+ allowedParams.push.apply(allowedParams, currentParamList);
+ }
+ }
+ for(var key in params) {
+ if (params.hasOwnProperty(key)) {
+ if(!~allowedParams.indexOf(key)) {
+ throw 'Query param "' + key + '" is not specified as a valid param for this route';
+ }
+ var value = params[key];
+ var pair = encodeURIComponent(key);
+ if(value !== true) {
+ pair += "=" + encodeURIComponent(value);
+ }
+ pairs.push(pair);
+ }
+ }
+
+ if (pairs.length === 0) { return ''; }
+
+ return "?" + pairs.join("&");
+ },
+
+ parseQueryString: function(queryString) {
+ var pairs = queryString.split("&"), queryParams = {};
+ for(var i=0; i < pairs.length; i++) {
+ var pair = pairs[i].split('='),
+ key = decodeURIComponent(pair[0]),
+ value = pair[1] ? decodeURIComponent(pair[1]) : true;
+ queryParams[key] = value;
+ }
+ return queryParams;
+ },
+
recognize: function(path) {
var states = [ this.rootState ],
- pathLen, i, l;
+ pathLen, i, l, queryStart, queryParams = {};
+
+ queryStart = path.indexOf('?');
+ if (~queryStart) {
+ var queryString = path.substr(queryStart + 1, path.length);
+ path = path.substr(0, queryStart);
+ queryParams = this.parseQueryString(queryString);
+ }
// DEBUG GROUP path
@@ -24800,7 +28828,7 @@ define("route-recognizer",
var state = solutions[0];
if (state && state.handlers) {
- return findHandler(state, path);
+ return findHandler(state, path, queryParams);
}
}
};
@@ -24825,12 +28853,25 @@ define("route-recognizer",
if (callback.length === 0) { throw new Error("You must have an argument in the function passed to `to`"); }
this.matcher.addChild(this.path, target, callback, this.delegate);
}
+ return this;
+ },
+
+ withQueryParams: function() {
+ if (arguments.length === 0) { throw new Error("you must provide arguments to the withQueryParams method"); }
+ for (var i = 0; i < arguments.length; i++) {
+ if (typeof arguments[i] !== "string") {
+ throw new Error('you should call withQueryParams with a list of strings, e.g. withQueryParams("foo", "bar")');
+ }
+ }
+ var queryParams = [].slice.call(arguments);
+ this.matcher.addQueryParams(this.path, queryParams);
}
};
function Matcher(target) {
this.routes = {};
this.children = {};
+ this.queryParams = {};
this.target = target;
}
@@ -24839,6 +28880,10 @@ define("route-recognizer",
this.routes[path] = handler;
},
+ addQueryParams: function(path, params) {
+ this.queryParams[path] = params;
+ },
+
addChild: function(path, target, callback, delegate) {
var matcher = new Matcher(target);
this.children[path] = matcher;
@@ -24865,23 +28910,26 @@ define("route-recognizer",
};
}
- function addRoute(routeArray, path, handler) {
+ function addRoute(routeArray, path, handler, queryParams) {
var len = 0;
for (var i=0, l=routeArray.length; i 0) {
+ var err = 'You supplied the params ';
+ err += missingParams.map(function(param) {
+ return '"' + param + "=" + queryParams[param] + '"';
+ }).join(' and ');
+
+ err += ' which are not valid for the "' + handlerName + '" handler or its parents';
+
+ throw new Error(err);
+ }
+
return this.recognizer.generate(handlerName, params);
},
isActive: function(handlerName) {
- var contexts = slice.call(arguments, 1);
+ var partitionedArgs = extractQueryParams(slice.call(arguments, 1)),
+ contexts = partitionedArgs[0],
+ queryParams = partitionedArgs[1],
+ activeQueryParams = {},
+ effectiveQueryParams = {};
var targetHandlerInfos = this.targetHandlerInfos,
found = false, names, object, handlerInfo, handlerObj;
@@ -25219,20 +29313,25 @@ define("router",
if (!targetHandlerInfos) { return false; }
var recogHandlers = this.recognizer.handlersFor(targetHandlerInfos[targetHandlerInfos.length - 1].name);
-
for (var i=targetHandlerInfos.length-1; i>=0; i--) {
handlerInfo = targetHandlerInfos[i];
if (handlerInfo.name === handlerName) { found = true; }
if (found) {
- if (contexts.length === 0) { break; }
+ var recogHandler = recogHandlers[i];
- if (handlerInfo.isDynamic) {
+ merge(activeQueryParams, handlerInfo.queryParams);
+ if (queryParams !== false) {
+ merge(effectiveQueryParams, handlerInfo.queryParams);
+ mergeSomeKeys(effectiveQueryParams, queryParams, recogHandler.queryParams);
+ }
+
+ if (handlerInfo.isDynamic && contexts.length > 0) {
object = contexts.pop();
if (isParam(object)) {
- var recogHandler = recogHandlers[i], name = recogHandler.names[0];
- if (object.toString() !== this.currentParams[name]) { return false; }
+ var name = recogHandler.names[0];
+ if ("" + object !== this.currentParams[name]) { return false; }
} else if (handlerInfo.context !== object) {
return false;
}
@@ -25240,12 +29339,13 @@ define("router",
}
}
- return contexts.length === 0 && found;
+
+ return contexts.length === 0 && found && queryParamsEqual(activeQueryParams, effectiveQueryParams);
},
trigger: function(name) {
var args = slice.call(arguments);
- trigger(this.currentHandlerInfos, false, args);
+ trigger(this, this.currentHandlerInfos, false, args);
},
/**
@@ -25263,7 +29363,7 @@ define("router",
a shared pivot parent route and other data necessary to perform
a transition.
*/
- function getMatchPoint(router, handlers, objects, inputParams) {
+ function getMatchPoint(router, handlers, objects, inputParams, queryParams) {
var matchPoint = handlers.length,
providedModels = {}, i,
@@ -25318,6 +29418,12 @@ define("router",
}
}
+ // If there is an old handler, see if query params are the same. If there isn't an old handler,
+ // hasChanged will already be true here
+ if(oldHandlerInfo && !queryParamsEqual(oldHandlerInfo.queryParams, handlerObj.queryParams)) {
+ hasChanged = true;
+ }
+
if (hasChanged) { matchPoint = i; }
}
@@ -25342,8 +29448,8 @@ define("router",
}
} else if (activeTransition) {
// Use model from previous transition attempt, preferably the resolved one.
- return (paramName && activeTransition.providedModels[handlerName]) ||
- activeTransition.resolvedModels[handlerName];
+ return activeTransition.resolvedModels[handlerName] ||
+ (paramName && activeTransition.providedModels[handlerName]);
}
}
@@ -25351,6 +29457,28 @@ define("router",
return (typeof object === "string" || object instanceof String || !isNaN(object));
}
+
+
+ /**
+ @private
+
+ This method takes a handler name and returns a list of query params
+ that are valid to pass to the handler or its parents
+
+ @param {Router} router
+ @param {String} handlerName
+ @return {Array[String]} a list of query parameters
+ */
+ function queryParamsForHandler(router, handlerName) {
+ var handlers = router.recognizer.handlersFor(handlerName),
+ queryParams = [];
+
+ for (var i = 0; i < handlers.length; i++) {
+ queryParams.push.apply(queryParams, handlers[i].queryParams || []);
+ }
+
+ return queryParams;
+ }
/**
@private
@@ -25362,13 +29490,17 @@ define("router",
@param {Array[Object]} objects
@return {Object} a serialized parameter hash
*/
- function paramsForHandler(router, handlerName, objects) {
+ function paramsForHandler(router, handlerName, objects, queryParams) {
var handlers = router.recognizer.handlersFor(handlerName),
params = {},
- matchPoint = getMatchPoint(router, handlers, objects).matchPoint,
+ handlerInfos = generateHandlerInfosWithQueryParams(router, handlers, queryParams),
+ matchPoint = getMatchPoint(router, handlerInfos, objects).matchPoint,
+ mergedQueryParams = {},
object, handlerObj, handler, names, i;
+ params.queryParams = {};
+
for (i=0; i 0) {
+ handlerInfo.queryParams = activeQueryParams;
+ }
+
+ handlerInfos.push(handlerInfo);
+ }
+
+ return handlerInfos;
+ }
+
+ /**
+ @private
+ */
+ function createQueryParamTransition(router, queryParams) {
+ var currentHandlers = router.currentHandlerInfos,
+ currentHandler = currentHandlers[currentHandlers.length - 1],
+ name = currentHandler.name;
+
+ log(router, "Attempting query param transition");
+
+ return createNamedTransition(router, [name, queryParams]);
+ }
+
/**
@private
*/
function createNamedTransition(router, args) {
- var handlers = router.recognizer.handlersFor(args[0]);
+ var partitionedArgs = extractQueryParams(args),
+ pureArgs = partitionedArgs[0],
+ queryParams = partitionedArgs[1],
+ handlers = router.recognizer.handlersFor(pureArgs[0]),
+ handlerInfos = generateHandlerInfosWithQueryParams(router, handlers, queryParams);
- log(router, "Attempting transition to " + args[0]);
- return performTransition(router, handlers, slice.call(args, 1), router.currentParams);
+ log(router, "Attempting transition to " + pureArgs[0]);
+
+ return performTransition(router, handlerInfos, slice.call(pureArgs, 1), router.currentParams, queryParams);
}
/**
@private
*/
function createURLTransition(router, url) {
-
var results = router.recognizer.recognize(url),
- currentHandlerInfos = router.currentHandlerInfos;
+ currentHandlerInfos = router.currentHandlerInfos,
+ queryParams = {};
log(router, "Attempting URL transition to " + url);
@@ -25422,7 +29620,11 @@ define("router",
return errorTransition(router, new Router.UnrecognizedURLError(url));
}
- return performTransition(router, results, [], {});
+ for(var i = 0; i < results.length; i++) {
+ merge(queryParams, results[i].queryParams);
+ }
+
+ return performTransition(router, results, [], {}, queryParams);
}
@@ -25489,10 +29691,6 @@ define("router",
eachHandler(partition.entered, function(handlerInfo) {
handlerEnteredOrUpdated(transition, currentHandlerInfos, handlerInfo, true);
});
-
- if (router.didTransition) {
- router.didTransition(handlerInfos);
- }
}
/**
@@ -25510,13 +29708,14 @@ define("router",
checkAbort(transition);
setContext(handler, context);
+ setQueryParams(handler, handlerInfo.queryParams);
- if (handler.setup) { handler.setup(context); }
+ if (handler.setup) { handler.setup(context, handlerInfo.queryParams); }
checkAbort(transition);
} catch(e) {
if (!(e instanceof Router.TransitionAborted)) {
// Trigger the `error` event starting from this failed handler.
- trigger(currentHandlerInfos.concat(handlerInfo), true, ['error', e, transition]);
+ trigger(transition.router, currentHandlerInfos.concat(handlerInfo), true, ['error', e, transition]);
}
// Propagate the error so that the transition promise will reject.
@@ -25542,6 +29741,29 @@ define("router",
}
}
+ /**
+ @private
+
+ determines if two queryparam objects are the same or not
+ **/
+ function queryParamsEqual(a, b) {
+ a = a || {};
+ b = b || {};
+ var checkedKeys = [], key;
+ for(key in a) {
+ if (!a.hasOwnProperty(key)) { continue; }
+ if(b[key] !== a[key]) { return false; }
+ checkedKeys.push(key);
+ }
+ for(key in b) {
+ if (!b.hasOwnProperty(key)) { continue; }
+ if (~checkedKeys.indexOf(key)) { continue; }
+ // b has a key not in a
+ return false;
+ }
+ return true;
+ }
+
/**
@private
@@ -25591,19 +29813,21 @@ define("router",
unchanged: []
};
- var handlerChanged, contextChanged, i, l;
+ var handlerChanged, contextChanged, queryParamsChanged, i, l;
for (i=0, l=newHandlers.length; i 0 && array[len - 1] && array[len - 1].hasOwnProperty('queryParams')) {
+ queryParams = array[len - 1].queryParams;
+ head = slice.call(array, 0, len - 1);
+ return [head, queryParams];
+ } else {
+ return [array, null];
+ }
+ }
+
/**
@private
Creates, begins, and returns a Transition.
*/
- function performTransition(router, recogHandlers, providedModelsArray, params, data) {
+ function performTransition(router, recogHandlers, providedModelsArray, params, queryParams, data) {
- var matchPointResults = getMatchPoint(router, recogHandlers, providedModelsArray, params),
+ var matchPointResults = getMatchPoint(router, recogHandlers, providedModelsArray, params, queryParams),
targetName = recogHandlers[recogHandlers.length - 1].handler,
- wasTransitioning = false;
+ wasTransitioning = false,
+ currentHandlerInfos = router.currentHandlerInfos;
// Check if there's already a transition underway.
if (router.activeTransition) {
- if (transitionsIdentical(router.activeTransition, targetName, providedModelsArray)) {
+ if (transitionsIdentical(router.activeTransition, targetName, providedModelsArray, queryParams)) {
return router.activeTransition;
}
router.activeTransition.abort();
@@ -25680,6 +29933,7 @@ define("router",
transition.providedModelsArray = providedModelsArray;
transition.params = matchPointResults.params;
transition.data = data || {};
+ transition.queryParams = queryParams;
router.activeTransition = transition;
var handlerInfos = generateHandlerInfos(router, recogHandlers);
@@ -25687,7 +29941,7 @@ define("router",
// Fire 'willTransition' event on current handlers, but don't fire it
// if a transition was already underway.
if (!wasTransitioning) {
- trigger(router.currentHandlerInfos, true, ['willTransition', transition]);
+ trigger(router, currentHandlerInfos, true, ['willTransition', transition]);
}
log(router, transition.sequence, "Beginning validation for transition to " + transition.targetName);
@@ -25700,7 +29954,20 @@ define("router",
checkAbort(transition);
try {
- finalizeTransition(transition, handlerInfos);
+ log(router, transition.sequence, "Validation succeeded, finalizing transition;");
+
+ // Don't overwrite contexts / update URL if this was a noop transition.
+ if (!currentHandlerInfos || !currentHandlerInfos.length ||
+ !router.recognizer.hasRoute(currentHandlerInfos[currentHandlerInfos.length - 1].name) ||
+ currentHandlerInfos.length !== matchPointResults.matchPoint) {
+ finalizeTransition(transition, handlerInfos);
+ }
+
+ if (router.didTransition) {
+ router.didTransition(handlerInfos);
+ }
+
+ log(router, transition.sequence, "TRANSITION COMPLETE.");
// Resolve with the final handler.
deferred.resolve(handlerInfos[handlerInfos.length - 1].handler);
@@ -25733,11 +30000,16 @@ define("router",
var handlerObj = recogHandlers[i],
isDynamic = handlerObj.isDynamic || (handlerObj.names && handlerObj.names.length);
- handlerInfos.push({
+
+ var handlerInfo = {
isDynamic: !!isDynamic,
name: handlerObj.handler,
handler: router.getHandler(handlerObj.handler)
- });
+ };
+ if(handlerObj.queryParams) {
+ handlerInfo.queryParams = handlerObj.queryParams;
+ }
+ handlerInfos.push(handlerInfo);
}
return handlerInfos;
}
@@ -25745,7 +30017,7 @@ define("router",
/**
@private
*/
- function transitionsIdentical(oldTransition, targetName, providedModelsArray) {
+ function transitionsIdentical(oldTransition, targetName, providedModelsArray, queryParams) {
if (oldTransition.targetName !== targetName) { return false; }
@@ -25755,6 +30027,11 @@ define("router",
for (var i = 0, len = oldModels.length; i < len; ++i) {
if (oldModels[i] !== providedModelsArray[i]) { return false; }
}
+
+ if(!queryParamsEqual(oldTransition.queryParams, queryParams)) {
+ return false;
+ }
+
return true;
}
@@ -25768,13 +30045,12 @@ define("router",
var router = transition.router,
seq = transition.sequence,
- handlerName = handlerInfos[handlerInfos.length - 1].name;
-
- log(router, seq, "Validation succeeded, finalizing transition;");
+ handlerName = handlerInfos[handlerInfos.length - 1].name,
+ i;
// Collect params for URL.
var objects = [], providedModels = transition.providedModelsArray.slice();
- for (var i = handlerInfos.length - 1; i>=0; --i) {
+ for (i = handlerInfos.length - 1; i>=0; --i) {
var handlerInfo = handlerInfos[i];
if (handlerInfo.isDynamic) {
var providedModel = providedModels.pop();
@@ -25782,12 +30058,18 @@ define("router",
}
}
- var params = paramsForHandler(router, handlerName, objects);
+ var newQueryParams = {};
+ for (i = handlerInfos.length - 1; i>=0; --i) {
+ merge(newQueryParams, handlerInfos[i].queryParams);
+ }
+ router.currentQueryParams = newQueryParams;
+
+
+ var params = paramsForHandler(router, handlerName, objects, transition.queryParams);
- transition.providedModelsArray = [];
- transition.providedContexts = {};
router.currentParams = params;
+
var urlMethod = transition.urlMethod;
if (urlMethod) {
var url = router.recognizer.generate(handlerName, params);
@@ -25801,7 +30083,6 @@ define("router",
}
setupContexts(transition, handlerInfos);
- log(router, seq, "TRANSITION COMPLETE.");
}
/**
@@ -25830,7 +30111,9 @@ define("router",
// We're before the match point, so don't run any hooks,
// just use the already resolved context from the handler.
- transition.resolvedModels[handlerInfo.name] = handlerInfo.handler.context;
+ transition.resolvedModels[handlerInfo.name] =
+ transition.providedModels[handlerInfo.name] ||
+ handlerInfo.handler.context;
return proceed();
}
@@ -25841,8 +30124,8 @@ define("router",
.then(handleAbort)
.then(afterModel)
.then(handleAbort)
- .then(proceed)
- .then(null, handleError);
+ .then(null, handleError)
+ .then(proceed);
function handleAbort(result) {
if (transition.isAborted) {
@@ -25867,11 +30150,7 @@ define("router",
// An error was thrown / promise rejected, so fire an
// `error` event from this handler info up to root.
- trigger(handlerInfos.slice(0, index + 1), true, ['error', reason, transition]);
-
- if (handler.error) {
- handler.error(reason, transition);
- }
+ trigger(router, handlerInfos.slice(0, index + 1), true, ['error', reason, transition]);
// Propagate the original error.
return RSVP.reject(reason);
@@ -25881,13 +30160,20 @@ define("router",
log(router, seq, handlerName + ": calling beforeModel hook");
- var p = handler.beforeModel && handler.beforeModel(transition);
+ var args;
+
+ if (handlerInfo.queryParams) {
+ args = [handlerInfo.queryParams, transition];
+ } else {
+ args = [transition];
+ }
+
+ var p = handler.beforeModel && handler.beforeModel.apply(handler, args);
return (p instanceof Transition) ? null : p;
}
function model() {
log(router, seq, handlerName + ": resolving model");
-
var p = getModel(handlerInfo, transition, handlerParams[handlerName], index >= matchPoint);
return (p instanceof Transition) ? null : p;
}
@@ -25902,7 +30188,15 @@ define("router",
transition.resolvedModels[handlerInfo.name] = context;
- var p = handler.afterModel && handler.afterModel(context, transition);
+ var args;
+
+ if (handlerInfo.queryParams) {
+ args = [context, handlerInfo.queryParams, transition];
+ } else {
+ args = [context, transition];
+ }
+
+ var p = handler.afterModel && handler.afterModel.apply(handler, args);
return (p instanceof Transition) ? null : p;
}
@@ -25933,9 +30227,8 @@ define("router",
or use one of the models provided to `transitionTo`.
*/
function getModel(handlerInfo, transition, handlerParams, needsUpdate) {
-
var handler = handlerInfo.handler,
- handlerName = handlerInfo.name;
+ handlerName = handlerInfo.name, args;
if (!needsUpdate && handler.hasOwnProperty('context')) {
return handler.context;
@@ -25946,7 +30239,13 @@ define("router",
return typeof providedModel === 'function' ? providedModel() : providedModel;
}
- return handler.model && handler.model(handlerParams || {}, transition);
+ if (handlerInfo.queryParams) {
+ args = [handlerParams || {}, handlerInfo.queryParams, transition];
+ } else {
+ args = [handlerParams || {}, transition, handlerInfo.queryParams];
+ }
+
+ return handler.model && handler.model.apply(handler, args);
}
/**
@@ -25979,10 +30278,12 @@ define("router",
// Normalize blank transitions to root URL transitions.
var name = args[0] || '/';
- if (name.charAt(0) === '/') {
+ if(args.length === 1 && args[0].hasOwnProperty('queryParams')) {
+ return createQueryParamTransition(router, args[0]);
+ } else if (name.charAt(0) === '/') {
return createURLTransition(router, name);
} else {
- return createNamedTransition(router, args);
+ return createNamedTransition(router, slice.call(args));
}
}
@@ -26060,21 +30361,21 @@ DSL.prototype = {
if (callback) {
var dsl = new DSL(name);
callback.call(dsl);
- this.push(options.path, name, dsl.generate());
+ this.push(options.path, name, dsl.generate(), options.queryParams);
} else {
- this.push(options.path, name);
+ this.push(options.path, name, null, options.queryParams);
}
},
- push: function(url, name, callback) {
+ push: function(url, name, callback, queryParams) {
var parts = name.split('.');
if (url === "" || url === "/" || parts[parts.length-1] === "index") { this.explicitIndex = true; }
- this.matches.push([url, name, callback]);
+ this.matches.push([url, name, callback, queryParams]);
},
route: function(name, options) {
- Ember.assert("You must use `this.resource` to nest", typeof options !== 'function');
+
options = options || {};
@@ -26086,7 +30387,7 @@ DSL.prototype = {
name = this.parent + "." + name;
}
- this.push(options.path, name);
+ this.push(options.path, name, null, options.queryParams);
},
generate: function() {
@@ -26099,7 +30400,12 @@ DSL.prototype = {
return function(match) {
for (var i=0, l=dslMatches.length; i " + routeName, { fullName: routeName });
+ }
+ }
+
+ if (name === 'application') {
+ // Inject default `error` handler.
+ // Note: `events` is deprecated, but we'll let the
+ // deprecation warnings be handled at event-handling time rather
+ // than duplicating that logic here.
+ var actions = handler._actions || handler.events;
+ if (!actions) { actions = handler._actions = {}; }
+ actions.error = actions.error || Ember.Router._defaultErrorHandler;
+ }
+
+ handler.routeName = name;
+ return handler;
+ };
+ },
+
+ _setupRouter: function(router, location) {
+ var lastURL, emberRouter = this;
+
+ router.getHandler = this._getHandlerFunction();
+
+ var doUpdateURL = function() {
+ location.setURL(lastURL);
+ };
+
+ router.updateURL = function(path) {
+ lastURL = path;
+ Ember.run.once(doUpdateURL);
+ };
+
+ if (location.replaceURL) {
+ var doReplaceURL = function() {
+ location.replaceURL(lastURL);
+ };
+
+ router.replaceURL = function(path) {
+ lastURL = path;
+ Ember.run.once(doReplaceURL);
+ };
+ }
+
+ router.didTransition = function(infos) {
+ emberRouter.didTransition(infos);
+ };
+ },
+
+ _doTransition: function(method, args) {
+ // Normalize blank route to root URL.
+ args = [].slice.call(args);
+ args[0] = args[0] || '/';
+
+ var passedName = args[0], name, self = this,
+ isQueryParamsOnly = false;
+
+ if (Ember.FEATURES.isEnabled("query-params")) {
+ isQueryParamsOnly = (args.length === 1 && args[0].hasOwnProperty('queryParams'));
+ }
+
+ if (!isQueryParamsOnly && passedName.charAt(0) === '/') {
+ name = passedName;
+ } else if (!isQueryParamsOnly) {
+ if (!this.router.hasRoute(passedName)) {
+ name = args[0] = passedName + '.index';
+ } else {
+ name = passedName;
+ }
+
+ }
+
+ var transitionPromise = this.router[method].apply(this.router, args);
+
+ // Don't schedule loading state entry if user has already aborted the transition.
+ if (this.router.activeTransition) {
+ this._scheduleLoadingStateEntry();
+ }
+
+ transitionPromise.then(function(route) {
+ self._transitionCompleted(route);
+ }, function(error) {
+ if (error.name === "UnrecognizedURLError") {
+
+ }
+ });
+
+ // We want to return the configurable promise object
+ // so that callers of this function can use `.method()` on it,
+ // which obviously doesn't exist for normal RSVP promises.
+ return transitionPromise;
+ },
+
+ _scheduleLoadingStateEntry: function() {
+ if (this._loadingStateActive) { return; }
+ this._shouldEnterLoadingState = true;
+ Ember.run.scheduleOnce('routerTransitions', this, this._enterLoadingState);
+ },
+
+ _enterLoadingState: function() {
+ if (this._loadingStateActive || !this._shouldEnterLoadingState) { return; }
+
+ var loadingRoute = this.router.getHandler('loading');
+ if (loadingRoute) {
+ if (loadingRoute.enter) { loadingRoute.enter(); }
+ if (loadingRoute.setup) { loadingRoute.setup(); }
+ this._loadingStateActive = true;
+ }
+ },
+
+ _exitLoadingState: function () {
+ this._shouldEnterLoadingState = false;
+ if (!this._loadingStateActive) { return; }
+
+ var loadingRoute = this.router.getHandler('loading');
+ if (loadingRoute && loadingRoute.exit) { loadingRoute.exit(); }
+ this._loadingStateActive = false;
+ },
+
+ _transitionCompleted: function(route) {
+ this.notifyPropertyChange('url');
+ this._exitLoadingState();
}
});
-function getHandlerFunction(router) {
- var seen = {}, container = router.container,
- DefaultRoute = container.resolve('route:basic');
+function triggerEvent(handlerInfos, ignoreFailure, args) {
+ var name = args.shift();
- return function(name) {
- var routeName = 'route:' + name,
- handler = container.lookup(routeName);
+ if (!handlerInfos) {
+ if (ignoreFailure) { return; }
+ throw new Error("Could not trigger event '" + name + "'. There are no active handlers");
+ }
- if (seen[name]) { return handler; }
+ var eventWasHandled = false;
- seen[name] = true;
+ for (var i=handlerInfos.length-1; i>=0; i--) {
+ var handlerInfo = handlerInfos[i],
+ handler = handlerInfo.handler;
- if (!handler) {
- if (name === 'loading') { return {}; }
+ if (handler._actions && handler._actions[name]) {
+ if (handler._actions[name].apply(handler, args) === true) {
+ eventWasHandled = true;
+ } else {
+ return;
+ }
+ } else if (handler.events && handler.events[name]) {
- container.register(routeName, DefaultRoute.extend());
- handler = container.lookup(routeName);
-
- if (get(router, 'namespace.LOG_ACTIVE_GENERATION')) {
- Ember.Logger.info("generated -> " + routeName, { fullName: routeName });
+ if (handler.events[name].apply(handler, args) === true) {
+ eventWasHandled = true;
+ } else {
+ return;
}
}
-
- if (name === 'application') {
- // Inject default `error` handler.
- handler.events = handler.events || {};
- handler.events.error = handler.events.error || defaultErrorHandler;
- }
-
- handler.routeName = name;
- return handler;
- };
-}
-
-function defaultErrorHandler(error, transition) {
- Ember.Logger.error('Error while loading route:', error);
-
- // Using setTimeout allows us to escape from the Promise's try/catch block
- setTimeout(function() { throw error; });
-}
-
-
-function routePath(handlerInfos) {
- var path = [];
-
- for (var i=1, l=handlerInfos.length; i 0 ? !Ember.isNone(arguments[0]) : true);
+
var namePassed = !!name;
@@ -27185,14 +31852,21 @@ Ember.Route = Ember.Object.extend({
name = this.routeName;
}
+ options = options || {};
name = name ? name.replace(/\//g, '.') : this.routeName;
+ var viewName = options.view || this.viewName || name;
+ var templateName = this.templateName || name;
var container = this.container,
- view = container.lookup('view:' + name),
- template = container.lookup('template:' + name);
+ view = container.lookup('view:' + viewName),
+ template = view ? view.get('template') : null;
+
+ if (!template) {
+ template = container.lookup('template:' + templateName);
+ }
if (!view && !template) {
- Ember.assert("Could not find \"" + name + "\" template or view.", !namePassed);
+
if (get(this.router, 'namespace.LOG_VIEW_LOOKUPS')) {
Ember.Logger.info("Could not find \"" + name + "\" template or view. Nothing will be rendered", { fullName: 'template:' + name });
}
@@ -27220,7 +31894,7 @@ Ember.Route = Ember.Object.extend({
```js
App.ApplicationRoute = App.Route.extend({
- events: {
+ actions: {
showModal: function(evt) {
this.render(evt.modalName, {
outlet: 'modal',
@@ -27253,6 +31927,11 @@ Ember.Route = Ember.Object.extend({
this.teardownViews();
},
+ /**
+ @private
+
+ @method teardownViews
+ */
teardownViews: function() {
// Tear down the top level view
if (this.teardownTopLevelView) { this.teardownTopLevelView(); }
@@ -27303,7 +31982,6 @@ function normalizeOptions(route, name, template, options) {
options.template = template;
options.LOG_VIEW_LOOKUPS = get(route.router, 'namespace.LOG_VIEW_LOOKUPS');
- Ember.assert("An outlet ("+options.outlet+") was specified but was not found.", options.outlet === 'main' || options.into);
var controller = options.controller, namedController;
@@ -27312,7 +31990,7 @@ function normalizeOptions(route, name, template, options) {
} else if (namedController = route.container.lookup('controller:' + name)) {
controller = namedController;
} else {
- controller = route.routeName;
+ controller = route.controllerName || route.routeName;
}
if (typeof controller === 'string') {
@@ -27390,24 +32068,45 @@ function generateOutletTeardown(parentView, outlet) {
Ember.onLoad('Ember.Handlebars', function() {
var handlebarsResolve = Ember.Handlebars.resolveParams,
map = Ember.ArrayPolyfills.map,
- get = Ember.get;
+ get = Ember.get,
+ handlebarsGet = Ember.Handlebars.get;
function resolveParams(context, params, options) {
- var resolved = handlebarsResolve(context, params, options);
- return map.call(resolved, unwrap);
+ return map.call(resolvePaths(context, params, options), function(path, i) {
+ if (null === path) {
+ // Param was string/number, not a path, so just return raw string/number.
+ return params[i];
+ } else {
+ return handlebarsGet(context, path, options);
+ }
+ });
+ }
- function unwrap(object, i) {
- if (params[i] === 'controller') { return object; }
+ function resolvePaths(context, params, options) {
+ var resolved = handlebarsResolve(context, params, options),
+ types = options.types;
+
+ return map.call(resolved, function(object, i) {
+ if (types[i] === 'ID') {
+ return unwrap(object, params[i]);
+ } else {
+ return null;
+ }
+ });
+
+ function unwrap(object, path) {
+ if (path === 'controller') { return path; }
if (Ember.ControllerMixin.detect(object)) {
- return unwrap(get(object, 'model'));
+ return unwrap(get(object, 'model'), path ? path + '.model' : 'model');
} else {
- return object;
+ return path;
}
}
}
Ember.Router.resolveParams = resolveParams;
+ Ember.Router.resolvePaths = resolvePaths;
});
})();
@@ -27424,6 +32123,7 @@ var get = Ember.get, set = Ember.set, fmt = Ember.String.fmt;
Ember.onLoad('Ember.Handlebars', function(Handlebars) {
var resolveParams = Ember.Router.resolveParams,
+ resolvePaths = Ember.Router.resolvePaths,
isSimpleClick = Ember.ViewUtils.isSimpleClick;
function fullRouteName(router, name) {
@@ -27434,19 +32134,12 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
return name;
}
- function resolvedPaths(options) {
- var types = options.options.types.slice(1),
+ function getResolvedPaths(options) {
+
+ var types = options.options.types,
data = options.options.data;
- return resolveParams(options.context, options.params, { types: types, data: data });
- }
-
- function createPath(path) {
- var fullPath = 'paramsContext';
- if (path !== '') {
- fullPath += '.' + path;
- }
- return fullPath;
+ return resolvePaths(options.context, options.params, { types: types, data: data });
}
/**
@@ -27455,17 +32148,16 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
a supplied route by name.
Instances of `LinkView` will most likely be created through
- the `linkTo` Handlebars helper, but properties of this class
+ the `link-to` Handlebars helper, but properties of this class
can be overridden to customize application-wide behavior.
@class LinkView
@namespace Ember
@extends Ember.View
- @see {Handlebars.helpers.linkTo}
+ @see {Handlebars.helpers.link-to}
**/
var LinkView = Ember.LinkView = Ember.View.extend({
tagName: 'a',
- namedRoute: null,
currentWhen: null,
/**
@@ -27476,6 +32168,14 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
**/
title: null,
+ /**
+ Sets the `rel` attribute of the `LinkView`'s HTML element.
+
+ @property rel
+ @default null
+ **/
+ rel: null,
+
/**
The CSS class to apply to `LinkView`'s element when its `active`
property is `true`.
@@ -27516,11 +32216,30 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
@default false
**/
replace: false,
- attributeBindings: ['href', 'title'],
+
+ /**
+ By default the `{{link-to}}` helper will bind to the `href` and
+ `title` attributes. It's discourage that you override these defaults,
+ however you can push onto the array if needed.
+
+ @property attributeBindings
+ @type Array | String
+ @default ['href', 'title', 'rel']
+ **/
+ attributeBindings: ['href', 'title', 'rel'],
+
+ /**
+ By default the `{{link-to}}` helper will bind to the `active`, `loading`, and
+ `disabled` classes. It is discouraged to override these directly.
+
+ @property classNameBindings
+ @type Array
+ @default ['active', 'loading', 'disabled']
+ **/
classNameBindings: ['active', 'loading', 'disabled'],
/**
- By default the `{{linkTo}}` helper responds to the `click` event. You
+ By default the `{{link-to}}` helper responds to the `click` event. You
can override this globally by setting this property to your custom
event name.
@@ -27545,6 +32264,28 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
@event click
**/
+ /**
+ An overridable method called when LinkView objects are instantiated.
+
+ Example:
+
+ ```javascript
+ App.MyLinkView = Ember.LinkView.extend({
+ init: function() {
+ this._super();
+ Ember.Logger.log('Event is ' + this.get('eventName'));
+ }
+ });
+ ```
+
+ NOTE: If you do override `init` for a framework class like `Ember.View` or
+ `Ember.ArrayController`, be sure to call `this._super()` in your
+ `init` declaration! If you don't, Ember may not have an opportunity to
+ do important setup work, and you'll see strange behavior in your
+ application.
+
+ @method init
+ */
init: function() {
this._super.apply(this, arguments);
@@ -27552,27 +32293,57 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
var eventName = get(this, 'eventName');
this.on(eventName, this, this._invoke);
- var params = this.parameters.params,
- length = params.length,
- context = this.parameters.context,
- self = this,
- path, paths = Ember.A([]), i;
-
- set(this, 'paramsContext', context);
+ var helperParameters = this.parameters,
+ templateContext = helperParameters.context,
+ paths = getResolvedPaths(helperParameters),
+ length = paths.length,
+ path, i;
for(i=0; i < length; i++) {
- paths.pushObject(createPath(params[i]));
+ path = paths[i];
+ if (null === path) {
+ // A literal value was provided, not a path, so nothing to observe.
+ continue;
+ }
+
+ var normalizedPath =
+ Ember.Handlebars.normalizePath(templateContext, path, helperParameters.options.data);
+ this.registerObserver(normalizedPath.root, normalizedPath.path, this, this._paramsChanged);
}
- var observer = function(object, path) {
- this.notifyPropertyChange('routeArgs');
- };
- for(i=0; i < length; i++) {
- this.registerObserver(this, paths[i], this, observer);
+ if (Ember.FEATURES.isEnabled("query-params")) {
+ var queryParams = get(this, '_potentialQueryParams') || [];
+
+ for(i=0; i < queryParams.length; i++) {
+ this.registerObserver(this, queryParams[i], this, this._queryParamsChanged);
+ }
}
},
+ /**
+ @private
+
+ This method is invoked by observers installed during `init` that fire
+ whenever the params change
+ @method _paramsChanged
+ */
+ _paramsChanged: function() {
+ this.notifyPropertyChange('resolvedParams');
+ },
+
+
+ /**
+ @private
+
+ This method is invoked by observers installed during `init` that fire
+ whenever the query params change
+ */
+ _queryParamsChanged: function (object, path) {
+ this.notifyPropertyChange('queryParams');
+ },
+
+
/**
@private
@@ -27596,7 +32367,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
disabled: Ember.computed(function(key, value) {
if (value !== undefined) { this.set('_isDisabled', value); }
- return value ? this.get('disabledClass') : false;
+ return value ? get(this, 'disabledClass') : false;
}),
/**
@@ -27610,33 +32381,44 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
@property active
**/
active: Ember.computed(function() {
+ if (get(this, 'loading')) { return false; }
+
var router = get(this, 'router'),
- params = resolvedPaths(this.parameters),
- currentWhen = this.currentWhen || get(this, 'namedRoute'),
+ routeArgs = get(this, 'routeArgs'),
+ contexts = routeArgs.slice(1),
+ resolvedParams = get(this, 'resolvedParams'),
+ currentWhen = this.currentWhen || resolvedParams[0],
currentWithIndex = currentWhen + '.index',
- isActive = router.isActive.apply(router, [currentWhen].concat(params)) ||
- router.isActive.apply(router, [currentWithIndex].concat(params));
+ isActive = router.isActive.apply(router, [currentWhen].concat(contexts)) ||
+ router.isActive.apply(router, [currentWithIndex].concat(contexts));
if (isActive) { return get(this, 'activeClass'); }
- }).property('namedRoute', 'router.url'),
+ }).property('resolvedParams', 'routeArgs', 'router.url'),
+ /**
+ Accessed as a classname binding to apply the `LinkView`'s `loadingClass`
+ CSS `class` to the element when the link is loading.
+
+ A `LinkView` is considered loading when it has at least one
+ parameter whose value is currently null or undefined. During
+ this time, clicking the link will perform no transition and
+ emit a warning that the link is still in a loading state.
+
+ @property loading
+ **/
loading: Ember.computed(function() {
if (!get(this, 'routeArgs')) { return get(this, 'loadingClass'); }
}).property('routeArgs'),
/**
- Accessed as a classname binding to apply the `LinkView`'s `activeClass`
- CSS `class` to the element when the link is active.
+ @private
- A `LinkView` is considered active when its `currentWhen` property is `true`
- or the application's current route is the route the `LinkView` would trigger
- transitions into.
+ Returns the application's main router from the container.
- @property active
+ @property router
**/
-
router: Ember.computed(function() {
- return this.get('controller').container.lookup('router:main');
+ return get(this, 'controller').container.lookup('router:main');
}),
/**
@@ -27656,44 +32438,102 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
if (get(this, '_isDisabled')) { return false; }
if (get(this, 'loading')) {
- Ember.Logger.warn("This linkTo is in an inactive loading state because at least one of its parameters' presently has a null/undefined value, or the provided route name is invalid.");
+ Ember.Logger.warn("This link-to is in an inactive loading state because at least one of its parameters presently has a null/undefined value, or the provided route name is invalid.");
return false;
}
var router = get(this, 'router'),
routeArgs = get(this, 'routeArgs');
- if (this.get('replace')) {
+ if (get(this, 'replace')) {
router.replaceWith.apply(router, routeArgs);
} else {
router.transitionTo.apply(router, routeArgs);
}
},
+ /**
+ @private
+
+ Computed property that returns the resolved parameters.
+
+ @property
+ @return {Array}
+ */
+ resolvedParams: Ember.computed(function() {
+ var parameters = this.parameters,
+ options = parameters.options,
+ types = options.types,
+ data = options.data;
+
+ return resolveParams(parameters.context, parameters.params, { types: types, data: data });
+ }).property(),
+
+ /**
+ @private
+
+ Computed property that returns the current route name and
+ any dynamic segments.
+
+ @property
+ @return {Array} An array with the route name and any dynamic segments
+ */
routeArgs: Ember.computed(function() {
+ var resolvedParams = get(this, 'resolvedParams').slice(0),
+ router = get(this, 'router'),
+ namedRoute = resolvedParams[0];
- var router = get(this, 'router'),
- namedRoute = get(this, 'namedRoute'), routeName;
+ if (!namedRoute) { return; }
- if (!namedRoute && this.namedRouteBinding) {
- // The present value of namedRoute is falsy, but since it's a binding
- // and could be valid later, don't treat as error.
- return;
+ namedRoute = fullRouteName(router, namedRoute);
+ resolvedParams[0] = namedRoute;
+
+
+ for (var i = 1, len = resolvedParams.length; i < len; ++i) {
+ var param = resolvedParams[i];
+ if (param === null || typeof param === 'undefined') {
+ // If contexts aren't present, consider the linkView unloaded.
+ return;
+ }
}
+
+ if (Ember.FEATURES.isEnabled("query-params")) {
+ var queryParams = get(this, 'queryParams');
+
+ if (queryParams || queryParams === false) { resolvedParams.push({queryParams: queryParams}); }
+ }
+
+ return resolvedParams;
+ }).property('resolvedParams', 'queryParams', 'router.url'),
+
+
+ _potentialQueryParams: Ember.computed(function () {
+ var namedRoute = get(this, 'resolvedParams')[0];
+ if (!namedRoute) { return null; }
+ var router = get(this, 'router');
+
namedRoute = fullRouteName(router, namedRoute);
- Ember.assert(fmt("The attempt to linkTo route '%@' failed. The router did not find '%@' in its possible routes: '%@'", [namedRoute, namedRoute, Ember.keys(router.router.recognizer.names).join("', '")]), router.hasRoute(namedRoute));
+ return router.router.queryParamsForHandler(namedRoute);
+ }).property('resolvedParams'),
- var resolvedContexts = resolvedPaths(this.parameters), paramsPresent = true;
- for (var i = 0, l = resolvedContexts.length; i < l; ++i) {
- var context = resolvedContexts[i];
+ queryParams: Ember.computed(function () {
+ var self = this,
+ queryParams = null,
+ allowedQueryParams = get(this, '_potentialQueryParams');
- // If contexts aren't present, consider the linkView unloaded.
- if (context === null || typeof context === 'undefined') { return; }
- }
+ if (!allowedQueryParams) { return null; }
+ allowedQueryParams.forEach(function (param) {
+ var value = get(self, param);
+ if (typeof value !== 'undefined') {
+ queryParams = queryParams || {};
+ queryParams[param] = value;
+ }
+ });
- return [ namedRoute ].concat(resolvedContexts);
- }).property('namedRoute'),
+
+ return queryParams;
+ }).property('_potentialQueryParams.[]'),
/**
Sets the element's `href` attribute to the url for
@@ -27705,7 +32545,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
@property href
**/
href: Ember.computed(function() {
- if (this.get('tagName') !== 'a') { return false; }
+ if (get(this, 'tagName') !== 'a') { return false; }
var router = get(this, 'router'),
routeArgs = get(this, 'routeArgs');
@@ -27714,7 +32554,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
}).property('routeArgs'),
/**
- The default href value to use while a linkTo is loading.
+ The default href value to use while a link-to is loading.
Only applies when tagName is 'a'
@property loadingHref
@@ -27727,16 +32567,16 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
LinkView.toString = function() { return "LinkView"; };
/**
- The `{{linkTo}}` helper renders a link to the supplied
+ The `{{link-to}}` helper renders a link to the supplied
`routeName` passing an optionally supplied model to the
route as its `model` context of the route. The block
- for `{{linkTo}}` becomes the innerHTML of the rendered
+ for `{{link-to}}` becomes the innerHTML of the rendered
element:
```handlebars
- {{#linkTo 'photoGallery'}}
+ {{#link-to 'photoGallery'}}
Great Hamster Photos
- {{/linkTo}}
+ {{/link-to}}
```
```html
@@ -27746,14 +32586,14 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```
### Supplying a tagName
- By default `{{linkTo}}` renders an `` element. This can
- be overridden for a single use of `{{linkTo}}` by supplying
+ By default `{{link-to}}` renders an ` ` element. This can
+ be overridden for a single use of `{{link-to}}` by supplying
a `tagName` option:
```handlebars
- {{#linkTo 'photoGallery' tagName="li"}}
+ {{#link-to 'photoGallery' tagName="li"}}
Great Hamster Photos
- {{/linkTo}}
+ {{/link-to}}
```
```html
@@ -27764,25 +32604,62 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
To override this option for your entire application, see
"Overriding Application-wide Defaults".
-
+
+ ### Disabling the `link-to` heper
+ By default `{{link-to}}` is enabled.
+ any passed value to `disabled` helper property will disable the `link-to` helper.
+
+ static use: the `disabled` option:
+
+ ```handlebars
+ {{#link-to 'photoGallery' disabled=true}}
+ Great Hamster Photos
+ {{/link-to}}
+ ```
+
+ dynamic use: the `disabledWhen` option:
+
+ ```handlebars
+ {{#link-to 'photoGallery' disabledWhen=controller.someProperty}}
+ Great Hamster Photos
+ {{/link-to}}
+ ```
+
+ any passed value to `disabled` will disable it except `undefined`.
+ to ensure that only `true` disable the `link-to` helper you can
+ override the global behaviour of `Ember.LinkView`.
+
+ ```javascript
+ Ember.LinkView.reopen({
+ disabled: Ember.computed(function(key, value) {
+ if (value !== undefined) {
+ this.set('_isDisabled', value === true);
+ }
+ return value === true ? get(this, 'disabledClass') : false;
+ })
+ });
+ ```
+
+ see "Overriding Application-wide Defaults" for more.
+
### Handling `href`
- `{{linkTo}}` will use your application's Router to
+ `{{link-to}}` will use your application's Router to
fill the element's `href` property with a url that
matches the path to the supplied `routeName` for your
routers's configured `Location` scheme, which defaults
to Ember.HashLocation.
### Handling current route
- `{{linkTo}}` will apply a CSS class name of 'active'
+ `{{link-to}}` will apply a CSS class name of 'active'
when the application's current route matches
the supplied routeName. For example, if the application's
current route is 'photoGallery.recent' the following
- use of `{{linkTo}}`:
+ use of `{{link-to}}`:
```handlebars
- {{#linkTo 'photoGallery.recent'}}
+ {{#link-to 'photoGallery.recent'}}
Great Hamster Photos from the last week
- {{/linkTo}}
+ {{/link-to}}
```
will result in
@@ -27794,13 +32671,13 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```
The CSS class name used for active classes can be customized
- for a single use of `{{linkTo}}` by passing an `activeClass`
+ for a single use of `{{link-to}}` by passing an `activeClass`
option:
```handlebars
- {{#linkTo 'photoGallery.recent' activeClass="current-url"}}
+ {{#link-to 'photoGallery.recent' activeClass="current-url"}}
Great Hamster Photos from the last week
- {{/linkTo}}
+ {{/link-to}}
```
```html
@@ -27820,13 +32697,13 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```javascript
App.Router.map(function() {
this.resource("photoGallery", {path: "hamster-photos/:photo_id"});
- })
+ });
```
```handlebars
- {{#linkTo 'photoGallery' aPhoto}}
+ {{#link-to 'photoGallery' aPhoto}}
{{aPhoto.title}}
- {{/linkTo}}
+ {{/link-to}}
```
```html
@@ -27852,9 +32729,9 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
This argument will become the model context of the linked route:
```handlebars
- {{#linkTo 'photoGallery.comment' aPhoto comment}}
+ {{#link-to 'photoGallery.comment' aPhoto comment}}
{{comment.body}}
- {{/linkTo}}
+ {{/link-to}}
```
```html
@@ -27863,8 +32740,50 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```
+ ### Supplying an explicit dynamic segment value
+ If you don't have a model object available to pass to `{{link-to}}`,
+ an optional string or integer argument can be passed for routes whose
+ paths contain dynamic segments. This argument will become the value
+ of the dynamic segment:
+
+ ```javascript
+ App.Router.map(function() {
+ this.resource("photoGallery", {path: "hamster-photos/:photo_id"});
+ });
+ ```
+
+ ```handlebars
+ {{#link-to 'photoGallery' aPhotoId}}
+ {{aPhoto.title}}
+ {{/link-to}}
+ ```
+
+ ```html
+
+ Tomster
+
+ ```
+
+ When transitioning into the linked route, the `model` hook will
+ be triggered with parameters including this passed identifier.
+
+ ### Overriding attributes
+ You can override any given property of the Ember.LinkView
+ that is generated by the `{{link-to}}` helper by passing
+ key/value pairs, like so:
+
+ ```handlebars
+ {{#link-to aPhoto tagName='li' title='Following this link will change your life' classNames=['pic', 'sweet']}}
+ Uh-mazing!
+ {{/link-to}}
+ ```
+
+ See [Ember.LinkView](/api/classes/Ember.LinkView.html) for a
+ complete list of overrideable properties. Be sure to also
+ check out inherited properties of `LinkView`.
+
### Overriding Application-wide Defaults
- ``{{linkTo}}`` creates an instance of Ember.LinkView
+ ``{{link-to}}`` creates an instance of Ember.LinkView
for rendering. To override options for your entire
application, reopen Ember.LinkView and supply the
desired values:
@@ -27885,28 +32804,18 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
});
```
- @method linkTo
+ @method link-to
@for Ember.Handlebars.helpers
@param {String} routeName
@param {Object} [context]*
+ @param [options] {Object} Handlebars key/value pairs of options, you can override any property of Ember.LinkView
@return {String} HTML string
+ @see {Ember.LinkView}
*/
- Ember.Handlebars.registerHelper('linkTo', function(name) {
+ Ember.Handlebars.registerHelper('link-to', function(name) {
var options = [].slice.call(arguments, -1)[0],
- params = [].slice.call(arguments, 1, -1);
-
- var hash = options.hash;
-
- if (options.types[0] === "ID") {
- if (Ember.ENV.HELPER_PARAM_LOOKUPS) {
- hash.namedRouteBinding = name;
- } else {
- Ember.deprecate("You provided a quoteless destination route parameter of " + name + " to the linkTo helper. Soon, this will perform a property lookup, rather than be treated as a string. To get rid of this warning, wrap " + name + " in quotes. To opt in to this new behavior, set ENV.HELPER_PARAM_LOOKUPS = true");
- hash.namedRoute = name;
- }
- } else {
- hash.namedRoute = name;
- }
+ params = [].slice.call(arguments, 0, -1),
+ hash = options.hash;
hash.disabledBinding = hash.disabledWhen;
@@ -27918,6 +32827,18 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
return Ember.Handlebars.helpers.view.call(this, LinkView, options);
});
+
+ /**
+ See [link-to](/api/classes/Ember.Handlebars.helpers.html#method_link-to)
+
+ @method linkTo
+ @for Ember.Handlebars.helpers
+ @deprecated
+ @param {String} routeName
+ @param {Object} [context]*
+ @return {String} HTML string
+ */
+ Ember.Handlebars.registerHelper('linkTo', Ember.Handlebars.helpers['link-to']);
});
@@ -27967,8 +32888,8 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
You can create custom named outlets for more control.
``` handlebars
- {{outlet favoritePost}}
- {{outlet posts}}
+ {{outlet 'favoritePost'}}
+ {{outlet 'posts'}}
```
Then you can define what template is rendered into each outlet in your
@@ -28002,6 +32923,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
@for Ember.Handlebars.helpers
@param {String} property the property on the controller
that holds the view for this outlet
+ @return {String} HTML string
*/
Handlebars.registerHelper('outlet', function(property, options) {
var outletSource, outletContainerClass;
@@ -28012,7 +32934,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
}
outletSource = options.data.view;
- while (!(outletSource.get('template.isTop'))) {
+ while (!outletSource.get('template.isTop')) {
outletSource = outletSource.get('_parentView');
}
@@ -28039,33 +32961,79 @@ var get = Ember.get, set = Ember.set;
Ember.onLoad('Ember.Handlebars', function(Handlebars) {
/**
- Renders the named template in the current context with the same-named
- controller.
+ Calling ``{{render}}`` from within a template will insert another
+ template that matches the provided name. The inserted template will
+ access its properties on its own controller (rather than the controller
+ of the parent template).
- If a view class with the same name exists, the view class will be used.
+ If a view class with the same name exists, the view class also will be used.
+
+ Note: A given controller may only be used *once* in your app in this manner.
+ A singleton instance of the controller will be created for you.
- The optional second argument is a property path that will be bound
- to the `model` property of the controller.
+ Example:
+
+ ```javascript
+ App.NavigationController = Ember.Controller.extend({
+ who: "world"
+ });
+ ```
+
+ ```handelbars
+
+ Hello, {{who}}.
+ ```
+
+ ```handelbars
+
+ My great app
+ {{render navigaton}}
+ ```
+
+ ```html
+ My great app
+
+ Hello, world.
+
+ ```
+
+ Optionally you may provide a second argument: a property path
+ that will be bound to the `model` property of the controller.
If a `model` property path is specified, then a new instance of the
- controller will be created.
+ controller will be created and `{{render}}` can be used multiple times
+ with the same name.
- If no `model` property path is provided, then the helper will use the
- singleton instance of the controller. A given controller may only be used
- one time in your app in this manner.
+ For example if you had this `author` template.
- The default target for `{{action}}`s in the rendered template is the
- controller.
+ ```handlebars
+
+ Written by {{firstName}} {{lastName}}.
+ Total Posts: {{postCount}}
+
+ ```
+
+ You could render it inside the `post` template using the `render` helper.
+
+ ```handlebars
+
+
{{title}}
+
{{body}}
+ {{render "author" author}}
+
+ click me
+
```
And application code
@@ -28288,7 +33257,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```
If you need the default handler to trigger you should either register your
- own event handler, or use event methods on your view class. See `Ember.View`
+ own event handler, or use event methods on your view class. See [Ember.View](/api/classes/Ember.View.html)
'Responding to Browser Events' for more information.
### Specifying DOM event type
@@ -28298,7 +33267,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```handlebars
@@ -28320,7 +33289,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```handlebars
@@ -28328,6 +33297,16 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
This way the `{{action}}` will fire when clicking with the alt key pressed down.
+ Alternatively, supply "any" to the `allowedKeys` option to accept any combination of modifier keys.
+
+ ```handlebars
+
+ ```
+
### Specifying a Target
There are several possible target objects for `{{action}}` helpers:
@@ -28342,7 +33321,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```handlebars
@@ -28356,7 +33335,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```handlebars
@@ -28387,7 +33366,7 @@ Ember.onLoad('Ember.Handlebars', function(Handlebars) {
```handlebars
+ ```
+
+ ```javascript
+ App.ListView = Ember.ListView.extend({
+ height: 500,
+ rowHeight: 20,
+ itemViewClass: Ember.ListItemView.extend({templateName: "row_item"})
+ });
+ ```
+
+ @extends Ember.View
+ @class ListItemView
+ @namespace Ember
+*/
+Ember.ListItemView = Ember.View.extend(Ember.ListItemViewMixin, {
+ updateContext: function(newContext){
+ var context = get(this, 'context');
+ Ember.instrument('view.updateContext.render', this, function() {
+ if (context !== newContext) {
+ this.set('context', newContext);
+ if (newContext instanceof Ember.ObjectController) {
+ this.set('controller', newContext);
+ }
+ }
+ }, this);
+ },
+ rerender: function () { Ember.run.scheduleOnce('render', this, rerender); },
+ _contextDidChange: Ember.observer(rerender, 'context', 'controller')
+});
+
+})();
+
+
+
+(function() {
+var get = Ember.get, set = Ember.set;
+
+Ember.ReusableListItemView = Ember.View.extend(Ember.ListItemViewMixin, {
+ init: function(){
+ this._super();
+ this.set('context', Ember.ObjectProxy.create());
+ },
+ isVisible: Ember.computed('context.content', function(){
+ return !!this.get('context.content');
+ }),
+ updateContext: function(newContext){
+ var context = get(this, 'context.content');
+ if (context !== newContext) {
+ if (this.state === 'inDOM') {
+ this.prepareForReuse(newContext);
+ }
+ set(this, 'context.content', newContext);
+ }
+ },
+ prepareForReuse: Ember.K
+});
+
+})();
+
+
+
+(function() {
+var el = document.createElement('div'), style = el.style;
+
+var propPrefixes = ['Webkit', 'Moz', 'O', 'ms'];
+
+function testProp(prop) {
+ if (prop in style) return prop;
+ var uppercaseProp = prop.charAt(0).toUpperCase() + prop.slice(1);
+ for (var i=0; i');
+ this._super(buffer);
+ buffer.push('');
+ },
+
+ willInsertElement: function() {
+ if (!this.get("height") || !this.get("rowHeight")) {
+ throw "A ListView must be created with a height and a rowHeight.";
+ }
+ this._super();
+ },
+
+ /**
+ @private
+
+ Sets inline styles of the view:
+ - height
+ - width
+ - position
+ - overflow
+ - -webkit-overflow
+ - overflow-scrolling
+
+ Called while attributes binding.
+
+ @property {Ember.ComputedProperty} style
+ */
+ style: Ember.computed('height', 'width', function() {
+ var height, width, style, css;
+
+ height = get(this, 'height');
+ width = get(this, 'width');
+ css = get(this, 'css');
+
+ style = '';
+
+ if (height) { style += 'height:' + height + 'px;'; }
+ if (width) { style += 'width:' + width + 'px;'; }
+
+ for ( var rule in css ){
+ if (css.hasOwnProperty(rule)) {
+ style += rule + ':' + css[rule] + ';';
+ }
+ }
+
+ return style;
+ }),
+
+ /**
+ @private
+
+ Performs visual scrolling. Is overridden in Ember.ListView.
+
+ @method scrollTo
+ */
+ scrollTo: function(y) {
+ throw 'must override to perform the visual scroll and effectively delegate to _scrollContentTo';
+ },
+
+ /**
+ @private
+
+ Internal method used to force scroll position
+
+ @method scrollTo
+ */
+ _scrollTo: Ember.K,
+
+ /**
+ @private
+ @method _scrollContentTo
+ */
+ _scrollContentTo: function(y) {
+ var startingIndex, endingIndex,
+ contentIndex, visibleEndingIndex, maxContentIndex,
+ contentIndexEnd, contentLength, scrollTop;
+
+ scrollTop = max(0, y);
+
+ Ember.instrument('view._scrollContentTo', {
+ scrollTop: scrollTop,
+ content: get(this, 'content'),
+ startingIndex: this._startingIndex(),
+ endingIndex: min(max(get(this, 'content.length') - 1, 0), this._startingIndex() + this._numChildViewsForViewport())
+ }, function () {
+ contentLength = get(this, 'content.length');
+ set(this, 'scrollTop', scrollTop);
+
+ maxContentIndex = max(contentLength - 1, 0);
+
+ startingIndex = this._startingIndex();
+ visibleEndingIndex = startingIndex + this._numChildViewsForViewport();
+
+ endingIndex = min(maxContentIndex, visibleEndingIndex);
+
+ this.trigger('scrollYChanged', y);
+
+ if (startingIndex === this._lastStartingIndex &&
+ endingIndex === this._lastEndingIndex) {
+ return;
+ }
+
+ this._reuseChildren();
+
+ this._lastStartingIndex = startingIndex;
+ this._lastEndingIndex = endingIndex;
+ }, this);
+ },
+
+ /**
+ @private
+
+ Computes the height for a `Ember.ListView` scrollable container div.
+ You must specify `rowHeight` parameter for the height to be computed properly.
+
+ @property {Ember.ComputedProperty} totalHeight
+ */
+ totalHeight: Ember.computed('content.length', 'rowHeight', 'columnCount', 'bottomPadding', function() {
+ var contentLength, rowHeight, columnCount, bottomPadding;
+
+ contentLength = get(this, 'content.length');
+ rowHeight = get(this, 'rowHeight');
+ columnCount = get(this, 'columnCount');
+ bottomPadding = get(this, 'bottomPadding');
+
+ return ((ceil(contentLength / columnCount)) * rowHeight) + bottomPadding;
+ }),
+
+ /**
+ @private
+ @method _prepareChildForReuse
+ */
+ _prepareChildForReuse: function(childView) {
+ childView.prepareForReuse();
+ },
+
+ /**
+ @private
+ @method _reuseChildForContentIndex
+ */
+ _reuseChildForContentIndex: function(childView, contentIndex) {
+ var content, context, newContext, childsCurrentContentIndex, position, enableProfiling;
+
+ content = get(this, 'content');
+ enableProfiling = get(this, 'enableProfiling');
+ position = this.positionForIndex(contentIndex);
+ set(childView, 'position', position);
+
+ set(childView, 'contentIndex', contentIndex);
+
+ if (enableProfiling) {
+ Ember.instrument('view._reuseChildForContentIndex', position, function(){}, this);
+ }
+
+ newContext = content.objectAt(contentIndex);
+ childView.updateContext(newContext);
+ },
+
+ /**
+ @private
+ @method positionForIndex
+ */
+ positionForIndex: function(index){
+ var elementWidth, width, columnCount, rowHeight, y, x;
+
+ elementWidth = get(this, 'elementWidth') || 1;
+ width = get(this, 'width') || 1;
+ columnCount = get(this, 'columnCount');
+ rowHeight = get(this, 'rowHeight');
+
+ y = (rowHeight * floor(index/columnCount));
+ x = (index % columnCount) * elementWidth;
+
+ return {
+ y: y,
+ x: x
+ };
+ },
+
+ /**
+ @private
+ @method _childViewCount
+ */
+ _childViewCount: function() {
+ var contentLength, childViewCountForHeight;
+
+ contentLength = get(this, 'content.length');
+ childViewCountForHeight = this._numChildViewsForViewport();
+
+ return min(contentLength, childViewCountForHeight);
+ },
+
+ /**
+ @private
+
+ Returns a number of columns in the Ember.ListView (for grid layout).
+
+ If you want to have a multi column layout, you need to specify both
+ `width` and `elementWidth`.
+
+ If no `elementWidth` is specified, it returns `1`. Otherwise, it will
+ try to fit as many columns as possible for a given `width`.
+
+ @property {Ember.ComputedProperty} columnCount
+ */
+ columnCount: Ember.computed('width', 'elementWidth', function() {
+ var elementWidth, width, count;
+
+ elementWidth = get(this, 'elementWidth');
+ width = get(this, 'width');
+
+ if (elementWidth) {
+ count = floor(width / elementWidth);
+ } else {
+ count = 1;
+ }
+
+ return count;
+ }),
+
+ /**
+ @private
+
+ Fires every time column count is changed.
+
+ @event columnCountDidChange
+ */
+ columnCountDidChange: Ember.observer(function(){
+ var ratio, currentScrollTop, proposedScrollTop, maxScrollTop,
+ scrollTop, lastColumnCount, newColumnCount, element;
+
+ lastColumnCount = this._lastColumnCount;
+
+ currentScrollTop = get(this, 'scrollTop');
+ newColumnCount = get(this, 'columnCount');
+ maxScrollTop = get(this, 'maxScrollTop');
+ element = get(this, 'element');
+
+ this._lastColumnCount = newColumnCount;
+
+ if (lastColumnCount) {
+ ratio = (lastColumnCount / newColumnCount);
+ proposedScrollTop = currentScrollTop * ratio;
+ scrollTop = min(maxScrollTop, proposedScrollTop);
+
+ this._scrollTo(scrollTop);
+ set(this, 'scrollTop', scrollTop);
+ }
+
+ if (arguments.length > 0) {
+ // invoked by observer
+ Ember.run.schedule('afterRender', this, syncListContainerWidth);
+ }
+ }, 'columnCount'),
+
+ /**
+ @private
+
+ Computes max possible scrollTop value given the visible viewport
+ and scrollable container div height.
+
+ @property {Ember.ComputedProperty} maxScrollTop
+ */
+ maxScrollTop: Ember.computed('height', 'totalHeight', function(){
+ var totalHeight, viewportHeight;
+
+ totalHeight = get(this, 'totalHeight');
+ viewportHeight = get(this, 'height');
+
+ return max(0, totalHeight - viewportHeight);
+ }),
+
+ /**
+ @private
+
+ Computes the number of views that would fit in the viewport area.
+ You must specify `height` and `rowHeight` parameters for the number of
+ views to be computed properly.
+
+ @method _numChildViewsForViewport
+ */
+ _numChildViewsForViewport: function() {
+ var height, rowHeight, paddingCount, columnCount;
+
+ height = get(this, 'height');
+ rowHeight = get(this, 'rowHeight');
+ paddingCount = get(this, 'paddingCount');
+ columnCount = get(this, 'columnCount');
+
+ return (ceil(height / rowHeight) * columnCount) + (paddingCount * columnCount);
+ },
+
+ /**
+ @private
+
+ Computes the starting index of the item views array.
+ Takes `scrollTop` property of the element into account.
+
+ Is used in `_syncChildViews`.
+
+ @method _startingIndex
+ */
+ _startingIndex: function() {
+ var scrollTop, rowHeight, columnCount, calculatedStartingIndex,
+ contentLength, largestStartingIndex;
+
+ contentLength = get(this, 'content.length');
+ scrollTop = get(this, 'scrollTop');
+ rowHeight = get(this, 'rowHeight');
+ columnCount = get(this, 'columnCount');
+
+ calculatedStartingIndex = floor(scrollTop / rowHeight) * columnCount;
+
+ largestStartingIndex = max(contentLength - 1, 0);
+
+ return min(calculatedStartingIndex, largestStartingIndex);
+ },
+
+ /**
+ @private
+ @event contentWillChange
+ */
+ contentWillChange: Ember.beforeObserver(function() {
+ var content;
+
+ content = get(this, 'content');
+
+ if (content) {
+ content.removeArrayObserver(this);
+ }
+ }, 'content'),
+
+ /**),
+ @private
+ @event contentDidChange
+ */
+ contentDidChange: Ember.observer(function() {
+ addContentArrayObserver.call(this);
+ syncChildViews.call(this);
+ }, 'content'),
+
+ /**
+ @private
+ @property {Function} needsSyncChildViews
+ */
+ needsSyncChildViews: Ember.observer(syncChildViews, 'height', 'width', 'columnCount'),
+
+ /**
+ @private
+
+ Returns a new item view. Takes `contentIndex` to set the context
+ of the returned view properly.
+
+ @param {Number} contentIndex item index in the content array
+ @method _addItemView
+ */
+ _addItemView: function(contentIndex){
+ var itemViewClass, childView;
+
+ itemViewClass = get(this, 'itemViewClass');
+ childView = this.createChildView(itemViewClass);
+
+ this.pushObject(childView);
+ },
+
+ /**
+ @private
+
+ Intelligently manages the number of childviews.
+
+ @method _syncChildViews
+ **/
+ _syncChildViews: function(){
+ var itemViewClass, startingIndex, childViewCount,
+ endingIndex, numberOfChildViews, numberOfChildViewsNeeded,
+ childViews, count, delta, index, childViewsLength, contentIndex;
+
+ if (get(this, 'isDestroyed') || get(this, 'isDestroying')) {
+ return;
+ }
+
+ childViewCount = this._childViewCount();
+ childViews = this.positionOrderedChildViews();
+
+ startingIndex = this._startingIndex();
+ endingIndex = startingIndex + childViewCount;
+
+ numberOfChildViewsNeeded = childViewCount;
+ numberOfChildViews = childViews.length;
+
+ delta = numberOfChildViewsNeeded - numberOfChildViews;
+
+ if (delta === 0) {
+ // no change
+ } else if (delta > 0) {
+ // more views are needed
+ contentIndex = this._lastEndingIndex;
+
+ for (count = 0; count < delta; count++, contentIndex++) {
+ this._addItemView(contentIndex);
+ }
+
+ } else {
+ // less views are needed
+ forEach.call(
+ childViews.splice(numberOfChildViewsNeeded, numberOfChildViews),
+ removeAndDestroy,
+ this
+ );
+ }
+
+ this._scrollContentTo(get(this, 'scrollTop'));
+
+ // if _scrollContentTo short-circuits, we still need
+ // to call _reuseChildren to get new views positioned
+ // and rendered correctly
+ this._reuseChildren();
+
+ this._lastStartingIndex = startingIndex;
+ this._lastEndingIndex = this._lastEndingIndex + delta;
+ },
+
+ /**
+ @private
+ @method _reuseChildren
+ */
+ _reuseChildren: function(){
+ var contentLength, childViews, childViewsLength,
+ startingIndex, endingIndex, childView, attrs,
+ contentIndex, visibleEndingIndex, maxContentIndex,
+ contentIndexEnd, scrollTop;
+
+ scrollTop = get(this, 'scrollTop');
+ contentLength = get(this, 'content.length');
+ maxContentIndex = max(contentLength - 1, 0);
+ childViews = this._childViews;
+ childViewsLength = childViews.length;
+
+ startingIndex = this._startingIndex();
+ visibleEndingIndex = startingIndex + this._numChildViewsForViewport();
+
+ endingIndex = min(maxContentIndex, visibleEndingIndex);
+
+ this.trigger('scrollContentTo', scrollTop);
+
+ contentIndexEnd = min(visibleEndingIndex, startingIndex + childViewsLength);
+
+ for (contentIndex = startingIndex; contentIndex < contentIndexEnd; contentIndex++) {
+ childView = childViews[contentIndex % childViewsLength];
+ this._reuseChildForContentIndex(childView, contentIndex);
+ }
+ },
+
+ /**
+ @private
+ @method positionOrderedChildViews
+ */
+ positionOrderedChildViews: function() {
+ return this._childViews.sort(sortByContentIndex);
+ },
+
+ arrayWillChange: Ember.K,
+
+ /**
+ @private
+ @event arrayDidChange
+ */
+ // TODO: refactor
+ arrayDidChange: function(content, start, removedCount, addedCount) {
+ var index, contentIndex;
+
+ if (this.state === 'inDOM') {
+ // ignore if all changes are out of the visible change
+ if( start >= this._lastStartingIndex || start < this._lastEndingIndex) {
+ index = 0;
+ // ignore all changes not in the visible range
+ // this can re-position many, rather then causing a cascade of re-renders
+ forEach.call(
+ this.positionOrderedChildViews(),
+ function(childView) {
+ contentIndex = this._lastStartingIndex + index;
+ this._reuseChildForContentIndex(childView, contentIndex);
+ index++;
+ },
+ this
+ );
+ }
+
+ syncChildViews.call(this);
+ }
+ }
+});
+
+})();
+
+
+
+(function() {
+var get = Ember.get, set = Ember.set;
+
+/**
+ The `Ember.ListView` view class renders a
+ [div](https://developer.mozilla.org/en/HTML/Element/div) HTML element,
+ with `ember-list-view` class.
+
+ The context of each item element within the `Ember.ListView` are populated
+ from the objects in the `Element.ListView`'s `content` property.
+
+ ### `content` as an Array of Objects
+
+ The simplest version of an `Ember.ListView` takes an array of object as its
+ `content` property. The object will be used as the `context` each item element
+ inside the rendered `div`.
+
+ Example:
+
+ ```javascript
+ App.contributors = [{ name: 'Stefan Penner' }, { name: 'Alex Navasardyan' }, { name: 'Rey Cohen'}];
+ ```
+
+ ```handlebars
+ {{#collection Ember.ListView contentBinding="App.contributors" height=500 rowHeight=50}}
+ {{name}}
+ {{/collection}}
+ ```
+
+ Would result in the following HTML:
+
+ ```html
+
+
+
+ Stefan Penner
+
+
+ Alex Navasardyan
+
+
+ Rey Cohen
+
+
+
+