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 -- You received this bug notification because you are a member of Mahara Contributors, which is subscribed to Mahara. Matching subscriptions: Subscription for all Mahara Contributors -- please ask on #mahara-dev or mahara.org forum before editing or unsubscribing it! https://bugs.launchpad.net/bugs/1521058 Title: Bad merge cruft in htdocs/js/tinymce/tinymce.jquery.js Status in Mahara: Confirmed Status in Mahara 15.10 series: Confirmed Status in Mahara 16.04 series: Confirmed Bug description: Robert noticed that there is a merge conflict ">>>>>" line left over in tinymce.jquery.js. It was apparently introduced in commit 5ba3418499cc419e, one of the bootstrap commits. The merge conflict was later partially cleaned up in commit e0d6f1c67f8ac, but this part was overlooked. Looking closer, it's also apparent that quite a bit of duplicated code from that merge conflict was also left in place. It's unclear whether this has caused any bugs, or which section of TinyMCE would cause this code to be executed. To manage notifications about this bug go to: https://bugs.launchpad.net/mahara/+bug/1521058/+subscriptions _______________________________________________ Mailing list: https://launchpad.net/~mahara-contributors Post to : [email protected] Unsubscribe : https://launchpad.net/~mahara-contributors More help : https://help.launchpad.net/ListHelp
