Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-04 21:15:24 +02:00
Code Releases Activity

removed open sans, chasing Code section refresh issue

Browse source
This commit is contained in:
Harvey Kandola 2017-03-06 18:30:55 +00:00
parent 7e7f63e6f4
commit 2bcef7831d
66 changed files with 243 additions and 18691 deletions
Download patch file Download diff file Expand all files Collapse all files

25
app/app/components/document/document-page.js
View file

@ -18,10 +18,20 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
sectionService: Ember.inject.service('section'),
editMode: false,
didReceiveAttrs() {
let toEdit = this.get('toEdit');
init() {
this._super(...arguments);
if (toEdit === this.get('page.id') && this.get('isEditor')) {
let page = this.get('page');
this.get('documentService').getPageMeta(page.get('documentId'), page.get('id')).then((meta) => {
this.set('meta', meta);
});
},
didReceiveAttrs() {
this._super(...arguments);
if (this.get('toEdit') === this.get('page.id') && this.get('isEditor')) {
this.send('onEdit');
}
},
@ -60,12 +70,7 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
return;
}
let page = this.get('page');
this.get('documentService').getPageMeta(page.get('documentId'), page.get('id')).then((meta) => {
this.set('editMode', true);
this.set('meta', meta);
});
this.set('editMode', true);
},
onCancelEdit() {
@ -73,8 +78,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
},
onSavePage(page, meta) {
this.get('onSavePage')(page, meta);
this.set('editMode', false);
this.attrs.onSavePage(page, meta);
}
}
});

23
app/app/components/document/document-tab.js
View file

@ -23,14 +23,22 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
},
didInsertElement() {
let self = this;
this.get('sectionService').refresh(this.get('document.id')).then(function (changes) {
changes.forEach(function (newPage) {
let oldPage = self.get('page');
if (!_.isUndefined(oldPage) && oldPage.get('id') === newPage.get('id')) {
this.get('sectionService').refresh(this.get('document.id')).then((changes) => {
if (this.get('isDestroyed') || this.get('isDestroying')) {
return;
}
let oldPage = this.get('page');
if (is.undefined(changes) || is.undefined(oldPage)) {
return;
}
changes.forEach((newPage) => {
if (oldPage.get('id') === newPage.get('id')) {
oldPage.set('body', newPage.get('body'));
oldPage.set('revised', newPage.get('revised'));
self.showNotification(`Refreshed ${oldPage.get('title')}`);
this.showNotification(`Refreshed ${oldPage.get('title')}`);
}
});
});
@ -67,7 +75,6 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
};
this.attrs.onDeletePage(params);
},
}
}
});

8
app/app/components/document/document-view.js
View file

@ -30,10 +30,14 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
toEdit: '',
didReceiveAttrs() {
this._super(...arguments);
this.loadBlocks();
},
didRender() {
this._super(...arguments);
this.contentLinkHandler();
let self = this;
@ -43,6 +47,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
},
didInsertElement() {
this._super(...arguments);
$(".start-section:not(.start-section-empty-state)").hoverIntent({interval: 100, over: function() {
// in
$(this).find('.start-button').velocity("transition.slideDownIn", {duration: 300});
@ -63,6 +69,8 @@ export default Ember.Component.extend(NotifierMixin, TooltipMixin, {
},
willDestroyElement() {
this._super(...arguments);
this.destroyTooltips();
},

4
app/app/components/section/base-renderer.js
View file

@ -13,6 +13,8 @@ import Ember from 'ember';
export default Ember.Component.extend({
didReceiveAttrs() {
this._super(...arguments);
this.set('rendererType', 'section/' + this.get('page.contentType') + '/type-renderer');
},
}
});

1
app/app/components/section/code/type-editor.js
View file

@ -90,7 +90,6 @@ export default Ember.Component.extend(TooltipMixin, {
this.set('codeEditor', editor);
let syntax = this.get("codeSyntax");
if (is.not.undefined(syntax)) {
CodeMirror.autoLoadMode(editor, syntax.mode);
editor.setOption("mode", syntax.mode);

29
app/app/components/section/code/type-renderer.js
View file

@ -16,6 +16,8 @@ export default Ember.Component.extend({
codeSyntax: "htmlmixed",
didReceiveAttrs() {
this._super(...arguments);
CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
let page = this.get('page');
@ -27,9 +29,22 @@ export default Ember.Component.extend({
this.set('codeSyntax', cleanBody.substring(0, startPos));
this.set('codeBody', cleanBody.substring(startPos + 2));
}
_.each(_.sortBy(CodeMirror.modeInfo, 'name'), (item) => {
let i = {
mode: item.mode,
name: item.name
};
if (item.mode === this.get('codeSyntax')) {
this.set('codeSyntax', i);
}
});
},
didRender() {
didInsertElement() {
this._super(...arguments);
let page = this.get('page');
let elem = `page-${page.id}-code`;
@ -44,14 +59,18 @@ export default Ember.Component.extend({
readOnly: true
});
let syntax = this.get("codeSyntax");
CodeMirror.autoLoadMode(editor, syntax);
editor.setOption("mode", syntax);
this.set('codeEditor', editor);
let syntax = this.get("codeSyntax");
if (is.not.undefined(syntax)) {
CodeMirror.autoLoadMode(editor, syntax.mode);
editor.setOption("mode", syntax.mode);
}
},
willDestroyElement() {
this._super(...arguments);
this.set('codeEditor', null);
}
});