[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.29.0-wmf.6]: Follow-up d66771523c2: unbreak ext.echo.emailicons module

2016-12-14 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/327393 )

Change subject: Follow-up d66771523c2: unbreak ext.echo.emailicons module
..


Follow-up d66771523c2: unbreak ext.echo.emailicons module

When generating extension.json, I missed the fact that
this module has a dynamic localBasePath (set to $wgExtensionDirectory),
and this turned into "localBasePath": null.

Instead, register this module dynamically.

Bug: T153261
Change-Id: I61709d6ea0948dd983ab41c9457adda434525bb7
(cherry picked from commit b758cc5d5af7b693cb26413b58cd1fea1f798c55)
---
M Hooks.php
M extension.json
2 files changed, 8 insertions(+), 6 deletions(-)

Approvals:
  20after4: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/Hooks.php b/Hooks.php
index 7d56ae1..286768e 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -153,6 +153,14 @@
}
 
$resourceLoader->register( 'ext.echo.logger', $definition );
+
+   global $wgExtensionDirectory;
+   $resourceLoader->register( 'ext.echo.emailicons', [
+   'class' => 'ResourceLoaderEchoImageModule',
+   'selector' => '.mw-echo-icon-{name}',
+   'localBasePath' => $wgExtensionDirectory,
+   'remoteExtPath' => 'Echo/modules'
+   ] );
}
 
/**
diff --git a/extension.json b/extension.json
index bb252f6..4a60aeb 100644
--- a/extension.json
+++ b/extension.json
@@ -521,12 +521,6 @@
"rootPath": "icons",
"selectorWithoutVariant": ".oo-ui-icon-{name}",
"selectorWithVariant": 
".oo-ui-image-{variant}.oo-ui-icon-{name}"
-   },
-   "ext.echo.emailicons": {
-   "class": "ResourceLoaderEchoImageModule",
-   "selector": ".mw-echo-icon-{name}",
-   "localBasePath": null,
-   "remoteExtPath": "Echo/modules"
}
},
"ResourceFileModulePaths": {

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I61709d6ea0948dd983ab41c9457adda434525bb7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.29.0-wmf.6
Gerrit-Owner: 20after4 
Gerrit-Reviewer: 20after4 
Gerrit-Reviewer: Catrope 
Gerrit-Reviewer: jenkins-bot <>

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

[MediaWiki-commits] [Gerrit] mediawiki...Echo[wmf/1.29.0-wmf.6]: Follow-up d66771523c2: unbreak ext.echo.emailicons module

2016-12-14 Thread 20after4 (Code Review) 
20after4 has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/327393 )

Change subject: Follow-up d66771523c2: unbreak ext.echo.emailicons module
..

Follow-up d66771523c2: unbreak ext.echo.emailicons module

When generating extension.json, I missed the fact that
this module has a dynamic localBasePath (set to $wgExtensionDirectory),
and this turned into "localBasePath": null.

Instead, register this module dynamically.

Bug: T153261
Change-Id: I61709d6ea0948dd983ab41c9457adda434525bb7
(cherry picked from commit b758cc5d5af7b693cb26413b58cd1fea1f798c55)
---
M Hooks.php
M extension.json
2 files changed, 8 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Echo 
refs/changes/93/327393/1

diff --git a/Hooks.php b/Hooks.php
index 7d56ae1..286768e 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -153,6 +153,14 @@
}
 
$resourceLoader->register( 'ext.echo.logger', $definition );
+
+   global $wgExtensionDirectory;
+   $resourceLoader->register( 'ext.echo.emailicons', [
+   'class' => 'ResourceLoaderEchoImageModule',
+   'selector' => '.mw-echo-icon-{name}',
+   'localBasePath' => $wgExtensionDirectory,
+   'remoteExtPath' => 'Echo/modules'
+   ] );
}
 
/**
diff --git a/extension.json b/extension.json
index bb252f6..4a60aeb 100644
--- a/extension.json
+++ b/extension.json
@@ -521,12 +521,6 @@
"rootPath": "icons",
"selectorWithoutVariant": ".oo-ui-icon-{name}",
"selectorWithVariant": 
".oo-ui-image-{variant}.oo-ui-icon-{name}"
-   },
-   "ext.echo.emailicons": {
-   "class": "ResourceLoaderEchoImageModule",
-   "selector": ".mw-echo-icon-{name}",
-   "localBasePath": null,
-   "remoteExtPath": "Echo/modules"
}
},
"ResourceFileModulePaths": {

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I61709d6ea0948dd983ab41c9457adda434525bb7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Echo
Gerrit-Branch: wmf/1.29.0-wmf.6
Gerrit-Owner: 20after4 
Gerrit-Reviewer: Catrope 

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