OK, this is absolutely not ready for integration yet, because it involves a change to TinyMCE core. See above. However, I would appreciate any review comments.

Apu, could you have a look at this code for Tim.

Editing Multiple choice questions in Moodle 2.1 will really suck if we don't do this. Please may I have some feedback.

Just a note that since we changed to TinyMCE 3.4.2 in master, this needs some more work before it is integrated.

Hi, sorry i missed this totally, will look at this very soon.

Hi Tim, this code looks fine to me. testing it seems fine too.

OK, so what is the procedure for getting this into Moodle? Do I need to fork https://github.com/moodle/custom-tinymce and prepare some commits against that?

I wonder if the Moxiecode people will ever respond to the pull request I sent them.

yea, it would be great to have Moxiecode respond, afaik your changes would be have to be integrated into custom-tinymce (via github) and moodle (via git.moodle.org) both.

I'm not sure if those changes would require a rebuild within custom-tinymce, really no idea there but to be safe,
there's a readme file about rebuilding at: https://github.com/moodle/custom-tinymce/blob/MOODLE_21_STABLE/readme.md

The readme file also takes you through steps that i went through in MDL-27500 to copy changes over into the moodle.git and hence integration into moodle.

its an unusual process i think mainly to keep tinymce's building 'materials' out of moodle.

it would help to ask Petr too.

There is also https://github.com/moodle/moodle/blob/master/lib/editor/tinymce/readme_moodle.txt

sorry that's the one i meant.

Attaching fixed (added parenthesis) and cleaned (from CRLF) patch that will be applied to https://github.com/moodle/custom-tinymce (21_STABLE)

To avoid forgetting it:

Process to incorporate one local change to tinymce:

1) apply one patch with the local change against https://github.com/moodle/custom-tinymce (one for each target branch).

2) rebuild it/them following the steps @ readme_moodle.txt

3) provide two patches:

a) one patch with the rebuilt version to be applied to https://github.com/moodle/custom-tinymce (one for each target branch).

b) another patch with the resulting changes to be applied to moodle.git

4) Integrate the patches as usual, review/test...

Done!

TODO: DOCUMENTE THIS IN THE README_MOODLE !

Done.

1) https://github.com/moodle/custom-tinymce/commits/MOODLE_21_STABLE now includes Tim's commit fixed and one more containing some changes that were applied only to moodle.git (no further action needed, everything has been pushed there already).

2) https://github.com/stronk7/moodle/compare/MOODLE_21_STABLE...MDL-27890_m21 changes to moodle.git (21_STABLE)

3) https://github.com/stronk7/moodle/compare/master...MDL-27890_master changes to moodle.git (master)

Going to integrate 2 & 3 now, heading for testing by anyone else...

Thanks for doing this Eloy. Those commits look good to me.

Wait!

This will be integrated next week, sorry. Didn't realise it was in peer-review status. In the mean time feel free to use it, will be great for testing because next week will land straight!

Ciao

For integrator:

A) The custom-tinymce repo was updated last week by me with Tim's modifications. No further action needed there.
B) The points 2) and 3) above are the ones to integrate and test into integration.git

Ciao

Yay for easy integration instructions. Hopefully they do accept them upstream as it certainly looks like a positive improvement.

Choice and choice feedback html editors are not small (one line of text) by default.
Although, html editor can be resized to one line of text or multiple lines.

Failing as point 2 in testing instructions is not observed.

Are you sure your browser is using the latest JavaScript? Also, TinyMCE remembers the size of each HTML editor during each browser session. So:

1. Quit your browser, then run it again.

2. Do a Shift/Ctrl + reload - or, better still, use firebug to open the TinyMCE JavaScript code, and verify that it is really using the latest version.

Sorry Tim,

My mistake I pulled wrong version of TinyMCE
It is working Great. choice and choice feedback are now one-line

Can you please reset the status, as it works as expected

(reset)

Thanks Tim
Works as expected, Great work Eloy

Congratulations - this fix has just been released in the weeklies.

Hi guys!

Thanks for the amazing work! Do you think something similar can be implemented for this bug, too? http://tracker.moodle.org/browse/MDL-23646

Many thanks in advance,
Alexander

resolved upstream by https://github.com/tinymce/tinymce/commit/c2c905845a60866b39f33b886a7093c85b817d15, the setting name is min_height, thanks

So, do we need a new tracker issue to undo our Moodle-specific changes from this bug, and use the new TinyMCE setting? If you create such an issue, please add me as watcher.