jenkins-bot has submitted this change and it was merged. Change subject: Fix missing edit preview ......................................................................
Fix missing edit preview Bug: 72522 Change-Id: I16edec975a16a87f1f426d84dd126ac8aa83d90e (cherry picked from commit f937dec06b385d5c02b974b9a28cb4e3d1ee7c45) --- M includes/Resources.php M javascripts/Section.js M javascripts/modules/editor/EditorOverlay.js A templates/section.hogan 4 files changed, 4 insertions(+), 1 deletion(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Resources.php b/includes/Resources.php index 192b7e5..e8c8767 100644 --- a/includes/Resources.php +++ b/includes/Resources.php @@ -180,6 +180,7 @@ ), 'templates' => array( 'icon.hogan', + 'section.hogan', ), 'scripts' => array( 'javascripts/Router.js', diff --git a/javascripts/Section.js b/javascripts/Section.js index 7dbce00..cf4a151 100644 --- a/javascripts/Section.js +++ b/javascripts/Section.js @@ -9,6 +9,7 @@ * @extends View */ Section = View.extend( { + template: M.template.get( 'section.hogan' ), defaults: { line: '', text: '', diff --git a/javascripts/modules/editor/EditorOverlay.js b/javascripts/modules/editor/EditorOverlay.js index 74e007b..3abcfcb 100644 --- a/javascripts/modules/editor/EditorOverlay.js +++ b/javascripts/modules/editor/EditorOverlay.js @@ -142,7 +142,7 @@ self.sectionLine = $( '<div/>' ).html( parsedSectionLine ).text(); new Section( { el: self.$preview, - content: parsedText + text: parsedText // bug 49218: stop links from being clickable (note user can still hold down to navigate to them) } ).$( 'a' ).on( 'click', false ); // Emit event so we can perform enhancements to page diff --git a/templates/section.hogan b/templates/section.hogan new file mode 100644 index 0000000..5df2b60 --- /dev/null +++ b/templates/section.hogan @@ -0,0 +1 @@ +<h{{level}} id="{{anchor}}">{{{line}}}</h{{level}}>{{{text}}} -- To view, visit https://gerrit.wikimedia.org/r/169039 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I16edec975a16a87f1f426d84dd126ac8aa83d90e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: wmf/1.25wmf5 Gerrit-Owner: Florianschmidtwelzow <florian.schmidt.wel...@t-online.de> Gerrit-Reviewer: Awjrichards <aricha...@wikimedia.org> Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org> Gerrit-Reviewer: MaxSem <maxsem.w...@gmail.com> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits