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
Dan Poltawski
02c482704b
Merge branch 'MDL-45403-master' of git://github.com/FMCorz/moodle
...
Conflicts:
lib/editor/atto/plugins/link/yui/build/moodle-atto_link-button/moodle-atto_link-button-min.js
2014-05-06 11:48:38 +08:00
Dan Poltawski
73c2ae4bff
Merge branch 'MDL-45253-master' of git://github.com/FMCorz/moodle
...
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2014-05-06 11:34:17 +08:00
Dan Poltawski
63469ab11d
Merge branch 'MDL-45338-master' of git://github.com/andrewnicols/moodle
2014-05-06 11:27:41 +08:00
Frederic Massart
664c851755
MDL-45403 editor_atto: Change default for tagMarchRequiresAll to true
2014-05-05 17:47:54 +08:00
Frederic Massart
e76ae8077a
MDL-45253 editor_atto: Async the highlighting of buttons
2014-05-05 17:46:13 +08:00
Frederic Massart
fafeb5a293
MDL-45253 editor_atto: Check for button highlights on change event
...
This will allow a button to be highlighted when a plugin has updated
the content, not only when the selection has changed.
2014-05-05 17:46:13 +08:00
Frederic Massart
e988383645
MDL-45253 editor_atto: Prevent selection of all nodes when selection is empty
2014-05-05 17:46:13 +08:00
Frederic Massart
d78920bdba
MDL-45253 editor_atto: selectionFilterMatches includes parents
2014-05-05 17:46:13 +08:00
Marina Glancy
d0144cd38e
Merge branch 'MDL-44972-master' of git://github.com/damyon/moodle
2014-05-05 17:17:11 +08:00
Damyon Wiese
c1660772b1
MDL-44972 Atto dialogues: Change M.core.dialogue attribute name to "focusOnShowSelector"
...
And some minor cleanups.
2014-05-05 16:27:36 +08:00
Damyon Wiese
e5ddec38cd
MDL-44972 Atto: Focus on the first input field in forms in dialogues.
2014-05-05 15:21:11 +08:00
Damyon Wiese
2372366f58
MDL-44224: outdent plugin - handle divs that have been silently switched for ps
...
Also - fix a shifter warning.
2014-05-05 14:07:02 +08:00
Sam Hemelryk
b16c2ec5c8
MDL-44224 atto_indent: converts blockquotes to div indents
2014-05-05 14:07:01 +08:00
Andrew Nicols
e30506416b
MDL-45338 editor_atto: Check for selection changes on touch-based devices too
2014-05-02 14:03:16 +08:00
Frederic Massart
16c6440dcb
MDL-45382 atto_link: Missing context when finding anchors
2014-05-02 12:02:36 +08:00
Damyon Wiese
6e4c18522d
Revert "MDL-45239 editor_atto: The editor cannot be active if it is not the active element"
...
This reverts commit 05a7f9e749
2014-05-01 16:22:41 +08:00
Dan Poltawski
9482292af2
Merge branch 'MDL-45254-master' of git://github.com/andrewnicols/moodle
...
Conflicts:
lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
2014-05-01 11:53:28 +08:00
Damyon Wiese
45b4f8734a
Merge branch 'MDL-44867-m2' of git://github.com/andrewnicols/moodle
2014-05-01 10:29:42 +08:00
