Phuedx has uploaded a new change for review.

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

Change subject: [WIP]
......................................................................

[WIP]

Bug: T146035
Change-Id: I1f024567010acaa61c1d613c6e59c998198a5976
---
M extension.json
M resources/ext.popups.core.js
M resources/ext.popups.experiment.js
A resources/ext.popups.init.js
M resources/ext.popups.renderer/desktopRenderer.js
M resources/ext.popups.renderer/mobileRenderer.js
6 files changed, 26 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups 
refs/changes/77/311977/1

diff --git a/extension.json b/extension.json
index ca47486..b95b2a6 100644
--- a/extension.json
+++ b/extension.json
@@ -59,6 +59,15 @@
                "popupsmobile": "1"
        },
        "ResourceModules": {
+               "ext.popups.init": {
+                       "scripts": [
+                               "resources/ext.popups.init.js"
+                       ],
+                       "targets": [
+                               "desktop",
+                               "mobile"
+                       ]
+               },
                "ext.popups.core": {
                        "scripts": [
                                "resources/ext.popups.core.js"
@@ -68,7 +77,9 @@
                                "mediawiki.Title",
                                "mediawiki.Uri",
                                "mediawiki.RegExp",
-                               "mediawiki.storage"
+                               "mediawiki.storage",
+                               "ext.popups.init",
+                               "ext.popups.experiment"
                        ],
                        "targets": [
                                "desktop",
@@ -86,8 +97,7 @@
                                "mediawiki.storage",
                                "jquery.client",
                                "ext.popups.core",
-                               "ext.popups.renderer.desktopRenderer",
-                               "ext.popups.experiment"
+                               "ext.popups.renderer.desktopRenderer"
                        ],
                        "targets": [ "desktop" ]
                },
@@ -112,13 +122,14 @@
                                "resources/ext.popups.experiment.js"
                        ],
                        "dependencies": [
-                               "ext.popups.core",
                                "mediawiki.user",
                                "mediawiki.storage",
-                               "mediawiki.experiments"
+                               "mediawiki.experiments",
+                               "ext.popups.init"
                        ],
                        "targets": [
-                               "desktop"
+                               "desktop",
+                               "mobile"
                        ]
                },
                "ext.popups.schemaPopups.utils": {
diff --git a/resources/ext.popups.core.js b/resources/ext.popups.core.js
index 28a941b..17157d2 100644
--- a/resources/ext.popups.core.js
+++ b/resources/ext.popups.core.js
@@ -7,7 +7,6 @@
         * @class mw.popups
         * @singleton
         */
-       mw.popups = {};
 
        /**
         * The API object used for all this extension's requests
diff --git a/resources/ext.popups.experiment.js 
b/resources/ext.popups.experiment.js
index 990fa17..48c3be7 100644
--- a/resources/ext.popups.experiment.js
+++ b/resources/ext.popups.experiment.js
@@ -44,7 +44,6 @@
         * @class mw.popups.experiment
         * @singleton
         */
-       mw.popups.experiment = {};
 
        /**
         * Gets whether or not the user has Popups enabled, i.e. whether they 
are in the experiment
diff --git a/resources/ext.popups.init.js b/resources/ext.popups.init.js
new file mode 100644
index 0000000..9ba462e
--- /dev/null
+++ b/resources/ext.popups.init.js
@@ -0,0 +1,9 @@
+( function (mw) {
+       'use strict';
+
+       // Initialize singletons/namespaces.
+       mw.popups = {};
+       mw.popups.render = {};
+       mw.popups.experiment = {};
+
+} ( mediaWiki ) );
diff --git a/resources/ext.popups.renderer/desktopRenderer.js 
b/resources/ext.popups.renderer/desktopRenderer.js
index 0cb737e..2722c06 100644
--- a/resources/ext.popups.renderer/desktopRenderer.js
+++ b/resources/ext.popups.renderer/desktopRenderer.js
@@ -20,7 +20,6 @@
         * @class mw.popups.render
         * @singleton
         */
-       mw.popups.render = {};
 
        /**
         * Time to wait in ms before showing a popup on hover.
diff --git a/resources/ext.popups.renderer/mobileRenderer.js 
b/resources/ext.popups.renderer/mobileRenderer.js
index 805d761..d0cd1b0 100644
--- a/resources/ext.popups.renderer/mobileRenderer.js
+++ b/resources/ext.popups.renderer/mobileRenderer.js
@@ -3,7 +3,6 @@
         * @class mw.popups.render
         * @singleton
         */
-       mw.popups.render = {};
 
        /**
         * Render a new LinkPreviewDrawer

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1f024567010acaa61c1d613c6e59c998198a5976
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: master
Gerrit-Owner: Phuedx <g...@samsmith.io>

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

Reply via email to