Commit Graph

1305 Commits

Author SHA1 Message Date
Mark Nelson c9b0e9769a MDL-32450 editor_tinymce: documented removal of DragMath 2014-06-30 13:08:00 -07:00
Mark Nelson 07f8f2f559 MDL-32450 editor_tinymce: removed DragMath from the 'customtoolbar' setting 2014-06-30 13:07:33 -07:00
Petr Skoda 1170df12a1 MDL-32450 delete Dragmath plugin and library because it is not compatible with GPL 2014-06-29 15:36:29 -07:00
Marina Glancy d70fe4f8d9 Merge branch 'wip-mdl-46061' of git://github.com/rajeshtaneja/moodle 2014-06-26 10:26:59 +08:00
Rajesh Taneja d7a0b72160 MDL-46061 behat: Fixed blur event problem for atto_image
atto_image look for blur event after changing width/height
Added a new step to get focus off the element, so this can
work.
2014-06-26 09:59:49 +08:00
Damyon Wiese 2b472c83b5 MDL-45983 Atto equation editor: Exclude phantomjs from this behat test because it's buggy 2014-06-25 15:04:20 +08:00
Marina Glancy 8d879f3928 Merge branch 'MDL-45983-master' of git://github.com/damyon/moodle 2014-06-24 13:51:30 +08:00
Marina Glancy 5c5d182301 Merge branch 'MDL-46061-master' of git://github.com/FMCorz/moodle 2014-06-24 13:32:13 +08:00
Damyon Wiese 95664d548f Merge branch 'MDL-46046-master' of git://github.com/FMCorz/moodle 2014-06-24 11:44:42 +08:00
Damyon Wiese f8793245e8 Merge branch 'MDL-44773-master' of git://github.com/FMCorz/moodle 2014-06-24 10:08:28 +08:00
Frederic Massart f756d3d492 MDL-46061 atto_image: Improved tests to cover sizing feature 2014-06-19 16:00:23 +08:00
Frederic Massart 91bc9570e1 MDL-46061 atto_image: Prevent error when image does not have a size 2014-06-19 16:00:22 +08:00
Frederic Massart 680482d14a MDL-44773 atto_accessibilitychecker: Improved image test coverage 2014-06-19 13:38:12 +08:00
Frederic Massart 325f668670 MDL-46046 atto_accessibilityhelper: Remove dead code from the plugin 2014-06-18 16:52:06 +08:00
Frederic Massart 61ebeec143 MDL-44773 atto_accessibilitychecker: Set focus on clicked warnings 2014-06-18 16:44:24 +08:00
Damyon Wiese aca670170a MDL-45983 Atto equation editor: Various bugs when editing an existing equation
(And a behat test for it).
2014-06-17 15:20:29 +08:00
Rajesh Taneja 96b86e038e MDL-46001 atto_clear: modfied behat test to work on xvfb 2014-06-16 11:09:43 +08:00
Damyon Wiese d27c8d924a MDL-44871 Atto: Add missing tags to behat tests @editor and @editor_atto 2014-06-12 11:14:21 +08:00
Rajesh Taneja 49d82f905e MDL-44871 behat: Hack to make equation editor visible 2014-06-11 17:20:18 +08:00
Damyon Wiese 162e050c66 MDL-44871 Atto behat: Use one less page load to get to profile edit page 2014-06-11 16:29:38 +08:00
Damyon Wiese e3adee555b MDL-44871 Atto: Move custom select text step to atto specific step definition. 2014-06-11 15:29:20 +08:00
Damyon Wiese 7d8f825bbf MDL-44871 Atto behat tests: Modified the tests to work around focus bugs with workspaces
The main changes here are that the "select the text in" step was modified to select only the
first text node in the editor field, and to focus on it's parent instead of the entire editable div.

Some tests had to be modified to match the new behaviour, and another "real" bug was found in the table plugin.
2014-06-11 14:34:48 +08:00
Damyon Wiese 457a9fa6c5 MDL-44871 Behat: Add tests for Atto functionalities (some of them) 2014-06-10 14:42:00 +08:00
Eloy Lafuente (stronk7) d663c5abc5 Merge branch 'wip-mdl-45769' of https://github.com/rajeshtaneja/moodle 2014-06-09 13:25:01 +02:00
Rajesh Taneja ddfbdf0924 MDL-45769 Behat: Fixed behat, was failing because of xpath chaining 2014-06-09 09:56:39 +08:00
Frederic Massart 097f7eca38 MDL-45634 editor_atto: Adding type button to toolbar buttons
This prevents the browser to assume that those buttons are submit
buttons. In which case the submit action was stolen and the form
could not be submitted pressing the 'enter' key.
2014-06-03 12:09:17 +08:00
Eloy Lafuente (stronk7) f94891cc00 MDL-45503 upgrade: add v2.7.0 sep lines 2014-05-28 01:13:42 +02:00
Andrew Nicols 362659725b MDL-45682 editor_atto: Ensure that the current editor is active when saving selections 2014-05-26 12:02:02 +08:00
Marina Glancy 4b7af5040d Merge branch 'MDL-45239-master-3' of git://github.com/andrewnicols/moodle 2014-05-22 12:59:56 +08:00
Andrew Nicols 2c549f7802 MDL-45239 editor_atto: On Android do not restore focus in the callbackWrapper
It seems that Android automatically focuses the cursor in the last position
when the content editable region is programatically re-focused.

Whilst this does not cause an issue on it's own, when combined with the
behaviour of the dictionary auto-completion to restore focus on the start
of the word when a word has not yet been finished, this was causing us to
change focus when pressing buttons.
2014-05-22 12:19:43 +08:00
Andrew Nicols ae14a50114 MDL-45536 atto_html: Update the textarea size when switching to HTML view 2014-05-22 11:20:35 +08:00
Sam Hemelryk 7be0b69893 Merge branch 'MDL-45479-master' of git://github.com/andrewnicols/moodle 2014-05-20 13:09:34 +12:00
Frederic Massart e722133aee MDL-45474 atto_undo: Remove notice when undo stack is empty 2014-05-20 10:47:32 +12:00
Damyon Wiese 495243f35c Merge branch 'MDL-45130-master' of git://github.com/FMCorz/moodle 2014-05-19 21:20:10 +08:00
Damyon Wiese e1a83b8327 Merge branch 'MDL-45447-master' of git://github.com/FMCorz/moodle 2014-05-19 20:18:59 +08:00
Andrew Nicols 1ce043614f MDL-45239 editor_atto: The editor cannot be active if it is not the active element
FireFox thinks that you can have an active selection on an element which
currently does not have focus. How this can be the case is a mystery.

Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2014-05-19 16:15:09 +08:00
Andrew Nicols 17f253faeb MDL-45468 editor_atto: Check that the common ancestor is within the editor
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2014-05-19 16:14:03 +08:00
Frederic Massart 9389ff572b MDL-45533 editor_atto: Default paragraph is removed from empty Atto 2014-05-15 11:10:54 +08:00
Andrew Nicols f366221309 MDL-45479 atto_image: Improve the preview area
This changes the preview area:
* to show the image at the requested size; and
* to fix the scaling issues.
2014-05-15 10:36:41 +08:00
Frederic Massart 4d2b346997 MDL-45130 editor_atto: Remove debugging messages for missing plugins
This is no longer required as the toolbar configuration prevents
missing plugins from being set. However, even if we do not output
any notice, we ignore missing plugins to prevent errors in case
one was uninstalled but left in the editor toolbar.
2014-05-12 16:08:14 +08:00
Eloy Lafuente (stronk7) 538bf99ece MDL-45486 Bump all versions to planned release
This bumps all versions to planned 2.7 release
(2014051200) version and all the dependencies to
current 2.7rc2 (2014050800)
2014-05-09 02:12:28 +02:00
Andrew Nicols 079c3a9446 MDL-45444 editor_atto: Fix vertical alignment of editor buttons 2014-05-08 12:33:12 +08:00
Dan Poltawski d1a316373f Merge branch 'MDL-45425-master' of git://github.com/andrewnicols/moodle 2014-05-08 11:05:20 +08:00
Dan Poltawski 327c382c47 MDL-43312 tinymce: bump plugin version 2014-05-08 10:52:36 +08:00
Dan Poltawski dac2e286da Merge branch 'MDL-43312-master' of git://github.com/damyon/moodle 2014-05-08 10:51:51 +08:00
Frederic Massart ba4e81d249 MDL-45447 editor_atto: Highlight collapse and html icons when toggled 2014-05-07 17:44:06 +08:00
Andrew Nicols ee37639542 MDL-45425 editor_atto: Check for change selections asynchronously 2014-05-07 14:30:28 +08:00
Damyon Wiese 6363588b72 MDL-43312 TinyMCE: Version bump to 3.5.10. Remove all the hacks.
I retested the old bugs that required custom hacks to tinymce and could not reproduce them,
so I have not reimplemented the hacks.
2014-05-07 12:54:43 +08:00
Helen Foster f15fa7a281 MDL-45410 Merge English strings from the en_fix language pack 2014-05-07 00:16:51 +02:00
Andrew Nicols eb497e26fb MDL-45338 editor_atto: Correct gesturemoveend listening
Delegate gesturemoveend rather than listen to ensure adequate event filters
and that we apply to only the correct editor.
2014-05-06 16:10:31 +08:00