Mattflaschen has uploaded a new change for review.

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

Change subject: Only register VE tour if VE is installed
......................................................................

Only register VE tour if VE is installed

Bug: T143297
Change-Id: I80f3be93aeb953a6752497d14cd55fd11945b69f
---
M GuidedTourHooks.php
M extension.json
2 files changed, 37 insertions(+), 14 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GuidedTour 
refs/changes/91/305691/1

diff --git a/GuidedTourHooks.php b/GuidedTourHooks.php
index 1d3132b..5f10fd9 100644
--- a/GuidedTourHooks.php
+++ b/GuidedTourHooks.php
@@ -159,6 +159,40 @@
        }
 
        /**
+        * Registers VisualEditor tour if VE is installed
+        *
+        * @param ResourceLoader &$resourceLoader
+        * @return true
+        */
+       public static function onResourceLoaderRegisterModules( 
&$resourceLoader ) {
+               -$dir = __DIR__ . DIRECTORY_SEPARATOR;
+
+               if ( class_exists( 'VisualEditorHooks' ) ) {
+                       $resourceLoader->register(
+                               'ext.guidedTour.tour.firsteditve',
+                               [
+                                       'scripts' => 'tours/firsteditve.js',
+                                       'localBasePath' => $dir . 'modules',
+                                       'remoteExtPath' => 'GuidedTour/modules',
+                                       'dependencies' => 'ext.guidedTour',
+                                       'messages' => [
+                                               'editsection',
+                                               
'visualeditor-toolbar-savedialog',
+                                               
'guidedtour-tour-firstedit-edit-page-title',
+                                               
'guidedtour-tour-firsteditve-edit-page-description',
+                                               
'guidedtour-tour-firstedit-edit-section-title',
+                                               
'guidedtour-tour-firsteditve-edit-section-description',
+                                               
'guidedtour-tour-firstedit-save-title',
+                                               
'guidedtour-tour-firsteditve-save-description'
+                                       ]
+                               ]
+                       );
+               }
+
+               return true;
+       }
+
+       /**
         * @param array &$testModules
         * @param ResourceLoader $resourceLoader
         * @return bool
diff --git a/extension.json b/extension.json
index 40f52a5..7aa3ee0 100644
--- a/extension.json
+++ b/extension.json
@@ -105,20 +105,6 @@
                                "guidedtour-tour-firstedit-save-description"
                        ]
                },
-               "ext.guidedTour.tour.firsteditve": {
-                       "scripts": "tours/firsteditve.js",
-                       "dependencies": "ext.guidedTour",
-                       "messages": [
-                               "editsection",
-                               "visualeditor-toolbar-savedialog",
-                               "guidedtour-tour-firstedit-edit-page-title",
-                               
"guidedtour-tour-firsteditve-edit-page-description",
-                               "guidedtour-tour-firstedit-edit-section-title",
-                               
"guidedtour-tour-firsteditve-edit-section-description",
-                               "guidedtour-tour-firstedit-save-title",
-                               "guidedtour-tour-firsteditve-save-description"
-                       ]
-               },
                "ext.guidedTour.tour.test": {
                        "scripts": "tours/test.js",
                        "dependencies": [
@@ -169,6 +155,9 @@
                "ResourceLoaderGetConfigVars": [
                        "GuidedTourHooks::onResourceLoaderGetConfigVars"
                ],
+               "ResourceLoaderRegisterModules": [
+                       "GuidedTourHooks::onResourceLoaderRegisterModules"
+               ],
                "ResourceLoaderTestModules": [
                        "GuidedTourHooks::onResourceLoaderTestModules"
                ],

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I80f3be93aeb953a6752497d14cd55fd11945b69f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GuidedTour
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen <mflasc...@wikimedia.org>

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

Reply via email to