Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/305746
Change subject: Only register VE-specific tour if VE is installed
......................................................................
Only register VE-specific tour if VE is installed
Bug: T143297
Change-Id: Ic5a398fef27a57f197756cba86fdf3d5efdc5518
---
M Hooks.php
M extension.json
2 files changed, 43 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GettingStarted
refs/changes/46/305746/1
diff --git a/Hooks.php b/Hooks.php
index f894651..d7141fb 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -227,6 +227,48 @@
}
/**
+ * 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.gettingstartedtasktoolbarve',
+ [
+ 'scripts' =>
'tours/gettingstartedtasktoolbarve.js',
+ 'localBasePath' => $dir . 'resources',
+ 'remoteExtPath' =>
'GettingStarted/resources',
+ 'dependencies' => [
+ 'ext.guidedTour',
+ 'ext.gettingstarted.logging'
+ ],
+ 'messages' => [
+ 'editsection',
+ 'vector-view-edit',
+
'visualeditor-toolbar-savedialog',
+
'guidedtour-tour-gettingstartedtasktoolbarintro-title',
+
'guidedtour-tour-gettingstartedtasktoolbarintro-description',
+
'guidedtour-tour-gettingstartedtasktoolbar-ambox-title',
+
'guidedtour-tour-gettingstartedtasktoolbar-ambox-description',
+
'guidedtour-tour-gettingstartedtasktoolbar-edit-article-title',
+
'guidedtour-tour-gettingstartedtasktoolbar-edit-article-description',
+
'guidedtour-tour-gettingstartedtasktoolbar-edit-section-title',
+
'guidedtour-tour-gettingstartedtasktoolbar-edit-section-description',
+
'guidedtour-tour-gettingstartedtasktoolbarve-click-save-title',
+
'guidedtour-tour-gettingstartedtasktoolbarve-click-save-description'
+ ]
+ ]
+ );
+ }
+
+ return true;
+ }
+
+ /**
* Adds applicable modules to the page
*
* @param OutputPage $out output page
diff --git a/extension.json b/extension.json
index db29187..52bc757 100644
--- a/extension.json
+++ b/extension.json
@@ -66,28 +66,6 @@
"guidedtour-tour-gettingstarted-click-save-description"
]
},
- "ext.guidedTour.tour.gettingstartedtasktoolbarve": {
- "scripts": "tours/gettingstartedtasktoolbarve.js",
- "dependencies": [
- "ext.guidedTour",
- "ext.gettingstarted.logging"
- ],
- "messages": [
- "editsection",
- "vector-view-edit",
- "visualeditor-toolbar-savedialog",
-
"guidedtour-tour-gettingstartedtasktoolbarintro-title",
-
"guidedtour-tour-gettingstartedtasktoolbarintro-description",
-
"guidedtour-tour-gettingstartedtasktoolbar-ambox-title",
-
"guidedtour-tour-gettingstartedtasktoolbar-ambox-description",
-
"guidedtour-tour-gettingstartedtasktoolbar-edit-article-title",
-
"guidedtour-tour-gettingstartedtasktoolbar-edit-article-description",
-
"guidedtour-tour-gettingstartedtasktoolbar-edit-section-title",
-
"guidedtour-tour-gettingstartedtasktoolbar-edit-section-description",
-
"guidedtour-tour-gettingstartedtasktoolbarve-click-save-title",
-
"guidedtour-tour-gettingstartedtasktoolbarve-click-save-description"
- ]
- },
"ext.gettingstarted.lightbulb.postEdit": {
"scripts": [
"lightbulb/lightbulb.postEdit.js"
@@ -243,6 +221,7 @@
"ArticleDeleteComplete":
"GettingStarted\\RedisCategorySync::onArticleDeleteComplete",
"MakeGlobalVariablesScript":
"GettingStarted\\Hooks::onMakeGlobalVariablesScript",
"ResourceLoaderGetConfigVars":
"GettingStarted\\Hooks::onResourceLoaderGetConfigVars",
+ "ResourceLoaderRegisterModules":
"GettingStarted\\Hooks::onResourceLoaderRegisterModules",
"CentralAuthPostLoginRedirect":
"GettingStarted\\Hooks::onCentralAuthPostLoginRedirect",
"PostLoginRedirect":
"GettingStarted\\Hooks::onPostLoginRedirect",
"GetPreferences": "GettingStarted\\Hooks::onGetPreferences",
--
To view, visit https://gerrit.wikimedia.org/r/305746
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5a398fef27a57f197756cba86fdf3d5efdc5518
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GettingStarted
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
