Skip to content

Commit

Permalink
Merge pull request #44 from documize/editor-upgrade
Browse files Browse the repository at this point in the history
Editor upgrade
  • Loading branch information
HarveyKandola authored Oct 16, 2016
2 parents f339bcf + 8f23472 commit b058353
Show file tree
Hide file tree
Showing 35 changed files with 87 additions and 55 deletions.
4 changes: 2 additions & 2 deletions app/app/components/section/base-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default Ember.Component.extend({
drop: null,
cancelLabel: "Close",
actionLabel: "Save",
tip: "Short and concise title for the page",
tip: "Short and concise title",
busy: false,

didRender() {
Expand Down Expand Up @@ -88,4 +88,4 @@ export default Ember.Component.extend({
this.attrs.onCancel();
}
}
});
});
6 changes: 2 additions & 4 deletions app/app/components/section/wysiwyg/type-editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,6 @@ export default Ember.Component.extend({
},

didInsertElement() {
let self = this;

let options = {
selector: "#rich-text-editor",
relative_urls: false,
Expand Down Expand Up @@ -72,12 +70,12 @@ export default Ember.Component.extend({
},
toolbar1: "formatselect fontselect fontsizeselect | bold italic underline | link unlink | image media | codesample | outdent indent | alignleft aligncenter alignright alignjustify | bullist numlist | forecolor backcolor",
save_onsavecallback: function () {
self.send('onAction');
Mousetrap.trigger('ctrl+s');
}
};

if (typeof tinymce === 'undefined') {
$.getScript("/tinymce/tinymce.min.js?v=430", function () {
$.getScript("/tinymce/tinymce.min.js?v=443", function () {
window.tinymce.dom.Event.domLoaded = true;
tinymce.baseURL = "//" + window.location.host + "/tinymce";
tinymce.suffix = ".min";
Expand Down
2 changes: 1 addition & 1 deletion app/public/tinymce/plugins/advlist/plugin.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/public/tinymce/plugins/autolink/plugin.min.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit b058353

Please sign in to comment.