Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 07:39:43 +02:00
Code Releases Activity

upgraded Ember and integrated Bootstrap 4

Browse source 
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
Download patch file Download diff file Expand all files Collapse all files

19
gui/app/pods/folder/route.js
View file

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