From 61101736cb793fff5f4d30466bfa375c5eae584b Mon Sep 17 00:00:00 2001 From: Robin Ward Date: Wed, 10 Dec 2014 13:15:30 -0500 Subject: [PATCH] `Ember.empty` has been renamed to `Ember.isEmpty` --- .../admin/components/admin-group-selector.js.es6 | 2 +- .../admin/controllers/admin-site-text-edit.js.es6 | 2 +- .../admin/controllers/admin-user-field-item.js.es6 | 2 +- .../javascripts/admin/controllers/admin-user-index.js.es6 | 2 +- .../javascripts/discourse/controllers/composer.js.es6 | 2 +- .../javascripts/discourse/controllers/create-account.js.es6 | 6 +++--- .../javascripts/discourse/controllers/preferences.js.es6 | 6 +++--- .../discourse/controllers/preferences/card-badge.js.es6 | 2 +- app/assets/javascripts/discourse/controllers/topic.js.es6 | 2 +- .../javascripts/discourse/helpers/icon-or-image.js.es6 | 2 +- app/assets/javascripts/discourse/views/button.js.es6 | 2 +- .../javascripts/discourse/views/category-chooser.js.es6 | 2 +- app/assets/javascripts/discourse/views/user-card.js.es6 | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/app/assets/javascripts/admin/components/admin-group-selector.js.es6 b/app/assets/javascripts/admin/components/admin-group-selector.js.es6 index 4189beed3f1..f838830b080 100644 --- a/app/assets/javascripts/admin/components/admin-group-selector.js.es6 +++ b/app/assets/javascripts/admin/components/admin-group-selector.js.es6 @@ -31,4 +31,4 @@ export default Ember.Component.extend({ _refreshOnReset: function() { this.$("input").select2("data", this.get("selected").map(this._format)); }.observes("selected") -}); \ No newline at end of file +}); diff --git a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 index 140e5537669..c95db1e8b8f 100644 --- a/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-site-text-edit.js.es6 @@ -4,7 +4,7 @@ export default Ember.ObjectController.extend({ saveDisabled: function() { if (this.get('saving')) { return true; } - if ((!this.get('allow_blank')) && Ember.empty(this.get('value'))) { return true; } + if ((!this.get('allow_blank')) && Ember.isEmpty(this.get('value'))) { return true; } return false; }.property('saving', 'value'), diff --git a/app/assets/javascripts/admin/controllers/admin-user-field-item.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-field-item.js.es6 index 0e0ac50be4a..57cf7e02707 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-field-item.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-field-item.js.es6 @@ -50,7 +50,7 @@ export default Ember.ObjectController.extend(BufferedContent, { cancel: function() { var id = this.get('id'); - if (Ember.empty(id)) { + if (Ember.isEmpty(id)) { this.get('controllers.admin-user-fields').send('destroy', this.get('model')); } else { this.rollbackBuffer(); diff --git a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 index 7c9efafa038..d218bbe1042 100644 --- a/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 +++ b/app/assets/javascripts/admin/controllers/admin-user-index.js.es6 @@ -19,7 +19,7 @@ export default ObjectController.extend(CanCheckEmails, { var siteUserFields = this.site.get('user_fields'), userFields = this.get('user_fields'); - if (!Ember.empty(siteUserFields)) { + if (!Ember.isEmpty(siteUserFields)) { return siteUserFields.map(function(uf) { var value = userFields ? userFields[uf.get('id').toString()] : null; return {name: uf.get('name'), value: value}; diff --git a/app/assets/javascripts/discourse/controllers/composer.js.es6 b/app/assets/javascripts/discourse/controllers/composer.js.es6 index c15d158ad4a..5acee185ecf 100644 --- a/app/assets/javascripts/discourse/controllers/composer.js.es6 +++ b/app/assets/javascripts/discourse/controllers/composer.js.es6 @@ -21,7 +21,7 @@ export default DiscourseController.extend({ var usernames = this.get('model.targetUsernames'); // We need exactly one user to issue a warning - if (Em.empty(usernames) || usernames.split(',').length !== 1) { + if (Ember.isEmpty(usernames) || usernames.split(',').length !== 1) { return false; } return this.get('model.creatingPrivateMessage'); diff --git a/app/assets/javascripts/discourse/controllers/create-account.js.es6 b/app/assets/javascripts/discourse/controllers/create-account.js.es6 index 5e9094aebca..eb15fa02626 100644 --- a/app/assets/javascripts/discourse/controllers/create-account.js.es6 +++ b/app/assets/javascripts/discourse/controllers/create-account.js.es6 @@ -51,10 +51,10 @@ export default DiscourseController.extend(ModalFunctionality, { // Validate required fields var userFields = this.get('userFields'); if (userFields) { userFields = userFields.filterProperty('field.required'); } - if (!Ember.empty(userFields)) { + if (!Ember.isEmpty(userFields)) { var anyEmpty = userFields.any(function(uf) { var val = uf.get('value'); - return !val || Ember.empty(val); + return !val || Ember.isEmpty(val); }); if (anyEmpty) { return true; } } @@ -336,7 +336,7 @@ export default DiscourseController.extend(ModalFunctionality, { userFields = this.get('userFields'); // Add the userfields to the data - if (!Em.empty(userFields)) { + if (!Ember.isEmpty(userFields)) { attrs.userFields = {}; userFields.forEach(function(f) { attrs.userFields[f.get('field.id')] = f.get('value'); diff --git a/app/assets/javascripts/discourse/controllers/preferences.js.es6 b/app/assets/javascripts/discourse/controllers/preferences.js.es6 index 98a5f9a3ba3..3f75db244dc 100644 --- a/app/assets/javascripts/discourse/controllers/preferences.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences.js.es6 @@ -20,7 +20,7 @@ export default ObjectController.extend(CanCheckEmails, { userFields: function() { var siteUserFields = this.site.get('user_fields'); - if (!Ember.empty(siteUserFields)) { + if (!Ember.isEmpty(siteUserFields)) { var userFields = this.get('user_fields'); return siteUserFields.filterProperty('editable', true).sortBy('field_type').map(function(uf) { var val = userFields ? userFields[uf.get('id').toString()] : null; @@ -85,9 +85,9 @@ export default ObjectController.extend(CanCheckEmails, { userFields = this.get('userFields'); // Update the user fields - if (!Em.empty(userFields)) { + if (!Ember.isEmpty(userFields)) { var modelFields = model.get('user_fields'); - if (!Em.empty(modelFields)) { + if (!Ember.isEmpty(modelFields)) { userFields.forEach(function(uf) { modelFields[uf.get('field.id').toString()] = uf.get('value'); }); diff --git a/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6 b/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6 index 9c5a21af4fe..4b0dcaacc5e 100644 --- a/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6 +++ b/app/assets/javascripts/discourse/controllers/preferences/card-badge.js.es6 @@ -3,7 +3,7 @@ import BadgeSelectController from "discourse/mixins/badge-select-controller"; export default Ember.ArrayController.extend(BadgeSelectController, { filteredList: function() { return this.get('model').filter(function(b) { - return !Em.empty(b.get('badge.image')); + return !Ember.isEmpty(b.get('badge.image')); }); }.property('model'), diff --git a/app/assets/javascripts/discourse/controllers/topic.js.es6 b/app/assets/javascripts/discourse/controllers/topic.js.es6 index 7cd9ecdeedc..a611d8033bc 100644 --- a/app/assets/javascripts/discourse/controllers/topic.js.es6 +++ b/app/assets/javascripts/discourse/controllers/topic.js.es6 @@ -19,7 +19,7 @@ export default ObjectController.extend(Discourse.SelectedPostsCount, { _titleChanged: function() { var title = this.get('title'); - if (!Em.empty(title)) { + if (!Ember.isEmpty(title)) { // Note normally you don't have to trigger this, but topic titles can be updated // and are sometimes lazily loaded. diff --git a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 index a520d8808ab..7a6ebc0ebfd 100644 --- a/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 +++ b/app/assets/javascripts/discourse/helpers/icon-or-image.js.es6 @@ -1,5 +1,5 @@ export default Ember.Handlebars.makeBoundHelper(function(str) { - if (Em.empty(str)) { return ""; } + if (Ember.isEmpty(str)) { return ""; } if (str.indexOf('fa-') === 0) { return new Handlebars.SafeString(""); diff --git a/app/assets/javascripts/discourse/views/button.js.es6 b/app/assets/javascripts/discourse/views/button.js.es6 index 0f62c720469..a791db4a60e 100644 --- a/app/assets/javascripts/discourse/views/button.js.es6 +++ b/app/assets/javascripts/discourse/views/button.js.es6 @@ -10,7 +10,7 @@ export default Discourse.View.extend(StringBuffer, { }.property('helpKey', 'textKey'), text: function() { - if (Em.empty(this.get('textKey'))) { return ""; } + if (Ember.isEmpty(this.get('textKey'))) { return ""; } return I18n.t(this.get('textKey')); }.property('textKey'), diff --git a/app/assets/javascripts/discourse/views/category-chooser.js.es6 b/app/assets/javascripts/discourse/views/category-chooser.js.es6 index 84bb3424d32..b0bda8b33fa 100644 --- a/app/assets/javascripts/discourse/views/category-chooser.js.es6 +++ b/app/assets/javascripts/discourse/views/category-chooser.js.es6 @@ -46,7 +46,7 @@ export default ComboboxView.extend({ var category; // If we have no id, but text with the uncategorized name, we can use that badge. - if (Em.empty(item.id)) { + if (Ember.isEmpty(item.id)) { var uncat = Discourse.Category.findUncategorized(); if (uncat && uncat.get('name') === item.text) { category = uncat; diff --git a/app/assets/javascripts/discourse/views/user-card.js.es6 b/app/assets/javascripts/discourse/views/user-card.js.es6 index b9ab9cf2028..12394202978 100644 --- a/app/assets/javascripts/discourse/views/user-card.js.es6 +++ b/app/assets/javascripts/discourse/views/user-card.js.es6 @@ -16,7 +16,7 @@ export default Discourse.View.extend(CleansUp, { var $this = this.$(); if (!$this) { return; } - if (Ember.empty(url)) { + if (Ember.isEmpty(url)) { $this.css('background-image', '').addClass('no-bg'); } else { $this.css('background-image', "url(" + url + ")").removeClass('no-bg');