upgraded Ember and integrated Bootstrap 4

Upgraded to Ember JS 2.16.x release. This upgrade uses the new JavaScript modules API syntax.

Integrated Bootstrap 4 Beta 2 via package.json and associated popper.js library. Overridden Bootstrap styles using bootstrap.scss -- this file selectively imports the modules we need.

gui/app/pods/auth/forgot/controller.js

@@ -9,10 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
 
-export default Ember.Controller.extend({
-	userService: Ember.inject.service('user'),
+import Controller from '@ember/controller';
+
+export default Controller.extend({
+	userService: service('user'),
 
 	actions: {
 		forgot: function (email) {

gui/app/pods/auth/forgot/route.js

@@ -9,11 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Route from '@ember/routing/route';
 import constants from '../../../utils/constants';
 
-export default Ember.Route.extend({
-    appMeta: Ember.inject.service(),
+export default Route.extend({
+    appMeta: service(),
 
 	beforeModel() {
 		if (this.get('appMeta.authProvider') === constants.AuthProvider.Keycloak) {

gui/app/pods/auth/forgot/template.hbs

@@ -1,6 +1,6 @@
 <div class="auth-box">
     <div class="logo">
-        <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
+        <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="img-fluid" />
     </div>
     <div class="login-form">
         {{forgot-password forgot=(action 'forgot')}}

gui/app/pods/auth/keycloak/controller.js

@@ -9,6 +9,6 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({});
+export default Controller.extend({});

gui/app/pods/auth/keycloak/route.js

@@ -9,14 +9,17 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import constants from '../../../utils/constants';
 
-export default Ember.Route.extend({
-	session: Ember.inject.service(),
-	appMeta: Ember.inject.service(),
-	kcAuth: Ember.inject.service(),
-	localStorage: Ember.inject.service(),
+export default Route.extend({
+	session: service(),
+	appMeta: service(),
+	kcAuth: service(),
+	localStorage: service(),
 	queryParams: {
 		mode: {
 			refreshModel: true
@@ -25,7 +28,7 @@ export default Ember.Route.extend({
 	message: '',
 
 	beforeModel(transition) {
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			this.set('mode', is.not.undefined(transition.queryParams.mode) ? transition.queryParams.mode : 'reject');
 
 			if (this.get('mode') === 'reject' || this.get('appMeta.authProvider') !== constants.AuthProvider.Keycloak) {

gui/app/pods/auth/login/controller.js

@@ -9,12 +9,14 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Controller from '@ember/controller';
 import AuthProvider from '../../../mixins/auth';
 
-export default Ember.Controller.extend(AuthProvider, {
-	appMeta: Ember.inject.service('app-meta'),
-	session: Ember.inject.service('session'),
+export default Controller.extend(AuthProvider, {
+	appMeta: service('app-meta'),
+	session: service('session'),
 	invalidCredentials: false,
 
 	reset() {

gui/app/pods/auth/login/route.js

@@ -9,17 +9,20 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import constants from '../../../utils/constants';
 
-export default Ember.Route.extend({
-    appMeta: Ember.inject.service(),
-	kcAuth: Ember.inject.service(),
-	localStorage: Ember.inject.service(),
+export default Route.extend({
+    appMeta: service(),
+	kcAuth: service(),
+	localStorage: service(),
 	showLogin: false,
 
 	beforeModel(transition) {
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			let authProvider = this.get('appMeta.authProvider');
 
 			switch (authProvider) {

gui/app/pods/auth/login/template.hbs

@@ -1,7 +1,7 @@
 {{#if model.showLogin}}
     <div class="auth-box">
         <div class="logo">
-            <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
+            <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="img-fluid" />
         </div>
         <div class="login-form">
             <form id="login-form" {{action 'login' on="submit"}}>

gui/app/pods/auth/logout/controller.js

@@ -9,6 +9,6 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({});
+export default Controller.extend({});

gui/app/pods/auth/logout/route.js

@@ -9,12 +9,14 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Route from '@ember/routing/route';
 import config from 'documize/config/environment';
 
-export default Ember.Route.extend({
-	session: Ember.inject.service(),
-	appMeta: Ember.inject.service(),
+export default Route.extend({
+	session: service(),
+	appMeta: service(),
 
 	activate: function () {
 		this.get('session').invalidate().then(() => { 

gui/app/pods/auth/reset/controller.js

@@ -9,10 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
 
-export default Ember.Controller.extend({
-	userService: Ember.inject.service('user'),
+import Controller from '@ember/controller';
+
+export default Controller.extend({
+	userService: service('user'),
 	password: "",
 	passwordConfirm: "",
 	mustMatch: false,

gui/app/pods/auth/reset/route.js

@@ -9,9 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
 	model: function (params) {
 		return params.token;
 	},

gui/app/pods/auth/reset/template.hbs

@@ -1,6 +1,6 @@
 <div class="auth-box">
     <div class="logo">
-        <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="responsive-img" />
+        <img src="/assets/img/logo-color.png" title="Documize" alt="Documize" class="img-fluid" />
     </div>
     {{password-reset reset=(action 'reset')}}
 </div>

gui/app/pods/auth/route.js

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
 });

gui/app/pods/auth/share/controller.js

@@ -9,6 +9,6 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({});
+export default Controller.extend({});

gui/app/pods/auth/share/route.js

@@ -9,12 +9,14 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	session: Ember.inject.service(),
-	localStorage: Ember.inject.service(),
+export default Route.extend(AuthenticatedRouteMixin, {
+	session: service(),
+	localStorage: service(),
 
 	beforeModel() {
 		this.get('localStorage').clearAll();

gui/app/pods/auth/sso/controller.js

@@ -9,6 +9,6 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({});
+export default Controller.extend({});

gui/app/pods/auth/sso/route.js

@@ -9,11 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
 
-export default Ember.Route.extend({
-	session: Ember.inject.service(),
-	localStorage: Ember.inject.service(),
+import Route from '@ember/routing/route';
+
+export default Route.extend({
+	session: service(),
+	localStorage: service(),
 
 	beforeModel() {
 		this.get('localStorage').clearAll();

gui/app/pods/customize/auth/controller.js

@@ -9,18 +9,21 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import NotifierMixin from "../../../mixins/notifier";
 // import constants from '../../../utils/constants';
 
-export default Ember.Controller.extend(NotifierMixin, {
-	global: Ember.inject.service(),
-    appMeta: Ember.inject.service(),
-	session: Ember.inject.service(),
+export default Controller.extend(NotifierMixin, {
+	global: service(),
+    appMeta: service(),
+	session: service(),
 
 	actions: {
 		onSave(data) {
-			return new Ember.RSVP.Promise((resolve) => {
+			return new EmberPromise((resolve) => {
 				if(!this.get('session.isGlobalAdmin')) {
 					resolve();
 				} else {
@@ -32,7 +35,7 @@ export default Ember.Controller.extend(NotifierMixin, {
 		},
 
 		onSync() {
-			return new Ember.RSVP.Promise((resolve) => {
+			return new EmberPromise((resolve) => {
 				this.get('global').syncExternalUsers().then((response) => {
 					resolve(response);
 				});

gui/app/pods/customize/auth/route.js

@@ -9,14 +9,17 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 import constants from '../../../utils/constants';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	appMeta: Ember.inject.service(),
-	session: Ember.inject.service(),
-	global: Ember.inject.service(),
+export default Route.extend(AuthenticatedRouteMixin, {
+	appMeta: service(),
+	session: service(),
+	global: service(),
 
 	beforeModel() {
 		if (!this.get("session.isGlobalAdmin")) {
@@ -30,7 +33,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 			authConfig: null,
 		};
 
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			this.get('global').getAuthConfig().then((config) => {
 				switch (data.authProvider) {
 					case constants.AuthProvider.Keycloak:

gui/app/pods/customize/controller.js

@@ -9,6 +9,6 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({});
+export default Controller.extend({});

gui/app/pods/customize/folders/controller.js

@@ -9,12 +9,14 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Controller from '@ember/controller';
 import NotifierMixin from '../../../mixins/notifier';
 import DropdownMixin from '../../../mixins/dropdown';
 
-export default Ember.Controller.extend(NotifierMixin, DropdownMixin, {
-	folderService: Ember.inject.service('folder'),
+export default Controller.extend(NotifierMixin, DropdownMixin, {
+	folderService: service('folder'),
 	folders: [],
 	dropdown: null,
 	deleteSpace: {

gui/app/pods/customize/folders/route.js

@@ -9,11 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	folderService: Ember.inject.service('folder'),
+export default Route.extend(AuthenticatedRouteMixin, {
+	folderService: service('folder'),
 
 	beforeModel() {
 		if (!this.session.isAdmin) {

gui/app/pods/customize/general/controller.js

@@ -9,11 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Controller from '@ember/controller';
 import NotifierMixin from "../../../mixins/notifier";
 
-export default Ember.Controller.extend(NotifierMixin, {
-	orgService: Ember.inject.service('organization'),
+export default Controller.extend(NotifierMixin, {
+	orgService: service('organization'),
 
 	actions: {
 		save() {

gui/app/pods/customize/general/route.js

@@ -9,14 +9,16 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Route from '@ember/routing/route';
 import RSVP from 'rsvp';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	orgService: Ember.inject.service('organization'),
-	appMeta: Ember.inject.service(),
-	session: Ember.inject.service(),
+export default Route.extend(AuthenticatedRouteMixin, {
+	orgService: service('organization'),
+	appMeta: service(),
+	session: service(),
 
 	beforeModel() {
 		if (!this.get("session.isAdmin")) {

gui/app/pods/customize/global/controller.js

@@ -9,11 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Controller from '@ember/controller';
 import NotifierMixin from "../../../mixins/notifier";
 
-export default Ember.Controller.extend(NotifierMixin, {
-	global: Ember.inject.service(),
+export default Controller.extend(NotifierMixin, {
+	global: service(),
 
 	actions: {
 		saveSMTP() {

gui/app/pods/customize/global/route.js

@@ -9,14 +9,16 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Route from '@ember/routing/route';
 import RSVP from 'rsvp';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	appMeta: Ember.inject.service(),
-	session: Ember.inject.service(),
-	global: Ember.inject.service(),
+export default Route.extend(AuthenticatedRouteMixin, {
+	appMeta: service(),
+	session: service(),
+	global: service(),
 
 	beforeModel() {
 		if (!this.get("session.isGlobalAdmin")) {

gui/app/pods/customize/route.js

@@ -9,10 +9,10 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend(AuthenticatedRouteMixin, {
 	beforeModel: function (transition) {
 		if (is.equal(transition.targetName, 'customize.index')) {
 			this.transitionTo('customize.general');

gui/app/pods/customize/users/controller.js

@@ -9,16 +9,19 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { set } from '@ember/object';
+
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import NotifierMixin from '../../../mixins/notifier';
 
-export default Ember.Controller.extend(NotifierMixin, {
-	userService: Ember.inject.service('user'),
+export default Controller.extend(NotifierMixin, {
+	userService: service('user'),
 	newUser: { firstname: "", lastname: "", email: "", active: true },
 
 	actions: {
 		add(user) {
-			Ember.set(this, 'newUser', user);
+			set(this, 'newUser', user);
 
 			return this.get('userService')
 				.add(this.get('newUser'))

gui/app/pods/customize/users/route.js

@@ -9,14 +9,17 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 import constants from '../../../utils/constants';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	userService: Ember.inject.service('user'),
-	global: Ember.inject.service('global'),
-	appMeta: Ember.inject.service(),
+export default Route.extend(AuthenticatedRouteMixin, {
+	userService: service('user'),
+	global: service('global'),
+	appMeta: service(),
 
 	beforeModel () {
 		if (!this.session.isAdmin) {
@@ -25,7 +28,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	},
 
 	model() {
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			if (this.get('appMeta.authProvider') == constants.AuthProvider.Keycloak) {
 				this.get('global').syncExternalUsers().then(() => {
 					this.get('userService').getComplete().then((users) =>{

gui/app/pods/document/block/controller.js

@@ -9,10 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
 
-export default Ember.Controller.extend({
-	sectionService: Ember.inject.service('section'),
+import Controller from '@ember/controller';
+
+export default Controller.extend({
+	sectionService: service('section'),
 
 	actions: {
 		onCancel( /*page*/ ) {

gui/app/pods/document/block/route.js

@@ -9,18 +9,21 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { hash } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	documentService: Ember.inject.service('document'),
-	folderService: Ember.inject.service('folder'),
-	sectionService: Ember.inject.service('section'),
+export default Route.extend(AuthenticatedRouteMixin, {
+	documentService: service('document'),
+	folderService: service('folder'),
+	sectionService: service('section'),
 
 	model(params) {
 		let self = this;
 
-		return Ember.RSVP.hash({
+		return hash({
 			folder: self.modelFor('document').folder,
 			document: self.modelFor('document').document,
 			block: self.get('sectionService').getBlock(params.block_id),

gui/app/pods/document/controller.js

@@ -9,8 +9,8 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 import NotifierMixin from '../../mixins/notifier';
 
-export default Ember.Controller.extend(NotifierMixin, {
+export default Controller.extend(NotifierMixin, {
 });

gui/app/pods/document/history/controller.js

@@ -1,8 +1,9 @@
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import NotifierMixin from '../../../mixins/notifier';
 
-export default Ember.Controller.extend(NotifierMixin, {
-	documentService: Ember.inject.service('document'),
+export default Controller.extend(NotifierMixin, {
+	documentService: service('document'),
 
 	actions: {
 		onFetchDiff(pageId, revisionId) {

gui/app/pods/document/history/route.js

@@ -1,12 +1,14 @@
-import Ember from 'ember';
+import { hash } from 'rsvp';
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	documentService: Ember.inject.service('document'),
-	folderService: Ember.inject.service('folder'),
+export default Route.extend(AuthenticatedRouteMixin, {
+	documentService: service('document'),
+	folderService: service('folder'),
 
 	model() {
-		return Ember.RSVP.hash({
+		return hash({
 			folders: this.modelFor('document').folders,
 			folder: this.modelFor('document').folder,
 			document: this.modelFor('document').document,

gui/app/pods/document/index/controller.js

@@ -9,15 +9,18 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
 import NotifierMixin from '../../../mixins/notifier';
 import TooltipMixin from '../../../mixins/tooltip';
 
-export default Ember.Controller.extend(NotifierMixin, TooltipMixin, {
-	documentService: Ember.inject.service('document'),
-	templateService: Ember.inject.service('template'),
-	sectionService: Ember.inject.service('section'),
-	linkService: Ember.inject.service('link'),
+export default Controller.extend(NotifierMixin, TooltipMixin, {
+	documentService: service('document'),
+	templateService: service('template'),
+	sectionService: service('section'),
+	linkService: service('link'),
 	folder: {},
 	pages: [],
 	toggled: false,
@@ -129,7 +132,7 @@ export default Ember.Controller.extend(NotifierMixin, TooltipMixin, {
 		},
 
 		onInsertSection(data) {
-			return new Ember.RSVP.Promise((resolve) => {
+			return new EmberPromise((resolve) => {
 				this.get('documentService').addPage(this.get('model.document.id'), data).then((newPage) => {
 					let data = this.get('store').normalize('page', newPage);
 					this.get('store').push(data);
@@ -154,7 +157,7 @@ export default Ember.Controller.extend(NotifierMixin, TooltipMixin, {
 		},
 
 		onDeleteBlock(blockId) {
-			return new Ember.RSVP.Promise((resolve) => {
+			return new EmberPromise((resolve) => {
 				this.get('sectionService').deleteBlock(blockId).then(() => {
 					this.send("showNotification", "Deleted");
 					resolve();
@@ -163,7 +166,7 @@ export default Ember.Controller.extend(NotifierMixin, TooltipMixin, {
 		},
 
 		onSavePageAsBlock(block) {
-			return new Ember.RSVP.Promise((resolve) => {
+			return new EmberPromise((resolve) => {
 				this.get('sectionService').addBlock(block).then(() => {
 					this.showNotification("Published");
 					resolve();

gui/app/pods/document/index/route.js

@@ -9,21 +9,24 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { hash } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	documentService: Ember.inject.service('document'),
-	linkService: Ember.inject.service('link'),
-	folderService: Ember.inject.service('folder'),
-	userService: Ember.inject.service('user'),
+export default Route.extend(AuthenticatedRouteMixin, {
+	documentService: service('document'),
+	linkService: service('link'),
+	folderService: service('folder'),
+	userService: service('user'),
 
 	model() {
 		let document = this.modelFor('document').document;
 		this.browser.setTitle(document.get('name'));
 		this.browser.setMetaDescription(document.get('excerpt'));
 
-		return Ember.RSVP.hash({
+		return hash({
 			folders: this.modelFor('document').folders,
 			folder: this.modelFor('document').folder,
 			document: this.modelFor('document').document,

gui/app/pods/document/route.js

@@ -9,21 +9,24 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise, hash } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	sectionService: Ember.inject.service('section'),
-	documentService: Ember.inject.service('document'),
-	folderService: Ember.inject.service('folder'),
-	linkService: Ember.inject.service('link'),
+export default Route.extend(AuthenticatedRouteMixin, {
+	sectionService: service('section'),
+	documentService: service('document'),
+	folderService: service('folder'),
+	linkService: service('link'),
 
 	beforeModel(transition) {
 		this.set('pageId', is.not.undefined(transition.queryParams.page) ? transition.queryParams.page : "");
 		this.set('folderId', this.paramsFor('document').folder_id);
 		this.set('documentId', this.paramsFor('document').document_id);
 
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			this.get('documentService').fetchDocumentData(this.get('documentId')).then((data) => {
 				this.set('document', data.document);
 				this.set('folders', data.folders);
@@ -36,7 +39,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	},
 
 	model() {
-		return Ember.RSVP.hash({
+		return hash({
 			folders: this.get('folders'),
 			folder: this.get('folder'),
 			document: this.get('document'),

gui/app/pods/document/section/controller.js

@@ -9,11 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Controller from '@ember/controller';
 import NotifierMixin from '../../../mixins/notifier';
 
-export default Ember.Controller.extend(NotifierMixin, {
-	documentService: Ember.inject.service('document'),
+export default Controller.extend(NotifierMixin, {
+	documentService: service('document'),
 
 	actions: {
 		onCancel() {

gui/app/pods/document/section/route.js

@@ -9,16 +9,19 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { hash } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	documentService: Ember.inject.service('document'),
-	folderService: Ember.inject.service('folder'),
-	userService: Ember.inject.service('user'),
+export default Route.extend(AuthenticatedRouteMixin, {
+	documentService: service('document'),
+	folderService: service('folder'),
+	userService: service('user'),
 
 	model(params) {
-		return Ember.RSVP.hash({
+		return hash({
 			folders: this.modelFor('document').folders,
 			folder: this.modelFor('document').folder,
 			document: this.modelFor('document').document,

gui/app/pods/folder/controller.js

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

gui/app/pods/folder/index/controller.js

@@ -9,14 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
+
+import { inject as service } from '@ember/service';
 import NotifierMixin from '../../../mixins/notifier';
 
-const {
-	inject: { service }
-} = Ember;
-
-export default Ember.Controller.extend(NotifierMixin, {
+export default Controller.extend(NotifierMixin, {
 	documentService: service('document'),
 	folderService: service('folder'),
 	localStorage: service('localStorage'),

gui/app/pods/folder/index/route.js

@@ -9,14 +9,17 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise, hash } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	categoryService: Ember.inject.service('category'),
+export default Route.extend(AuthenticatedRouteMixin, {
+	categoryService: service('category'),
 
 	beforeModel() {
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			this.get('categoryService').fetchSpaceData(this.modelFor('folder').folder.get('id')).then((data) => {
 				this.set('categories', data.category);
 				this.set('categorySummary', data.summary);
@@ -30,7 +33,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	model() {
 		this.get('browser').setTitle(this.modelFor('folder').folder.get('name'));
 
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.modelFor('folder').folder,
 			permissions: this.modelFor('folder').permissions,
 			folders: this.modelFor('folder').folders,

gui/app/pods/folder/route.js

@@ -9,20 +9,23 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { Promise as EmberPromise, hash } from 'rsvp';
+
+import { inject as service } from '@ember/service';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	documentService: Ember.inject.service('document'),
-	folderService: Ember.inject.service('folder'),
-	templateService: Ember.inject.service('template'),
-	session: Ember.inject.service(''),
+export default Route.extend(AuthenticatedRouteMixin, {
+	documentService: service('document'),
+	folderService: service('folder'),
+	templateService: service('template'),
+	session: service(''),
 	folder: {},
 
 	beforeModel() {
 		this.set('folderId', this.paramsFor('folder').folder_id)
 
-		return new Ember.RSVP.Promise((resolve) => {
+		return new EmberPromise((resolve) => {
 			this.get('folderService').getFolder(this.get('folderId')).then((folder) => {
 				this.set('folder', folder);
 
@@ -35,7 +38,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	},
 
 	model(params) {
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.get('folder'),
 			permissions: this.get('permissions'),
 			folders: this.get('folderService').getAll(),

gui/app/pods/folder/settings/category/controller.js

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

gui/app/pods/folder/settings/category/route.js

@@ -9,14 +9,16 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { hash } from 'rsvp';
+
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend(AuthenticatedRouteMixin, {
 	model() {
 		this.get('browser').setTitle(this.modelFor('folder').folder.get('name'));
 
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.modelFor('folder').folder,
 			permissions: this.modelFor('folder').permissions,
 			folders: this.modelFor('folder').folders

gui/app/pods/folder/settings/controller.js

@@ -9,12 +9,14 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Controller from '@ember/controller';
 import NotifierMixin from '../../../mixins/notifier';
 import AuthProvider from '../../../mixins/auth';
 
-export default Ember.Controller.extend(AuthProvider, NotifierMixin, {
-	documentService: Ember.inject.service('document'),
-	folderService: Ember.inject.service('folder'),
-	localStorage: Ember.inject.service('localStorage'),
+export default Controller.extend(AuthProvider, NotifierMixin, {
+	documentService: service('document'),
+	folderService: service('folder'),
+	localStorage: service('localStorage'),
 });

gui/app/pods/folder/settings/invitation/controller.js

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

gui/app/pods/folder/settings/invitation/route.js

@@ -9,14 +9,16 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { hash } from 'rsvp';
+
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend(AuthenticatedRouteMixin, {
 	model() {
 		this.get('browser').setTitle(this.modelFor('folder').folder.get('name'));
 
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.modelFor('folder').folder,
 			permissions: this.modelFor('folder').permissions,
 			folders: this.modelFor('folder').folders

gui/app/pods/folder/settings/route.js

@@ -9,10 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { hash } from 'rsvp';
+
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend(AuthenticatedRouteMixin, {
 	beforeModel: function (transition) {
 		if (is.equal(transition.targetName, 'folder.settings.index')) {
 			this.transitionTo('folder.settings.security');
@@ -22,7 +24,7 @@ export default Ember.Route.extend(AuthenticatedRouteMixin, {
 	model() {
 		this.get('browser').setTitle(this.modelFor('folder').folder.get('name'));
 
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.modelFor('folder').folder,
 			permissions: this.modelFor('folder').permissions,
 			folders: this.modelFor('folder').folders

gui/app/pods/folder/settings/security/controller.js

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
 });

gui/app/pods/folder/settings/security/route.js

@@ -9,14 +9,16 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { hash } from 'rsvp';
+
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend(AuthenticatedRouteMixin, {
 	model() {
 		this.get('browser').setTitle(this.modelFor('folder').folder.get('name'));
 
-		return Ember.RSVP.hash({
+		return hash({
 			folder: this.modelFor('folder').folder,
 			permissions: this.modelFor('folder').permissions,
 			folders: this.modelFor('folder').folders

gui/app/pods/folders/controller.js

@@ -9,11 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Controller from '@ember/controller';
 import NotifierMixin from '../../mixins/notifier';
 
-export default Ember.Controller.extend(NotifierMixin, {
-	folderService: Ember.inject.service('folder'),
+export default Controller.extend(NotifierMixin, {
+	folderService: service('folder'),
 
 	actions: {
 		onAddSpace(m) {

gui/app/pods/folders/route.js

@@ -9,14 +9,12 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Route from '@ember/routing/route';
+
+import { inject as service } from '@ember/service';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-const {
-	inject: { service }
-} = Ember;
-
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend(AuthenticatedRouteMixin, {
 	appMeta: service(),
 	folderService: service('folder'),
 	localStorage: service(),

gui/app/pods/not-found/controller.js

@@ -9,6 +9,6 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({});
+export default Controller.extend({});

gui/app/pods/not-found/route.js

@@ -9,10 +9,10 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
+export default Route.extend(AuthenticatedRouteMixin, {
 	beforeModel() {
 		this.transitionTo('folders');
 	}

gui/app/pods/profile/controller.js

@@ -9,15 +9,14 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
 
-const {
-	isPresent
-} = Ember;
+import Controller from '@ember/controller';
+import { isPresent } from '@ember/utils';
 
-export default Ember.Controller.extend({
-	userService: Ember.inject.service('user'),
-	session: Ember.inject.service(),
+export default Controller.extend({
+	userService: service('user'),
+	session: service(),
 
 	actions: {
 		save(passwords) {

gui/app/pods/profile/route.js

@@ -9,13 +9,15 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin, {
-	userService: Ember.inject.service('user'),
-	folderService: Ember.inject.service('folder'),
-	session: Ember.inject.service(),
+export default Route.extend(AuthenticatedRouteMixin, {
+	userService: service('user'),
+	folderService: service('folder'),
+	session: service(),
 
 	beforeModel: function () {
 		if (!this.get("session.authenticated")) {

gui/app/pods/search/controller.js

@@ -9,10 +9,13 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { debounce } from '@ember/runloop';
 
-export default Ember.Controller.extend({
-	searchService: Ember.inject.service('search'),
+import { inject as service } from '@ember/service';
+import Controller from '@ember/controller';
+
+export default Controller.extend({
+	searchService: service('search'),
 	filter: "",
 	results: [],
 	matchDoc: true,
@@ -21,20 +24,20 @@ export default Ember.Controller.extend({
 	matchTag: false,
 
 	onKeywordChange: function () {
-		Ember.run.debounce(this, this.fetch, 750);
+		debounce(this, this.fetch, 750);
 	}.observes('filter'),
 
 	onMatchDoc: function () {
-		Ember.run.debounce(this, this.fetch, 750);
+		debounce(this, this.fetch, 750);
 	}.observes('matchDoc'),
 	onMatchContent: function () {
-		Ember.run.debounce(this, this.fetch, 750);
+		debounce(this, this.fetch, 750);
 	}.observes('matchContent'),
 	onMatchTag: function () {
-		Ember.run.debounce(this, this.fetch, 750);
+		debounce(this, this.fetch, 750);
 	}.observes('matchTag'),
 	onMatchFile: function () {
-		Ember.run.debounce(this, this.fetch, 750);
+		debounce(this, this.fetch, 750);
 	}.observes('matchFile'),
 
 	fetch() {

gui/app/pods/search/route.js

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin);
+export default Route.extend(AuthenticatedRouteMixin);

gui/app/pods/setup/controller.js

@@ -9,12 +9,14 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import { inject as service } from '@ember/service';
+
+import Controller from '@ember/controller';
 import NotifierMixin from "../../mixins/notifier";
 import Encoding from "../../utils/encoding";
 
-export default Ember.Controller.extend(NotifierMixin, {
-	ajax: Ember.inject.service(),
+export default Controller.extend(NotifierMixin, {
+	ajax: service(),
 
 	actions: {
 		save() {

gui/app/pods/setup/route.js

@@ -9,9 +9,9 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
 	beforeModel() {
 		let pwd = document.head.querySelector("[property=dbhash]").content;
 		if (pwd.length === 0 || pwd === "{{.DBhash}}") {

gui/app/pods/widgets/route.js

@@ -9,7 +9,7 @@
 //
 // https://documize.com
 
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import AuthenticatedRouteMixin from 'ember-simple-auth/mixins/authenticated-route-mixin';
 
-export default Ember.Route.extend(AuthenticatedRouteMixin);
+export default Route.extend(AuthenticatedRouteMixin);