moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-06 01:16:44 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'MDL-42625_master' of git://github.com/dmonllao/moodle

Browse source
This commit is contained in:
Eloy Lafuente (stronk7) 2013-12-10 23:29:06 +01:00
commit ebc77165a4
51 changed files with 991 additions and 335 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/editor/tinymce/module.js
View file

@ -43,6 +43,8 @@ M.editor_tinymce.init_editor = function(Y, editorid, options) {
};
M.editor_tinymce.initialised = true;
M.util.js_pending('editors');
options.oninit = "M.editor_tinymce.init_callback";
}
M.editor_tinymce.editor_options[editorid] = options;
@ -86,6 +88,10 @@ M.editor_tinymce.init_editor = function(Y, editorid, options) {
}
};
M.editor_tinymce.init_callback = function() {
M.util.js_complete('editors');
}
M.editor_tinymce.init_filepicker = function(Y, editorid, options) {
M.editor_tinymce.filepicker_options[editorid] = options;
};

1
lib/editor/tinymce/tests/behat/edit_available_icons.feature
View file

@ -45,6 +45,7 @@ Feature: Add or remove items from the TinyMCE editor toolbar
Given I follow "Course 1"
And I turn editing mode on
When I add a "Database" to section "1"
And I wait until "#id_introeditor_tbl" "css_element" exists
Then "#id_introeditor_tbl .mce_bold" "css_element" should exists
And "#id_introeditor_tbl .mce_anchor" "css_element" should not exists
And I press "Cancel"