Commit Graph

1205 Commits

Author SHA1 Message Date
Dan Poltawski db68a1e688 Merge branch 'MDL-52317-m31' of https://github.com/NeillM/moodle into MOODLE_31_STABLE 2016-10-03 16:09:33 +01:00
Neill Magill b9143c7883 MDL-52317 Atto: Large resized images may display scroll bars
When an image was added via Atto and it was set to resize automatically
if the alignment was set to Top, Middle or Bottom when it was made
smaller then a vertical scroll bar would be displayed.

This was caused by the interaction of the margin settings on the image
and the 100% width set via the img-responsive css class. The width of
an element only includes the content area and not any borders, padding
or margins.

This change stops atto hardcoding the styles for image alignment into
the images style tag, it instead adds a class that defines the alignment
the image should have.

This change has the benefit that themers will now be able to adjust
how atto image alignments work if they wish.

Images added before this patch will continue to have the issue
until they are edited by the plugin, at which time their legacy style
will be removed and the new alignment method will be added.

Thanks to Andrew Nicols who provided a refactor for the Alignment
and style detection code.
2016-09-30 08:50:38 +01:00
Dan Poltawski 1c4e222256 MDL-55421 js: add some global ignores to js files
This is to prevent linting to be extremely noisy about rollup related
problems.

Should not affect built files.
2016-09-29 16:42:54 +01:00
David Monllao ea634405d6 MDL-55183 atto: Fix whitespaces 2016-07-26 10:05:44 +08:00
David Monllao 2f905b06d7 Merge branch 'wip-MDL-55183-31' of git://github.com/abgreeve/moodle into MOODLE_31_STABLE
Conflicts:
	lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
2016-07-26 09:56:52 +08:00
Adrian Greeve bc29b3920b MDL-55183 editor_atto: Fix requires error.
When using a different theme and removing an editor
plugin such as the equation plugin, atto will display
an error about a missing dependency.

A thank you to Anthony Forth for providing this patch.
2016-07-26 09:42:37 +08:00
Adrian Greeve 2f7b29a366 MDL-54796 forms: Editor restore event created.
The editor restore event is currently being subscribed
to by the change checkers to refresh their savedstate.
2016-07-25 10:45:30 +08:00
Dan Poltawski 4dc180b05d Merge branch 'MDL-55012-31' of git://github.com/damyon/moodle into MOODLE_31_STABLE 2016-07-18 13:57:41 +01:00
Damyon Wiese 7166d2ab48 MDL-55012 Atto: no style attrs on paste
Specifically on paste - we don't need all the random style attributes
from content on the clipboard. When you copy from a webpage - the browser
inlines all the styles from the page so that the pasted content will look
like the place it was copied from. But this is never what you want - you
want the content on paste, but with no special styling.
2016-07-15 13:36:50 +08:00
Jake Dallimore 89ea16e44e MDL-54795 mod_assign: Fix Atto notify js error in grading interface 2016-07-01 13:52:38 +08:00
Frederic Massart adaf294a75 MDL-48756 editor_atto: Bulk atto autosave queries 2016-06-07 11:49:49 +01:00
Eloy Lafuente (stronk7) 1f010acdd0 MDL-54677 upgrade: add 3.1.0 separation line to all upgrade scripts 2016-05-23 01:32:56 +02:00
Dan Poltawski 5d84a61419 Merge branch 'MDL-54633-master-tinymce' of git://github.com/mudrd8mz/moodle 2016-05-19 13:00:34 +01:00
David Mudrák 929727e3ef MDL-54633 tinymce: Sync editors' iframe to textarea on form submit
The previous commit "Automatically sync editor with its textarea" was
found a not good solution as the onchange event is triggered way less
often than needed for our needs. So this reverts commit 34321d49.

Instead, we add a hack to the formslib so that when there are some
TinyMCE editors used at the page, we explicitly save them before
triggering the form validation. This simply calls save() on all editors
on the page - see the API reference:
http://archive.tinymce.com/wiki.php/API3:method.tinymce.triggerSave

Having TinyMCE hardcoded like this on this core level does not make me
happy. But it seems to be most effective solution for now (and
definitely more efficient than the previous solution). Plus there is a
precedence - we already use window.tinyMCE in formchangechecker.js YUI
module, for example.
2016-05-19 13:44:41 +02:00
Dan Poltawski b887c81907 Merge branch 'MDL-54633-master-tinymce' of git://github.com/mudrd8mz/moodle 2016-05-19 09:00:12 +01:00
Eloy Lafuente (stronk7) 1abca11e0a MDL-54638 versions: bump all versions and requires near release
version = 2016052300 release version
requires= 2016051900 current rc1 version
2016-05-19 02:16:15 +02:00
David Mudrák 34321d491b MDL-54633 tinymce: Automatically sync editor with its textarea
Probably as a result of recent changes in the way how forms client side
validators are trigerred (MDL-52826), the field validator has been
triggered before the underlying textarea's values property is updated by
TinyMCE. This led to marking such a field as "required" even if the
value is provided.

Inspired by http://stackoverflow.com/questions/2122085/
this patch adds a new onchange callback that automatically keeps the
underlying textarea synced with the editor iframe. Relevant API docs:
http://archive.tinymce.com/wiki.php/Configuration3x:onchange_callback

I was also trying to call the save() method via the editor's onSubmit
method but that one seems to be also triggered only after the validator.
2016-05-19 00:50:08 +02:00
Panagiotis Nikoloutsopoulos c3c3c9f28a MDL-52550 atto: Added preventDefaults for events dragover and dragenter 2016-04-21 15:08:20 +08:00
Dan Poltawski e92a39cf0c Revert "Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle"
This reverts commit 61a0465ce7, reversing
changes made to 2408f8fe2b.
2016-04-13 10:48:59 +01:00
Dan Poltawski 61a0465ce7 Merge branch 'MDL-52944-master' of git://github.com/cameron1729/moodle 2016-04-12 14:13:36 +01:00
Dan Poltawski 5702a8289b Merge branch 'MDL-52954-master' of git://github.com/damyon/moodle 2016-04-11 09:52:40 +01:00
Cameron Ball a6a59bcaa4 MDL-52944 atto: Use event-key to handle enter key 2016-04-08 12:25:27 +08:00
Panagiotis Nikoloutsopoulos 92a8ca4ba2 MDL-52944 atto: Contenteditable command 'FormatBlock' set to 'p' 2016-04-08 12:13:23 +08:00
Damyon Wiese b803df8170 MDL-52954 atto: Stop autosave timer, when editor no-longer exists. 2016-03-30 11:48:40 +08:00
Adrian Greeve 387c8026a5 MDL-50795 atto: Pasting into atto removes background colour style.
Copying from one atto editor to another comes with a lot of style
information. This removes the color attributes which make the page
look ugly when competing with different themes.
2016-03-24 10:53:59 +08:00
Rajesh Taneja e01012e96d MDL-46891 behat: Driver specific fixes.
1. Browserkit doesn't handle [] in name
2. Grades are not visible in viewport and might fail
   with few drivers, increasing size of window to ensure
   grades are visible and can be modified.
3. Click edit first to see grade link
4. Expand fields before setting value
5. Updated xpath, as crawler update it.
6. Hover fails to show icon
2016-03-11 10:51:16 +08:00
Eric Merrill 1f0d77f7cd MDL-53249 atto: Make sure all editors see end move event 2016-02-25 21:37:16 -05:00
Rajesh Taneja 7b61603406 MDL-52996 Atto: Only check if plugins are loaded
Atto bold using behat with phantomjs doesn't work.
In this case there is no need to test plugin functionality.
Only checking if plugin is loaded in toolbar is sufficient.
2016-02-24 10:09:15 +08:00
Andrew Nicols 0ea14dd849 Merge branch 'MDL-52996-master' of https://github.com/sammarshallou/moodle 2016-02-23 12:44:06 +08:00
Rajesh Taneja 9b4903c8fd MDL-52970 behat: Wait for page to be ready after click
After click enusre to wait so text fields are not
use autosize
2016-02-19 15:23:49 +08:00
Eloy Lafuente (stronk7) e8c82aac82 MDL-51580 upgrade: clean < 2.7.0 upgrade steps
This just deletes all the upgrade steps previous to 2.7.0. Some
small adjustments, like adding missing MOODLE_INTERNAL or tweaking
globals can also be applied when needed.

Next commit will get rid of/deprecate all the upgradelib functions
not used anymore in codebase.
2016-02-15 18:38:09 +01:00
sam marshall f66da45fa5 MDL-52996 Atto: Allow plugins to customise toolbar 2016-02-04 12:42:27 +00:00
David Monllao 90902953a8 MDL-52825 atto: Listen to gesturemovestart to discard some events 2016-01-29 10:15:26 +08:00
David Monllao 923589d759 MDL-52825 atto: Ignore out of bounds event targets 2016-01-19 15:37:00 +08:00
Eloy Lafuente (stronk7) c38bdd62c7 Merge branch 'MDL-51719-master' of git://github.com/danpoltawski/moodle 2015-12-22 13:07:01 +01:00
David Monllao 9e313e798f MDL-51784 general: Adding missing php4 style constructors
Adding them to warn people calling the php4 constructor.
2015-12-11 14:02:42 +08:00
Marina Glancy c4d0b752a2 MDL-51784 various: use __construct() for PHP7 compatibility 2015-12-11 12:48:24 +08:00
Dan Poltawski e746afacef MDL-51719 atto_rtl: RTL/LTR buttons now indicate state
Previously the RTL buttons did not indiciate wether RTL or LTR was
selected. Thanks to Andrew Nicols for guiding how to do this.
2015-11-27 14:03:53 +00:00
Andrew Nicols b27d4eac7f MDL-45364 atto_rtl: Fix JS lint 2015-11-26 19:09:03 +00:00
Eloy Lafuente (stronk7) 6d29c4acdd MDL-52140 upgrade: add 3.0.0 separation line to all upgrade scripts 2015-11-17 17:08:56 +01:00
Frederic Massart 3b10fa25bc MDL-50564 atto: Require atto_menu in atto_plugin 2015-11-13 14:38:33 -06:00
David Monllao 212dc418d4 Merge branch 'MDL-51991-master' of git://github.com/ryanwyllie/moodle 2015-11-11 09:18:52 +08:00
Eloy Lafuente (stronk7) 2e144835bb MDL-52059 versions: bump all versions and requires near release
version = planned 2015111600 release version
requires= current 2015111000 rc3 version
2015-11-10 12:33:52 +01:00
Ryan Wyllie d26d0d9b7e MDL-51991 atto_table: simplify settings
Cleaned up the language strings on the Atto table settings page
and reduced the number of settings options for border styling.
2015-11-10 08:15:01 +00:00
David Monllao 3f08e9b98a MDL-51000 editor_atto: No autosave for guests 2015-11-04 18:46:27 +08:00
Dan Poltawski 728754de6b Merge branch 'MDL-52018-master-enfix' of git://github.com/mudrd8mz/moodle 2015-11-03 17:56:21 +01:00
Helen Foster da6ecfd8c1 MDL-52018 lang: Merge English strings from the en_fix language pack 2015-11-02 22:12:06 +01:00
Dan Poltawski deec056650 Merge branch 'MDL-51854-master' of https://github.com/pauln/moodle 2015-11-02 09:08:01 +00:00
Ryan Wyllie 1c53bc813e MDL-51956 atto_table: fix bg colour bug
The table editor will now set the backgorund colour on the
table in Firefox version 34 and below.

Also expanded the dialogue slightly because the colour choices
were wrapping and I added some styling to put a gap in for the
metric markers for border width and table width.
2015-10-29 02:51:06 +00:00
Andrew Nicols af39ce0f8d MDL-51880 atto_table: Coding style fix 2015-10-28 11:39:17 +08:00