[MediaWiki-commits] [Gerrit] Hygiene: Editor overlay using mw.template - change (mediawiki...MobileFrontend)

2014-11-04 Thread Jdlrobson (Code Review)
Jdlrobson has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/171019

Change subject: Hygiene: Editor overlay using mw.template
..

Hygiene: Editor overlay using mw.template

Change-Id: Ica4129e7e9e151eb2c29a59d52513dc8839deaee
---
M includes/Resources.php
M javascripts/modules/editor/EditorOverlay.js
2 files changed, 4 insertions(+), 4 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend 
refs/changes/19/171019/1

diff --git a/includes/Resources.php b/includes/Resources.php
index 31515db..ec406ad 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -363,8 +363,8 @@
'javascripts/modules/editor/EditorOverlay.js',
),
'templates' = array(
-   'modules/editor/EditorOverlayHeader.hogan',
-   'modules/editor/EditorOverlay.hogan',
+   'header.hogan' = 
'templates/modules/editor/EditorOverlayHeader.hogan',
+   'content.hogan' = 
'templates/modules/editor/EditorOverlay.hogan',
),
'messages' = array(
'mobile-frontend-editor-viewing-source-page',
diff --git a/javascripts/modules/editor/EditorOverlay.js 
b/javascripts/modules/editor/EditorOverlay.js
index e0ec5aa..01c849d 100644
--- a/javascripts/modules/editor/EditorOverlay.js
+++ b/javascripts/modules/editor/EditorOverlay.js
@@ -22,8 +22,8 @@
EditorOverlay = EditorOverlayBase.extend( {
templatePartials: {
switcher: mw.template.get( 'mobile.editor.common', 
'switcher.hogan' ),
-   header: M.template.get( 
'modules/editor/EditorOverlayHeader.hogan' ),
-   content: M.template.get( 
'modules/editor/EditorOverlay.hogan' )
+   header: mw.template.get( 'mobile.editor.overlay', 
'header.hogan' ),
+   content: mw.template.get( 'mobile.editor.overlay', 
'content.hogan' )
},
editor: 'SourceEditor',
sectionLine: '',

-- 
To view, visit https://gerrit.wikimedia.org/r/171019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ica4129e7e9e151eb2c29a59d52513dc8839deaee
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits


[MediaWiki-commits] [Gerrit] Hygiene: Editor overlay using mw.template - change (mediawiki...MobileFrontend)

2014-11-04 Thread jenkins-bot (Code Review)
jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: Editor overlay using mw.template
..


Hygiene: Editor overlay using mw.template

Change-Id: Ica4129e7e9e151eb2c29a59d52513dc8839deaee
---
M includes/Resources.php
M javascripts/modules/editor/EditorOverlay.js
2 files changed, 5 insertions(+), 5 deletions(-)

Approvals:
  Robmoen: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/includes/Resources.php b/includes/Resources.php
index 6d7df0f..a56b06e 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -354,7 +354,7 @@
),
),
 
-   'mobile.editor.overlay' = $wgMFMobileResourceBoilerplate + array(
+   'mobile.editor.overlay' = $wgMFResourceFileModuleBoilerplate + array(
'dependencies' = array(
'mobile.editor.common',
'mobile.loggingSchemas',
@@ -363,8 +363,8 @@
'javascripts/modules/editor/EditorOverlay.js',
),
'templates' = array(
-   'modules/editor/EditorOverlayHeader.hogan',
-   'modules/editor/EditorOverlay.hogan',
+   'header.hogan' = 
'templates/modules/editor/EditorOverlayHeader.hogan',
+   'content.hogan' = 
'templates/modules/editor/EditorOverlay.hogan',
),
'messages' = array(
'mobile-frontend-editor-viewing-source-page',
diff --git a/javascripts/modules/editor/EditorOverlay.js 
b/javascripts/modules/editor/EditorOverlay.js
index e0ec5aa..01c849d 100644
--- a/javascripts/modules/editor/EditorOverlay.js
+++ b/javascripts/modules/editor/EditorOverlay.js
@@ -22,8 +22,8 @@
EditorOverlay = EditorOverlayBase.extend( {
templatePartials: {
switcher: mw.template.get( 'mobile.editor.common', 
'switcher.hogan' ),
-   header: M.template.get( 
'modules/editor/EditorOverlayHeader.hogan' ),
-   content: M.template.get( 
'modules/editor/EditorOverlay.hogan' )
+   header: mw.template.get( 'mobile.editor.overlay', 
'header.hogan' ),
+   content: mw.template.get( 'mobile.editor.overlay', 
'content.hogan' )
},
editor: 'SourceEditor',
sectionLine: '',

-- 
To view, visit https://gerrit.wikimedia.org/r/171019
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Ica4129e7e9e151eb2c29a59d52513dc8839deaee
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Awjrichards aricha...@wikimedia.org
Gerrit-Reviewer: Robmoen rm...@wikimedia.org
Gerrit-Reviewer: jenkins-bot 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits