1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-22 22:59:43 +02:00

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.
This commit is contained in:
Harvey Kandola 2017-11-16 13:28:05 +00:00
parent 0f04be4ea1
commit b31ab712c1
229 changed files with 1610 additions and 3181 deletions

View file

@ -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();