Docker/documize
Docker/documize
1
0
Fork 0
mirror of https://github.com/documize/community.git synced 2025-08-05 05:25:27 +02:00
Code Releases Activity

upgraded libs and improved Markdown editing experience

Browse source
This commit is contained in:
Harvey Kandola 2017-03-13 15:40:28 +00:00
parent 2e146cf767
commit ea1a8000ee
165 changed files with 15930 additions and 19013 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -94,7 +94,16 @@ export default Ember.Component.extend(TooltipMixin, {
},
willDestroyElement() {
this.set('codeEditor', null);
let editor = this.get('codeEditor');
if (is.not.null(editor)) {
editor.toTextArea();
editor = null;
this.set('codeEditor', null);
}
this.destroyTooltips();
},
// Wrap code in PRE tag with language identifier for subsequent rendering.

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

@ -74,6 +74,12 @@ export default Ember.Component.extend({
willDestroyElement() {
this._super(...arguments);
let editor = this.get('codeEditor');
if (is.not.null(editor)) {
editor.toTextArea();
editor = null;
}
this.set('codeEditor', null);
}
});

71
app/app/components/section/markdown/type-editor.js
View file

@ -35,46 +35,35 @@ export default Ember.Component.extend(TooltipMixin, {
init() {
this._super(...arguments);
let self = this;
// let self = this;
CodeMirror.modeURL = "/codemirror/mode/%N/%N.js";
let rawBody = this.get('meta.rawBody');
let cleanBody = rawBody.replace("</pre>", "");
this.set('pageBody', this.get('meta.rawBody').trim());
cleanBody = cleanBody.replace('<pre class="code-mirror cm-s-solarized cm-s-dark" data-lang="', "");
let startPos = cleanBody.indexOf('">');
let syntax = {
mode: "markdown",
name: "Markdown"
};
// let opts = [];
// let syntax = {
// mode: "markdown",
// name: "Markdown"
// };
if (startPos !== -1) {
syntax = cleanBody.substring(0, startPos);
cleanBody = cleanBody.substring(startPos + 2);
}
// _.each(_.sortBy(CodeMirror.modeInfo, 'name'), function(item) {
// let i = {
// mode: item.mode,
// name: item.name
// };
// opts.pushObject(i);
this.set('pageBody', cleanBody);
// if (item.mode === syntax) {
// self.set('codeSyntax', i);
// }
// });
let opts = [];
// this.set('syntaxOptions', opts);
_.each(_.sortBy(CodeMirror.modeInfo, 'name'), function(item) {
let i = {
mode: item.mode,
name: item.name
};
opts.pushObject(i);
if (item.mode === syntax) {
self.set('codeSyntax', i);
}
});
this.set('syntaxOptions', opts);
// default check
if (is.null(this.get("codeSyntax"))) {
this.set("codeSyntax", opts.findBy("mode", "markdown"));
}
// // default check
// if (is.null(this.get("codeSyntax"))) {
// this.set("codeSyntax", opts.findBy("mode", "markdown"));
// }
},
didInsertElement() {
@ -83,17 +72,25 @@ export default Ember.Component.extend(TooltipMixin, {
},
willDestroyElement() {
this.set('codeEditor', null);
let editor = this.get('codeEditor');
if (this.get('editMode')) {
editor.toTextArea();
editor = null;
}
this.set('codeEditor', null);
this.destroyTooltips();
},
getBody() {
return this.get('codeEditor').getDoc().getValue();
return this.get('codeEditor').getDoc().getValue().trim();
},
attachEditor() {
var editor = CodeMirror.fromTextArea(document.getElementById(this.get('editorId')), {
theme: "default",
mode: "markdown",
lineNumbers: false,
lineWrapping: true,
indentUnit: 4,
@ -112,8 +109,8 @@ export default Ember.Component.extend(TooltipMixin, {
let syntax = this.get("codeSyntax");
if (is.not.undefined(syntax)) {
CodeMirror.autoLoadMode(editor, syntax.mode);
editor.setOption("mode", syntax.mode);
CodeMirror.autoLoadMode(editor, "markdown");
editor.setOption("mode", "markdown");
}
},