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
69675 commits 37 branches 540 tags 1.3 GiB
Commit graph

1034 commits

Author SHA1 Message Date
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
Sam Hemelryk
9b1a4cde78 Merge branch 'MDL-44834-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:28:49 +13:00
Marina Glancy
5bb81ad437 Merge branch 'MDL-44770-master' of git://github.com/jethac/moodle 2014-04-01 15:50:14 +08:00
Jetha Chan
b1421abdb6 MDL-44770 editor_atto: moved table context menu 2014-04-01 15:46:37 +08:00
Marina Glancy
1a1049990f Merge branch 'MDL-44759-master' of git://github.com/FMCorz/moodle 2014-04-01 15:42:21 +08:00
Marina Glancy
99342b5197 Merge branch 'MDL-43999-master' of git://github.com/damyon/moodle 2014-04-01 15:35:05 +08:00
Marina Glancy
7fff0290eb Merge branch 'MDL-44777-master' of git://github.com/FMCorz/moodle 2014-04-01 15:34:44 +08:00
Damyon Wiese
43a737d1b5 MDL-43999 Atto : Make image dialogue open on double click of an image. 2014-04-01 15:22:12 +08:00
Frederic Massart
1eb5839cf9 MDL-44777 atto_equation: More consistent width of buttons 2014-04-01 15:21:11 +08:00
Marina Glancy
364411b123 MDL-44747 editor_atto: coding error fixed 2014-04-01 14:55:39 +08:00
Marina Glancy
3accdbff60 Merge branch 'MDL-44234-master' of git://github.com/FMCorz/moodle 2014-04-01 14:44:13 +08:00
Frederic Massart
dfd5127531 MDL-44234 atto_table: Reduce the size of the caption field 2014-04-01 14:37:33 +08:00
Marina Glancy
e50a6fa5fb Merge branch 'MDL-44747-master' of git://github.com/FMCorz/moodle 2014-04-01 14:26:08 +08:00
Marina Glancy
2f7949cd57 Merge branch 'MDL-44755-master' of git://github.com/FMCorz/moodle 2014-04-01 13:32:03 +08:00
Marina Glancy
814f40ba31 Merge branch 'MDL-44763_preview_int' of https://github.com/andyjdavis/moodle 2014-04-01 11:19:26 +08:00
Marina Glancy
d767af7c2d Merge branch 'MDL-44754-master' of git://github.com/phalacee/moodle 2014-04-01 11:08:40 +08:00
Andrew Nicols
c390774ade MDL-44752 atto: Correct spelling of color => colour in plugin languages 2014-04-01 11:08:18 +08:00
Andrew Davis
5491fd7f07 MDL-44763 editor_atto: removed unnecessary "preview" label 2014-04-01 10:57:16 +08:00
Frederic Massart
76748496d8 MDL-44869 atto_noautolink: Highlight button when noautolink is active 2014-03-31 17:50:08 +08:00
Frederic Massart
ac0f8617d4 MDL-44870 atto_noautolink: Remove plugin from default toolbar settings 2014-03-31 17:24:02 +08:00
Frederic Massart
33bb15eb80 MDL-44808 atto_table: Removing unused language string for JS 2014-03-31 17:21:15 +08:00
Frederic Massart
b9d065edc4 MDL-44868 editor_atto: Prevent disable buttons to keep tabIndex 
Now, if a button gets disabled but the tabIndex and the focus
are on that button, the focus and tabIndex are moves to its
closest neighbour.
 2014-03-31 16:47:32 +08:00
Frederic Massart
af31595b4b MDL-44868 editor_atto: Toolbar navigation ignores disabled buttons 2014-03-31 16:40:29 +08:00
Marina Glancy
de19c44c82 Merge branch 'MDL-44808-master' of git://github.com/FMCorz/moodle 2014-03-31 16:36:12 +08:00
Damyon Wiese
ffb8aff65c MDL-44000 Atto: Add option to constrain image size 
(Keep aspect ratio)

Also some small improvements to the edit image dialogue.
 2014-03-31 16:28:57 +08:00