[MediaWiki-commits] [Gerrit] mediawiki...BlueSpiceExtensions[REL1_27]: ExtendedSearch: readded namespace preferences
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331969 )
Change subject: ExtendedSearch: readded namespace preferences
..
ExtendedSearch: readded namespace preferences
Fixed issue from ERM4018
also let autocomplete recognize namespace preferences
Needs merge to master
Change-Id: Ie7580a597b562ce6cba809d929e3ce69b2787fad
---
M ExtendedSearch/ExtendedSearch.class.php
M ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
2 files changed, 37 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index e52a460..bbfd2f8 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -111,6 +111,7 @@
$this->setHook( 'BSDashboardsAdminDashboardPortalPortlets' );
$this->setHook( 'SkinTemplateOutputPageBeforeExec' );
$this->setHook( 'BSExtendedSearchAutocomplete' );
+ $this->setHook( 'GetPreferences' );
$this->mCore->registerPermission( 'searchfiles', array( 'user'
), array( 'type' => 'global' ) );
$this->mCore->registerPermission(
'extendedsearch-viewspecialpage', array( 'user' ), array( 'type' => 'global' )
);
@@ -122,6 +123,42 @@
}
/**
+* Adds preferences for extended search, e.g. which namespaces should
be searched by default.
+*
+* @param $user User
+* @param $preferences array
+* @return bool always true to keep hook running
+*/
+ public function onGetPreferences( $user, &$preferences ) {
+ $namespaces = $this->getLanguage()->getNamespaces();
+
+ $namespaceArray = array();
+
+ foreach( $namespaces as $namespaceId => $namespace ) {
+ $dummy = Title::makeTitle( $namespaceId, 'X' );
+
+ if( $namespaceId >= 0 && $dummy->userCan( 'read' ) ) {
+ $label = $dummy->getNsText();
+
+ if( $namespaceId === NS_MAIN ) {
+ $label = wfMessage( 'bs-ns_main'
)->plain();
+ }
+
+ $namespaceArray[$label] = $namespaceId;
+ }
+ }
+
+ $preferences['searchNs'] = array(
+ 'type' => 'multiselect',
+ 'label' => wfMessage(
'bs-extendedsearch-facet-namespace' )->plain(),
+ 'section' => 'extendedsearch',
+ 'options' => $namespaceArray
+ );
+
+ return true;
+ }
+
+ /**
* extension.json callback
* @global array $wgAjaxExportList
*/
diff --git a/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
b/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
index 15a16b7..377355c 100644
--- a/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
+++ b/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
@@ -184,7 +184,6 @@
public function getSolrAutocompleteQuery( $sSearchString,
$sSolrSearchString ) {
$aSearchOptions = array();
$aSearchOptions['fl'] = 'type,title,namespace';
- $aSearchOptions['fq'] = array( 'wiki:(' .
$this->getCustomerId() . ')' );
$aSearchOptions['sort'] = $this->aSearchOptions['sort'];
$vNamespace = $this->checkSearchstringForNamespace(
--
To view, visit https://gerrit.wikimedia.org/r/331969
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie7580a597b562ce6cba809d929e3ce69b2787fad
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Nasty
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
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...BlueSpiceExtendedSearch[master]: Fix load of alias file in extension.json
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332132 )
Change subject: Fix load of alias file in extension.json
..
Fix load of alias file in extension.json
When MessagesDirs and ExtensionMessagesFiles uses the same key, the
later one is not loaded, because this situation is reserved for the
fallback to (old) php message files.
So use another name in ExtensionMessagesFiles to load the alias file.
Change-Id: Ic620710c8b5e8dda44f4ceda10534a90a9ac0eed
---
M extension.json
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index 18d1a07..077de34 100644
--- a/extension.json
+++ b/extension.json
@@ -14,7 +14,7 @@
]
},
"ExtensionMessagesFiles": {
- "BlueSpiceExtendedSearch": "languages/BSSearchCenter.alias.php"
+ "BlueSpiceExtendedSearchAlias":
"languages/BSSearchCenter.alias.php"
},
"ConfigRegistry": {
"bsgES": "BS\\ExtendedSearch\\Setup::makeConfig"
--
To view, visit https://gerrit.wikimedia.org/r/332132
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic620710c8b5e8dda44f4ceda10534a90a9ac0eed
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BlueSpiceExtendedSearch
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
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...BSSMWConnector[master]: Fix autoload entry
Robert Vogel has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332047 ) Change subject: Fix autoload entry .. Fix autoload entry Change-Id: Icbd9d3b805c50f98e765c61aaf6ac6a5ea723063 --- M BSSMWConnector.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/BSSMWConnector.php b/BSSMWConnector.php index 4f2ac2d..dcc1b1f 100644 --- a/BSSMWConnector.php +++ b/BSSMWConnector.php @@ -17,7 +17,7 @@ $GLOBALS['wgMessagesDirs']['BSSMWConnectorHooks'] = __DIR__ .'/i18n'; $GLOBALS['wgAutoloadClasses']['BSSMWConnectorHooks'] = __DIR__.'/includes/BSSMWConnectorHooks.php'; -$GLOBALS['wgAutoloadClasses']['SMWCNamespaceManager'] = __DIR__.'/includes/SMWCNamespaceManager.php'; +$GLOBALS['wgAutoloadClasses']['BSSMWCNamespaceManager'] = __DIR__.'/includes/BSSMWCNamespaceManager.php'; $GLOBALS['wgAutoloadClasses']['BSSFVisualEditor'] = __DIR__.'/includes/forminputs/BSSFVisualEditor.php'; $GLOBALS['wgAutoloadClasses']['BSGridResultPrinter'] = __DIR__.'/includes/formats/Grid/BSGridResultPrinter.php'; $GLOBALS['wgAutoloadClasses']['BSPropertyRegistry'] = __DIR__.'/includes/BSPropertyRegistry.php'; -- To view, visit https://gerrit.wikimedia.org/r/332047 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Icbd9d3b805c50f98e765c61aaf6ac6a5ea723063 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BSSMWConnector Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Robert Vogel 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...BlueSpiceExtensions[REL1_23]: ExtendedSearch: let autocomplete recognize namespace prefere...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331970 )
Change subject: ExtendedSearch: let autocomplete recognize namespace preferences
..
ExtendedSearch: let autocomplete recognize namespace preferences
Fixed issue from ERM4018
Change-Id: I40da3f079b2fbce27e3927a52bd7346425980176
---
M ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
1 file changed, 0 insertions(+), 1 deletion(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
b/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
index 15a16b7..377355c 100644
--- a/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
+++ b/ExtendedSearch/includes/SearchIndex/SearchOptions.class.php
@@ -184,7 +184,6 @@
public function getSolrAutocompleteQuery( $sSearchString,
$sSolrSearchString ) {
$aSearchOptions = array();
$aSearchOptions['fl'] = 'type,title,namespace';
- $aSearchOptions['fq'] = array( 'wiki:(' .
$this->getCustomerId() . ')' );
$aSearchOptions['sort'] = $this->aSearchOptions['sort'];
$vNamespace = $this->checkSearchstringForNamespace(
--
To view, visit https://gerrit.wikimedia.org/r/331970
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40da3f079b2fbce27e3927a52bd7346425980176
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_23
Gerrit-Owner: Nasty
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
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...BlueSpiceSkin[master]: Split author list in extension.json
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332070 ) Change subject: Split author list in extension.json .. Split author list in extension.json Use one entry for each author, gives better output on Special:Version Change-Id: I86d6e349f386a3e6814526754efd3aa9b2808d74 --- M skin.json 1 file changed, 7 insertions(+), 1 deletion(-) Approvals: Robert Vogel: Looks good to me, approved jenkins-bot: Verified diff --git a/skin.json b/skin.json index a6d0662..fda16ba 100644 --- a/skin.json +++ b/skin.json @@ -2,7 +2,13 @@ "name": "BlueSpiceSkin", "version": "2.27.1-alpha", "license-name": "GPL-2.0+", - "author": "Radovan Kubani, Robert Vogel, Patric Wirth, Tobias Weichart et. al.", + "author": [ + "Radovan Kubani", + "Robert Vogel", + "Patric Wirth", + "Tobias Weichart", + "..." + ], "url": "http://bluespice.com";, "descriptionmsg": "bluespiceskin-desc", "type": "skin", -- To view, visit https://gerrit.wikimedia.org/r/332070 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I86d6e349f386a3e6814526754efd3aa9b2808d74 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/skins/BlueSpiceSkin Gerrit-Branch: master Gerrit-Owner: Umherirrender Gerrit-Reviewer: Dvogel hallowelt Gerrit-Reviewer: Ljonka Gerrit-Reviewer: Mglaser Gerrit-Reviewer: Pwirth Gerrit-Reviewer: Robert Vogel 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...BlueSpiceExtensions[master]: Fix author list in extension.json
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332071 )
Change subject: Fix author list in extension.json
..
Fix author list in extension.json
ArticleInfo: Split list to have better output on Special:Version
ExtendedEditBar: Strip off unrelated infos
Change-Id: I9de0158729e6197ca89698d5d97c347dd4126feb
---
M ArticleInfo/extension.json
M ExtendedEditBar/extension.json
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ArticleInfo/extension.json b/ArticleInfo/extension.json
index 002700e..fc84427 100644
--- a/ArticleInfo/extension.json
+++ b/ArticleInfo/extension.json
@@ -2,7 +2,10 @@
"name": "ArticleInfo",
"version": "2.27.1-alpha",
"url": "https://help.bluespice.com/index.php/Articleinfo";,
- "author": "Markus Glaser, Stephan Muggli",
+ "author": [
+ "Markus Glaser",
+ "Stephan Muggli"
+ ],
"descriptionmsg": "bs-articleinfo-desc",
"type": "bluespice",
"bsgExtensions": {
diff --git a/ExtendedEditBar/extension.json b/ExtendedEditBar/extension.json
index dd9eab3..a080eb3 100644
--- a/ExtendedEditBar/extension.json
+++ b/ExtendedEditBar/extension.json
@@ -2,7 +2,7 @@
"name": "ExtendedEditBar",
"version": "2.27.1-alpha",
"url": "https://help.bluespice.com/index.php/ExtendedEditbar";,
- "author": "MediaWiki Extension, packaging by Markus Glaser",
+ "author": "Markus Glaser",
"descriptionmsg": "bs-extendededitbar-desc",
"type": "bluespice",
"bsgExtensions": {
--
To view, visit https://gerrit.wikimedia.org/r/332071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9de0158729e6197ca89698d5d97c347dd4126feb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Dvogel hallowelt
Gerrit-Reviewer: Ljonka
Gerrit-Reviewer: Mglaser
Gerrit-Reviewer: Pwirth
Gerrit-Reviewer: Robert Vogel
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...BlueSpiceExtensions[REL1_27]: Fix author list in extension.json
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332214 )
Change subject: Fix author list in extension.json
..
Fix author list in extension.json
ArticleInfo: Split list to have better output on Special:Version
ExtendedEditBar: Strip off unrelated infos
Change-Id: I9de0158729e6197ca89698d5d97c347dd4126feb
---
M ArticleInfo/extension.json
M ExtendedEditBar/extension.json
2 files changed, 5 insertions(+), 2 deletions(-)
Approvals:
Robert Vogel: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ArticleInfo/extension.json b/ArticleInfo/extension.json
index a434f03..2af0f34 100644
--- a/ArticleInfo/extension.json
+++ b/ArticleInfo/extension.json
@@ -2,7 +2,10 @@
"name": "ArticleInfo",
"version": "2.27.0",
"url": "https://help.bluespice.com/index.php/Articleinfo";,
- "author": "Markus Glaser, Stephan Muggli",
+ "author": [
+ "Markus Glaser",
+ "Stephan Muggli"
+ ],
"descriptionmsg": "bs-articleinfo-desc",
"type": "bluespice",
"bsgExtensions": {
diff --git a/ExtendedEditBar/extension.json b/ExtendedEditBar/extension.json
index f15cec4..c445f38 100644
--- a/ExtendedEditBar/extension.json
+++ b/ExtendedEditBar/extension.json
@@ -2,7 +2,7 @@
"name": "ExtendedEditBar",
"version": "2.27.0",
"url": "https://help.bluespice.com/index.php/ExtendedEditbar";,
- "author": "MediaWiki Extension, packaging by Markus Glaser",
+ "author": "Markus Glaser",
"descriptionmsg": "bs-extendededitbar-desc",
"type": "bluespice",
"bsgExtensions": {
--
To view, visit https://gerrit.wikimedia.org/r/332214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9de0158729e6197ca89698d5d97c347dd4126feb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Robert Vogel
Gerrit-Reviewer: Umherirrender
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...BlueSpiceExtensions[REL1_27]: Fix author list in extension.json
Robert Vogel has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332214 )
Change subject: Fix author list in extension.json
..
Fix author list in extension.json
ArticleInfo: Split list to have better output on Special:Version
ExtendedEditBar: Strip off unrelated infos
Change-Id: I9de0158729e6197ca89698d5d97c347dd4126feb
---
M ArticleInfo/extension.json
M ExtendedEditBar/extension.json
2 files changed, 5 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/14/332214/1
diff --git a/ArticleInfo/extension.json b/ArticleInfo/extension.json
index a434f03..2af0f34 100644
--- a/ArticleInfo/extension.json
+++ b/ArticleInfo/extension.json
@@ -2,7 +2,10 @@
"name": "ArticleInfo",
"version": "2.27.0",
"url": "https://help.bluespice.com/index.php/Articleinfo";,
- "author": "Markus Glaser, Stephan Muggli",
+ "author": [
+ "Markus Glaser",
+ "Stephan Muggli"
+ ],
"descriptionmsg": "bs-articleinfo-desc",
"type": "bluespice",
"bsgExtensions": {
diff --git a/ExtendedEditBar/extension.json b/ExtendedEditBar/extension.json
index f15cec4..c445f38 100644
--- a/ExtendedEditBar/extension.json
+++ b/ExtendedEditBar/extension.json
@@ -2,7 +2,7 @@
"name": "ExtendedEditBar",
"version": "2.27.0",
"url": "https://help.bluespice.com/index.php/ExtendedEditbar";,
- "author": "MediaWiki Extension, packaging by Markus Glaser",
+ "author": "Markus Glaser",
"descriptionmsg": "bs-extendededitbar-desc",
"type": "bluespice",
"bsgExtensions": {
--
To view, visit https://gerrit.wikimedia.org/r/332214
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9de0158729e6197ca89698d5d97c347dd4126feb
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: REL1_27
Gerrit-Owner: Robert Vogel
Gerrit-Reviewer: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_23]: add $egMultiMapsGoogleApiKey parameter and use latest google...
Pastakhov has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332213 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
Approvals:
Pastakhov: Verified; Looks good to me, approved
diff --git a/MultiMaps.php b/MultiMaps.php
index efcf8f8..09a48e4 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -103,12 +103,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index eab841a..89744f1 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[2] )
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_24]: add $egMultiMapsGoogleApiKey parameter and use latest google...
Pastakhov has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332212 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
Approvals:
Pastakhov: Verified; Looks good to me, approved
diff --git a/MultiMaps.php b/MultiMaps.php
index 9c17337..d59873a 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -103,12 +103,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[2] )
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_26]: add $egMultiMapsGoogleApiKey parameter and use latest google...
Pastakhov has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332210 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
Approvals:
Pastakhov: Verified; Looks good to me, approved
diff --git a/MultiMaps.php b/MultiMaps.php
index e283ea6..86709e2 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -104,12 +104,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[2] )
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_27]: add $egMultiMapsGoogleApiKey parameter and use latest google...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332209 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultiMaps.php b/MultiMaps.php
index e283ea6..86709e2 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -104,12 +104,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[2] )
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_25]: add $egMultiMapsGoogleApiKey parameter and use latest google...
Pastakhov has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332211 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
Approvals:
Pastakhov: Verified; Looks good to me, approved
diff --git a/MultiMaps.php b/MultiMaps.php
index e283ea6..86709e2 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -104,12 +104,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[2] )
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_28]: add $egMultiMapsGoogleApiKey parameter and use latest google...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332208 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultiMaps.php b/MultiMaps.php
index e283ea6..86709e2 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -104,12 +104,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[2] )
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_23]: add $egMultiMapsGoogleApiKey parameter and use latest google...
Pastakhov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332213 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiMaps
refs/changes/13/332213/1
diff --git a/MultiMaps.php b/MultiMaps.php
index efcf8f8..09a48e4 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -103,12 +103,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index eab841a..89744f1 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[master]: add $egMultiMapsGoogleApiKey parameter and use latest google...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332207 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
Approvals:
Pastakhov: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultiMaps.php b/MultiMaps.php
index e283ea6..86709e2 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -104,12 +104,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[2] )
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_26]: add $egMultiMapsGoogleApiKey parameter and use latest google...
Pastakhov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332210 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiMaps
refs/changes/10/332210/1
diff --git a/MultiMaps.php b/MultiMaps.php
index e283ea6..86709e2 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -104,12 +104,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_24]: add $egMultiMapsGoogleApiKey parameter and use latest google...
Pastakhov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332212 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiMaps
refs/changes/12/332212/1
diff --git a/MultiMaps.php b/MultiMaps.php
index 9c17337..d59873a 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -103,12 +103,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_25]: add $egMultiMapsGoogleApiKey parameter and use latest google...
Pastakhov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332211 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiMaps
refs/changes/11/332211/1
diff --git a/MultiMaps.php b/MultiMaps.php
index e283ea6..86709e2 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -104,12 +104,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_27]: add $egMultiMapsGoogleApiKey parameter and use latest google...
Pastakhov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332209 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiMaps
refs/changes/09/332209/1
diff --git a/MultiMaps.php b/MultiMaps.php
index e283ea6..86709e2 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -104,12 +104,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[REL1_28]: add $egMultiMapsGoogleApiKey parameter and use latest google...
Pastakhov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332208 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiMaps
refs/changes/08/332208/1
diff --git a/MultiMaps.php b/MultiMaps.php
index e283ea6..86709e2 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -104,12 +104,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$
[MediaWiki-commits] [Gerrit] mediawiki...MultiMaps[master]: add $egMultiMapsGoogleApiKey parameter and use latest google...
Pastakhov has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332207 )
Change subject: add $egMultiMapsGoogleApiKey parameter and use latest google
map API
..
add $egMultiMapsGoogleApiKey parameter and use latest google map API
Change-Id: Ie572aff27982e3b3b50e888eabc6c69767eea297
---
M MultiMaps.php
M includes/mapelements/Marker.php
M services/Google/Google.php
M services/Leaflet/Leaflet.php
4 files changed, 27 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultiMaps
refs/changes/07/332207/1
diff --git a/MultiMaps.php b/MultiMaps.php
index e283ea6..86709e2 100644
--- a/MultiMaps.php
+++ b/MultiMaps.php
@@ -104,12 +104,15 @@
* @codeCoverageIgnore
*/
$wgHooks['UnitTestsList'][] = function ( &$files ) {
- $testDir = __DIR__ . '/tests/phpunit';
- $files = array_merge( $files, glob(
"$testDir/includes/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/includes/mapelements/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Google/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Leaflet/*Test.php" ) );
- $files = array_merge( $files, glob(
"$testDir/services/Yandex/*Test.php" ) );
+ $files[] = __DIR__ . '/tests/phpunit/includes/BoundsTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeoCoordinateTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/GeocodersTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/MapServicesTest.php';
+ $files[] = __DIR__ . '/tests/phpunit/includes/PointTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/PolygonTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/includes/mapelements/RectangleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Google/GoogleTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Leaflet/LeafletTest.php';
+ $files[] = __DIR__ .
'/tests/phpunit/services/Yandex/YandexTest.php';
return true;
};
diff --git a/includes/mapelements/Marker.php b/includes/mapelements/Marker.php
index 3161441..5471342 100644
--- a/includes/mapelements/Marker.php
+++ b/includes/mapelements/Marker.php
@@ -35,7 +35,8 @@
}
public function setProperty($name, $value) {
- global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator;
+ global $egMultiMaps_CoordinatesSeparator,
$egMultiMaps_OptionsSeparator,
+ $egMultiMaps_IconPath,
$egMultiMaps_IconAllowFromDirectory;
if ( strtolower($name) != 'icon' ) {
return parent::setProperty( $name, $value );
@@ -50,12 +51,12 @@
// Icon URL
if ( !empty($properties[0]) ) {
$v = $properties[0];
- if ( $v[0] == '/' &&
$GLOBALS['egMultiMaps_IconAllowFromDirectory'] === true ) {
+ if ( $v[0] == '/' &&
$egMultiMaps_IconAllowFromDirectory ) {
if (
preg_match('#[^0-9a-zA-Zа-яА-Я/_=\.\+\-]#', $v) || mb_strpos($v, '/../') !==
false ) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-url', $v )->escaped();
return false;
}
- $v = $GLOBALS['wgServer'] .
$GLOBALS['egMultiMaps_IconPath'] . $v;
+ $v = $GLOBALS['wgServer'] .
$egMultiMaps_IconPath . $v;
} else {
$title = \Title::newFromText( $v, NS_FILE );
if ( !is_null( $title ) && $title->exists() ) {
@@ -73,7 +74,7 @@
if ( !empty($properties[1]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[1])
+ explode( $egMultiMaps_OptionsSeparator,
$properties[1] )
);
if ( count($v) != 2) {
$this->errormessages[] = \wfMessage(
'multimaps-marker-incorrect-icon-size', $v, $value )->escaped();
@@ -86,7 +87,7 @@
if ( !empty($properties[2]) ) {
$v = array_map(
'intval',
- explode($egMultiMaps_OptionsSeparator,
$properties[2])
+ explode( $egMultiMaps_OptionsSeparator,
$
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Center iframe content in video.js mode
TheDJ has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332206 )
Change subject: Center iframe content in video.js mode
..
Center iframe content in video.js mode
Also make sure it's background is black.
Note that it centers slightly different compared to mwembed, since
video.js aligns the player controls with the canvas, instead of
adapting the canvas inside the player. Shouldn't matter too much
however.
Bug: T138772
Change-Id: I38ca8a2e6f33045ed723991b0ddef9d65bd4b09c
---
M TimedMediaIframeOutput.php
M resources/embedPlayerIframe.css
2 files changed, 9 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/06/332206/1
diff --git a/TimedMediaIframeOutput.php b/TimedMediaIframeOutput.php
index 1fff8c8..379040e 100644
--- a/TimedMediaIframeOutput.php
+++ b/TimedMediaIframeOutput.php
@@ -70,13 +70,13 @@
if ( TimedMediaHandlerHooks::activePlayerMode() === 'mwembed' )
{
$wgOut->addModules( [ 'mw.MediaWikiPlayer.loader',
'ext.tmh.embedPlayerIframe' ] );
- $wgOut->addModuleStyles( 'embedPlayerIframeStyle' );
}
if ( TimedMediaHandlerHooks::activePlayerMode() === 'videojs' )
{
$wgOut->addModules( 'ext.tmh.player' );
$wgOut->addModuleStyles( 'ext.tmh.player.styles' );
}
+ $wgOut->addModuleStyles( 'embedPlayerIframeStyle' );
$wgOut->sendCacheControl();
$rlClient = $wgOut->getRlClient();
diff --git a/resources/embedPlayerIframe.css b/resources/embedPlayerIframe.css
index 5dd8c32..3bc5902 100644
--- a/resources/embedPlayerIframe.css
+++ b/resources/embedPlayerIframe.css
@@ -17,3 +17,11 @@
#videoContainer .videoHolder {
position: static;
}
+#videoContainer {
+ width: 100%;
+ height: 100%;
+ background-color: #000;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+}
--
To view, visit https://gerrit.wikimedia.org/r/332206
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I38ca8a2e6f33045ed723991b0ddef9d65bd4b09c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Remove no longer useful css change
TheDJ has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332205 )
Change subject: Remove no longer useful css change
..
Remove no longer useful css change
Follow-up to: Ide8912e
Change-Id: I86e39dc070d164ff29e8a0f6fdffd4aa855d0642
---
M resources/ext.tmh.embedPlayerIframe.js
1 file changed, 1 insertion(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/05/332205/1
diff --git a/resources/ext.tmh.embedPlayerIframe.js
b/resources/ext.tmh.embedPlayerIframe.js
index b3523de..fbef29f 100644
--- a/resources/ext.tmh.embedPlayerIframe.js
+++ b/resources/ext.tmh.embedPlayerIframe.js
@@ -7,11 +7,7 @@
var iframePlayerInit = function () {
// rewrite player, normally done by mw.EmbedPlayer.loader upon
wikipage.content hook
var $players = $( mw.config.get( 'EmbedPlayer.RewriteSelector'
) );
- $players.embedPlayer( function () {
- $( '#videoContainer' ).css( {
- visibility: 'visible'
- } );
- } );
+ $players.embedPlayer();
};
$( iframePlayerInit );
--
To view, visit https://gerrit.wikimedia.org/r/332205
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I86e39dc070d164ff29e8a0f6fdffd4aa855d0642
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...TimedMediaHandler[master]: Remove last trace of bgimage
TheDJ has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332204 )
Change subject: Remove last trace of bgimage
..
Remove last trace of bgimage
Follow-up to: Ide8912e
Bug: T138773
Change-Id: I0f515a567034daf16ae5b5448121a20c8f29a044
---
M resources/embedPlayerIframe.css
M resources/ext.tmh.embedPlayerIframe.js
2 files changed, 0 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/04/332204/1
diff --git a/resources/embedPlayerIframe.css b/resources/embedPlayerIframe.css
index 5dd8c32..50c368e 100644
--- a/resources/embedPlayerIframe.css
+++ b/resources/embedPlayerIframe.css
@@ -11,9 +11,6 @@
margin: 0;
padding: 0;
}
-img#bgimage {
- display: none;
-}
#videoContainer .videoHolder {
position: static;
}
diff --git a/resources/ext.tmh.embedPlayerIframe.js
b/resources/ext.tmh.embedPlayerIframe.js
index 704793c..b3523de 100644
--- a/resources/ext.tmh.embedPlayerIframe.js
+++ b/resources/ext.tmh.embedPlayerIframe.js
@@ -11,7 +11,6 @@
$( '#videoContainer' ).css( {
visibility: 'visible'
} );
- $( '#bgimage' ).remove();
} );
};
--
To view, visit https://gerrit.wikimedia.org/r/332204
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0f515a567034daf16ae5b5448121a20c8f29a044
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Nimbus[master]: "More Wikis" menu: Close when clicked outside the menu
Prtksxna has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332203 )
Change subject: "More Wikis" menu: Close when clicked outside the menu
..
"More Wikis" menu: Close when clicked outside the menu
Bug: T155318
Change-Id: I1618fe256c12665ef9397ca084b90f7889495898
---
M nimbus/Menu.js
1 file changed, 10 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/skins/Nimbus
refs/changes/03/332203/1
diff --git a/nimbus/Menu.js b/nimbus/Menu.js
index c0ccd08..0c4598e 100644
--- a/nimbus/Menu.js
+++ b/nimbus/Menu.js
@@ -263,13 +263,11 @@
NimbusSkin.last_displayed = '';
},
- show_more_category: function( el ) {
- if ( NimbusSkin.show === 'false' ) {
- document.getElementById( el ).style.display = 'block';
- NimbusSkin.show = 'true';
+ show_more_category: function( el, toggle ) {
+ if ( toggle !== undefined ) {
+ $( '#' + el ).toggle( toggle );
} else {
- document.getElementById( el ).style.display = 'none';
- NimbusSkin.show = 'false';
+ $( '#' + el ).toggle();
}
},
@@ -350,8 +348,13 @@
NimbusSkin.show_actions( 'article-more-container', 'hide' );
} );
- $( '#sw-more-category' ).on( 'click', function() {
+ $( '#sw-more-category' ).on( 'click', function( e ) {
NimbusSkin.show_more_category( 'more-wikis-menu' );
+ e.stopPropagation();
+ } );
+
+ $( 'body' ).on( 'click', function () {
+ NimbusSkin.show_more_category( 'more-wikis-menu', false );
} );
} );
--
To view, visit https://gerrit.wikimedia.org/r/332203
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1618fe256c12665ef9397ca084b90f7889495898
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/Nimbus
Gerrit-Branch: master
Gerrit-Owner: Prtksxna
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Fix lint error ModuleLoader defined but not used
Jhernandez has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332195 )
Change subject: Fix lint error ModuleLoader defined but not used
..
Fix lint error ModuleLoader defined but not used
Since ModuleLoader is linted it complains that the defined ModuleLoader
is not used anywhere because it is only exposed for testing.
Error: Unused defines from file: resources/mobile.modules/modules.js:
ModuleLoader
Expose it as a global variable on the mobileFrontend instead
Change-Id: I861f277ade8fe83083c9d1b4dc115b872d190f87
---
M resources/mobile.modules/modules.js
M tests/qunit/mobile.modules/test_modules.js
2 files changed, 3 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/95/332195/1
diff --git a/resources/mobile.modules/modules.js
b/resources/mobile.modules/modules.js
index 6c93885..6b9a0ab 100644
--- a/resources/mobile.modules/modules.js
+++ b/resources/mobile.modules/modules.js
@@ -109,7 +109,6 @@
mw.mobileFrontend = new ModuleLoader();
// inception to support testing (!!)
- module.exports.ModuleLoader = ModuleLoader;
- mw.mobileFrontend.define( 'ModuleLoader', ModuleLoader );
+ mw.mobileFrontend.ModuleLoader = ModuleLoader;
}() );
diff --git a/tests/qunit/mobile.modules/test_modules.js
b/tests/qunit/mobile.modules/test_modules.js
index e42c6ed..856c4e4 100644
--- a/tests/qunit/mobile.modules/test_modules.js
+++ b/tests/qunit/mobile.modules/test_modules.js
@@ -1,5 +1,4 @@
-( function ( M ) {
- var ModuleLoader = M.require( 'ModuleLoader' );
+( function ( ModuleLoader ) {
QUnit.module( 'MobileFrontend ModuleLoader', {
setup: function () {
@@ -33,4 +32,4 @@
}, 'Cannot define two modules with the same name' );
assert.strictEqual( this.loader.require( 'bar' ), 5, 'Returns
first definition of module.' );
} );
-}( mw.mobileFrontend ) );
+}( mw.mobileFrontend.ModuleLoader ) );
--
To view, visit https://gerrit.wikimedia.org/r/332195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I861f277ade8fe83083c9d1b4dc115b872d190f87
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jhernandez
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: ReferencesMobileViewGateway depends on mw.Api
Jhernandez has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332194 ) Change subject: ReferencesMobileViewGateway depends on mw.Api .. ReferencesMobileViewGateway depends on mw.Api ReferencesMobileViewGateway.getSingleton uses mw.Api but that wasn't found in the dependency tree of the module explicitly. Fixes linting error from https://gerrit.wikimedia.org/r/#/c/312850/ and https://integration.wikimedia.org/ci/job/mwext-MobileFrontend-npm-run-lint-modules/18/console Error: Dependency problems in file: resources/mobile.references.gateway/ReferencesMobileViewGateway.js: Required mw.Api defined in file resources/src/mediawiki/api.js not found in any ResourceModules Change-Id: Ie09722d838b3aa37b0f127fc942caa9c2a64f0f0 --- M extension.json 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend refs/changes/94/332194/1 diff --git a/extension.json b/extension.json index 4e27aa9..8446394 100644 --- a/extension.json +++ b/extension.json @@ -1069,6 +1069,7 @@ "desktop" ], "dependencies": [ + "mediawiki.api", "mobile.oo", "mobile.cache" ], -- To view, visit https://gerrit.wikimedia.org/r/332194 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie09722d838b3aa37b0f127fc942caa9c2a64f0f0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MobileFrontend Gerrit-Branch: master Gerrit-Owner: Jhernandez ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Theme[master]: Fix eyesore on action=edit
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332193 )
Change subject: Fix eyesore on action=edit
..
Fix eyesore on action=edit
Change-Id: Id9aa13a51e84b150d18f8c80af8d11cbbb0068c7
---
M monobook/dark.css
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/monobook/dark.css b/monobook/dark.css
index 293c2ab..d011d5d 100644
--- a/monobook/dark.css
+++ b/monobook/dark.css
@@ -434,4 +434,13 @@
*/
table.mw-datatable th, table.mw-datatable tr:hover td, table.mw-datatable td {
background-color: transparent;
+}
+
+/**
+ * The default background color of the edit summary area container on
+ * action=edit is a real eyesore with a dark color scheme (such as this one!),
+ * so let's make it a tad bit less obnoxious, yes?
+ */
+div.editOptions {
+ background-color: transparent;
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/332193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id9aa13a51e84b150d18f8c80af8d11cbbb0068c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Theme
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
Gerrit-Reviewer: Jack Phoenix
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...Theme[master]: Fix eyesore on action=edit
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332193 )
Change subject: Fix eyesore on action=edit
..
Fix eyesore on action=edit
Change-Id: Id9aa13a51e84b150d18f8c80af8d11cbbb0068c7
---
M monobook/dark.css
1 file changed, 9 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Theme
refs/changes/93/332193/1
diff --git a/monobook/dark.css b/monobook/dark.css
index 293c2ab..d011d5d 100644
--- a/monobook/dark.css
+++ b/monobook/dark.css
@@ -434,4 +434,13 @@
*/
table.mw-datatable th, table.mw-datatable tr:hover td, table.mw-datatable td {
background-color: transparent;
+}
+
+/**
+ * The default background color of the edit summary area container on
+ * action=edit is a real eyesore with a dark color scheme (such as this one!),
+ * so let's make it a tad bit less obnoxious, yes?
+ */
+div.editOptions {
+ background-color: transparent;
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/332193
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id9aa13a51e84b150d18f8c80af8d11cbbb0068c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Theme
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Remove unused mw.mobileFrontend reference
Jhernandez has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332192 )
Change subject: Remove unused mw.mobileFrontend reference
..
Remove unused mw.mobileFrontend reference
As part of fixing linting errors
https://gerrit.wikimedia.org/r/#/c/312850/ and
https://integration.wikimedia.org/ci/job/mwext-MobileFrontend-npm-run-lint-modules/18/console
Error: Dependency problems in file:
resources/mobile.special.userlogin.scripts/userlogin.js:
Required mw.mobileFrontend defined in file
resources/mobile.modules/modules.js not found in any ResourceModules
Change-Id: I2b5416aa512d39389a0055edf56ba6819fb28583
---
M resources/mobile.special.userlogin.scripts/userlogin.js
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/92/332192/1
diff --git a/resources/mobile.special.userlogin.scripts/userlogin.js
b/resources/mobile.special.userlogin.scripts/userlogin.js
index 9539066..4a6513e 100644
--- a/resources/mobile.special.userlogin.scripts/userlogin.js
+++ b/resources/mobile.special.userlogin.scripts/userlogin.js
@@ -1,8 +1,8 @@
-( function ( M, $ ) {
+( function ( $ ) {
// Most people on mobile devices are on a personal device so this
property should be assumed.
// To be consistent across platforms do same on desktop
$( function () {
$( '#wpRemember' ).prop( 'checked', true );
} );
-}( mw.mobileFrontend, jQuery ) );
+}( jQuery ) );
--
To view, visit https://gerrit.wikimedia.org/r/332192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b5416aa512d39389a0055edf56ba6819fb28583
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jhernandez
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Comments[master]: Add missing API i18n messages in Comments extension
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331929 )
Change subject: Add missing API i18n messages in Comments extension
..
Add missing API i18n messages in Comments extension
Bug: T154036
Change-Id: Ib3cf0ed04c12d340158aea8c798e70655a1c374f
---
M i18n/en.json
M i18n/qqq.json
2 files changed, 41 insertions(+), 3 deletions(-)
Approvals:
Jack Phoenix: Looks good to me, approved
SamanthaNguyen: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index e4a7a87..7eefe8b 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -1,9 +1,28 @@
{
"@metadata": {
"authors": [
- "David Pean "
+ "David Pean ",
+ "Mihir Thakkar "
]
},
+ "apihelp-commentblock-description": "The commentblock API allows
blocking a user from the comment it originated from after filling out the
following parameters: CommentID.",
+ "apihelp-commentdelete-description": "The commentdelete API allows
deleting a comment after filling out the following parameters: CommentID.",
+ "apihelp-commentlatestid-description": "The commentlatestID API allows
to retrieve latest comment ID after filling out the following parameters:
pageID",
+ "apihelp-commentlist-description": "The commentlist API retrieves
multiple comments and outputs them as a list after filling out the following
parameters: pageID, order, pagerPage, and showForm.",
+ "apihelp-commentsubmit-description": "The commentsubmit API allows to
submit/post a comment after filling out the following parameters: pageID,
parentID, commentText.",
+ "apihelp-commentvote-description": "The commentvote API allows to vote
on a comment after filling out the following parameters: commentID, voteValue.",
+ "apihelp-commentblock-param-commentID": "Comment ID of the comment by
user which is to be blocked",
+ "apihelp-commentdelete-param-commentID": "Comment ID of the comment to
be deleted",
+ "apihelp-commentlatestid-param-pageID": "Page ID of the page on which
latest comment is there",
+ "apihelp-commentlist-param-pageID": "Page ID of the page from which
comment list is retrieved",
+ "apihelp-commentlist-param-order": "Defined whether comment list in
ascending or descending order",
+ "apihelp-commentlist-param-pagerPage": "Comments page number",
+ "apihelp-commentlist-param-showForm": "Show comments form",
+ "apihelp-commentsubmit-param-pageID": "Page ID of the page on which
comment is to be submitted",
+ "apihelp-commentsubmit-param-parentID": "Comment ID of the parent
comment",
+ "apihelp-commentsubmit-param-commentText": "Comment Text",
+ "apihelp-commentvote-param-commentID": "Comment ID of the comment that
is voted for",
+ "apihelp-commentvote-param-voteValue": "Vote value for the comment",
"comments-comment": "Comment",
"comments-desc": "Adds parser hook that
allows commenting on pages",
"comments-db-locked": "Adding commentsThe database is
currently locked for routine database maintenance, after which it will be back
to normal. Please check back later!",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index cd58017..3a48e8d 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -9,7 +9,8 @@
"Shirayuki",
"Siebrand",
"Liuxinyu970226",
- "Umherirrender"
+ "Umherirrender",
+ "Mihir Thakkar"
]
},
"comments-comment": "This message might be
unused.\n{{Identical|Comment}}",
@@ -66,5 +67,23 @@
"grouppage-commentadmin": "{{doc-group|commentadmin|page}}",
"right-comment": "{{doc-right|comment}}",
"right-commentadmin": "{{doc-right|commentadmin}}",
- "right-commentlinks": "{{Doc-right|commentlinks}}"
+ "right-commentlinks": "{{doc-right|commentlinks}}",
+ "apihelp-commentblock-description":
"{{doc-apihelp-description|CommentBlock}}",
+
"apihelp-commentblock-param-commentID":"{{doc-apihelp-param|CommentBlock|commentID}}",
+ "apihelp-commentdelete-description":
"{{doc-apihelp-description|CommentDelete}}",
+
"apihelp-commentdelete-param-commentID":"{{doc-apihelp-param|CommentDelete|commentID}}",
+ "apihelp-commentlatestid-description":
"{{doc-apihelp-description|CommentLatestid}}",
+
"apihelp-commentlatestid-param-pageID":"{{doc-apihelp-param|CommentLatestid|pageID}}",
+ "apihelp-commentlist-description":
"{{doc-apihelp-description|CommentList}}",
+
"apihelp-commentlist-param-pageID":"{{doc-apihelp-param|CommentList|pageID}}",
+ "apihelp-commentlist-param-order":
"{{doc-apihelp-param|CommentList|order}}",
+
[MediaWiki-commits] [Gerrit] pywikibot/core[master]: Add DictPatchManager and WikibasePatchManager
Phantom42 has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332189 )
Change subject: Add DictPatchManager and WikibasePatchManager
..
Add DictPatchManager and WikibasePatchManager
Add DictPatchManager (can be used to compare dicts)
and WikibasePatchManager (can be used to compare wikibase entities)
Bug: T66468
Change-Id: I4d5165f8361ddb8007dd237a0a40cfc694e376a6
---
M pywikibot/diff.py
M pywikibot/page.py
M pywikibot/site.py
A pywikibot/wikibase_diff.py
M requirements.txt
M tests/diff_tests.py
A tests/wikibase_diff_tests.py
7 files changed, 1,100 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/89/332189/1
diff --git a/pywikibot/diff.py b/pywikibot/diff.py
index 12fe490..434c878 100644
--- a/pywikibot/diff.py
+++ b/pywikibot/diff.py
@@ -1,7 +1,7 @@
# -*- coding: utf-8 -*-
"""Diff module."""
#
-# (C) Pywikibot team, 2014-2015
+# (C) Pywikibot team, 2014-2017
#
# Distributed under the terms of the MIT license.
#
@@ -563,6 +563,256 @@
return l_text
+class DictHunk(Hunk):
+"""One change (change of one key) between two dictionaries."""
+
+def __init__(self, key, a, b, grouped_opcode):
+"""
+Constructor.
+
+@param key: key of two dictionaries, which is compared.
+@param a: first value.
+@param b: second value.
+@param grouped_opcode: list of 5-tuples describing how to turn a into
b.
+it has the same format as returned by difflib.get_opcodes().
+"""
+self.key = key
+Hunk.__init__(self, a, b, grouped_opcode)
+self.diff_plain_text = u''.join(self.diff)
+
+def create_diff(self):
+"""Generator of diff text for this hunk, without formatting."""
+for line in Hunk.create_diff(self):
+yield u'%s %s: %s' % (line[0], self.key, line[2:])
+
+def __str__(self):
+"""Return the diff as formatted text."""
+return self.diff_text
+
+
+class DictPatchManager(PatchManager):
+"""Similar to PatchManager, but compares dictionaries instead."""
+
+def __init__(self, dict_a, dict_b):
+"""
+Constructor.
+
+@param dict_a: first dictionary to compare.
+@param dict_b: second dictionary to compare.
+"""
+self.a = dict_a
+self.b = dict_b
+
+self.hunks = []
+
+self.add_dict_hunks(self.a, self.b)
+
+def add_hunk(self, a, b, key, add_quotes=True):
+"""
+Add new hunk to the list of hunks.
+
+@param a: first value.
+@param b: second value.
+@param key: key of the dictionary (used when displaying)
+@param add_quotes: whether to add quotes to string values when
displaying
+"""
+if isinstance(a, Sequence):
+if add_quotes:
+a = u'"%s"' % a
+else:
+a = a or ''
+a = str(a)
+
+a = a.splitlines(1)
+
+if isinstance(b, Sequence):
+if add_quotes:
+b = u'"%s"' % b
+else:
+b = b or ''
+b = str(b)
+
+b = b.splitlines(1)
+
+s = difflib.SequenceMatcher(None, a, b)
+groups = list(s.get_grouped_opcodes(0))
+if len(groups) > 0:
+hunk = DictHunk(key, a, b, groups[0])
+self.hunks.append(hunk)
+
+def add_dict_hunks(self, a, b, key_prefix=None, key_parts=[],
sort_keys=True):
+"""
+Compare two dictionaries (recursively).
+
+@param a: first dictionary.
+@param b: second dictionary.
+@param key_prefix: prefix to add to each key (used when displayed).
+@param key_parts: list of keys, indicating location of dictionaries
relative to the root.
+@param sort_keys: whether to sort keys when creating diff.
+"""
+a = a or {}
+b = b or {}
+
+keys = []
+keys.extend(a.keys())
+for key in b.keys():
+if key not in keys:
+keys.append(key)
+
+if sort_keys:
+keys = sorted(keys)
+
+for key in keys:
+a_value = None
+b_value = None
+
+if key in a:
+a_value = a[key]
+if key in b:
+b_value = b[key]
+
+if key_prefix:
+prefixed_key = '%s.%s' % (key_prefix, key)
+else:
+prefixed_key = key
+
+new_key_parts = key_parts + [key]
+
+if isinstance(a_value, dict) or isinstance(b_value, dict):
+self.add_dict_hunks(a_value, b_value, prefixed_key,
new_key_parts)
+continue
+
+if isinstance(a_value, list) or isinstance(b_value, list):
+self.add_list_hunks(a_value, b_value, prefixed_key,
new_key_parts)
+continue
+
+self.add_hunk(a_value, b_value, prefix
[MediaWiki-commits] [Gerrit] mediawiki...MobileFrontend[master]: Remove unused ContentOverlay
Jhernandez has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332191 )
Change subject: Remove unused ContentOverlay
..
Remove unused ContentOverlay
As part of fixing linting errors in
https://gerrit.wikimedia.org/r/#/c/312850/17 and
https://integration.wikimedia.org/ci/job/mwext-MobileFrontend-npm-run-lint-modules/18/console
Change-Id: I7ce1ca7230823ef85f51ce0620e97961b5fd0dfd
---
D resources/mobile.overlays/ContentOverlay.js
M resources/mobile.overlays/Overlay.less
M resources/skins.minerva.tablet.styles/common.less
3 files changed, 0 insertions(+), 40 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/91/332191/1
diff --git a/resources/mobile.overlays/ContentOverlay.js
b/resources/mobile.overlays/ContentOverlay.js
deleted file mode 100644
index 6d68161..000
--- a/resources/mobile.overlays/ContentOverlay.js
+++ /dev/null
@@ -1,34 +0,0 @@
-( function ( M ) {
-
- var Overlay = M.require( 'mobile.overlays/Overlay' );
-
- /**
-* An {@link Overlay} that is loaded as a modal within the content and
that does
-* not take up the full screen.
-* @class ContentOverlay
-* @extends Overlay
-*/
- function ContentOverlay() {
- Overlay.apply( this, arguments );
- }
-
- OO.mfExtend( ContentOverlay, Overlay, {
- /** @inheritdoc */
- templatePartials: {},
- className: 'overlay content-overlay',
- /**
-* @inheritdoc
-*/
- fullScreen: false,
- /**
-* @inheritdoc
-*/
- closeOnContentTap: true,
- /**
-* @inheritdoc
-*/
- appendToElement: '#mw-mf-page-center'
- } );
- M.define( 'mobile.overlays/ContentOverlay', ContentOverlay );
-
-}( mw.mobileFrontend ) );
diff --git a/resources/mobile.overlays/Overlay.less
b/resources/mobile.overlays/Overlay.less
index a1b1ee6..7ae897f 100644
--- a/resources/mobile.overlays/Overlay.less
+++ b/resources/mobile.overlays/Overlay.less
@@ -8,10 +8,6 @@
.m-background-image( 'back-ltr.png' );
}
-.content-overlay {
- margin: 0 auto;
-}
-
.overlay-enabled {
#mw-mf-page-center {
overflow: hidden;
diff --git a/resources/skins.minerva.tablet.styles/common.less
b/resources/skins.minerva.tablet.styles/common.less
index ac34e0d..e134816 100644
--- a/resources/skins.minerva.tablet.styles/common.less
+++ b/resources/skins.minerva.tablet.styles/common.less
@@ -59,7 +59,6 @@
// FIXME: Have a class that identifies all of these selectors
.pre-content,
.content,
- .content-overlay,
.post-content {
max-width: @contentMaxWidthTablet;
margin: 0 @contentPaddingTablet;
@@ -141,7 +140,6 @@
.content-unstyled,
.pre-content,
.post-content,
- .content-overlay,
// FIXME: remove need for id selector
#mw-mf-page-center .pointer-overlay {
margin-left: auto;
--
To view, visit https://gerrit.wikimedia.org/r/332191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ce1ca7230823ef85f51ce0620e97961b5fd0dfd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jhernandez
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] apps...wikipedia[master]: Add LangLinksClientTest
Mholloway has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332190 )
Change subject: Add LangLinksClientTest
..
Add LangLinksClientTest
Bug: T152397
Change-Id: I54ab46ee844691fde9315593aba72387cc7baaac
---
A app/src/test/java/org/wikipedia/language/LangLinksClientTest.java
A app/src/test/res/raw/api_error.json
A app/src/test/res/raw/langlinks.json
A app/src/test/res/raw/langlinks_empty.json
4 files changed, 161 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/90/332190/1
diff --git a/app/src/test/java/org/wikipedia/language/LangLinksClientTest.java
b/app/src/test/java/org/wikipedia/language/LangLinksClientTest.java
new file mode 100644
index 000..fbc3d45
--- /dev/null
+++ b/app/src/test/java/org/wikipedia/language/LangLinksClientTest.java
@@ -0,0 +1,109 @@
+package org.wikipedia.language;
+
+import android.support.annotation.NonNull;
+
+import com.google.gson.stream.MalformedJsonException;
+
+import org.junit.Test;
+import org.wikipedia.dataclient.WikiSite;
+import org.wikipedia.dataclient.mwapi.MwQueryResponse;
+import org.wikipedia.page.PageTitle;
+import org.wikipedia.test.MockWebServerTest;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import retrofit2.Call;
+
+import static org.mockito.Matchers.any;
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isA;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.never;
+import static org.mockito.Mockito.verify;
+
+public class LangLinksClientTest extends MockWebServerTest {
+@NonNull private final LangLinksClient subject = new LangLinksClient();
+@NonNull private final PageTitle title = new PageTitle(null,
"Scientology", new WikiSite("en.wikipedia.org"));
+
+@Test public void testRequestSuccessHasResults() throws Throwable {
+List expected = getExpectedResults();
+enqueueFromFile("langlinks.json");
+
+LangLinksClient.Callback cb = mock(LangLinksClient.Callback.class);
+Call> call = request(cb);
+
+server().takeRequest();
+assertCallbackSuccess(call, cb, expected);
+}
+
+@Test public void testRequestSuccessNoResults() throws Throwable {
+List expected = new ArrayList<>();
+enqueueFromFile("langlinks_empty.json");
+
+LangLinksClient.Callback cb = mock(LangLinksClient.Callback.class);
+Call> call = request(cb);
+
+server().takeRequest();
+assertCallbackSuccess(call, cb, expected);
+}
+
+@Test public void testRequestResponseApiError() throws Throwable {
+enqueueFromFile("api_error.json");
+
+LangLinksClient.Callback cb = mock(LangLinksClient.Callback.class);
+Call> call = request(cb);
+
+server().takeRequest();
+assertCallbackFailure(call, cb, IOException.class);
+}
+
+@Test public void testRequestResponseFailure() throws Throwable {
+enqueue404();
+
+LangLinksClient.Callback cb = mock(LangLinksClient.Callback.class);
+Call> call = request(cb);
+
+server().takeRequest();
+assertCallbackFailure(call, cb, IOException.class);
+}
+
+@Test public void testRequestResponseMalformed() throws Throwable {
+server().enqueue("⨌⨀_⨀⨌");
+
+LangLinksClient.Callback cb = mock(LangLinksClient.Callback.class);
+Call> call = request(cb);
+
+server().takeRequest();
+assertCallbackFailure(call, cb, MalformedJsonException.class);
+}
+
+private void assertCallbackSuccess(@NonNull
Call> call,
+ @NonNull LangLinksClient.Callback cb,
+ @NonNull List expected) {
+verify(cb).success(eq(call), eq(expected));
+//noinspection unchecked
+verify(cb, never()).failure(any(Call.class), any(Throwable.class));
+}
+
+private void assertCallbackFailure(@NonNull
Call> call,
+ @NonNull LangLinksClient.Callback cb,
+ @NonNull Class
throwable) {
+//noinspection unchecked
+verify(cb, never()).success(any(Call.class), any(List.class));
+verify(cb).failure(eq(call), isA(throwable));
+}
+
+private List getExpectedResults() {
+List result = new ArrayList<>();
+result.add(new PageTitle(null, "Sciëntologie", new
WikiSite("af.wikipedia.org")));
+result.add(new PageTitle(null, "سينتولوجيا", new
WikiSite("ar.wikipedia.org")));
+result.add(new PageTitle(null, "سيينتولوجيا", new
WikiSite("arz.wikipedia.org")));
+return result;
+}
+
+private Call> request(@NonNull
LangLinksClient.Callback cb) {
+return subject.request(service(LangLinksClient.Service.class), title,
cb);
+}
+}
diff --git a/app/src/test/res/raw/api_error.json
b/a
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[REL1_28]: Fix for d7e4ce9d3274
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332187 )
Change subject: Fix for d7e4ce9d3274
..
Fix for d7e4ce9d3274
Change-Id: I8b398da636348b05c429f011c0eb8d33d1866c4f
(cherry picked from commit 77f88106442b5b60f538154407c8e24036da291a)
---
M includes/PF_CreatePageJob.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PF_CreatePageJob.php b/includes/PF_CreatePageJob.php
index 72683cf..a7ce868 100644
--- a/includes/PF_CreatePageJob.php
+++ b/includes/PF_CreatePageJob.php
@@ -57,7 +57,7 @@
}
if ( method_exists( 'WikiPage', 'doEditContent' ) ) {
- $new_content = new WikitextContent( $text );
+ $new_content = new WikitextContent( $page_text );
$wikiPage->doEditContent( $new_content, $edit_summary,
$flags );
} else {
$article->doEditContent( $page_text, $edit_summary,
$flags );
--
To view, visit https://gerrit.wikimedia.org/r/332187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b398da636348b05c429f011c0eb8d33d1866c4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Yaron Koren
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...PageForms[REL1_28]: Fix for helper forms when SMW not installed
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332188 )
Change subject: Fix for helper forms when SMW not installed
..
Fix for helper forms when SMW not installed
Change-Id: I74a8e216ed849dd7225bab6722de96af14421193
(cherry picked from commit ed36bd00626247f9044a8ae071983fee61134f9f)
---
M includes/PF_HelperFormAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PF_HelperFormAction.php b/includes/PF_HelperFormAction.php
index e2087f5..60c99be 100644
--- a/includes/PF_HelperFormAction.php
+++ b/includes/PF_HelperFormAction.php
@@ -139,7 +139,7 @@
*/
static function displayForm( $action, $article ) {
$title = $article->getTitle();
- if ( $title->getNamespace() == SMW_NS_PROPERTY ) {
+ if ( defined( 'SMW_NS_PROPERTY' ) && $title->getNamespace() ==
SMW_NS_PROPERTY ) {
$createPropertyPage = new PFCreateProperty();
$createPropertyPage->execute( $title->getText() );
} elseif ( $title->getNamespace() == NS_TEMPLATE ) {
--
To view, visit https://gerrit.wikimedia.org/r/332188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I74a8e216ed849dd7225bab6722de96af14421193
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Yaron Koren
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...Popups[mpga]: Vary cog click behavior
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/328675 )
Change subject: Vary cog click behavior
..
Vary cog click behavior
The behavior of the cog varies when:
* The user is logged in/out.
* Page Previews is enabled as a beta feature.
Since the behavior of the cog doesn't vary per-preview, it can be
determined at boot time and passed to the renderer. However, in order to
keep the renderer stateless, we pass the behavior to it when a preview
is added to the DOM.
Changes:
* Add the mw.popups.createPreviewBehavior factory function, which
returns an object that encapsulates how a preview responds to the user
dwelling on it, abandoning it, and clicking on the cog.
* Invoke mw.popups.createPreviewBehavior at boot time and pass it to the
mw.popups.changeListeners.render change listener, which then passes it
to mw.popups.Preview#show.
* Make mw.popups.Preview#show responsible for binding event handlers
and configuring the cog based on the behavior.
Bug: T146889
Change-Id: I39d7d0afd7b1fe896019a1b3a82ee907bfb20edd
---
M extension.json
M resources/ext.popups/boot.js
M resources/ext.popups/changeListeners/render.js
A resources/ext.popups/preview/index.js
A resources/ext.popups/previewBehavior.js
M resources/ext.popups/renderer.js
M tests/qunit/ext.popups/changeListeners/render.test.js
A tests/qunit/ext.popups/previewBehavior.test.js
8 files changed, 222 insertions(+), 33 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/extension.json b/extension.json
index a841035..99562f5 100644
--- a/extension.json
+++ b/extension.json
@@ -75,6 +75,7 @@
"resources/ext.popups/processLinks.js",
"resources/ext.popups/counts.js",
"resources/ext.popups/gateway.js",
+
"resources/ext.popups/renderer.js",
"resources/ext.popups/schema.js",
@@ -90,9 +91,12 @@
"resources/ext.popups/changeListeners/eventLogging.js",
"resources/ext.popups/changeListeners/syncUserSettings.js",
"resources/ext.popups/changeListeners/settings.js",
+
"resources/ext.popups/settingsDialog.js",
"resources/ext.popups/pageVisibility.js",
"resources/ext.popups/checkin.js",
+ "resources/ext.popups/previewBehavior.js",
+
"resources/ext.popups/boot.js"
],
"templates": {
diff --git a/resources/ext.popups/boot.js b/resources/ext.popups/boot.js
index d72b2d5..062658f 100644
--- a/resources/ext.popups/boot.js
+++ b/resources/ext.popups/boot.js
@@ -32,8 +32,9 @@
* @param {mw.eventLog.Schema} schema
* @param {ext.popups.UserSettings} userSettings
* @param {Function} settingsDialog
+* @param {ext.popups.PreviewBehavior} previewBehavior
*/
- function registerChangeListeners( store, actions, schema, userSettings,
settingsDialog ) {
+ function registerChangeListeners( store, actions, schema, userSettings,
settingsDialog, previewBehavior ) {
// Sugar.
var changeListeners = mw.popups.changeListeners,
@@ -41,7 +42,7 @@
registerChangeListener( store, changeListeners.footerLink(
actions ) );
registerChangeListener( store, changeListeners.linkTitle() );
- registerChangeListener( store, changeListeners.render( actions
) );
+ registerChangeListener( store, changeListeners.render(
previewBehavior ) );
registerChangeListener( store, changeListeners.eventLogging(
actions, schema ) );
registerChangeListener( store,
changeListeners.syncUserSettings( userSettings ) );
registerChangeListener( store, changeListeners.settings(
actions, settingsDialog ) );
@@ -89,7 +90,8 @@
userSettings,
settingsDialog,
isEnabled,
- schema;
+ schema,
+ previewBehavior;
userSettings = mw.popups.createUserSettings( mw.storage );
settingsDialog = mw.popups.createSettingsDialogRenderer();
@@ -110,7 +112,10 @@
) )
);
actions = createBoundActions( store );
- registerChangeListeners( store, actions, schema, userSettings,
settingsDialog );
+
+ previewBehavior = mw.popups.createPreviewBehavior( mw.config,
mw.user, actions );
+
+ registerChangeListeners( store, actions, schema, userSettings,
settingsDialog, previewB
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[REL1_28]: Fix for helper forms when SMW not installed
Paladox has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332188 )
Change subject: Fix for helper forms when SMW not installed
..
Fix for helper forms when SMW not installed
Change-Id: I74a8e216ed849dd7225bab6722de96af14421193
(cherry picked from commit ed36bd00626247f9044a8ae071983fee61134f9f)
---
M includes/PF_HelperFormAction.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/88/332188/1
diff --git a/includes/PF_HelperFormAction.php b/includes/PF_HelperFormAction.php
index e2087f5..60c99be 100644
--- a/includes/PF_HelperFormAction.php
+++ b/includes/PF_HelperFormAction.php
@@ -139,7 +139,7 @@
*/
static function displayForm( $action, $article ) {
$title = $article->getTitle();
- if ( $title->getNamespace() == SMW_NS_PROPERTY ) {
+ if ( defined( 'SMW_NS_PROPERTY' ) && $title->getNamespace() ==
SMW_NS_PROPERTY ) {
$createPropertyPage = new PFCreateProperty();
$createPropertyPage->execute( $title->getText() );
} elseif ( $title->getNamespace() == NS_TEMPLATE ) {
--
To view, visit https://gerrit.wikimedia.org/r/332188
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I74a8e216ed849dd7225bab6722de96af14421193
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Yaron Koren
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[REL1_28]: Fix for d7e4ce9d3274
Paladox has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332187 )
Change subject: Fix for d7e4ce9d3274
..
Fix for d7e4ce9d3274
Change-Id: I8b398da636348b05c429f011c0eb8d33d1866c4f
(cherry picked from commit 77f88106442b5b60f538154407c8e24036da291a)
---
M includes/PF_CreatePageJob.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/87/332187/1
diff --git a/includes/PF_CreatePageJob.php b/includes/PF_CreatePageJob.php
index 72683cf..a7ce868 100644
--- a/includes/PF_CreatePageJob.php
+++ b/includes/PF_CreatePageJob.php
@@ -57,7 +57,7 @@
}
if ( method_exists( 'WikiPage', 'doEditContent' ) ) {
- $new_content = new WikitextContent( $text );
+ $new_content = new WikitextContent( $page_text );
$wikiPage->doEditContent( $new_content, $edit_summary,
$flags );
} else {
$article->doEditContent( $page_text, $edit_summary,
$flags );
--
To view, visit https://gerrit.wikimedia.org/r/332187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b398da636348b05c429f011c0eb8d33d1866c4f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Yaron Koren
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[REL1_28]: Another renaming fix
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/332186 ) Change subject: Another renaming fix .. Another renaming fix Change-Id: Id6289173d773bccbc44a89293c550d85ffd95d8e (cherry picked from commit 98909271b0fa4a87dc054fb3dab76cba15cb19d6) --- M PageForms.php 1 file changed, 5 insertions(+), 5 deletions(-) Approvals: Paladox: Looks good to me, approved jenkins-bot: Verified diff --git a/PageForms.php b/PageForms.php index 8efef74..7e4640b 100644 --- a/PageForms.php +++ b/PageForms.php @@ -395,17 +395,17 @@ 'libs/ext.pf.js', ), ), - 'ext.pageforms.pf_CreateProperty' => $wgPageFormsResourceTemplate + array( + 'ext.pageforms.PF_CreateProperty' => $wgPageFormsResourceTemplate + array( 'scripts' => array( 'libs/PF_CreateProperty.js', ), ), - 'ext.pageforms.pf_PageSchemas' => $wgPageFormsResourceTemplate + array( + 'ext.pageforms.PF_PageSchemas' => $wgPageFormsResourceTemplate + array( 'scripts' => array( 'libs/PF_PageSchemas.js', ), ), - 'ext.pageforms.pf_CreateTemplate' => $wgPageFormsResourceTemplate + array( + 'ext.pageforms.PF_CreateTemplate' => $wgPageFormsResourceTemplate + array( 'scripts' => array( 'libs/PF_CreateTemplate.js', ), @@ -413,12 +413,12 @@ 'pf_blank_error', ), ), - 'ext.pageforms.pf_CreateClass' => $wgPageFormsResourceTemplate + array( + 'ext.pageforms.PF_CreateClass' => $wgPageFormsResourceTemplate + array( 'scripts' => array( 'libs/PF_CreateClass.js', ), ), - 'ext.pageforms.pf_CreateForm' => $wgPageFormsResourceTemplate + array( + 'ext.pageforms.PF_CreateForm' => $wgPageFormsResourceTemplate + array( 'scripts' => array( 'libs/PF_CreateForm.js', ), -- To view, visit https://gerrit.wikimedia.org/r/332186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id6289173d773bccbc44a89293c550d85ffd95d8e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: REL1_28 Gerrit-Owner: Paladox Gerrit-Reviewer: Paladox Gerrit-Reviewer: Yaron Koren 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...PageForms[REL1_28]: Fix for e3f2972d7fe7
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332185 )
Change subject: Fix for e3f2972d7fe7
..
Fix for e3f2972d7fe7
Change-Id: Id1a9b9d8facf91afbea60665492e276d7e659011
(cherry picked from commit 7b95a65fd39518fdefe0bf74e41dd8e6885197fd)
---
M specials/PF_CreateClass.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/PF_CreateClass.php b/specials/PF_CreateClass.php
index 6251900..9f2be5c 100644
--- a/specials/PF_CreateClass.php
+++ b/specials/PF_CreateClass.php
@@ -71,7 +71,7 @@
// Create the property, and make a job for it.
if ( defined( 'SMW_VERSION' ) && !empty( $property_name
) ) {
- $full_text =
PFCreateProperty::createPropertyText( $property_type, '', $allowed_values );
+ $full_text =
PFCreateProperty::createPropertyText( $property_type, $allowed_values );
$property_title = Title::makeTitleSafe(
SMW_NS_PROPERTY, $property_name );
$params = array();
$params['user_id'] = $user->getId();
@@ -87,7 +87,7 @@
global $smwgContLang;
$datatypeLabels = $smwgContLang->getDatatypeLabels();
$property_type = $datatypeLabels['_wpg'];
- $full_text = PFCreateProperty::createPropertyText(
$property_type, '', $allowed_values );
+ $full_text = PFCreateProperty::createPropertyText(
$property_type, $allowed_values );
$property_title = Title::makeTitleSafe(
SMW_NS_PROPERTY, $connectingProperty );
$params = array();
$params['user_id'] = $user->getId();
--
To view, visit https://gerrit.wikimedia.org/r/332185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1a9b9d8facf91afbea60665492e276d7e659011
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Yaron Koren
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...PageForms[REL1_28]: Another renaming fix
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332186 ) Change subject: Another renaming fix .. Another renaming fix Change-Id: Id6289173d773bccbc44a89293c550d85ffd95d8e (cherry picked from commit 98909271b0fa4a87dc054fb3dab76cba15cb19d6) --- M PageForms.php 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms refs/changes/86/332186/1 diff --git a/PageForms.php b/PageForms.php index 8efef74..7e4640b 100644 --- a/PageForms.php +++ b/PageForms.php @@ -395,17 +395,17 @@ 'libs/ext.pf.js', ), ), - 'ext.pageforms.pf_CreateProperty' => $wgPageFormsResourceTemplate + array( + 'ext.pageforms.PF_CreateProperty' => $wgPageFormsResourceTemplate + array( 'scripts' => array( 'libs/PF_CreateProperty.js', ), ), - 'ext.pageforms.pf_PageSchemas' => $wgPageFormsResourceTemplate + array( + 'ext.pageforms.PF_PageSchemas' => $wgPageFormsResourceTemplate + array( 'scripts' => array( 'libs/PF_PageSchemas.js', ), ), - 'ext.pageforms.pf_CreateTemplate' => $wgPageFormsResourceTemplate + array( + 'ext.pageforms.PF_CreateTemplate' => $wgPageFormsResourceTemplate + array( 'scripts' => array( 'libs/PF_CreateTemplate.js', ), @@ -413,12 +413,12 @@ 'pf_blank_error', ), ), - 'ext.pageforms.pf_CreateClass' => $wgPageFormsResourceTemplate + array( + 'ext.pageforms.PF_CreateClass' => $wgPageFormsResourceTemplate + array( 'scripts' => array( 'libs/PF_CreateClass.js', ), ), - 'ext.pageforms.pf_CreateForm' => $wgPageFormsResourceTemplate + array( + 'ext.pageforms.PF_CreateForm' => $wgPageFormsResourceTemplate + array( 'scripts' => array( 'libs/PF_CreateForm.js', ), -- To view, visit https://gerrit.wikimedia.org/r/332186 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id6289173d773bccbc44a89293c550d85ffd95d8e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: REL1_28 Gerrit-Owner: Paladox Gerrit-Reviewer: Yaron Koren ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[REL1_28]: Fix for e3f2972d7fe7
Paladox has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332185 )
Change subject: Fix for e3f2972d7fe7
..
Fix for e3f2972d7fe7
Change-Id: Id1a9b9d8facf91afbea60665492e276d7e659011
(cherry picked from commit 7b95a65fd39518fdefe0bf74e41dd8e6885197fd)
---
M specials/PF_CreateClass.php
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/85/332185/1
diff --git a/specials/PF_CreateClass.php b/specials/PF_CreateClass.php
index 6251900..9f2be5c 100644
--- a/specials/PF_CreateClass.php
+++ b/specials/PF_CreateClass.php
@@ -71,7 +71,7 @@
// Create the property, and make a job for it.
if ( defined( 'SMW_VERSION' ) && !empty( $property_name
) ) {
- $full_text =
PFCreateProperty::createPropertyText( $property_type, '', $allowed_values );
+ $full_text =
PFCreateProperty::createPropertyText( $property_type, $allowed_values );
$property_title = Title::makeTitleSafe(
SMW_NS_PROPERTY, $property_name );
$params = array();
$params['user_id'] = $user->getId();
@@ -87,7 +87,7 @@
global $smwgContLang;
$datatypeLabels = $smwgContLang->getDatatypeLabels();
$property_type = $datatypeLabels['_wpg'];
- $full_text = PFCreateProperty::createPropertyText(
$property_type, '', $allowed_values );
+ $full_text = PFCreateProperty::createPropertyText(
$property_type, $allowed_values );
$property_title = Title::makeTitleSafe(
SMW_NS_PROPERTY, $connectingProperty );
$params = array();
$params['user_id'] = $user->getId();
--
To view, visit https://gerrit.wikimedia.org/r/332185
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id1a9b9d8facf91afbea60665492e276d7e659011
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Yaron Koren
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[REL1_28]: Removed call to OutputPage::getHeadScripts() - removed in MW...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332184 )
Change subject: Removed call to OutputPage::getHeadScripts() - removed in MW
1.28
..
Removed call to OutputPage::getHeadScripts() - removed in MW 1.28
Change-Id: I22abbf8cae759ecf7b9db3be972770fb608b65c7
(cherry picked from commit b8825ae30b3f1802e231f95868a1679d1be5be08)
---
M specials/PF_UploadForm.php
1 file changed, 0 insertions(+), 3 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/specials/PF_UploadForm.php b/specials/PF_UploadForm.php
index df50356..9cc7f64 100644
--- a/specials/PF_UploadForm.php
+++ b/specials/PF_UploadForm.php
@@ -323,9 +323,6 @@
$text .= <<
-
-{$out->getHeadScripts()}
-
{$out->getHTML()}
{$out->getBottomScripts()}
--
To view, visit https://gerrit.wikimedia.org/r/332184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I22abbf8cae759ecf7b9db3be972770fb608b65c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Yaron Koren
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...PageForms[REL1_28]: Removed call to OutputPage::getHeadScripts() - removed in MW...
Paladox has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332184 )
Change subject: Removed call to OutputPage::getHeadScripts() - removed in MW
1.28
..
Removed call to OutputPage::getHeadScripts() - removed in MW 1.28
Change-Id: I22abbf8cae759ecf7b9db3be972770fb608b65c7
(cherry picked from commit b8825ae30b3f1802e231f95868a1679d1be5be08)
---
M specials/PF_UploadForm.php
1 file changed, 0 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/84/332184/1
diff --git a/specials/PF_UploadForm.php b/specials/PF_UploadForm.php
index df50356..9cc7f64 100644
--- a/specials/PF_UploadForm.php
+++ b/specials/PF_UploadForm.php
@@ -323,9 +323,6 @@
$text .= <<
-
-{$out->getHeadScripts()}
-
{$out->getHTML()}
{$out->getBottomScripts()}
--
To view, visit https://gerrit.wikimedia.org/r/332184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I22abbf8cae759ecf7b9db3be972770fb608b65c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Yaron Koren
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[REL1_28]: Fix for regexp function name
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332183 )
Change subject: Fix for regexp function name
..
Fix for regexp function name
Change-Id: I124dc82c5e1c6a012eae4c567037f9112e54a279
(cherry picked from commit 79020a0725aacd93aa4c501f27752b93dac4ca51)
---
M includes/forminputs/PF_RegExpInput.php
M libs/PF_regexp.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/forminputs/PF_RegExpInput.php
b/includes/forminputs/PF_RegExpInput.php
index 851feea..c7a81a6 100644
--- a/includes/forminputs/PF_RegExpInput.php
+++ b/includes/forminputs/PF_RegExpInput.php
@@ -84,7 +84,7 @@
);
// Finally set name and parameters for the validation function
- $this->addJsValidationFunctionData( 'PFI_RE_validate',
$jsFunctionData );
+ $this->addJsValidationFunctionData( 'PF_RE_validate',
$jsFunctionData );
// set base input type name
diff --git a/libs/PF_regexp.js b/libs/PF_regexp.js
index 1a9d7cf..4a5b1ad 100644
--- a/libs/PF_regexp.js
+++ b/libs/PF_regexp.js
@@ -16,7 +16,7 @@
* @return (Boolean) true, if the input's value matches the regular expression
in
* retext, false otherwise; the value is inverted if inverse is true
*/
-window.SFI_RE_validate = function( input_id, params ) { //input_number,
retext, inverse, message, multiple
+window.PF_RE_validate = function( input_id, params ) { //input_number, retext,
inverse, message, multiple
var match;
var message;
--
To view, visit https://gerrit.wikimedia.org/r/332183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I124dc82c5e1c6a012eae4c567037f9112e54a279
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Yaron Koren
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...PageForms[REL1_28]: Fix for regexp function name
Paladox has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332183 )
Change subject: Fix for regexp function name
..
Fix for regexp function name
Change-Id: I124dc82c5e1c6a012eae4c567037f9112e54a279
(cherry picked from commit 79020a0725aacd93aa4c501f27752b93dac4ca51)
---
M includes/forminputs/PF_RegExpInput.php
M libs/PF_regexp.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/83/332183/1
diff --git a/includes/forminputs/PF_RegExpInput.php
b/includes/forminputs/PF_RegExpInput.php
index 851feea..c7a81a6 100644
--- a/includes/forminputs/PF_RegExpInput.php
+++ b/includes/forminputs/PF_RegExpInput.php
@@ -84,7 +84,7 @@
);
// Finally set name and parameters for the validation function
- $this->addJsValidationFunctionData( 'PFI_RE_validate',
$jsFunctionData );
+ $this->addJsValidationFunctionData( 'PF_RE_validate',
$jsFunctionData );
// set base input type name
diff --git a/libs/PF_regexp.js b/libs/PF_regexp.js
index 1a9d7cf..4a5b1ad 100644
--- a/libs/PF_regexp.js
+++ b/libs/PF_regexp.js
@@ -16,7 +16,7 @@
* @return (Boolean) true, if the input's value matches the regular expression
in
* retext, false otherwise; the value is inverted if inverse is true
*/
-window.SFI_RE_validate = function( input_id, params ) { //input_number,
retext, inverse, message, multiple
+window.PF_RE_validate = function( input_id, params ) { //input_number, retext,
inverse, message, multiple
var match;
var message;
--
To view, visit https://gerrit.wikimedia.org/r/332183
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I124dc82c5e1c6a012eae4c567037f9112e54a279
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Yaron Koren
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SignWritingMediaWikiPlugin[master]: Add grunt-jsonlint and grunt-banana-checker
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332141 )
Change subject: Add grunt-jsonlint and grunt-banana-checker
..
Add grunt-jsonlint and grunt-banana-checker
jsonlint and banana-checker will test for valid i18n files
Bug: T94547
Change-Id: I8c1b74a731674bcc7d6c7c2701a19e7664e1b374
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)
Approvals:
Slevinski: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
.svn
*~
*.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/332141
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8c1b74a731674bcc7d6c7c2701a19e7664e1b374
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SignWritingMediaWikiPlugin
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
Gerrit-Reviewer: Slevinski
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...PageForms[REL1_28]: Fix error in wording of message
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332182 )
Change subject: Fix error in wording of message
..
Fix error in wording of message
Change-Id: Ia2c5562db6a75d4bc98e82ba60ff0f8563c9551d
---
M libs/PF_maps.js
M libs/PF_maps.offline.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/libs/PF_maps.js b/libs/PF_maps.js
index 7e2477a..72aca2a 100644
--- a/libs/PF_maps.js
+++ b/libs/PF_maps.js
@@ -74,7 +74,7 @@
googleMapsSetMarker(
results[0].geometry.location );
map.setZoom(14);
} else {
- alert("Geocode was not succespful for
the following reason: " + status);
+ alert("Geocode was not successful for
the following reason: " + status);
}
});
} else { // if ( mapService == "OpenLayers" ) {
diff --git a/libs/PF_maps.offline.js b/libs/PF_maps.offline.js
index d4de87b..47196f3 100644
--- a/libs/PF_maps.offline.js
+++ b/libs/PF_maps.offline.js
@@ -137,7 +137,7 @@
googleMapsSetMarker(
results[0].geometry.location );
map.setZoom(14);
} else {
- alert("Geocode was not succespful for
the following reason: " + status);
+ alert("Geocode was not successful for
the following reason: " + status);
}
});
} // else { if ( mapService == "OpenLayers" ) {
--
To view, visit https://gerrit.wikimedia.org/r/332182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2c5562db6a75d4bc98e82ba60ff0f8563c9551d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Paladox
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...PageForms[master]: Fix error in wording of message
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332181 )
Change subject: Fix error in wording of message
..
Fix error in wording of message
Change-Id: Ia2c5562db6a75d4bc98e82ba60ff0f8563c9551d
---
M libs/PF_maps.js
M libs/PF_maps.offline.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/libs/PF_maps.js b/libs/PF_maps.js
index d97d228..5af15c8 100644
--- a/libs/PF_maps.js
+++ b/libs/PF_maps.js
@@ -83,7 +83,7 @@
googleMapsSetMarker(
results[0].geometry.location );
map.setZoom(14);
} else {
- alert("Geocode was not succespful for
the following reason: " + status);
+ alert("Geocode was not successful for
the following reason: " + status);
}
});
} else { // if ( mapService == "OpenLayers" ) {
diff --git a/libs/PF_maps.offline.js b/libs/PF_maps.offline.js
index f9db582..9d1f0f5 100644
--- a/libs/PF_maps.offline.js
+++ b/libs/PF_maps.offline.js
@@ -149,7 +149,7 @@
googleMapsSetMarker(
results[0].geometry.location );
map.setZoom(14);
} else {
- alert("Geocode was not succespful for
the following reason: " + status);
+ alert("Geocode was not successful for
the following reason: " + status);
}
});
} // else { if ( mapService == "OpenLayers" ) {
--
To view, visit https://gerrit.wikimedia.org/r/332181
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia2c5562db6a75d4bc98e82ba60ff0f8563c9551d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Paladox
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Yaron Koren
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...PageForms[REL1_28]: Fix error in wording of message
Paladox has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332182 )
Change subject: Fix error in wording of message
..
Fix error in wording of message
Change-Id: Ia2c5562db6a75d4bc98e82ba60ff0f8563c9551d
---
M libs/PF_maps.js
M libs/PF_maps.offline.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/82/332182/1
diff --git a/libs/PF_maps.js b/libs/PF_maps.js
index 7e2477a..72aca2a 100644
--- a/libs/PF_maps.js
+++ b/libs/PF_maps.js
@@ -74,7 +74,7 @@
googleMapsSetMarker(
results[0].geometry.location );
map.setZoom(14);
} else {
- alert("Geocode was not succespful for
the following reason: " + status);
+ alert("Geocode was not successful for
the following reason: " + status);
}
});
} else { // if ( mapService == "OpenLayers" ) {
diff --git a/libs/PF_maps.offline.js b/libs/PF_maps.offline.js
index d4de87b..47196f3 100644
--- a/libs/PF_maps.offline.js
+++ b/libs/PF_maps.offline.js
@@ -137,7 +137,7 @@
googleMapsSetMarker(
results[0].geometry.location );
map.setZoom(14);
} else {
- alert("Geocode was not succespful for
the following reason: " + status);
+ alert("Geocode was not successful for
the following reason: " + status);
}
});
} // else { if ( mapService == "OpenLayers" ) {
--
To view, visit https://gerrit.wikimedia.org/r/332182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia2c5562db6a75d4bc98e82ba60ff0f8563c9551d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix error in wording of message
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332181 ) Change subject: Fix error in wording of message .. Fix error in wording of message Change-Id: Ia2c5562db6a75d4bc98e82ba60ff0f8563c9551d --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms refs/changes/81/332181/1 -- To view, visit https://gerrit.wikimedia.org/r/332181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ia2c5562db6a75d4bc98e82ba60ff0f8563c9551d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/PageForms Gerrit-Branch: master Gerrit-Owner: Paladox 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...PageForms[REL1_28]: Fix for acaa67f52e8b - OpenLayers fix
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332180 )
Change subject: Fix for acaa67f52e8b - OpenLayers fix
..
Fix for acaa67f52e8b - OpenLayers fix
Change-Id: Ic5ec83716b65e65aad97a4e7d84e95117b92cbb8
(cherry picked from commit 376774e921f466ac7ea3864f1639e6f2230dc069)
---
M libs/PF_maps.js
M libs/PF_maps.offline.js
2 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Paladox: Looks good to me, approved
jenkins-bot: Verified
diff --git a/libs/PF_maps.js b/libs/PF_maps.js
index 5956018..7e2477a 100644
--- a/libs/PF_maps.js
+++ b/libs/PF_maps.js
@@ -112,8 +112,8 @@
}
function toOpenLayersLonLat( map, lat, lon ) {
- return new OpenLayers.LonLat( lon, lat ).tranpform(
- new OpenLayers.Projection("EPSG:4326"), // tranpform
from WGS 1984
+ return new OpenLayers.LonLat( lon, lat ).transform(
+ new OpenLayers.Projection("EPSG:4326"), // transform
from WGS 1984
map.getProjectionObject() // to Spherical Mercator
Projection
);
}
@@ -148,10 +148,10 @@
marker = new OpenLayers.Marker( location );
markers.addMarker( marker );
- // Tranpform the coordinates back, in order to display them.
+ // Transform the coordinates back, in order to display them.
var realLonLat = location.clone();
- realLonLat.tranpform(
- map.getProjectionObject(), // tranpform from Spherical
Mercator Projection
+ realLonLat.transform(
+ map.getProjectionObject(), // transform from Spherical
Mercator Projection
new OpenLayers.Projection("EPSG:4326") // to WGS 1984
);
var stringVal = pfRoundOffDecimal( realLonLat.lat ) + ', ' +
pfRoundOffDecimal( realLonLat.lon );
diff --git a/libs/PF_maps.offline.js b/libs/PF_maps.offline.js
index cbffce1..d4de87b 100644
--- a/libs/PF_maps.offline.js
+++ b/libs/PF_maps.offline.js
@@ -41,10 +41,10 @@
marker = new OpenLayers.Marker( location );
markers.addMarker( marker );
- // Tranpform the coordinates back, in order to display them.
+ // Transform the coordinates back, in order to display them.
var realLonLat = location.clone();
- realLonLat.tranpform(
- map.getProjectionObject(), // tranpform from Spherical
Mercator Projection
+ realLonLat.transform(
+ map.getProjectionObject(), // transform from Spherical
Mercator Projection
new OpenLayers.Projection("EPSG:4326") // to WGS 1984
);
var stringVal = pfRoundOffDecimal( realLonLat.lat ) + ', ' +
pfRoundOffDecimal( realLonLat.lon );
@@ -79,8 +79,8 @@
}
function toOpenLayersLonLat( map, lat, lon ) {
- return new OpenLayers.LonLat( lon, lat ).tranpform(
- new OpenLayers.Projection( "EPSG:4326" ), // tranpform
from WGS 1984
+ return new OpenLayers.LonLat( lon, lat ).transform(
+ new OpenLayers.Projection( "EPSG:4326" ), // transform
from WGS 1984
map.getProjectionObject() // to Spherical Mercator
Projection
);
}
--
To view, visit https://gerrit.wikimedia.org/r/332180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5ec83716b65e65aad97a4e7d84e95117b92cbb8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Yaron Koren
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...PageForms[REL1_28]: Fix for acaa67f52e8b - OpenLayers fix
Paladox has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332180 )
Change subject: Fix for acaa67f52e8b - OpenLayers fix
..
Fix for acaa67f52e8b - OpenLayers fix
Change-Id: Ic5ec83716b65e65aad97a4e7d84e95117b92cbb8
(cherry picked from commit 376774e921f466ac7ea3864f1639e6f2230dc069)
---
M libs/PF_maps.js
M libs/PF_maps.offline.js
2 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/80/332180/1
diff --git a/libs/PF_maps.js b/libs/PF_maps.js
index 5956018..7e2477a 100644
--- a/libs/PF_maps.js
+++ b/libs/PF_maps.js
@@ -112,8 +112,8 @@
}
function toOpenLayersLonLat( map, lat, lon ) {
- return new OpenLayers.LonLat( lon, lat ).tranpform(
- new OpenLayers.Projection("EPSG:4326"), // tranpform
from WGS 1984
+ return new OpenLayers.LonLat( lon, lat ).transform(
+ new OpenLayers.Projection("EPSG:4326"), // transform
from WGS 1984
map.getProjectionObject() // to Spherical Mercator
Projection
);
}
@@ -148,10 +148,10 @@
marker = new OpenLayers.Marker( location );
markers.addMarker( marker );
- // Tranpform the coordinates back, in order to display them.
+ // Transform the coordinates back, in order to display them.
var realLonLat = location.clone();
- realLonLat.tranpform(
- map.getProjectionObject(), // tranpform from Spherical
Mercator Projection
+ realLonLat.transform(
+ map.getProjectionObject(), // transform from Spherical
Mercator Projection
new OpenLayers.Projection("EPSG:4326") // to WGS 1984
);
var stringVal = pfRoundOffDecimal( realLonLat.lat ) + ', ' +
pfRoundOffDecimal( realLonLat.lon );
diff --git a/libs/PF_maps.offline.js b/libs/PF_maps.offline.js
index cbffce1..d4de87b 100644
--- a/libs/PF_maps.offline.js
+++ b/libs/PF_maps.offline.js
@@ -41,10 +41,10 @@
marker = new OpenLayers.Marker( location );
markers.addMarker( marker );
- // Tranpform the coordinates back, in order to display them.
+ // Transform the coordinates back, in order to display them.
var realLonLat = location.clone();
- realLonLat.tranpform(
- map.getProjectionObject(), // tranpform from Spherical
Mercator Projection
+ realLonLat.transform(
+ map.getProjectionObject(), // transform from Spherical
Mercator Projection
new OpenLayers.Projection("EPSG:4326") // to WGS 1984
);
var stringVal = pfRoundOffDecimal( realLonLat.lat ) + ', ' +
pfRoundOffDecimal( realLonLat.lon );
@@ -79,8 +79,8 @@
}
function toOpenLayersLonLat( map, lat, lon ) {
- return new OpenLayers.LonLat( lon, lat ).tranpform(
- new OpenLayers.Projection( "EPSG:4326" ), // tranpform
from WGS 1984
+ return new OpenLayers.LonLat( lon, lat ).transform(
+ new OpenLayers.Projection( "EPSG:4326" ), // transform
from WGS 1984
map.getProjectionObject() // to Spherical Mercator
Projection
);
}
--
To view, visit https://gerrit.wikimedia.org/r/332180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5ec83716b65e65aad97a4e7d84e95117b92cbb8
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: REL1_28
Gerrit-Owner: Paladox
Gerrit-Reviewer: Yaron Koren
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] oojs/ui[master]: MediaWiki theme: Unify box-shadows to one visual appearance
VolkerE has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332179 )
Change subject: MediaWiki theme: Unify box-shadows to one visual appearance
..
MediaWiki theme: Unify box-shadows to one visual appearance
Making them all faded to address spatial overlap issues with vertical
lines and use variables.
Bug: T155383
Change-Id: I6ce358f23e87bde688ac9760eb496faf898dfa0a
---
M src/themes/mediawiki/common.less
M src/themes/mediawiki/tools.less
2 files changed, 6 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/79/332179/1
diff --git a/src/themes/mediawiki/common.less b/src/themes/mediawiki/common.less
index bd9253b..989905b 100644
--- a/src/themes/mediawiki/common.less
+++ b/src/themes/mediawiki/common.less
@@ -107,8 +107,9 @@
@right-indicator-label: ( @right-indicator * 2 ) + @size-indicator;
@right-label: 8 / @oo-ui-font-size-browser / @oo-ui-font-size-default;
-@box-shadow-dialog: 0 0.15em 0 0 rgba( 0, 0, 0, 0.15 );
+@box-shadow-dialog: 0 2px 2px 0 rgba( 0, 0, 0, 0.25 );
@box-shadow-menu: @box-shadow-dialog;
+@box-shadow-toolbar: 0 1px 1px 0 rgba( 0, 0, 0, 0.1 );
@box-shadow-widget: inset 0 0 0 1px @background-color-default;
@box-shadow-widget-focus: inset 0 0 0 1px @color-progressive;
@box-shadow-progressive-focus: inset 0 0 0 1px @color-progressive, inset 0 0 0
2px @color-default-light;
diff --git a/src/themes/mediawiki/tools.less b/src/themes/mediawiki/tools.less
index f09197a..b0dfdab 100644
--- a/src/themes/mediawiki/tools.less
+++ b/src/themes/mediawiki/tools.less
@@ -2,11 +2,11 @@
.theme-oo-ui-toolbar () {
&-bar {
- border-bottom: @border-toolbar;
background-color: @background-color-toolbar;
- box-shadow: 0 1px 1px rgba( 0, 0, 0, 0.1 );
- font-weight: 500;
color: @color-default;
+ border-bottom: @border-toolbar;
+ box-shadow: @box-shadow-toolbar;
+ font-weight: 500;
.oo-ui-toolbar-bar {
border-bottom: 0;
@@ -246,7 +246,7 @@
margin: 0 -1px;
border: @border-toolbar;
background-color: @background-color-toolbar;
- box-shadow: 0 2px 3px rgba( 0, 0, 0, 0.2 );
+ box-shadow: @box-shadow-menu;
min-width: 16em;
}
--
To view, visit https://gerrit.wikimedia.org/r/332179
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6ce358f23e87bde688ac9760eb496faf898dfa0a
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: VolkerE
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Forward PopupsBetaFeature to the client
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332152 )
Change subject: Forward PopupsBetaFeature to the client
..
Forward PopupsBetaFeature to the client
Bug: T146889
Change-Id: I66739b01e405bd7be29e912388005e0bb1f25b3f
---
M Popups.hooks.php
M tests/phpunit/PopupsHooksTest.php
2 files changed, 15 insertions(+), 4 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Popups.hooks.php b/Popups.hooks.php
index 807ffae..29cb9ab 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -142,6 +142,7 @@
public static function onResourceLoaderGetConfigVars( array &$vars ) {
$conf = PopupsContext::getInstance()->getConfig();
$vars['wgPopupsSchemaSamplingRate'] = $conf->get(
'PopupsSchemaSamplingRate' );
+ $vars['wgPopupsBetaFeature'] = $conf->get( 'PopupsBetaFeature'
);
}
/**
diff --git a/tests/phpunit/PopupsHooksTest.php
b/tests/phpunit/PopupsHooksTest.php
index dc30481..0223f59 100644
--- a/tests/phpunit/PopupsHooksTest.php
+++ b/tests/phpunit/PopupsHooksTest.php
@@ -188,11 +188,21 @@
*/
public function testOnResourceLoaderGetConfigVars() {
$vars = [ 'something' => 'notEmpty' ];
- $value = 10;
- $this->setMwGlobals( [ 'wgPopupsSchemaSamplingRate' => $value ]
);
+ $config = [
+ 'wgPopupsSchemaSamplingRate' => 10,
+ 'wgPopupsBetaFeature' => true,
+ ];
+ $this->setMwGlobals( $config );
PopupsHooks::onResourceLoaderGetConfigVars( $vars );
- $this->assertCount( 2, $vars );
- $this->assertEquals( $value, $vars[
'wgPopupsSchemaSamplingRate' ] );
+ $this->assertCount( 3, $vars );
+
+ foreach ( $config as $key => $value ) {
+ $this->assertEquals(
+ $value,
+ $vars[ $key ],
+ "It forwards the \"{$key}\" config variable to
the client."
+ );
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/332152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I66739b01e405bd7be29e912388005e0bb1f25b3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: mpga
Gerrit-Owner: Phuedx
Gerrit-Reviewer: Jhernandez
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...Popups[mpga]: Hygiene: Rename SchemaPopupsSamplingRate
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332151 )
Change subject: Hygiene: Rename SchemaPopupsSamplingRate
..
Hygiene: Rename SchemaPopupsSamplingRate
The SchemaPopupsSamplingRate config variable is inconsistently named and
even forwarded to the client as wgPopupsSchemaPopupsSamplingRate.
Changes:
* SchemaPopupsSamplingRate -> PopupsSchemaSamplingRate
* Forward PopupsSchemaSamplingRate to the client as
$wgPopupsSchemaSamplingRate.
Bug: T146889
Bug: T146434
Change-Id: I80d6a0abccf462e2eb0fd96af6849b5e82b49c26
---
M Popups.hooks.php
M extension.json
M resources/ext.popups/schema.js
M tests/phpunit/PopupsHooksTest.php
M tests/qunit/ext.popups/schema.test.js
5 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Popups.hooks.php b/Popups.hooks.php
index ee9ea97..807ffae 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -141,7 +141,7 @@
*/
public static function onResourceLoaderGetConfigVars( array &$vars ) {
$conf = PopupsContext::getInstance()->getConfig();
- $vars['wgPopupsSchemaPopupsSamplingRate'] = $conf->get(
'SchemaPopupsSamplingRate' );
+ $vars['wgPopupsSchemaSamplingRate'] = $conf->get(
'PopupsSchemaSamplingRate' );
}
/**
diff --git a/extension.json b/extension.json
index 25d76e5..a841035 100644
--- a/extension.json
+++ b/extension.json
@@ -47,8 +47,8 @@
"config": {
"@PopupsBetaFeature": "@var bool: Whether the extension should
be enabled as an opt-in beta feature. If true, the BetaFeatures extension must
be installed. False by default.",
"PopupsBetaFeature": false,
- "@SchemaPopupsSamplingRate": "@var number: Sample rate for
logging events to Schema:Popups.",
- "SchemaPopupsSamplingRate": 0,
+ "@PopupsSchemaSamplingRate": "@var number: Sample rate for
logging events to Schema:Popups.",
+ "PopupsSchemaSamplingRate": 0,
"@PopupsHideOptInOnPreferencesPage": "@var bool: Whether the
option to senable/disable Page Previews should be hidden on Preferences page.
Please note if PopupsBetaFeature is set to true this option will be always
hidden. False by default",
"PopupsHideOptInOnPreferencesPage": false,
"@PopupsOptInDefaultState" : "@var string:['1'|'0'] Default
Page Previews visibility. Has to be a string as a compatibility with beta
feature settings",
diff --git a/resources/ext.popups/schema.js b/resources/ext.popups/schema.js
index d3e5904..683da2c 100644
--- a/resources/ext.popups/schema.js
+++ b/resources/ext.popups/schema.js
@@ -9,7 +9,7 @@
* @return {mw.eventLog.Schema}
*/
mw.popups.createSchema = function ( config, window ) {
- var samplingRate = config.get(
'wgPopupsSchemaPopupsSamplingRate', 0 );
+ var samplingRate = config.get( 'wgPopupsSchemaSamplingRate', 0
);
if (
!window.navigator ||
diff --git a/tests/phpunit/PopupsHooksTest.php
b/tests/phpunit/PopupsHooksTest.php
index e1360fa..dc30481 100644
--- a/tests/phpunit/PopupsHooksTest.php
+++ b/tests/phpunit/PopupsHooksTest.php
@@ -189,10 +189,10 @@
public function testOnResourceLoaderGetConfigVars() {
$vars = [ 'something' => 'notEmpty' ];
$value = 10;
- $this->setMwGlobals( [ 'wgSchemaPopupsSamplingRate' => $value ]
);
+ $this->setMwGlobals( [ 'wgPopupsSchemaSamplingRate' => $value ]
);
PopupsHooks::onResourceLoaderGetConfigVars( $vars );
$this->assertCount( 2, $vars );
- $this->assertEquals( $value, $vars[
'wgPopupsSchemaPopupsSamplingRate' ] );
+ $this->assertEquals( $value, $vars[
'wgPopupsSchemaSamplingRate' ] );
}
/**
diff --git a/tests/qunit/ext.popups/schema.test.js
b/tests/qunit/ext.popups/schema.test.js
index 6f92df9..8e63604 100644
--- a/tests/qunit/ext.popups/schema.test.js
+++ b/tests/qunit/ext.popups/schema.test.js
@@ -3,7 +3,7 @@
QUnit.module( 'ext.popups/schema', {
setup: function () {
this.config = new mw.Map();
- this.config.set( 'wgPopupsSchemaPopupsSamplingRate', 1
);
+ this.config.set( 'wgPopupsSchemaSamplingRate', 1 );
this.window = {
navigator: {
@@ -16,7 +16,7 @@
}
} );
- QUnit.test( 'it should use $wgPopupsSchemaPopupsSamplingRate as the
sampling rate', function ( assert ) {
+ QUnit.test( 'it should use $wgPopupsSchemaSamplingRate as the sampling
rate', function ( assert ) {
assert.expect( 2 );
mw.popups.createS
[MediaWiki-commits] [Gerrit] mediawiki/vagrant[jessie-migration]: Replace upstart with systemd unit in ::xvfb
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/329619 )
Change subject: Replace upstart with systemd unit in ::xvfb
..
Replace upstart with systemd unit in ::xvfb
Bug: T154273
Change-Id: I087ea936177eeca34df33fe1d25b4ac008c75908
---
M puppet/modules/xvfb/manifests/init.pp
D puppet/modules/xvfb/templates/xvfb.conf.erb
A puppet/modules/xvfb/templates/xvfb.systemd.erb
3 files changed, 28 insertions(+), 21 deletions(-)
Approvals:
Muehlenhoff: Looks good to me, but someone else must approve
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git a/puppet/modules/xvfb/manifests/init.pp
b/puppet/modules/xvfb/manifests/init.pp
index 02df16a..1639490 100644
--- a/puppet/modules/xvfb/manifests/init.pp
+++ b/puppet/modules/xvfb/manifests/init.pp
@@ -39,15 +39,24 @@
system => true,
}
-file { '/etc/init/xvfb.conf':
-content => template('xvfb/xvfb.conf.erb'),
-require => [ Package['xvfb'], User['xvfb'] ],
+file { '/lib/systemd/system/xvfb.service':
+content => template('xvfb/xvfb.systemd.erb'),
+require => [
+Package['xvfb'],
+User['xvfb'],
+],
+notify => Service['xvfb'],
+}
+exec { 'systemd reload for xvfb':
+refreshonly => true,
+command => '/bin/systemctl daemon-reload',
+subscribe => File['/lib/systemd/system/xvfb.service'],
+notify => Service['xvfb'],
}
service { 'xvfb':
ensure => running,
enable => true,
-provider => 'upstart',
-require => File['/etc/init/xvfb.conf'],
+provider => 'systemd',
}
}
diff --git a/puppet/modules/xvfb/templates/xvfb.conf.erb
b/puppet/modules/xvfb/templates/xvfb.conf.erb
deleted file mode 100644
index 9d94c51..000
--- a/puppet/modules/xvfb/templates/xvfb.conf.erb
+++ /dev/null
@@ -1,16 +0,0 @@
-# xvfb - X virtual framebuffer
-#
-# Xvfb or X virtual framebuffer is an X11 server that performs all
-# graphical operations in memory, not showing any screen output.
-#
-description "X virtual framebuffer"
-
-start on (local-filesystems and net-device-up IFACE!=lo)
-
-setuid xvfb
-setgid xvfb
-
-respawn
-respawn limit 10 5
-
-exec Xvfb :<%= @display %> -screen 0 <%= @resolution %> -ac
diff --git a/puppet/modules/xvfb/templates/xvfb.systemd.erb
b/puppet/modules/xvfb/templates/xvfb.systemd.erb
new file mode 100644
index 000..de61978
--- /dev/null
+++ b/puppet/modules/xvfb/templates/xvfb.systemd.erb
@@ -0,0 +1,14 @@
+[Unit]
+Description="X virtual framebuffer"
+
+[Service]
+Environment=NODE_PATH=<%= @dir %>/node_modules
+User=xvfb
+Group=xvfb
+SyslogIdentifier=xvfb
+ExecStart=/usr/bin/Xvfb :<%= @display %> -screen 0 <%= @resolution %> -ac
+Restart=on-failure
+RestartSec=30
+
+[Install]
+WantedBy=multi-user.target
--
To view, visit https://gerrit.wikimedia.org/r/329619
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I087ea936177eeca34df33fe1d25b4ac008c75908
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: jessie-migration
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Dduvall
Gerrit-Reviewer: Muehlenhoff
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...Popups[mpga]: actions: Merge LINK_ABANDON_* + PREVIEW_ABANDON_*
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331806 )
Change subject: actions: Merge LINK_ABANDON_* + PREVIEW_ABANDON_*
..
actions: Merge LINK_ABANDON_* + PREVIEW_ABANDON_*
Per Id1339dc2, the LINK_ABANDON_* and PREVIEW_ABANDON_* actions can (and
should) be merged, as they are always reduced in the same way.
Change-Id: I71b30d4d2774deb4efea9e565f2ccd7383bf08c1
---
M resources/ext.popups/actions.js
M resources/ext.popups/boot.js
M resources/ext.popups/changeListeners/linkTitle.js
M resources/ext.popups/reducers/eventLogging.js
M resources/ext.popups/reducers/preview.js
M resources/ext.popups/renderer.js
M tests/qunit/ext.popups/actions.test.js
M tests/qunit/ext.popups/integration.test.js
M tests/qunit/ext.popups/reducers/preview.test.js
9 files changed, 81 insertions(+), 173 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index a2a5074..3135794 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -5,15 +5,13 @@
BOOT: 'BOOT',
CHECKIN: 'CHECKIN',
LINK_DWELL: 'LINK_DWELL',
- LINK_ABANDON_START: 'LINK_ABANDON_START',
- LINK_ABANDON_END: 'LINK_ABANDON_END',
+ ABANDON_START: 'ABANDON_START',
+ ABANDON_END: 'ABANDON_END',
LINK_CLICK: 'LINK_CLICK',
FETCH_START: 'FETCH_START',
FETCH_END: 'FETCH_END',
FETCH_FAILED: 'FETCH_FAILED',
PREVIEW_DWELL: 'PREVIEW_DWELL',
- PREVIEW_ABANDON_START: 'PREVIEW_ABANDON_START',
- PREVIEW_ABANDON_END: 'PREVIEW_ABANDON_END',
PREVIEW_SHOW: 'PREVIEW_SHOW',
PREVIEW_CLICK: 'PREVIEW_CLICK',
SETTINGS_SHOW: 'SETTINGS_SHOW',
@@ -201,28 +199,24 @@
/**
* Represents the user abandoning a link, either by moving their mouse
away
* from it or by shifting focus to another UI element using their
keyboard or
-* an assistive device.
-*
-* TODO: linkAbandon and previewAbandon share test cases and structure,
-* we should collapse them into one action creator in a followup commit,
-* maybe keeping a origin: 'LINK'|'PREVIEW' field on the action payload
for
-* introspection on the devtools.
+* an assistive device, or abandoning a preview by moving their mouse
away
+* from it.
*
* @return {Redux.Thunk}
*/
- actions.linkAbandon = function () {
+ actions.abandon = function () {
return function ( dispatch, getState ) {
var token = getState().preview.activeToken;
dispatch( timedAction( {
- type: types.LINK_ABANDON_START,
+ type: types.ABANDON_START,
token: token
} ) );
mw.popups.wait( ABANDON_END_DELAY )
.then( function () {
dispatch( {
- type: types.LINK_ABANDON_END,
+ type: types.ABANDON_END,
token: token
} );
} );
@@ -251,31 +245,6 @@
actions.previewDwell = function () {
return {
type: types.PREVIEW_DWELL
- };
- };
-
- /**
-* Represents the user abandoning a preview by moving their mouse away
from
-* it.
-*
-* @return {Object}
-*/
- actions.previewAbandon = function () {
- return function ( dispatch, getState ) {
- var token = getState().preview.activeToken;
-
- dispatch( {
- type: types.PREVIEW_ABANDON_START,
- token: token
- } );
-
- mw.popups.wait( ABANDON_END_DELAY )
- .then( function () {
- dispatch( timedAction( {
- type: types.PREVIEW_ABANDON_END,
- token: token
- } ) );
- } );
};
};
diff --git a/resources/ext.popups/boot.js b/resources/ext.popups/boot.js
index bae4819..d72b2d5 100644
--- a/resources/ext.p
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Hygiene: Remove link element from LINK_ABANDON_*
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331805 )
Change subject: Hygiene: Remove link element from LINK_ABANDON_*
..
Hygiene: Remove link element from LINK_ABANDON_*
Initially, the link element was added to LINK_ABANDON_* to determine
when an interaction should be reset. However, this wasn't enough to
protect against timing-related bugs, e.g. T154923. Now that tokens are
used to determine when interactions should be reset, the link element
can safely be removed from the LINK_ABANON_* actions.
Supporting changes:
* Update the return type of mw.popups.actions.linkAbandon in its
DocBlock.
Change-Id: Iaaed7a4846af75f9c4051d7bc761022ea5b3f6cf
---
M resources/ext.popups/actions.js
M tests/qunit/ext.popups/actions.test.js
2 files changed, 2 insertions(+), 7 deletions(-)
Approvals:
Jhernandez: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js
index 8bae158..a2a5074 100644
--- a/resources/ext.popups/actions.js
+++ b/resources/ext.popups/actions.js
@@ -208,16 +208,14 @@
* maybe keeping a origin: 'LINK'|'PREVIEW' field on the action payload
for
* introspection on the devtools.
*
-* @param {Element} el
-* @return {Object}
+* @return {Redux.Thunk}
*/
- actions.linkAbandon = function ( el ) {
+ actions.linkAbandon = function () {
return function ( dispatch, getState ) {
var token = getState().preview.activeToken;
dispatch( timedAction( {
type: types.LINK_ABANDON_START,
- el: el,
token: token
} ) );
@@ -225,7 +223,6 @@
.then( function () {
dispatch( {
type: types.LINK_ABANDON_END,
- el: el,
token: token
} );
} );
diff --git a/tests/qunit/ext.popups/actions.test.js
b/tests/qunit/ext.popups/actions.test.js
index 7f1c670..8aed7d8 100644
--- a/tests/qunit/ext.popups/actions.test.js
+++ b/tests/qunit/ext.popups/actions.test.js
@@ -340,7 +340,6 @@
assert.ok( dispatch.calledWith( {
type: 'LINK_ABANDON_START',
- el: that.el,
timestamp: mw.now(),
token: token
} ) );
@@ -356,7 +355,6 @@
assert.ok(
dispatch.calledWith( {
type: 'LINK_ABANDON_END',
- el: that.el,
token: token
} ),
'LINK_ABANDON_* share the same token.'
--
To view, visit https://gerrit.wikimedia.org/r/331805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iaaed7a4846af75f9c4051d7bc761022ea5b3f6cf
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: mpga
Gerrit-Owner: Phuedx
Gerrit-Reviewer: Jhernandez
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...Popups[mpga]: Hygiene: Remove unused action types
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/331804 ) Change subject: Hygiene: Remove unused action types .. Hygiene: Remove unused action types PREVIEW_ANIMATING and PREVIEW_INTERACTIVE were introduced in Ib495755b but never used. Change-Id: Ib849960874f938185414ae74bc67d906f26aae0c --- M resources/ext.popups/actions.js 1 file changed, 0 insertions(+), 2 deletions(-) Approvals: Jhernandez: Looks good to me, approved jenkins-bot: Verified diff --git a/resources/ext.popups/actions.js b/resources/ext.popups/actions.js index d38051f..8bae158 100644 --- a/resources/ext.popups/actions.js +++ b/resources/ext.popups/actions.js @@ -14,8 +14,6 @@ PREVIEW_DWELL: 'PREVIEW_DWELL', PREVIEW_ABANDON_START: 'PREVIEW_ABANDON_START', PREVIEW_ABANDON_END: 'PREVIEW_ABANDON_END', - PREVIEW_ANIMATING: 'PREVIEW_ANIMATING', - PREVIEW_INTERACTIVE: 'PREVIEW_INTERACTIVE', PREVIEW_SHOW: 'PREVIEW_SHOW', PREVIEW_CLICK: 'PREVIEW_CLICK', SETTINGS_SHOW: 'SETTINGS_SHOW', -- To view, visit https://gerrit.wikimedia.org/r/331804 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib849960874f938185414ae74bc67d906f26aae0c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Popups Gerrit-Branch: mpga Gerrit-Owner: Phuedx Gerrit-Reviewer: Jhernandez 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/core[master]: Language fallback from sh (Serbo-Croatian) to bs, sr-el, hr
Nemo bis has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332178 ) Change subject: Language fallback from sh (Serbo-Croatian) to bs, sr-el, hr .. Language fallback from sh (Serbo-Croatian) to bs, sr-el, hr Bosnian, Serbian and Croatian are closely related languages and have respectively about 2700, 1400 and 1200 translations identical to that of Serbo-Croatian, which has about 5400 in total. This demonstrates that we can profitably reuse some translators' work to reduce the usage of English in Serbo-Croatian despite the low level of translation and that there is a logical order in the fallback sequence. The information has been collected and discussed with translators at https://translatewiki.net/wiki/Thread:Portal_talk:Sh/Language_fallback and Wikipedia editors have been notified of the discussion: https://sh.wikipedia.org/w/index.php?diff=40677113&oldid=40676567 Inherit linktrail and digit separators, but not $defaultDateFormat, $datePreferences, $datePreferenceMigrationMap or $namespaceGenderAliases to reduce the impact and variance. Change-Id: I04310ee32370ae20c00ea970b3163dcb8f167eba --- M languages/messages/MessagesSh.php 1 file changed, 5 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/78/332178/1 diff --git a/languages/messages/MessagesSh.php b/languages/messages/MessagesSh.php index fb79237..8f27e51 100644 --- a/languages/messages/MessagesSh.php +++ b/languages/messages/MessagesSh.php @@ -13,6 +13,8 @@ * @author לערי ריינהארט */ +$fallback = 'bs, sr-el, hr'; + $namespaceNames = [ NS_SPECIAL => 'Posebno', NS_TALK => 'Razgovor', @@ -29,6 +31,8 @@ NS_CATEGORY => 'Kategorija', NS_CATEGORY_TALK=> 'Razgovor_o_kategoriji', ]; + +$namespaceGenderAliases = []; $specialPageAliases = [ 'Activeusers' => [ 'Aktivni_korisnici' ], @@ -203,3 +207,4 @@ $linkTrail = '/^([a-zčćđžš]+)(.*)$/sDu'; +$defaultDateFormat = 'dmy'; -- To view, visit https://gerrit.wikimedia.org/r/332178 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04310ee32370ae20c00ea970b3163dcb8f167eba Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Nemo bis ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...FanBoxes[master]: Handle the case where the user tries to reuse the title of a...
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332177 )
Change subject: Handle the case where the user tries to reuse the title of a
userbox that already exists
..
Handle the case where the user tries to reuse the title of a userbox that
already exists
Bug: T155364
Change-Id: I1d014751910349c12b7d75e7f568c4ed5c74c29a
---
M FanBoxes.js
M extension.json
2 files changed, 4 insertions(+), 1 deletion(-)
Approvals:
Jack Phoenix: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FanBoxes.js b/FanBoxes.js
index 22154ed..d031acf 100644
--- a/FanBoxes.js
+++ b/FanBoxes.js
@@ -232,6 +232,8 @@
function( data ) {
if ( data.error ) {
alert( 'API error! ' + data.error.info
);
+ } else if ( data.fanboxes.result === 'Page
exists' ) {
+ alert( mediaWiki.msg(
'fan-addfan-exists' ) );
} else if ( data.fanboxes.result.indexOf( 'OK'
) >= 0 ) {
document.form1.submit();
}
diff --git a/extension.json b/extension.json
index afa860b..51a8b2b 100644
--- a/extension.json
+++ b/extension.json
@@ -99,7 +99,8 @@
"messages": [
"fanbox-mustenter-left",
"fanbox-mustenter-right",
"fanbox-mustenter-right-or",
"fanbox-mustenter-title", "fanbox-hash",
- "fanbox-choose-another",
"fanbox-upload-new-image"
+ "fanbox-choose-another",
"fanbox-upload-new-image",
+ "fan-addfan-exists"
],
"position": "top"
},
--
To view, visit https://gerrit.wikimedia.org/r/332177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1d014751910349c12b7d75e7f568c4ed5c74c29a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
Gerrit-Reviewer: Jack Phoenix
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...FanBoxes[master]: Handle the case where the user tries to reuse the title of a...
Jack Phoenix has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332177 )
Change subject: Handle the case where the user tries to reuse the title of a
userbox that already exists
..
Handle the case where the user tries to reuse the title of a userbox that
already exists
Bug: T155364
Change-Id: I1d014751910349c12b7d75e7f568c4ed5c74c29a
---
M FanBoxes.js
M extension.json
2 files changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/FanBoxes
refs/changes/77/332177/1
diff --git a/FanBoxes.js b/FanBoxes.js
index 22154ed..2941ad7 100644
--- a/FanBoxes.js
+++ b/FanBoxes.js
@@ -232,6 +232,8 @@
function( data ) {
if ( data.error ) {
alert( 'API error! ' + data.error.info
);
+ } else if ( data.fanboxes.result === 'Page
exists' ) {
+ alert( mw.msg( 'fan-addfan-exists' ) );
} else if ( data.fanboxes.result.indexOf( 'OK'
) >= 0 ) {
document.form1.submit();
}
diff --git a/extension.json b/extension.json
index afa860b..51a8b2b 100644
--- a/extension.json
+++ b/extension.json
@@ -99,7 +99,8 @@
"messages": [
"fanbox-mustenter-left",
"fanbox-mustenter-right",
"fanbox-mustenter-right-or",
"fanbox-mustenter-title", "fanbox-hash",
- "fanbox-choose-another",
"fanbox-upload-new-image"
+ "fanbox-choose-another",
"fanbox-upload-new-image",
+ "fan-addfan-exists"
],
"position": "top"
},
--
To view, visit https://gerrit.wikimedia.org/r/332177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1d014751910349c12b7d75e7f568c4ed5c74c29a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/FanBoxes
Gerrit-Branch: master
Gerrit-Owner: Jack Phoenix
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SpellingApi] Add npm and composer test
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332176 ) Change subject: [SpellingApi] Add npm and composer test .. [SpellingApi] Add npm and composer test Change-Id: I713af613d6d036526b551a68fd3ceb2b2dfdd63e --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/76/332176/1 -- To view, visit https://gerrit.wikimedia.org/r/332176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I713af613d6d036526b551a68fd3ceb2b2dfdd63e Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...citoid[master]: Scrape language from html tag
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/331851 )
Change subject: Scrape language from html tag
..
Scrape language from html tag
Bug:T148301
Change-Id: Ie4717faf636edb21edbbadcf17d5ea81f3c53d54
---
M lib/translators/general.js
M test/features/scraping/lang.js
2 files changed, 25 insertions(+), 0 deletions(-)
Approvals:
Mobrovac: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/translators/general.js b/lib/translators/general.js
index 18be0b3..f7e1cc7 100644
--- a/lib/translators/general.js
+++ b/lib/translators/general.js
@@ -16,6 +16,7 @@
canonical: makeTranslator('url'),
description: makeTranslator('abstractNote'),
publisher: makeTranslator('publisher'),
+lang: makeTranslator('language'),
title: makeTranslator('title')
};
@@ -29,6 +30,7 @@
exports.generalNoPublisher = {
author: makeCreatorsTranslator('author'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('title')
};
@@ -37,6 +39,7 @@
exports.artwork = {
author: makeCreatorsTranslator('artist'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('title')
};
@@ -46,12 +49,14 @@
exports.audioRecording = {
author: makeCreatorsTranslator('performer'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('title')
};
exports.bill = {
author: makeCreatorsTranslator('sponsor'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('title')
};
@@ -61,6 +66,7 @@
exports['case'] = {
author: makeCreatorsTranslator('author'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('caseName')
};
@@ -74,6 +80,7 @@
exports.email = {
author: makeCreatorsTranslator('author'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('subject')
};
@@ -81,6 +88,7 @@
exports.film = {
author: makeCreatorsTranslator('director'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('title')
};
@@ -90,6 +98,7 @@
exports.interview = {
author: makeCreatorsTranslator('interviewee'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('title')
};
@@ -101,6 +110,7 @@
exports.newspaperArticle = {
author: makeCreatorsTranslator('author'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('title')
};
@@ -108,24 +118,28 @@
exports.patent = {
author: makeCreatorsTranslator('inventor'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('title')
};
exports.podcast = {
author: makeCreatorsTranslator('podcaster'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('title')
};
exports.presentation = {
author: makeCreatorsTranslator('presenter'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('title')
};
exports.radioBroadcast = {
author: makeCreatorsTranslator('director'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('title')
};
@@ -133,6 +147,7 @@
exports.statute = {
author: makeCreatorsTranslator('author'),
canonical: makeTranslator('url'),
+lang: makeTranslator('language'),
description: makeTranslator('abstractNote'),
title: makeTranslator('nameOfAct')
};
diff --git a/test/features/scraping/lang.js b/test/features/scraping/lang.js
index b246c8f..b72b837 100644
--- a/test/features/scraping/lang.js
+++ b/test/features/scraping/lang.js
@@ -57,6 +57,16 @@
assert.deepEqual(!!res.body[0].accessDate, true, 'No
accessDate present');
});
});
+
+// Scrapes language from html tag
+it('Language present in html tag', function() {
+return
server.query('http://mno.hu/migr_1834/tellerlevel-cafolat-es-cafolat-700280').then
[MediaWiki-commits] [Gerrit] mediawiki...SpellingApi[master]: Add npm and composer entry point's
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332175 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: Ic8e09836a442772e2ddc0385cbd051ff0d277560 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpellingApi refs/changes/75/332175/1 -- To view, visit https://gerrit.wikimedia.org/r/332175 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8e09836a442772e2ddc0385cbd051ff0d277560 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SpellingApi Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [Special404] Add npm and composer tests
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332174 ) Change subject: [Special404] Add npm and composer tests .. [Special404] Add npm and composer tests Change-Id: I4df4ba51a30ee87d254c91486015aaed08885e1c Depends-On: Iea5fcce2acd09b439fa13ace384d656b1377e92e --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/74/332174/1 -- To view, visit https://gerrit.wikimedia.org/r/332174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4df4ba51a30ee87d254c91486015aaed08885e1c Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox 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...Special404[master]: Add npm and composer entry point
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332173 ) Change subject: Add npm and composer entry point .. Add npm and composer entry point Change-Id: Iea5fcce2acd09b439fa13ace384d656b1377e92e --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Special404 refs/changes/73/332173/1 -- To view, visit https://gerrit.wikimedia.org/r/332173 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iea5fcce2acd09b439fa13ace384d656b1377e92e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Special404 Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [Spark] Add npm and composer test
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332172 ) Change subject: [Spark] Add npm and composer test .. [Spark] Add npm and composer test Change-Id: Icc155a2ca1a1eecedf799cdbb4063ea853b7c119 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/72/332172/1 -- To view, visit https://gerrit.wikimedia.org/r/332172 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc155a2ca1a1eecedf799cdbb4063ea853b7c119 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox 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...Spark[master]: Add missing jquery.spark.js file
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332171 ) Change subject: Add missing jquery.spark.js file .. Add missing jquery.spark.js file Add from https://github.com/JeroenDeDauw/rdf-spark/blob/master/src/jquery.spark.js Change-Id: If7af3e2a437aa3b510589652c472cd5cdb2878d7 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Spark refs/changes/71/332171/1 -- To view, visit https://gerrit.wikimedia.org/r/332171 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If7af3e2a437aa3b510589652c472cd5cdb2878d7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Spark Gerrit-Branch: master Gerrit-Owner: Paladox 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...Spark[master]: Add npm and composer entry point's
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332169 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: I8f7e37b3dc911d0e49ecda97ab9197d782de6173 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Spark refs/changes/69/332169/1 -- To view, visit https://gerrit.wikimedia.org/r/332169 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8f7e37b3dc911d0e49ecda97ab9197d782de6173 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Spark Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/extensions[master]: Remove ShoutBox extension
Florianschmidtwelzow has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332170 ) Change subject: Remove ShoutBox extension .. Remove ShoutBox extension The service has been shutdown and the extension is now ueseless. It should therefore be archived. Bug: T155365 Change-Id: I0fd330e155f301c87d5bbcde73c86af73d7e23c6 --- M .gitmodules D ShoutBox 2 files changed, 0 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/70/332170/1 diff --git a/.gitmodules b/.gitmodules index 2d399ee..f663fd2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2266,10 +2266,6 @@ path = ShortUrl url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ShortUrl branch = . -[submodule "ShoutBox"] - path = ShoutBox - url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ShoutBox - branch = . [submodule "ShoutWikiAPI"] path = ShoutWikiAPI url = https://gerrit.wikimedia.org/r/mediawiki/extensions/ShoutWikiAPI diff --git a/ShoutBox b/ShoutBox deleted file mode 16 index 76947bf..000 --- a/ShoutBox +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 76947bfcaa69e9ce148e5ea0afc74d9f9adaa0a2 -- To view, visit https://gerrit.wikimedia.org/r/332170 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0fd330e155f301c87d5bbcde73c86af73d7e23c6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SpamRegex] Add npm and composer tests
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332168 ) Change subject: [SpamRegex] Add npm and composer tests .. [SpamRegex] Add npm and composer tests Change-Id: I5b8dc7e705d20e37c2c90e60417360321ac6a226 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/68/332168/1 -- To view, visit https://gerrit.wikimedia.org/r/332168 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b8dc7e705d20e37c2c90e60417360321ac6a226 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Remove jobs for ShoutBox extension
Florianschmidtwelzow has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332167 ) Change subject: Remove jobs for ShoutBox extension .. Remove jobs for ShoutBox extension ShoutBox service was shutdown already, so this extension is useless and should be archived. Bug: T155365 Change-Id: I8a4de7cd6aecabe7882a3ff91691bdb40160e4d2 --- M zuul/layout.yaml 1 file changed, 0 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/67/332167/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 86d4aa3..8eee863 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6623,12 +6623,6 @@ - name: extension-unittests-generic - name: jsonlint - - name: mediawiki/extensions/ShoutBox -template: - - name: jshint - - name: jsonlint - - name: extension-unittests-generic - - name: mediawiki/extensions/ShoutWikiAds template: - name: composer-test -- To view, visit https://gerrit.wikimedia.org/r/332167 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a4de7cd6aecabe7882a3ff91691bdb40160e4d2 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Florianschmidtwelzow ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SpamRegex[master]: Add npm and composer entry point's
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332166 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: If1627b1aa6abaf113b95edcc9d39fb742477e104 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SpamRegex refs/changes/66/332166/1 -- To view, visit https://gerrit.wikimedia.org/r/332166 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1627b1aa6abaf113b95edcc9d39fb742477e104 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SpamRegex Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SoundManager2Button] Add npm and composer tests
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332165 ) Change subject: [SoundManager2Button] Add npm and composer tests .. [SoundManager2Button] Add npm and composer tests Change-Id: I38d5dc9e53fe8ec4eb3b11785e6c21ecf1349013 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/65/332165/1 -- To view, visit https://gerrit.wikimedia.org/r/332165 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I38d5dc9e53fe8ec4eb3b11785e6c21ecf1349013 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox 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...SoundManager2Button[master]: Add npm and composer entry point's
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332164 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: I0388ff0842b42b7881a38ec9324a3322b19ac960 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SoundManager2Button refs/changes/64/332164/1 -- To view, visit https://gerrit.wikimedia.org/r/332164 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0388ff0842b42b7881a38ec9324a3322b19ac960 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SoundManager2Button Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SolrStore] Add npm and composer test
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332163 ) Change subject: [SolrStore] Add npm and composer test .. [SolrStore] Add npm and composer test Change-Id: Ib2a16fa8bd784a4e8f364f885f670346954cffb8 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/63/332163/1 -- To view, visit https://gerrit.wikimedia.org/r/332163 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib2a16fa8bd784a4e8f364f885f670346954cffb8 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SolrStore[master]: Add npm and composer entry point's
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332162 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: I43fede082f283a0caaf939bd88ae45bd9b9628ae --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SolrStore refs/changes/62/332162/1 -- To view, visit https://gerrit.wikimedia.org/r/332162 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I43fede082f283a0caaf939bd88ae45bd9b9628ae Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SolrStore Gerrit-Branch: master Gerrit-Owner: Paladox 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...Snippet[master]: Add missing qqq.json file so npm test passes
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332161 )
Change subject: Add missing qqq.json file so npm test passes
..
Add missing qqq.json file so npm test passes
Change-Id: I63410ba98ceb3da1d53a1fab113222735abb5cd2
---
A i18n/qqq.json
1 file changed, 9 insertions(+), 0 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/qqq.json b/i18n/qqq.json
new file mode 100644
index 000..94fd086
--- /dev/null
+++ b/i18n/qqq.json
@@ -0,0 +1,9 @@
+{
+ "@metadata": {
+ "authors": []
+ },
+ "snippet-desc":
"{{desc|what=extension|name=Snippet|url=https://www.mediawiki.org/wiki/Extension:Snippet}}";,
+ "apihelp-snippet-description": "",
+ "apihelp-snippet-param-set": "",
+ "apihelp-snippet-example-1": ""
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/332161
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I63410ba98ceb3da1d53a1fab113222735abb5cd2
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/Snippet
Gerrit-Branch: master
Gerrit-Owner: Paladox
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: SamanthaNguyen
Gerrit-Reviewer: SamanthaNguyen
Gerrit-Reviewer: Siebrand
Gerrit-Reviewer: Umherirrender
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...Snippet[master]: Disable banana checker temp as it fails
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332161 ) Change subject: Disable banana checker temp as it fails .. Disable banana checker temp as it fails Due to missing qqq.json file. Change-Id: I63410ba98ceb3da1d53a1fab113222735abb5cd2 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Snippet refs/changes/61/332161/1 -- To view, visit https://gerrit.wikimedia.org/r/332161 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I63410ba98ceb3da1d53a1fab113222735abb5cd2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Snippet Gerrit-Branch: master Gerrit-Owner: Paladox 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...Snippet[master]: Add npm and composer entry point's
jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332160 )
Change subject: Add npm and composer entry point's
..
Add npm and composer entry point's
Change-Id: I200ec9b0ab89e6b351b98fb8a2e6f7e45982551f
---
A Gruntfile.js
A composer.json
A package.json
3 files changed, 43 insertions(+), 0 deletions(-)
Approvals:
SamanthaNguyen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..ae4e6d7
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/* eslint-env node */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ jsonlint: {
+ all: [
+ '*.json',
+ '**/*.json',
+ '!node_modules/**'
+ ]
+ },
+ banana: {
+ all: 'i18n/'
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/composer.json b/composer.json
new file mode 100644
index 000..6d97b43
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,11 @@
+{
+ "require-dev": {
+ "jakub-onderka/php-parallel-lint": "0.9.*"
+ },
+ "scripts": {
+ "fix": "phpcbf",
+ "test": [
+ "parallel-lint . --exclude vendor"
+ ]
+ }
+}
diff --git a/package.json b/package.json
new file mode 100644
index 000..31cfda5
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+"test": "grunt test"
+ },
+ "devDependencies": {
+"grunt": "1.0.1",
+"grunt-banana-checker": "0.5.0",
+"grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/332160
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I200ec9b0ab89e6b351b98fb8a2e6f7e45982551f
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Snippet
Gerrit-Branch: master
Gerrit-Owner: Paladox
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Paladox
Gerrit-Reviewer: Reedy
Gerrit-Reviewer: SamanthaNguyen
Gerrit-Reviewer: Umherirrender
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...Snippet[master]: Add npm and composer entry point's
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332160 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: I200ec9b0ab89e6b351b98fb8a2e6f7e45982551f --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Snippet refs/changes/60/332160/1 -- To view, visit https://gerrit.wikimedia.org/r/332160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I200ec9b0ab89e6b351b98fb8a2e6f7e45982551f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Snippet Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SlimboxThumbs] Add npm and composer test
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332159 ) Change subject: [SlimboxThumbs] Add npm and composer test .. [SlimboxThumbs] Add npm and composer test Change-Id: Iabcc67b0702b2b45cfde6ffe136d4b2371a54079 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/59/332159/1 -- To view, visit https://gerrit.wikimedia.org/r/332159 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iabcc67b0702b2b45cfde6ffe136d4b2371a54079 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: [SkinPerNamespace] Add npm and composer test
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332158 ) Change subject: [SkinPerNamespace] Add npm and composer test .. [SkinPerNamespace] Add npm and composer test Change-Id: Iffa9c906ab87d8892cd95b090e3393931934b205 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/58/332158/1 -- To view, visit https://gerrit.wikimedia.org/r/332158 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iffa9c906ab87d8892cd95b090e3393931934b205 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SlimboxThumbs[master]: Add npm and composer entry point's
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332157 ) Change subject: Add npm and composer entry point's .. Add npm and composer entry point's Change-Id: I746617f5003e60bc663efbfe39ba25a389e60e60 --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SlimboxThumbs refs/changes/57/332157/1 -- To view, visit https://gerrit.wikimedia.org/r/332157 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I746617f5003e60bc663efbfe39ba25a389e60e60 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SlimboxThumbs Gerrit-Branch: master Gerrit-Owner: Paladox ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SkinPerNamespace[master]: Add npm and composer test entry point
Paladox has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332156 ) Change subject: Add npm and composer test entry point .. Add npm and composer test entry point Change-Id: If1700983705037f03b9af4d02e904a44253cf46d --- 0 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SkinPerNamespace refs/changes/56/332156/1 -- To view, visit https://gerrit.wikimedia.org/r/332156 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1700983705037f03b9af4d02e904a44253cf46d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/SkinPerNamespace Gerrit-Branch: master Gerrit-Owner: Paladox Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] unicodejs[master]: README.md: change Bugzilla URL to Phabricator
Ricordisamoa has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332155 ) Change subject: README.md: change Bugzilla URL to Phabricator .. README.md: change Bugzilla URL to Phabricator Change-Id: I9876682995da5781f3ffab5d1ba432e3236d22fe --- M README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/unicodejs refs/changes/55/332155/1 diff --git a/README.md b/README.md index a462d91..92f4706 100644 --- a/README.md +++ b/README.md @@ -29,7 +29,7 @@ Bug tracker --- -Found a bug? Please report it in the [issue tracker](https://bugzilla.wikimedia.org/enter_bug.cgi?product=Utilities&component=UnicodeJS)! +Found a bug? Please report it in the [issue tracker](https://phabricator.wikimedia.org/maniphest/task/edit/form/1/?project=Utilities-UnicodeJS)! Release -- -- To view, visit https://gerrit.wikimedia.org/r/332155 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9876682995da5781f3ffab5d1ba432e3236d22fe Gerrit-PatchSet: 1 Gerrit-Project: unicodejs Gerrit-Branch: master Gerrit-Owner: Ricordisamoa ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...PageForms[master]: Fix for acaa67f52e8b - OpenLayers fix
Yaron Koren has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/332154 )
Change subject: Fix for acaa67f52e8b - OpenLayers fix
..
Fix for acaa67f52e8b - OpenLayers fix
Change-Id: Ic5ec83716b65e65aad97a4e7d84e95117b92cbb8
---
M libs/PF_maps.js
M libs/PF_maps.offline.js
2 files changed, 10 insertions(+), 10 deletions(-)
Approvals:
Yaron Koren: Looks good to me, approved
jenkins-bot: Verified
diff --git a/libs/PF_maps.js b/libs/PF_maps.js
index 1a918e1..d97d228 100644
--- a/libs/PF_maps.js
+++ b/libs/PF_maps.js
@@ -121,8 +121,8 @@
}
function toOpenLayersLonLat( map, lat, lon ) {
- return new OpenLayers.LonLat( lon, lat ).tranpform(
- new OpenLayers.Projection("EPSG:4326"), // tranpform
from WGS 1984
+ return new OpenLayers.LonLat( lon, lat ).transform(
+ new OpenLayers.Projection("EPSG:4326"), // transform
from WGS 1984
map.getProjectionObject() // to Spherical Mercator
Projection
);
}
@@ -161,10 +161,10 @@
marker = new OpenLayers.Marker( location );
markers.addMarker( marker );
- // Tranpform the coordinates back, in order to display them.
+ // Transform the coordinates back, in order to display them.
var realLonLat = location.clone();
- realLonLat.tranpform(
- map.getProjectionObject(), // tranpform from Spherical
Mercator Projection
+ realLonLat.transform(
+ map.getProjectionObject(), // transform from Spherical
Mercator Projection
new OpenLayers.Projection("EPSG:4326") // to WGS 1984
);
var stringVal = pfRoundOffDecimal( realLonLat.lat ) + ', ' +
pfRoundOffDecimal( realLonLat.lon );
diff --git a/libs/PF_maps.offline.js b/libs/PF_maps.offline.js
index 21f7f26..f9db582 100644
--- a/libs/PF_maps.offline.js
+++ b/libs/PF_maps.offline.js
@@ -44,10 +44,10 @@
marker = new OpenLayers.Marker( location );
markers.addMarker( marker );
- // Tranpform the coordinates back, in order to display them.
+ // Transform the coordinates back, in order to display them.
var realLonLat = location.clone();
- realLonLat.tranpform(
- map.getProjectionObject(), // tranpform from Spherical
Mercator Projection
+ realLonLat.transform(
+ map.getProjectionObject(), // transform from Spherical
Mercator Projection
new OpenLayers.Projection("EPSG:4326") // to WGS 1984
);
var stringVal = pfRoundOffDecimal( realLonLat.lat ) + ', ' +
pfRoundOffDecimal( realLonLat.lon );
@@ -91,8 +91,8 @@
}
function toOpenLayersLonLat( map, lat, lon ) {
- return new OpenLayers.LonLat( lon, lat ).tranpform(
- new OpenLayers.Projection( "EPSG:4326" ), // tranpform
from WGS 1984
+ return new OpenLayers.LonLat( lon, lat ).transform(
+ new OpenLayers.Projection( "EPSG:4326" ), // transform
from WGS 1984
map.getProjectionObject() // to Spherical Mercator
Projection
);
}
--
To view, visit https://gerrit.wikimedia.org/r/332154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic5ec83716b65e65aad97a4e7d84e95117b92cbb8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: Yaron Koren
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...PageForms[master]: Fix for acaa67f52e8b - OpenLayers fix
Yaron Koren has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332154 )
Change subject: Fix for acaa67f52e8b - OpenLayers fix
..
Fix for acaa67f52e8b - OpenLayers fix
Change-Id: Ic5ec83716b65e65aad97a4e7d84e95117b92cbb8
---
M libs/PF_maps.js
M libs/PF_maps.offline.js
2 files changed, 10 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageForms
refs/changes/54/332154/2
diff --git a/libs/PF_maps.js b/libs/PF_maps.js
index 1a918e1..d97d228 100644
--- a/libs/PF_maps.js
+++ b/libs/PF_maps.js
@@ -121,8 +121,8 @@
}
function toOpenLayersLonLat( map, lat, lon ) {
- return new OpenLayers.LonLat( lon, lat ).tranpform(
- new OpenLayers.Projection("EPSG:4326"), // tranpform
from WGS 1984
+ return new OpenLayers.LonLat( lon, lat ).transform(
+ new OpenLayers.Projection("EPSG:4326"), // transform
from WGS 1984
map.getProjectionObject() // to Spherical Mercator
Projection
);
}
@@ -161,10 +161,10 @@
marker = new OpenLayers.Marker( location );
markers.addMarker( marker );
- // Tranpform the coordinates back, in order to display them.
+ // Transform the coordinates back, in order to display them.
var realLonLat = location.clone();
- realLonLat.tranpform(
- map.getProjectionObject(), // tranpform from Spherical
Mercator Projection
+ realLonLat.transform(
+ map.getProjectionObject(), // transform from Spherical
Mercator Projection
new OpenLayers.Projection("EPSG:4326") // to WGS 1984
);
var stringVal = pfRoundOffDecimal( realLonLat.lat ) + ', ' +
pfRoundOffDecimal( realLonLat.lon );
diff --git a/libs/PF_maps.offline.js b/libs/PF_maps.offline.js
index 21f7f26..f9db582 100644
--- a/libs/PF_maps.offline.js
+++ b/libs/PF_maps.offline.js
@@ -44,10 +44,10 @@
marker = new OpenLayers.Marker( location );
markers.addMarker( marker );
- // Tranpform the coordinates back, in order to display them.
+ // Transform the coordinates back, in order to display them.
var realLonLat = location.clone();
- realLonLat.tranpform(
- map.getProjectionObject(), // tranpform from Spherical
Mercator Projection
+ realLonLat.transform(
+ map.getProjectionObject(), // transform from Spherical
Mercator Projection
new OpenLayers.Projection("EPSG:4326") // to WGS 1984
);
var stringVal = pfRoundOffDecimal( realLonLat.lat ) + ', ' +
pfRoundOffDecimal( realLonLat.lon );
@@ -91,8 +91,8 @@
}
function toOpenLayersLonLat( map, lat, lon ) {
- return new OpenLayers.LonLat( lon, lat ).tranpform(
- new OpenLayers.Projection( "EPSG:4326" ), // tranpform
from WGS 1984
+ return new OpenLayers.LonLat( lon, lat ).transform(
+ new OpenLayers.Projection( "EPSG:4326" ), // transform
from WGS 1984
map.getProjectionObject() // to Spherical Mercator
Projection
);
}
--
To view, visit https://gerrit.wikimedia.org/r/332154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic5ec83716b65e65aad97a4e7d84e95117b92cbb8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/PageForms
Gerrit-Branch: master
Gerrit-Owner: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] RelPath[master]: travis: Add PHP 7.1
Ricordisamoa has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332153 ) Change subject: travis: Add PHP 7.1 .. travis: Add PHP 7.1 Change-Id: I5652c82b8722520799b68b872dfba911d1822260 --- M .travis.yml 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/RelPath refs/changes/53/332153/1 diff --git a/.travis.yml b/.travis.yml index 8c4bb1f..4ee0465 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ - "5.5" - "5.6" - "7.0" + - "7.1" - "hhvm" install: - composer install -- To view, visit https://gerrit.wikimedia.org/r/332153 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5652c82b8722520799b68b872dfba911d1822260 Gerrit-PatchSet: 1 Gerrit-Project: RelPath Gerrit-Branch: master Gerrit-Owner: Ricordisamoa ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Hygiene: Rename SchemaPopupsSamplingRate
Phuedx has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332151 )
Change subject: Hygiene: Rename SchemaPopupsSamplingRate
..
Hygiene: Rename SchemaPopupsSamplingRate
The SchemaPopupsSamplingRate config variable is inconsistently named and
even forwarded to the client as wgPopupsSchemaPopupsSamplingRate.
Changes:
* SchemaPopupsSamplingRate -> PopupsSchemaSamplingRate
* Forward PopupsSchemaSamplingRate to the client as
$wgPopupsSchemaSamplingRate.
Bug: T146889
Bug: T146434
Change-Id: I80d6a0abccf462e2eb0fd96af6849b5e82b49c26
---
M Popups.hooks.php
M extension.json
M resources/ext.popups/schema.js
M tests/phpunit/PopupsHooksTest.php
M tests/qunit/ext.popups/schema.test.js
5 files changed, 9 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/51/332151/1
diff --git a/Popups.hooks.php b/Popups.hooks.php
index ee9ea97..807ffae 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -141,7 +141,7 @@
*/
public static function onResourceLoaderGetConfigVars( array &$vars ) {
$conf = PopupsContext::getInstance()->getConfig();
- $vars['wgPopupsSchemaPopupsSamplingRate'] = $conf->get(
'SchemaPopupsSamplingRate' );
+ $vars['wgPopupsSchemaSamplingRate'] = $conf->get(
'PopupsSchemaSamplingRate' );
}
/**
diff --git a/extension.json b/extension.json
index 25d76e5..a841035 100644
--- a/extension.json
+++ b/extension.json
@@ -47,8 +47,8 @@
"config": {
"@PopupsBetaFeature": "@var bool: Whether the extension should
be enabled as an opt-in beta feature. If true, the BetaFeatures extension must
be installed. False by default.",
"PopupsBetaFeature": false,
- "@SchemaPopupsSamplingRate": "@var number: Sample rate for
logging events to Schema:Popups.",
- "SchemaPopupsSamplingRate": 0,
+ "@PopupsSchemaSamplingRate": "@var number: Sample rate for
logging events to Schema:Popups.",
+ "PopupsSchemaSamplingRate": 0,
"@PopupsHideOptInOnPreferencesPage": "@var bool: Whether the
option to senable/disable Page Previews should be hidden on Preferences page.
Please note if PopupsBetaFeature is set to true this option will be always
hidden. False by default",
"PopupsHideOptInOnPreferencesPage": false,
"@PopupsOptInDefaultState" : "@var string:['1'|'0'] Default
Page Previews visibility. Has to be a string as a compatibility with beta
feature settings",
diff --git a/resources/ext.popups/schema.js b/resources/ext.popups/schema.js
index d3e5904..683da2c 100644
--- a/resources/ext.popups/schema.js
+++ b/resources/ext.popups/schema.js
@@ -9,7 +9,7 @@
* @return {mw.eventLog.Schema}
*/
mw.popups.createSchema = function ( config, window ) {
- var samplingRate = config.get(
'wgPopupsSchemaPopupsSamplingRate', 0 );
+ var samplingRate = config.get( 'wgPopupsSchemaSamplingRate', 0
);
if (
!window.navigator ||
diff --git a/tests/phpunit/PopupsHooksTest.php
b/tests/phpunit/PopupsHooksTest.php
index e1360fa..dc30481 100644
--- a/tests/phpunit/PopupsHooksTest.php
+++ b/tests/phpunit/PopupsHooksTest.php
@@ -189,10 +189,10 @@
public function testOnResourceLoaderGetConfigVars() {
$vars = [ 'something' => 'notEmpty' ];
$value = 10;
- $this->setMwGlobals( [ 'wgSchemaPopupsSamplingRate' => $value ]
);
+ $this->setMwGlobals( [ 'wgPopupsSchemaSamplingRate' => $value ]
);
PopupsHooks::onResourceLoaderGetConfigVars( $vars );
$this->assertCount( 2, $vars );
- $this->assertEquals( $value, $vars[
'wgPopupsSchemaPopupsSamplingRate' ] );
+ $this->assertEquals( $value, $vars[
'wgPopupsSchemaSamplingRate' ] );
}
/**
diff --git a/tests/qunit/ext.popups/schema.test.js
b/tests/qunit/ext.popups/schema.test.js
index 6f92df9..8e63604 100644
--- a/tests/qunit/ext.popups/schema.test.js
+++ b/tests/qunit/ext.popups/schema.test.js
@@ -3,7 +3,7 @@
QUnit.module( 'ext.popups/schema', {
setup: function () {
this.config = new mw.Map();
- this.config.set( 'wgPopupsSchemaPopupsSamplingRate', 1
);
+ this.config.set( 'wgPopupsSchemaSamplingRate', 1 );
this.window = {
navigator: {
@@ -16,7 +16,7 @@
}
} );
- QUnit.test( 'it should use $wgPopupsSchemaPopupsSamplingRate as the
sampling rate', function ( assert ) {
+ QUnit.test( 'it should use $wgPopupsSchemaSamplingRate as the sampling
rate', function ( assert ) {
assert.expect( 2 );
mw.popups
[MediaWiki-commits] [Gerrit] mediawiki...Popups[mpga]: Forward PopupsBetaFeature to the client
Phuedx has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332152 )
Change subject: Forward PopupsBetaFeature to the client
..
Forward PopupsBetaFeature to the client
Bug: T146889
Change-Id: I66739b01e405bd7be29e912388005e0bb1f25b3f
---
M Popups.hooks.php
M tests/phpunit/PopupsHooksTest.php
2 files changed, 15 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Popups
refs/changes/52/332152/1
diff --git a/Popups.hooks.php b/Popups.hooks.php
index 807ffae..29cb9ab 100644
--- a/Popups.hooks.php
+++ b/Popups.hooks.php
@@ -142,6 +142,7 @@
public static function onResourceLoaderGetConfigVars( array &$vars ) {
$conf = PopupsContext::getInstance()->getConfig();
$vars['wgPopupsSchemaSamplingRate'] = $conf->get(
'PopupsSchemaSamplingRate' );
+ $vars['wgPopupsBetaFeature'] = $conf->get( 'PopupsBetaFeature'
);
}
/**
diff --git a/tests/phpunit/PopupsHooksTest.php
b/tests/phpunit/PopupsHooksTest.php
index dc30481..0223f59 100644
--- a/tests/phpunit/PopupsHooksTest.php
+++ b/tests/phpunit/PopupsHooksTest.php
@@ -188,11 +188,21 @@
*/
public function testOnResourceLoaderGetConfigVars() {
$vars = [ 'something' => 'notEmpty' ];
- $value = 10;
- $this->setMwGlobals( [ 'wgPopupsSchemaSamplingRate' => $value ]
);
+ $config = [
+ 'wgPopupsSchemaSamplingRate' => 10,
+ 'wgPopupsBetaFeature' => true,
+ ];
+ $this->setMwGlobals( $config );
PopupsHooks::onResourceLoaderGetConfigVars( $vars );
- $this->assertCount( 2, $vars );
- $this->assertEquals( $value, $vars[
'wgPopupsSchemaSamplingRate' ] );
+ $this->assertCount( 3, $vars );
+
+ foreach ( $config as $key => $value ) {
+ $this->assertEquals(
+ $value,
+ $vars[ $key ],
+ "It forwards the \"{$key}\" config variable to
the client."
+ );
+ }
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/332152
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I66739b01e405bd7be29e912388005e0bb1f25b3f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Popups
Gerrit-Branch: mpga
Gerrit-Owner: Phuedx
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki/core[master]: Removed deprecated ContentHandler hooks.
Filip has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332150 ) Change subject: Removed deprecated ContentHandler hooks. .. Removed deprecated ContentHandler hooks. Bug: T154498 Change-Id: Ie398fd4e06d3e286fe8e24112d0c8b4ac7d883dc --- M RELEASE-NOTES-1.29 M docs/contenthandler.txt M docs/hooks.txt M includes/EditPage.php M includes/Title.php M includes/content/ContentHandler.php M includes/page/Article.php M includes/page/WikiPage.php 8 files changed, 11 insertions(+), 182 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/50/332150/1 diff --git a/RELEASE-NOTES-1.29 b/RELEASE-NOTES-1.29 index fac6f7e..016cc62 100644 --- a/RELEASE-NOTES-1.29 +++ b/RELEASE-NOTES-1.29 @@ -184,6 +184,15 @@ RewriteEngine On RewriteBase / RewriteRule ^/w/wiki\.phtml$ /w/index.php [R=301,L] +* ArticleAfterFetchContent was removed. Use ArticleAfterFetchContentObject instead. +* ArticleInsertComplete was removed. Use PageContentInsertComplete instead. +* ArticleSave was removed. Use PageContentSave instead. +* ArticleSaveComplete was removed. Use PageContentSaveComplete instead. +* ArticleViewCustom was removed. Use ArticleContentViewCustom instead. +* EditFilterMerged was removed. Use EditFilterMergedContent instead. +* EditPageGetPreviewText was removed. Use EditPageGetPreviewContent instead. +* TitleIsCssOrJsPage was removed. Use ContentHandlerDefaultModelFor instead. +* TitleIsWikitextPage was removed. Use ContentHandlerDefaultModelFor instead. == Compatibility == diff --git a/docs/contenthandler.txt b/docs/contenthandler.txt index 6209b14..5f379e7 100644 --- a/docs/contenthandler.txt +++ b/docs/contenthandler.txt @@ -21,10 +21,6 @@ * The hook ContentHandlerDefaultModelFor may be used to override the page's default model. * Pages in NS_MEDIAWIKI and NS_USER default to the CSS or JavaScript model if they end in .css or .js, respectively. Pages in NS_MEDIAWIKI default to the wikitext model otherwise. -* The hook TitleIsCssOrJsPage may be used to force a page to use the CSS or JavaScript model. - This is a compatibility feature. The ContentHandlerDefaultModelFor hook should be used instead if possible. -* The hook TitleIsWikitextPage may be used to force a page to use the wikitext model. - This is a compatibility feature. The ContentHandlerDefaultModelFor hook should be used instead if possible. * Otherwise, the wikitext model is used. Note that is currently no mechanism to convert a page from one content model to another, and there is no guarantee that diff --git a/docs/hooks.txt b/docs/hooks.txt index 1da39cf..8360265 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -603,12 +603,6 @@ AND in the final query) $logTypes: Array of log types being queried -'ArticleAfterFetchContent': DEPRECATED! Use ArticleAfterFetchContentObject -instead. -After fetching content of an article from the database. -&$article: the article (object) being loaded from the database -&$content: the content (string) of the article - 'ArticleAfterFetchContentObject': After fetching content of an article from the database. &$article: the article (object) being loaded from the database @@ -677,18 +671,6 @@ &$article: Article (object) that will be returned $context: IContextSource (object) -'ArticleInsertComplete': DEPRECATED! Use PageContentInsertComplete. -After a new article is created. -$wikiPage: WikiPage created -$user: User creating the article -$text: New content -$summary: Edit summary/comment -$isMinor: Whether or not the edit was marked as minor -$isWatch: (No longer used) -$section: (No longer used) -$flags: Flags passed to WikiPage::doEditContent() -$revision: New Revision of the article - 'ArticleMergeComplete': After merging to article using Special:Mergehistory. $targetTitle: target title (object) $destTitle: destination title (object) @@ -739,31 +721,6 @@ $user: the user who did the rollback $revision: the revision the page was reverted back to $current: the reverted revision - -'ArticleSave': DEPRECATED! Use PageContentSave instead. -Before an article is saved. -$wikiPage: the WikiPage (object) being saved -$user: the user (object) saving the article -$text: the new article text -$summary: the article summary (comment) -$isminor: minor flag -$iswatch: watch flag -$section: section # - -'ArticleSaveComplete': DEPRECATED! Use PageContentSaveComplete instead. -After an article has been updated. -$wikiPage: WikiPage modified -$user: User performing the modification -$text: New content -$summary: Edit summary/comment -$isMinor: Whether or not the edit was marked as minor -$isWatch: (No longer used) -$section: (No longer used) -$flags: Flags passed to WikiPage::doEditContent() -$revision: New Revision of the article -$status: Status object about to be returned by doEditContent() -$baseRevId: the rev ID (or false) this edit was based on -$undidRevId: the rev ID (
[MediaWiki-commits] [Gerrit] integration/config[master]: [UIFeedback] Make unit test voting
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332149 ) Change subject: [UIFeedback] Make unit test voting .. [UIFeedback] Make unit test voting Fixed with I0bfd27071482f69fe3f8e850d1eb1100403c9f06 Change-Id: Ib3b4ada11f70ad2babbe7c81d21b1bf184d7e671 --- M zuul/layout.yaml 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/49/332149/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 86d4aa3..8e1727c 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -7011,7 +7011,7 @@ - name: mediawiki/extensions/UIFeedback template: - name: jsonlint - - name: extension-unittests-non-voting + - name: extension-unittests-generic - name: mediawiki/extensions/UnCaptcha template: -- To view, visit https://gerrit.wikimedia.org/r/332149 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib3b4ada11f70ad2babbe7c81d21b1bf184d7e671 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] integration/config[master]: Add npm jobs
Umherirrender has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/332148 ) Change subject: Add npm jobs .. Add npm jobs Related changes: ShoutBox: I01d1b8c629114592c5546998c620c732952b2cb7 SideBarMenu: Icf3f6d45c77db3b1375c2ccf9553672a12c24644 SidebarDonateBox: I5552d3afe2a977c3fad204a2ca1ee13d9bcd1a1d SignWritingMediaWikiPlugin: I8c1b74a731674bcc7d6c7c2701a19e7664e1b374 SimpleChanges: I882a62b285f4c96fa20190a6e08b860143e81ac1 SimpleFarm: I438812507738846e35066c129bcb7f521dad8846 SimpleSAMLphp: Iea8f6dfeaef5758f82b8473fb5dcbae88ee21058 SimpleSecurity: I6b54fe7dd527e4c71023cf15906da610d3e2dd53 SimpleSort: I12f9417b9804c2250d07985291a41aeea9f04497 SiteMetrics: I8f0ccfa0af6a932e2ce9ea554611fbf742cd9652 Change-Id: I8bf88959dbdfe84e9a9fe11bb700e0ec694a1e8d --- M zuul/layout.yaml 1 file changed, 10 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/48/332148/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 86d4aa3..80823aa 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -6628,6 +6628,7 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/ShoutWikiAds template: @@ -6651,28 +6652,33 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SignWritingMediaWikiPlugin template: - name: jsonlint - name: extension-unittests-non-voting + - name: npm - name: mediawiki/extensions/SimpleChanges template: - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SimpleSecurity template: - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SimpleSort template: - name: extension-unittests-generic - name: jsonlint + - name: npm - name: mediawiki/extensions/SimpleSurvey template: @@ -6683,6 +6689,7 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SiteSettings template: @@ -7613,6 +7620,7 @@ template: - name: extension-unittests-generic - name: jsonlint + - name: npm - name: mediawiki/extensions/SiteScout template: @@ -8159,6 +8167,7 @@ - name: jshint - name: jsonlint - name: extension-unittests-generic + - name: npm - name: mediawiki/extensions/SiteMatrix template: @@ -8295,6 +8304,7 @@ - name: jsonlint - name: jshint - name: extension-unittests-composer + - name: npm - name: mediawiki/extensions/SyntaxHighlight_GeSHi template: -- To view, visit https://gerrit.wikimedia.org/r/332148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bf88959dbdfe84e9a9fe11bb700e0ec694a1e8d Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Umherirrender ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SimpleSort[master]: Add grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332146 )
Change subject: Add grunt-jsonlint and grunt-banana-checker
..
Add grunt-jsonlint and grunt-banana-checker
jsonlint and banana-checker will test for valid i18n files
Bug: T94547
Change-Id: I12f9417b9804c2250d07985291a41aeea9f04497
---
A .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SimpleSort
refs/changes/46/332146/1
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000..a7abe44
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,3 @@
+node_modules/
+vendor/
+
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/332146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I12f9417b9804c2250d07985291a41aeea9f04497
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SimpleSort
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki...SimpleSecurity[master]: Add grunt-jsonlint and grunt-banana-checker
Umherirrender has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/332145 )
Change subject: Add grunt-jsonlint and grunt-banana-checker
..
Add grunt-jsonlint and grunt-banana-checker
jsonlint and banana-checker will test for valid i18n files
Bug: T94547
Change-Id: I6b54fe7dd527e4c71023cf15906da610d3e2dd53
---
M .gitignore
A Gruntfile.js
A package.json
3 files changed, 35 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SimpleSecurity
refs/changes/45/332145/1
diff --git a/.gitignore b/.gitignore
index 98b092a..e62fc28 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,6 @@
+node_modules/
+vendor/
+
.svn
*~
*.kate-swp
diff --git a/Gruntfile.js b/Gruntfile.js
new file mode 100644
index 000..a45071e
--- /dev/null
+++ b/Gruntfile.js
@@ -0,0 +1,21 @@
+/*jshint node:true */
+module.exports = function ( grunt ) {
+ grunt.loadNpmTasks( 'grunt-jsonlint' );
+ grunt.loadNpmTasks( 'grunt-banana-checker' );
+
+ grunt.initConfig( {
+ banana: {
+ all: 'i18n/'
+ },
+ jsonlint: {
+ all: [
+ '**/*.json',
+ '!node_modules/**',
+ '!vendor/**'
+ ]
+ }
+ } );
+
+ grunt.registerTask( 'test', [ 'jsonlint', 'banana' ] );
+ grunt.registerTask( 'default', 'test' );
+};
diff --git a/package.json b/package.json
new file mode 100644
index 000..bcf5b13
--- /dev/null
+++ b/package.json
@@ -0,0 +1,11 @@
+{
+ "private": true,
+ "scripts": {
+ "test": "grunt test"
+ },
+ "devDependencies": {
+ "grunt": "1.0.1",
+ "grunt-banana-checker": "0.5.0",
+ "grunt-jsonlint": "1.1.0"
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/332145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6b54fe7dd527e4c71023cf15906da610d3e2dd53
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SimpleSecurity
Gerrit-Branch: master
Gerrit-Owner: Umherirrender
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
