jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Move over VE to new template mechanism
......................................................................
Hygiene: Move over VE to new template mechanism
Change-Id: Icf23ceb87a87ef1a767f2258b0401a6ea00cea72
---
M includes/Resources.php
M javascripts/modules/editor/VisualEditorOverlay.js
2 files changed, 6 insertions(+), 5 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index edd8a78..d5d3a74 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -320,10 +320,11 @@
),
),
- 'mobile.editor.ve' => $wgMFMobileResourceBoilerplate + array(
+ 'mobile.editor.ve' => $wgMFResourceFileModuleBoilerplate + array(
'dependencies' => array(
'ext.visualEditor.mobileViewTarget',
'mobile.stable',
+ 'mobile.templates',
'mobile.editor.common',
'mobile.stable.common',
),
@@ -334,8 +335,8 @@
'javascripts/modules/editor/VisualEditorOverlay.js',
),
'templates' => array(
- 'modules/editor/VisualEditorOverlayHeader.hogan',
- 'modules/editor/VisualEditorOverlay.hogan',
+ 'OverlayHeader.hogan' =>
'templates/modules/editor/VisualEditorOverlayHeader.hogan',
+ 'OverlayContent.hogan' =>
'templates/modules/editor/VisualEditorOverlay.hogan',
),
'messages' => array(
'mobile-frontend-page-edit-summary',
diff --git a/javascripts/modules/editor/VisualEditorOverlay.js
b/javascripts/modules/editor/VisualEditorOverlay.js
index f5331cd..0a3a860 100644
--- a/javascripts/modules/editor/VisualEditorOverlay.js
+++ b/javascripts/modules/editor/VisualEditorOverlay.js
@@ -10,8 +10,8 @@
VisualEditorOverlay = EditorOverlayBase.extend( {
templatePartials: {
switcher: mw.template.get( 'mobile.editor.common',
'switcher.hogan' ),
- header: M.template.get(
'modules/editor/VisualEditorOverlayHeader.hogan' ),
- content: M.template.get(
'modules/editor/VisualEditorOverlay.hogan' )
+ header: mw.template.get( 'mobile.editor.ve',
'OverlayHeader.hogan' ),
+ content: mw.template.get( 'mobile.editor.ve',
'OverlayContent.hogan' )
},
className: 'overlay editor-overlay editor-overlay-ve',
editor: 'VisualEditor',
--
To view, visit https://gerrit.wikimedia.org/r/170780
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf23ceb87a87ef1a767f2258b0401a6ea00cea72
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <[email protected]>
Gerrit-Reviewer: Awjrichards <[email protected]>
Gerrit-Reviewer: Phuedx <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
