1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 07:39: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,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);
});