more shimming of controllers (#110)

refs #101, #95
- shim controllers that were missed initially

app/controllers/about.js

@@ -1,9 +1,5 @@
-import Ember from 'ember';
-
-const {
-    Controller,
-    computed
-} = Ember;
+import Controller from 'ember-controller';
+import computed from 'ember-computed';
 
 export default Controller.extend({
     updateNotificationCount: 0,

app/controllers/application.js

@@ -1,14 +1,10 @@
-import Ember from 'ember';
-
-const {
-    Controller,
-    computed,
-    inject: {service}
-} = Ember;
+import Controller from 'ember-controller';
+import computed from 'ember-computed';
+import injectService from 'ember-service/inject';
 
 export default Controller.extend({
-    dropdown: service(),
-    session: service(),
+    dropdown: injectService(),
+    session: injectService(),
 
     showNavMenu: computed('currentPath', 'session.isAuthenticated', function () {
         return (this.get('currentPath') !== 'error404' || this.get('session.isAuthenticated')) &&

app/controllers/error.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const {Controller, computed} = Ember;
+import Controller from 'ember-controller';
+import computed from 'ember-computed';
 
 export default Controller.extend({
 

app/controllers/post-settings-menu.js

@@ -1,38 +1,36 @@
+import $ from 'jquery';
 import Ember from 'ember';
+import Controller from 'ember-controller';
+import RSVP from 'rsvp';
+import computed from 'ember-computed';
+import {guidFor} from 'ember-metal/utils';
+import injectService from 'ember-service/inject';
+import injectController from 'ember-controller/inject';
+import {htmlSafe} from 'ember-string';
+import {isEmberArray} from 'ember-array/utils';
+import {isBlank} from 'ember-utils';
+import observer from 'ember-metal/observer';
+import run from 'ember-runloop';
+
 import {parseDateString} from 'ghost-admin/utils/date-formatting';
 import SettingsMenuMixin from 'ghost-admin/mixins/settings-menu-controller';
 import boundOneWay from 'ghost-admin/utils/bound-one-way';
 import isNumber from 'ghost-admin/utils/isNumber';
 
-const {
-    $,
-    ArrayProxy,
-    Controller,
-    Handlebars,
-    PromiseProxyMixin,
-    RSVP,
-    computed,
-    guidFor,
-    inject: {service, controller},
-    String: {htmlSafe},
-    isArray,
-    isBlank,
-    observer,
-    run
-} = Ember;
+const {ArrayProxy, Handlebars, PromiseProxyMixin} = Ember;
 
 export default Controller.extend(SettingsMenuMixin, {
     debounceId: null,
     lastPromise: null,
     selectedAuthor: null,
 
-    application: controller(),
-    config: service(),
-    ghostPaths: service(),
-    notifications: service(),
-    session: service(),
-    slugGenerator: service(),
-    timeZone: service(),
+    application: injectController(),
+    config: injectService(),
+    ghostPaths: injectService(),
+    notifications: injectService(),
+    session: injectService(),
+    slugGenerator: injectService(),
+    timeZone: injectService(),
 
     initializeSelectedAuthor: observer('model', function () {
         return this.get('model.author').then((author) => {
@@ -183,7 +181,7 @@ export default Controller.extend(SettingsMenuMixin, {
     }),
 
     showErrors(errors) {
-        errors = isArray(errors) ? errors : [errors];
+        errors = isEmberArray(errors) ? errors : [errors];
         this.get('notifications').showErrors(errors);
     },
 

app/controllers/posts.js

@@ -1,15 +1,12 @@
 import Ember from 'ember';
+import Controller from 'ember-controller';
+import computed, {equal} from 'ember-computed';
+import injectService from 'ember-service/inject';
 
-const {
-    Controller,
-    compare,
-    computed,
-    inject: {service}
-} = Ember;
-const {equal} = computed;
+const {compare} = Ember;
 
 export default Controller.extend({
-    feature: service(),
+    feature: injectService(),
 
     showDeletePostModal: false,
 

app/controllers/reset.js

@@ -1,11 +1,8 @@
-import Ember from 'ember';
-import ValidationEngine from 'ghost-admin/mixins/validation-engine';
+import Controller from 'ember-controller';
+import computed from 'ember-computed';
+import injectService from 'ember-service/inject';
 
-const {
-    Controller,
-    computed,
-    inject: {service}
-} = Ember;
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 export default Controller.extend(ValidationEngine, {
     newPassword: '',
@@ -16,10 +13,10 @@ export default Controller.extend(ValidationEngine, {
 
     validationType: 'reset',
 
-    ghostPaths: service(),
-    notifications: service(),
-    session: service(),
-    ajax: service(),
+    ghostPaths: injectService(),
+    notifications: injectService(),
+    session: injectService(),
+    ajax: injectService(),
 
     email: computed('token', function () {
         // The token base64 encodes the email (and some other stuff),

app/controllers/setup.js

@@ -1,22 +1,16 @@
-import Ember from 'ember';
-
-const {
-    Controller,
-    computed,
-    get,
-    inject: {service, controller}
-} = Ember;
-const {match} = computed;
+import Controller from 'ember-controller';
+import computed, {match} from 'ember-computed';
+import injectService from 'ember-service/inject';
+import injectController from 'ember-controller/inject';
 
 export default Controller.extend({
-    appController: controller('application'),
-    ghostPaths: service(),
+    appController: injectController('application'),
+    ghostPaths: injectService(),
 
     showBackLink: match('appController.currentRouteName', /^setup\.(two|three)$/),
 
     backRoute: computed('appController.currentRouteName', function () {
-        let appController = this.get('appController');
-        let currentRoute = get(appController, 'currentRouteName');
+        let currentRoute = this.get('appController.currentRouteName');
 
         return currentRoute === 'setup.two' ? 'setup.one' : 'setup.two';
     })

app/controllers/setup/three.js

@@ -1,21 +1,18 @@
-import Ember from 'ember';
+import Controller from 'ember-controller';
+import RSVP from 'rsvp';
+import computed, {alias} from 'ember-computed';
+import {A as emberA} from 'ember-array/utils';
+import injectService from 'ember-service/inject';
+import injectController from 'ember-controller/inject';
+import {htmlSafe} from 'ember-string';
+import run from 'ember-runloop';
 import DS from 'ember-data';
 
-const {
-    Controller,
-    RSVP,
-    computed,
-    inject: {service, controller},
-    A: emberA,
-    String: {htmlSafe},
-    run
-} = Ember;
 const {Errors} = DS;
-const {alias} = computed;
 
 export default Controller.extend({
-    notifications: service(),
-    two: controller('setup/two'),
+    notifications: injectService(),
+    two: injectController('setup/two'),
 
     errors: Errors.create(),
     hasValidated: emberA(),

app/controllers/setup/two.js

@@ -1,12 +1,12 @@
-import Ember from 'ember';
+import Controller from 'ember-controller';
+import RSVP from 'rsvp';
+import injectService from 'ember-service/inject';
+import injectController from 'ember-controller/inject';
+import {isEmberArray} from 'ember-array/utils';
+
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
-const {
-    Controller,
-    RSVP: {Promise},
-    inject: {service, controller},
-    isArray
-} = Ember;
+const {Promise} = RSVP;
 
 export default Controller.extend(ValidationEngine, {
     size: 90,
@@ -19,12 +19,12 @@ export default Controller.extend(ValidationEngine, {
     submitting: false,
     flowErrors: '',
 
-    ghostPaths: service(),
-    notifications: service(),
-    application: controller(),
-    config: service(),
-    session: service(),
-    ajax: service(),
+    ghostPaths: injectService(),
+    notifications: injectService(),
+    application: injectController(),
+    config: injectService(),
+    session: injectService(),
+    ajax: injectService(),
 
     // ValidationEngine settings
     validationType: 'setup',
@@ -56,7 +56,7 @@ export default Controller.extend(ValidationEngine, {
     _handleSaveError(resp) {
         this.toggleProperty('submitting');
 
-        if (resp && resp.errors && isArray(resp.errors)) {
+        if (resp && resp.errors && isEmberArray(resp.errors)) {
             this.set('flowErrors', resp.errors[0].message);
         } else {
             this.get('notifications').showAPIError(resp, {key: 'setup.blog-details'});

app/controllers/signin.js

@@ -1,23 +1,21 @@
-import Ember from 'ember';
-import ValidationEngine from 'ghost-admin/mixins/validation-engine';
+import $ from 'jquery';
+import Controller from 'ember-controller';
+import injectService from 'ember-service/inject';
+import injectController from 'ember-controller/inject';
+import {isEmberArray} from 'ember-array/utils';
 
-const {
-    $,
-    Controller,
-    inject: {service, controller},
-    isArray
-} = Ember;
+import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
 export default Controller.extend(ValidationEngine, {
     submitting: false,
     loggingIn: false,
     authProperties: ['identification', 'password'],
 
-    ghostPaths: service(),
-    notifications: service(),
-    session: service(),
-    application: controller(),
-    ajax: service(),
+    ghostPaths: injectService(),
+    notifications: injectService(),
+    session: injectService(),
+    application: injectController(),
+    ajax: injectService(),
     flowErrors: '',
 
     // ValidationEngine settings
@@ -94,7 +92,7 @@ export default Controller.extend(ValidationEngine, {
                 }).catch((resp) => {
                     this.toggleProperty('submitting');
 
-                    if (resp && resp.errors && isArray(resp.errors)) {
+                    if (resp && resp.errors && isEmberArray(resp.errors)) {
                         let [{message}] = resp.errors;
 
                         this.set('flowErrors', message);

app/controllers/signup.js

@@ -1,12 +1,11 @@
-import Ember from 'ember';
+import Controller from 'ember-controller';
+import RSVP from 'rsvp';
+import injectService from 'ember-service/inject';
+import {isEmberArray} from 'ember-array/utils';
+
 import ValidationEngine from 'ghost-admin/mixins/validation-engine';
 
-const {
-    Controller,
-    RSVP: {Promise},
-    inject: {service},
-    isArray
-} = Ember;
+const {Promise} = RSVP;
 
 export default Controller.extend(ValidationEngine, {
     // ValidationEngine settings
@@ -16,11 +15,11 @@ export default Controller.extend(ValidationEngine, {
     flowErrors: '',
     image: null,
 
-    ghostPaths: service(),
-    config: service(),
-    notifications: service(),
-    session: service(),
-    ajax: service(),
+    ghostPaths: injectService(),
+    config: injectService(),
+    notifications: injectService(),
+    session: injectService(),
+    ajax: injectService(),
 
     sendImage() {
         let image = this.get('image');
@@ -78,7 +77,7 @@ export default Controller.extend(ValidationEngine, {
                 }).catch((resp) => {
                     this.toggleProperty('submitting');
 
-                    if (resp && resp.errors && isArray(resp.errors)) {
+                    if (resp && resp.errors && isEmberArray(resp.errors)) {
                         this.set('flowErrors', resp.errors[0].message);
                     } else {
                         notifications.showAPIError(resp, {key: 'signup.complete'});

app/controllers/subscribers.js

@@ -1,16 +1,13 @@
-import Ember from 'ember';
+import $ from 'jquery';
+import {assign} from 'ember-platform';
+import computed from 'ember-computed';
+import injectService from 'ember-service/inject';
+import Controller from 'ember-controller';
+
 import Table from 'ember-light-table';
 import PaginationMixin from 'ghost-admin/mixins/pagination';
 import ghostPaths from 'ghost-admin/utils/ghost-paths';
 
-const {
-    $,
-    assign,
-    computed,
-    inject: {service},
-    Controller
-} = Ember;
-
 export default Controller.extend(PaginationMixin, {
 
     queryParams: ['order', 'direction'],
@@ -23,7 +20,7 @@ export default Controller.extend(PaginationMixin, {
     table: null,
     subscriberToDelete: null,
 
-    session: service(),
+    session: injectService(),
 
     // paginationSettings is replaced by the pagination mixin so we need a
     // getter/setter CP here so that we don't lose the dynamic order param

app/controllers/team/index.js

@@ -1,11 +1,6 @@
-import Ember from 'ember';
-
-const {
-    Controller,
-    computed,
-    inject: {service}
-} = Ember;
-const {alias, filter} = computed;
+import Controller from 'ember-controller';
+import {alias, filter} from 'ember-computed';
+import injectService from 'ember-service/inject';
 
 export default Controller.extend({
 
@@ -13,7 +8,7 @@ export default Controller.extend({
 
     users: alias('model'),
 
-    session: service(),
+    session: injectService(),
 
     activeUsers: filter('users', function (user) {
         return /^active|warn-[1-4]|locked$/.test(user.get('status'));

app/controllers/team/user.js

@@ -1,19 +1,15 @@
-import Ember from 'ember';
+import Controller from 'ember-controller';
+import RSVP from 'rsvp';
+import computed, {alias, and, not, or, readOnly} from 'ember-computed';
+import injectService from 'ember-service/inject';
+import {htmlSafe} from 'ember-string';
+import run from 'ember-runloop';
+import {isEmberArray} from 'ember-array/utils';
+
 import isNumber from 'ghost-admin/utils/isNumber';
 import boundOneWay from 'ghost-admin/utils/bound-one-way';
 import { invoke } from 'ember-invoke-action';
 
-const {
-    Controller,
-    RSVP,
-    computed,
-    inject: {service},
-    String: {htmlSafe},
-    run,
-    isArray
-} = Ember;
-const {alias, and, not, or, readOnly} = computed;
-
 export default Controller.extend({
     submitting: false,
     lastPromise: null,
@@ -24,12 +20,12 @@ export default Controller.extend({
     _scratchFacebook: null,
     _scratchTwitter: null,
 
-    ajax: service(),
-    dropdown: service(),
-    ghostPaths: service(),
-    notifications: service(),
-    session: service(),
-    slugGenerator: service(),
+    ajax: injectService(),
+    dropdown: injectService(),
+    ghostPaths: injectService(),
+    notifications: injectService(),
+    session: injectService(),
+    slugGenerator: injectService(),
 
     user: alias('model'),
     currentUser: alias('session.user'),
@@ -394,7 +390,7 @@ export default Controller.extend({
             }).then((response) => {
                 // manually update the roles for the users that just changed roles
                 // because store.pushPayload is not working with embedded relations
-                if (response && isArray(response.users)) {
+                if (response && isEmberArray(response.users)) {
                     response.users.forEach((userJSON) => {
                         let user = this.store.peekRecord('user', userJSON.id);
                         let role = this.store.peekRecord('role', userJSON.roles[0].id);