Merge branch '1.11.x' of https://github.com/chamilo/chamilo-lms into 1.11.x

pull/2585/head
Alex Aragón 7 years ago
commit dd48d98a73
  1. 2
      main/inc/lib/javascript/ckeditor/plugins/toolbarswitch/plugin.js

@ -47,6 +47,7 @@ function switchMe(editor, callback) {
} else { } else {
newToolbar = origSmallToolbar; newToolbar = origSmallToolbar;
} }
var origFullPage = !!editor.config.fullPage;
// Copy data to original text element before getting rid of the old editor // Copy data to original text element before getting rid of the old editor
var data = editor.getData(); var data = editor.getData();
@ -67,6 +68,7 @@ function switchMe(editor, callback) {
smallToolbar: origSmallToolbar, smallToolbar: origSmallToolbar,
maximizedToolbar: origMaximizedToolbar, maximizedToolbar: origMaximizedToolbar,
extraPlugins : origExtraPlugins, extraPlugins : origExtraPlugins,
fullPage : origFullPage,
on: { on: {
instanceReady: function(e) { instanceReady: function(e) {
if (typeof CKeditor_OnComplete !== 'undefined') { if (typeof CKeditor_OnComplete !== 'undefined') {

Loading…
Cancel
Save