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/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,