Jdlrobson has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/333981 )
Change subject: Global event emitter passed in as option to Skin
......................................................................
Global event emitter passed in as option to Skin
Bug: T156186
Change-Id: If9e5cb796e0d0e1e866f797fd19911c89714998e
---
M resources/mobile.startup/Skin.js
M resources/skins.minerva.scripts/preInit.js
2 files changed, 10 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/81/333981/1
diff --git a/resources/mobile.startup/Skin.js b/resources/mobile.startup/Skin.js
index 01e5072..15cd058 100644
--- a/resources/mobile.startup/Skin.js
+++ b/resources/mobile.startup/Skin.js
@@ -50,6 +50,7 @@
this.page = options.page;
this.name = options.name;
+ this.emitter = options.globalEventEmitter;
this.mainMenu = options.mainMenu;
View.call( this, options );
// Must be run after merging with defaults as must be defined.
@@ -73,7 +74,7 @@
}
}
}
- M.on( 'resize', $.proxy( this, 'emit', '_resize' ) );
+ this.emitter.on( 'resize', $.proxy( this, 'emit', '_resize' ) );
this.on( '_resize', loadWideScreenModules );
this.emit( '_resize' );
@@ -87,7 +88,7 @@
}
if ( mw.config.get( 'wgMFLazyLoadReferences' ) ) {
- M.on( 'before-section-toggled', $.proxy(
this.lazyLoadReferences, this ) );
+ this.emitter.on( 'before-section-toggled', $.proxy(
this.lazyLoadReferences, this ) );
}
}
@@ -199,17 +200,17 @@
} );
if ( !imagePlaceholders.length ) {
- M.off( 'scroll:throttled', _loadImages
);
- M.off( 'resize:throttled', _loadImages
);
- M.off( 'section-toggled', _loadImages );
+ this.emitter.off( 'scroll:throttled',
_loadImages );
+ this.emitter.off( 'resize:throttled',
_loadImages );
+ this.emitter.off( 'section-toggled',
_loadImages );
self.off( 'changed', _loadImages );
}
}
- M.on( 'scroll:throttled', _loadImages );
- M.on( 'resize:throttled', _loadImages );
- M.on( 'section-toggled', _loadImages );
+ this.emitter.on( 'scroll:throttled', _loadImages );
+ this.emitter.on( 'resize:throttled', _loadImages );
+ this.emitter.on( 'section-toggled', _loadImages );
this.on( 'changed', _loadImages );
_loadImages();
diff --git a/resources/skins.minerva.scripts/preInit.js
b/resources/skins.minerva.scripts/preInit.js
index 4736030..fa6f7ac 100644
--- a/resources/skins.minerva.scripts/preInit.js
+++ b/resources/skins.minerva.scripts/preInit.js
@@ -19,6 +19,7 @@
'mobile.references.gateway/ReferencesMobileViewGateway'
),
skinData = {
+ globalEventEmitter: M,
el: 'body',
tabletModules: mw.config.get( 'skin' ) === 'minerva' ?
[ 'skins.minerva.tablet.scripts' ] : [],
page: getCurrentPage(),
--
To view, visit https://gerrit.wikimedia.org/r/333981
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9e5cb796e0d0e1e866f797fd19911c89714998e
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
