Comment 3 for bug 1521058

Revision history for this message
Aaron Wells (u-aaronw) wrote :

The merged code contains a duplicated of the module "tinymce/dom/StyleSheetLoader", and a partial duplicate of "tinymce/dom/DOMUTils". After comparing these with what was there before patch 5ba3418499, I saw some differences, but it looked like the copied versions were simpler than what was there before, rather than being purposeful changes.

Comparing it further, it looked like the versions in the merge commit were from TinyMCE 4.0.16. I think what happened is that I upgrade TinyMCE to 4.1.9 on the main branch, and then when the front-end people tried to merge their changes in, they got a merge conflict because their branch was still on 4.0.16.

That being the case, the best thing is just to revert that section. I've pushed a patch to do that: https://reviews.mahara.org/5809