1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-02 20:15:26 +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,6 +9,6 @@
//
// https://documize.com
import Ember from 'ember';
import Controller from '@ember/controller';
export default Ember.Controller.extend({});
export default Controller.extend({});

View file

@ -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) {