Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-07-24 15:49:44 +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

8
gui/app/pods/document/block/controller.js
View file

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

15
gui/app/pods/document/block/route.js
View file

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