Commit Graph

1305 Commits

Author SHA1 Message Date
Damyon Wiese c492d41f3b MDL-41098 atto: Enable atto text editor on upgrade
TinyMCE is still the default.
2013-08-27 21:36:21 +08:00
Damyon Wiese ceaef9a9cc MDL-41098 atto: Fix min-height on firefox. 2013-08-27 21:09:32 +08:00
Damyon Wiese cbd91e23e9 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle
Conflicts:
	version.php
2013-08-27 15:29:49 +08:00
Damyon Wiese 4fd8adab75 MDL-41098 atto: Fix for dialogue ignoring centered option. 2013-08-27 10:40:31 +08:00
Damyon Wiese 08a95d50bb MDL-41098 atto: Force some styles on the editor
Bootstrap is overriding random styles on the contenteditable div like:
line-height, font-size and color. Silly - force them to be the same as the
textarea we are derived from.
2013-08-27 10:40:24 +08:00
Damyon Wiese c90641facb MDL-41098 Atto Text editor: Add new text editor to core
This is an alternative to the TinyMCE text editor that is based on HTML5
content editable regions.

It has been designed to "gel" with Moodle and uses YUI for javascript,
Moodle standard dialogs and standard moodle buttons. It has also been designed
to work well on mobile devices and can collapse down to a narrow column if required.

Imported from the plugins database here:
https://moodle.org/plugins/view.php?plugin=editor_contenteditable

Original git repository here:
https://github.com/damyon/contenteditable
2013-08-26 22:16:43 +08:00
Sam Hemelryk c3d2fbf9cd MDL-40931 useragent: separated user agent functionality into a lib
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
2013-08-26 13:59:19 +12:00
Damyon Wiese 3cb75dd1fb MDL-36803 tinymce: Version bump for js changes 2013-08-26 09:29:06 +08:00
Damyon Wiese 8920b2e288 Merge branch 'MDL-36803-m' of https://github.com/andrewnicols/moodle 2013-08-26 09:27:57 +08:00
Damyon Wiese 9ead041cdb Revert "MDL-40931 useragent: separated user agent functionality into a lib"
This reverts commit af62237d0e.
This reverts commit 87a4194fdc.
This reverts commit b2c66eb60c.

Conflicts:

	version.php
2013-08-22 13:31:25 +08:00
Andrew Nicols be94c6d88d MDL-36803 TinyMCE: Fix TinyMCE following touch events on iOS browsers 2013-08-20 23:58:59 +01:00
Damyon Wiese 89959d9ad1 Merge branch 'wip-MDL-40931-m26' of git://github.com/samhemelryk/moodle 2013-08-20 16:45:33 +08:00
Dan Poltawski 6f44a73369 Merge branch 'w33_MDL-39474_m26_debugdeveloper' of https://github.com/skodak/moodle
Conflicts:
	lib/upgrade.txt
2013-08-20 11:42:03 +08:00
Sam Hemelryk af62237d0e MDL-40931 useragent: separated user agent functionality into a lib
This commit moves user agent related functionality out of several
core libraries and combines it into a more manageable class.
All core uses are converted and functions deprecated in favor
of the new class.
2013-08-16 09:02:01 +12:00
Dan Poltawski 387d040b7b Merge branch 'MDL-40668-master' of git://github.com/damyon/moodle 2013-08-13 11:14:37 +08:00
Damyon Wiese 0c0dfa8fbd MDL-40668 tinymce: Remove collapsable editor options
We have an alternative (pdw toolbars)
Also, allow tinymce to be collapsed down to a single row.
2013-08-13 10:54:36 +08:00
Damyon Wiese bf7c86cfcf MDL-39851 M.core.dialogue: Various fixes
Items addressed
* Get rid of custom attribute srcNode
* Change extraClasses to a config only parameter.
* Change attribute fullscreen to a method.
* Restore the original window overflow value.
* Use setStyles instead of setStyle for performance.
* Tinymce end the zindex wars
* Prevent fullscreen dialogs in an iframe (tinymce managefiles plugin).
* tinymce: Cross browser fix for zindex on popups
* Use CSS for overflow changes (easier to keep track of the previous state).
* Fix Coding style for css changes
2013-08-13 10:42:01 +08:00
Petr Škoda 96f81ea385 MDL-39474 introduce $CFG->debugdeveloper and cleanup $CFG init 2013-08-12 13:01:47 +02:00
Petr Škoda 2f1e464a88 MDL-40438 migrate all collatorlib:: and textlib:: uses 2013-08-06 21:04:35 +02:00
Marina Glancy 287e2a34db MDL-41034 Additional check to be extra sure that no JS error occurs 2013-08-06 20:59:21 +10:00
Marina Glancy e7328732e9 Merge branch 'MDL-41034-essay-broken' of git://github.com/ktemkin/moodle 2013-08-06 20:49:13 +10:00
Kyle Temkin f936128f5b MDL-41034 fix TinyMCE managefiles plugin for textareas that do not support file uploads
The current managefiles plugin assumes that every file manager will be created
by either calling use_editor without filepicker options ($fpoptions) or with
filepicker options that include options for the moodleimage plugin.
2013-08-05 16:12:16 -04:00
Petr Škoda 6b32d6bc93 MDL-40995 simplify minify integration and fix all known issues 2013-08-03 17:16:17 +02:00
Jason Fowler 7eebe381a6 MDL-40660 - HTML Editor - Fix the width when toggling TinyMCE toolbars 2013-07-29 10:01:48 +08:00
Marina Glancy c59a65b273 MDL-40766 Smarter positioning of tinymce button 2013-07-24 10:58:32 +10:00
Damyon Wiese 683bd5b15e MDL-28019 tinymce managefiles: change tabs to spaces 2013-07-23 14:14:08 +08:00
Marina Glancy 9e88661e58 MDL-28019 Added plugin tinymce_managefiles 2013-07-23 14:12:55 +08:00
Damyon Wiese 9ced78bd3e Merge branch 'wip-MDL-40648-master' of git://github.com/marinaglancy/moodle
Conflicts:
	version.php
2013-07-23 10:37:20 +08:00
Petr Škoda e4d3403e58 MDL-38867 remove Google spell checking option 2013-07-19 09:31:50 +02:00
Marina Glancy de685c7d25 MDL-40648 annotated new functions in upgrade.txt 2013-07-19 14:29:14 +10:00
Marina Glancy 184518f994 MDL-40648 unittests for editor_tinymce_plugin 2013-07-19 14:29:14 +10:00
Marina Glancy 8780bf1b7e MDL-40648 Make sure the button is added in the correct row
previously code expected to find the button in particular row but the tinymce setting may change the buttons' layout
2013-07-19 14:29:14 +10:00
Marina Glancy c276b739fd MDL-40648 Use new function in parent class, increase sortorder. 2013-07-19 14:29:09 +10:00
Marina Glancy cbc2444e8a MDL-40648 Added useful functions find_button() and count_button_rows() 2013-07-19 14:13:18 +10:00
Petr Škoda b0d1d941c9 MDL-40220 use new core_component::get_component_directory() 2013-07-16 22:42:37 +02:00
Petr Škoda bd3b3bba9f MDL-40220 use new core_component::get_plugin_list() 2013-07-16 22:36:11 +02:00
Damyon Wiese b30a12db52 Merge branch 'wip-MDL-40621-master' of git://github.com/marinaglancy/moodle 2013-07-16 21:29:58 +08:00
Petr Škoda 485392f308 MDL-40574 remove forgotten $delete from editor subplugins page 2013-07-12 12:33:05 +02:00
Marina Glancy 0bff314daa MDL-40621 fixed small bug in function editor_tinymce_plugin::fix_row() 2013-07-11 15:00:23 +10:00
Marina Glancy bf50508f06 MDL-37565 fixed PDW plugin to calculate number of button rows 2013-07-11 14:47:58 +10:00
Sam Hemelryk 1be1f6be53 Merge branch 'w28_MDL-40450_m26_tinymcebuttons' of https://github.com/skodak/moodle 2013-07-10 11:02:21 +12:00
Damyon Wiese b9bca41b53 MDL-23646: Tinymce wrap plugin fixes.
Added info to upgrade.txt
Removed wrap plugins from the tinymce plugin list.
Fix trailing comma in wrap plugin javascript.
Removed non functioning "!" handling.
Fixed icons for wrap plugin.
2013-07-09 13:22:33 +08:00
Damyon Wiese 46a24596b8 MDL-23646 tinymce: Fix for pdw plugin
This plugin was changing the display of the toolbar tables from "display: table"
to "display: block" when hiding/unhiding the toolbars.

This broke the wrapping plugin.
2013-07-09 13:22:33 +08:00
Damyon Wiese 650a44fc26 MDL-23646 tinymce: Add upgrade algorithm for custom toolbars. 2013-07-09 13:22:33 +08:00
Damyon Wiese 05e9c136e6 MDL-23646 tinymce: Add plugin to wrap toolbar on small screens 2013-07-09 13:22:33 +08:00
Jason Fowler 3b62cd64d7 MDL-37565 - HTMLEditor - Adding a toggle plugin to TinyMCE to improve the appearance of the editor 2013-07-09 13:02:05 +08:00
Petr Škoda 83f45bfd56 MDL-40450 update links to TinyMCE 3.x docs 2013-07-07 16:11:19 +02:00
Dan Poltawski fe6d32fcb3 Merge branch 'MDL-40282' of github.com:colchambers/moodle 2013-07-02 15:15:04 +08:00
Colin Chambers 4704eda0f0 MDL-40282 Collapsible editor loses border in IE8-9 2013-06-28 11:18:28 +01:00
Petr Škoda dd24dd37ee MDL-39088 use word "Uninstall" consistently in plugin administration UI 2013-06-27 22:20:36 +02:00