[MediaWiki-commits] [Gerrit] Hygiene: Start enforcing modules - change (mediawiki...MobileFrontend)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Hygiene: Start enforcing modules
......................................................................


Hygiene: Start enforcing modules

This will make leakage from beta/alpha to stable more obvious

Change-Id: I7bf02628dd256cd6e30eecf9bf91ba08cc5fd22a
---
M javascripts/common/history-alpha.js
M javascripts/common/modules.js
M javascripts/modules/talk.js
M javascripts/specials/overlays/preview.js
M tests/javascripts/fixtures.js
5 files changed, 12 insertions(+), 0 deletions(-)

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



diff --git a/javascripts/common/history-alpha.js 
b/javascripts/common/history-alpha.js
index 49277c2..1d80e08 100644
--- a/javascripts/common/history-alpha.js
+++ b/javascripts/common/history-alpha.js
@@ -1,4 +1,5 @@
 ( function( M, $ ) {
+       M.assertMode( [ 'alpha' ] );
 
        var
                Page = M.require( 'page' ),
diff --git a/javascripts/common/modules.js b/javascripts/common/modules.js
index 9a64365..1c68e61 100644
--- a/javascripts/common/modules.js
+++ b/javascripts/common/modules.js
@@ -1,6 +1,13 @@
 mw.mobileFrontend = {
        _modules: {},
 
+       assertMode: function( modes ) {
+               var mode = mw.config.get( 'wgMFMode' );
+               if ( modes.indexOf( mode ) === -1 ) {
+                       throw new Error( 'Attempt to run module outside 
declared environment mode ' + mode  );
+               }
+       },
+
        /**
         * Require (import) a module previously defined using define().
         *
diff --git a/javascripts/modules/talk.js b/javascripts/modules/talk.js
index fe22211..ee2c310 100644
--- a/javascripts/modules/talk.js
+++ b/javascripts/modules/talk.js
@@ -1,4 +1,5 @@
 ( function( M, $ ) {
+       M.assertMode( [ 'beta', 'alpha' ] );
 
        var
                Overlay = M.require( 'Overlay' ),
diff --git a/javascripts/specials/overlays/preview.js 
b/javascripts/specials/overlays/preview.js
index f6c8bac..e3923a3 100644
--- a/javascripts/specials/overlays/preview.js
+++ b/javascripts/specials/overlays/preview.js
@@ -1,4 +1,5 @@
 ( function( M, $ ) {
+       M.assertMode( [ 'beta', 'alpha' ] );
        var Overlay = M.require( 'Overlay' ),
                ua = window.navigator.userAgent,
                device = 'unknown',
diff --git a/tests/javascripts/fixtures.js b/tests/javascripts/fixtures.js
index e0bada5..31de835 100644
--- a/tests/javascripts/fixtures.js
+++ b/tests/javascripts/fixtures.js
@@ -1,2 +1,4 @@
 // turn sinon into a global
 window.sinon = sinon;
+// force alpha so all code passes M.assert
+mw.config.set( 'wgMFMode', 'alpha' );

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I7bf02628dd256cd6e30eecf9bf91ba08cc5fd22a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: JGonera <jgon...@wikimedia.org>
Gerrit-Reviewer: Jdlrobson <jrob...@wikimedia.org>
Gerrit-Reviewer: Kaldari <rkald...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot

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