Esanders has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362420 )
Change subject: Fix jQuery3 deferred issues
......................................................................
Fix jQuery3 deferred issues
Resolved deferreds don't run synchronously anymore.
Also fix some local variable names.
Bug: T168744
Change-Id: Ia2008b8f7130e0a04f4256de6f072386117ecf28
---
M modules/dialog/closefullscreen_control.js
M modules/dialog/index.js
2 files changed, 37 insertions(+), 45 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Kartographer
refs/changes/20/362420/1
diff --git a/modules/dialog/closefullscreen_control.js
b/modules/dialog/closefullscreen_control.js
index 98a19f5..f776a13 100644
--- a/modules/dialog/closefullscreen_control.js
+++ b/modules/dialog/closefullscreen_control.js
@@ -12,51 +12,43 @@
var ControlClass,
createControl = function ( options ) {
- var control = this;
+ ControlClass = ControlClass || L.Control.extend( {
+ options: {
+ position: 'topright'
+ },
- // Since the control is added to an existing map, by
the time we get here,
- // `ext.kartographer.box` was loaded, so this will be
synchronous.
- // We need this hack because `L` is undefined until a
map was created.
- mw.loader.using( 'ext.kartographer.box' ).then(
function () {
- ControlClass = ControlClass ||
L.Control.extend( {
- options: {
- position: 'topright'
- },
+ /**
+ * Creates the control element.
+ *
+ * @override
+ * @protected
+ */
+ onAdd: function () {
+ var container = L.DomUtil.create(
'div', 'leaflet-bar' ),
+ link = L.DomUtil.create( 'a',
'oo-ui-icon-close', container );
- /**
- * Creates the control element.
- *
- * @override
- * @protected
- */
- onAdd: function () {
- var container =
L.DomUtil.create( 'div', 'leaflet-bar' ),
- link =
L.DomUtil.create( 'a', 'oo-ui-icon-close', container );
+ link.href = '';
+ link.title = mw.msg(
'kartographer-fullscreen-close' );
- link.href = '';
- link.title = mw.msg(
'kartographer-fullscreen-close' );
+ L.DomEvent.addListener( link, 'click',
this.closeFullScreen, this );
+ L.DomEvent.disableClickPropagation(
container );
- L.DomEvent.addListener( link,
'click', this.closeFullScreen, this );
-
L.DomEvent.disableClickPropagation( container );
+ return container;
+ },
- return container;
- },
-
- /**
- * Closes the full screen dialog on
`click`.
- *
- * @param {Event} e
- * @protected
- */
- closeFullScreen: function ( e ) {
- L.DomEvent.stop( e );
- this._map.closeFullScreen();
- }
- } );
-
- control = new ControlClass( options );
+ /**
+ * Closes the full screen dialog on `click`.
+ *
+ * @param {Event} e
+ * @protected
+ */
+ closeFullScreen: function ( e ) {
+ L.DomEvent.stop( e );
+ this._map.closeFullScreen();
+ }
} );
- return control;
+
+ return new ControlClass( options );
};
return createControl;
diff --git a/modules/dialog/index.js b/modules/dialog/index.js
index f91f92a..c666ba0 100644
--- a/modules/dialog/index.js
+++ b/modules/dialog/index.js
@@ -47,7 +47,7 @@
*/
render: function ( map ) {
- var window = getWindowManager(),
+ var manager = getWindowManager(),
dialog = getMapDialog(),
instance;
@@ -57,8 +57,8 @@
routerEnabled = true;
}
- if ( !window.getCurrentWindow() ) {
- instance = getWindowManager().openWindow(
dialog, { map: map } );
+ if ( !manager.getCurrentWindow() ) {
+ instance = manager.openWindow( dialog, { map:
map } );
instance.closing.then( function () {
if ( map.parentMap ) {
map.parentMap.setView(
@@ -83,7 +83,7 @@
*/
renderNewMap: function ( mapObject, mapCb ) {
- var window = getWindowManager(),
+ var manager = getWindowManager(),
dialog = getMapDialog(),
map, instance;
@@ -104,10 +104,10 @@
} );
}
- if ( window.getCurrentWindow() ) {
+ if ( manager.getCurrentWindow() ) {
createAndRenderMap();
} else {
- instance = getWindowManager().openWindow(
dialog, {} );
+ instance = manager.openWindow( dialog, {} );
instance.opened.then( function () {
createAndRenderMap();
} );
--
To view, visit https://gerrit.wikimedia.org/r/362420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2008b8f7130e0a04f4256de6f072386117ecf28
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Kartographer
Gerrit-Branch: master
Gerrit-Owner: Esanders <esand...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
