moodle/moodle
3
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-08-07 09:56:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions
85084 commits 37 branches 540 tags 1.3 GiB
Commit graph

1258 commits

Author SHA1 Message Date
Damyon Wiese
313ae82ec0 Merge branch 'MDL-44844-master' of git://github.com/andrewnicols/moodle 2014-04-14 10:32:00 +08:00
Andrew Nicols
e41b0e7543 MDL-44674 editor_atto: Remove the ability to prevent callback wrapping 
The callback wrapping handles various important ARIA options and should not
be so easily preventable.
 2014-04-14 10:09:14 +08:00
Andrew Nicols
040e13010d MDL-44906 atto_collapse: Keep focus on the collapse button on toggle 2014-04-14 09:51:50 +08:00
Damyon Wiese
2e8cbbb3ac MDL-44826 Atto: Remove most of the image alignment options 
Just keep the simple ones and put some default padding on images.
 2014-04-11 12:55:28 +08:00
Damyon Wiese
7b28067413 Revert "MDL-44758 editor-atto: prevent table-in-table creation" 
This reverts commit 3a6511a530.

Conflicts:
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
	lib/editor/atto/plugins/table/yui/src/button/js/button.js
 2014-04-11 09:47:57 +08:00
Jetha Chan
efbcbd5e46 MDL-45040 editor-atto: selection reverts erroneously 
Fixed an issue where selections reverted on toolbar button press when the last selection was made by dragging outside of Atto.
 2014-04-10 18:06:47 +08:00
Dan Poltawski
e5d3f6ea26 Merge branch 'MDL-44868-master-fixup' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-04-10 14:51:42 +08:00
Frederic Massart
5e543b4f76 MDL-44868 editor_atto: Remember the last focused button in the toolbar 2014-04-10 14:22:10 +08:00
Damyon Wiese
92810c07f7 MDL-44927 Atto: Fix bad merge of MDL-44760 (missing menu entry) 2014-04-10 13:26:03 +08:00
Andrew Nicols
c63f90539a MDL-44760 editor_atto: Address issues with focus when closing menus 
Safari fires it's events in a slightly different order for the focusoutside
event which causes the focusAfterHide to be called *after* we change focus.

As a result, we must keep track of the menus which are currently open and
remove their focusAfterHide.
 2014-04-09 15:26:34 +08:00
Andrew Nicols
9b2fc5741e MDL-44844 core: Fix custom menu navigation 
Atto introduced a rule to hide all Nodes with the yui3-menu-hidden class
but this rule is too general and applies to non-atto content too.

As a result, when loading the menu and during the XY calculation, the
native Element.getBoundingClientRect() function was returning a bounding
box size of 0 because the Node was not visible and the node was being
hidden from view when it was later made visible.
 2014-04-09 14:50:02 +08:00
Damyon Wiese
48dc9f0175 MDL-44927 Atto: Table editor typo that prevents creation of new tables. 2014-04-09 11:31:26 +08:00
Sam Hemelryk
6a90bc5e05 Merge branch 'MDL-44870-master' of git://github.com/FMCorz/moodle 2014-04-09 10:37:05 +12:00
Sam Hemelryk
b983a5d869 Merge branch 'MDL-44765-master' of git://github.com/phalacee/moodle 2014-04-09 10:26:33 +12:00
Damyon Wiese
0610d2ca92 Merge branch 'MDL-44131-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-debug.js
	lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button-min.js
	lib/editor/atto/plugins/equation/yui/build/moodle-atto_equation-button/moodle-atto_equation-button.js
	lib/editor/atto/plugins/equation/yui/src/button/js/button.js
 2014-04-08 14:18:50 +08:00
Frederic Massart
050159dc9f MDL-44131 atto_equation: Equation library groups are aria toolbars 2014-04-08 14:08:54 +08:00
Dan Poltawski
052d51b15f Merge branch 'MDL-44241-master' of git://github.com/andrewnicols/moodle 2014-04-08 13:53:19 +08:00
Damyon Wiese
594a5c8c02 Merge branch 'MDL-44235-master' of git://github.com/FMCorz/moodle 2014-04-08 12:32:49 +08:00
Dan Poltawski
822b055c61 Merge branch 'MDL-44784-master' of git://github.com/FMCorz/moodle 2014-04-08 12:12:01 +08:00
Dan Poltawski
d0a3cec564 Merge branch 'MDL-44806-master' of git://github.com/phalacee/moodle 2014-04-08 12:07:15 +08:00
Dan Poltawski
9a59ebaa6c Merge branch 'MDL-44810-master' of git://github.com/jethac/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
 2014-04-08 12:04:41 +08:00
Dan Poltawski
23cc5bbdc0 Merge branch 'MDL-44868-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
 2014-04-08 11:37:25 +08:00
Dan Poltawski
95ce54f060 Merge branch 'MDL-44869-master' of git://github.com/FMCorz/moodle 2014-04-08 11:27:59 +08:00
Sam Hemelryk
87f2c808f7 Merge branch 'MDL-44760-master' of git://github.com/andrewnicols/moodle 
Conflicts:
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-debug.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button.js
	lib/editor/atto/plugins/table/yui/src/button/js/button.js
	lib/editor/atto/yui/build/moodle-editor_atto-plugin/moodle-editor_atto-plugin-min.js
 2014-04-08 08:59:54 +12:00
Andrew Nicols
ee616cff45 MDL-44760 editor_atto: Make menus consistent with Clean theme 2014-04-07 20:43:57 +08:00
Dan Poltawski
4834cfdf59 Merge branch 'MDL-43856-master' of git://github.com/damyon/moodle 2014-04-07 16:58:46 +08:00
Marina Glancy
a8e4b006ce Merge branch 'MDL-44761-master' of git://github.com/andrewnicols/moodle 2014-04-07 16:16:32 +08:00
Damyon Wiese
353473aa59 MDL-44927 Atto: Improve table editing UX 
Hide context menu items that don't apply.
Add "Edit table" menu entry to change the caption / headers.
 2014-04-07 15:57:59 +08:00
Sam Hemelryk
b017ff6da6 Merge branch 'MDL-44748-master' of git://github.com/damyon/moodle 2014-04-07 15:18:52 +12:00
Sam Hemelryk
5ee0b3ceaf Merge branch 'MDL-44758-master' of git://github.com/jethac/moodle 
Conflicts:
	lib/editor/atto/plugins/table/yui/build/moodle-atto_table-button/moodle-atto_table-button-min.js
 2014-04-07 15:02:40 +12:00
Jetha Chan
3a6511a530 MDL-44758 editor-atto: prevent table-in-table creation 
Prevent new table creation, displaying table context menu instead when cursor is within caption, when multiple cells are selected, when selection contains both nodes within and outside of the table, and when selection contains nodes from multiple tables.
 2014-04-07 10:44:29 +08:00
Jason Fowler
9754ab92da MDL-44765 Atto: Fix the accessibility warning events for image dialogue 2014-04-07 07:59:45 +08:00
Sam Hemelryk
2429e44011 Merge branch 'MDL-44846-master' of git://github.com/damyon/moodle 2014-04-07 08:48:50 +12:00
Sam Hemelryk
70aab3836a Merge branch 'MDL-44949-master' of git://github.com/damyon/moodle 2014-04-07 08:15:34 +12:00
Andrew Nicols
49a510efbd MDL-44241 atto_unlink: Merge into atto_link 2014-04-04 12:03:02 +08:00
Damyon Wiese
8d1c017979 MDL-44949 Atto: JS error when picking an image from a repository 2014-04-04 12:03:01 +08:00
Jetha Chan
0a1456dfa8 MDL-44810 editor_atto: restore selection after button press 
Fixed issue where clicking on buttons erroneously lost viewport focus and selection.
 2014-04-04 11:47:56 +08:00
Andrew Nicols
d86e45f0ce MDL-44761 editor_atto: Add keyboard shortcut descriptions to the button titles. 2014-04-04 11:32:20 +08:00
Damyon Wiese
441f94b263 MDL-43856 MathJax: Coding style cleanups. 2014-04-03 14:36:42 +08:00
Damyon Wiese
cc90cedc85 MDL-43856 MathJax: Improvements to the MathJax filter 
* Remove all traces of mathjax from the atto equation editor - it is filter agnostic
* Add a M.core.event module for core events that can be published/subscribed to by plugins (loose coupling)
* Add a FILTER_CONTENT_UPDATED event so plugins can tell the filter system when nodes are added to the page
* Implement a listener for this event in the MathJax filter
* Fire this event from the equation editor and from the glossary filter
* Add a nolink tag to the mathjax filter, so equations will not be processed by the other filters
* Add a smarter throttle function to the equation editor preview updates (Y.throttle is dumb)
 2014-04-03 14:36:36 +08:00
Damyon Wiese
8939ebac77 MDL-43856 MathJax: alter the equation editor to make it use MathJax if it is available. 
If MathJax is loaded by any means, the editor should use it instead of the filter. This prevents
slow ajax requests and gives much better rendering. MathJax could be loaded by the filter,
or it could just be done the old way by sticking the include in the page header.
 2014-04-03 14:36:25 +08:00
Frederic Massart
52329a32f1 MDL-44747 editor_atto: Improved configuration error messages 2014-04-03 11:24:05 +08:00
Frederic Massart
24650c78bb MDL-44235 atto_table: A long table caption does not overlap the table content 2014-04-03 11:05:38 +08:00
Damyon Wiese
af6a2e9459 MDL-44846 Atto: Make the color plugins reliable. 
The problem is that in IE, the browser implements color commands with font tags (<font color=...>).

We specifically strip font tags to avoid abuse when pasting from word (the world has seen enough of Tahoma).

This solution instead uses Rangy to set inline styles on the selection. This works in all browsers nicely.

I also updated the toggleInlineSelectionClass function to use the same rangy function. This solves problems with
whitespace squashing in ie.
 2014-04-03 10:52:41 +08:00
Andrew Nicols
9ad87e7900 MDL-44749 atto_collapse: Skip button inclusion if it will impact UX 
Do not show the collapse button if:
* it's specified after the cut-off and would therefore be unusable; or
* the total number of groups matches the number of groups to display anyway.
 2014-04-02 09:52:22 +08:00
Sam Hemelryk
3ed2a4b2cc Merge branch 'w14_MDL-44824_m27_subplugins' of https://github.com/skodak/moodle 2014-04-02 13:04:46 +13:00
Eloy Lafuente (stronk7)
e154e9d8cd Merge branch 'MDL-44000-master' of git://github.com/damyon/moodle 
Conflicts:
	lib/editor/atto/plugins/image/yui/build/moodle-atto_image-button/moodle-atto_image-button-min.js
 2014-04-02 00:27:30 +02:00
Sam Hemelryk
8412561a3d Merge branch 'MDL-44756_help' of https://github.com/andyjdavis/moodle 2014-04-02 09:51:47 +13:00
Sam Hemelryk
53361c3087 Merge branch 'MDL-44772-master' of git://github.com/FMCorz/moodle 
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
 2014-04-02 09:43:25 +13:00
Sam Hemelryk
3b07cc1c4e Merge branch 'MDL-44762-master' of git://github.com/FMCorz/moodle 2014-04-02 09:29:11 +13:00