[MediaWiki-commits] [Gerrit] Spelling typo: it's existent not existant - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Spelling typo: it's existent not existant
..
Spelling typo: it's existent not existant
Change-Id: I72da617fcefc189159644ee264e7a2c8356196e2
---
M Hooks.php
M includes/Block/Topic.php
M includes/Content/Content.php
M includes/Parsoid/Fixer/Redlinker.php
M includes/Repository/TreeRepository.php
M tests/phpunit/Parsoid/ReferenceExtractorTest.php
6 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
SG: Looks good to me, approved
Mattflaschen: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/Hooks.php b/Hooks.php
index bc75d68..7fad1c6 100644
--- a/Hooks.php
+++ b/Hooks.php
@@ -894,7 +894,7 @@
}
$workflow = Container::get( 'storage' )-get( 'Workflow', $uuid
);
if ( !$workflow ) {
- wfDebugLog( 'Flow', __METHOD__ . ': Title for
non-existant Workflow ' . $title-getPrefixedText() );
+ wfDebugLog( 'Flow', __METHOD__ . ': Title for
non-existent Workflow ' . $title-getPrefixedText() );
return true;
}
$urls = array_merge(
diff --git a/includes/Block/Topic.php b/includes/Block/Topic.php
index 82b8ff0..a6f8bc4 100644
--- a/includes/Block/Topic.php
+++ b/includes/Block/Topic.php
@@ -635,7 +635,7 @@
protected function renderTopicHistoryAPI( array $options ) {
if ( $this-workflow-isNew() ) {
- throw new FlowException( 'No topic history can exist
for non-existant topic' );
+ throw new FlowException( 'No topic history can exist
for non-existent topic' );
}
$found = Container::get( 'query.topic.history' )-getResults(
$this-workflow-getId() );
return $this-processHistoryResult( $found, $options );
@@ -643,7 +643,7 @@
protected function renderPostHistoryAPI( array $options, UUID $postId )
{
if ( $this-workflow-isNew() ) {
- throw new FlowException( 'No post history can exist for
non-existant topic' );
+ throw new FlowException( 'No post history can exist for
non-existent topic' );
}
$found = Container::get( 'query.post.history' )-getResults(
$postId );
return $this-processHistoryResult( $found, $options );
diff --git a/includes/Content/Content.php b/includes/Content/Content.php
index 253..3d3110b 100644
--- a/includes/Content/Content.php
+++ b/includes/Content/Content.php
@@ -29,7 +29,7 @@
if ( $article-getTitle()-getNamespace() === NS_TOPIC ) {
// @todo pretty message about invalid workflow
- throw new FlowException( 'Non-existant topic' );
+ throw new FlowException( 'Non-existent topic' );
}
$emptyContent = ContentHandler::getForModelID( 'flow-board'
)-makeEmptyContent();
diff --git a/includes/Parsoid/Fixer/Redlinker.php
b/includes/Parsoid/Fixer/Redlinker.php
index fc83a7c..6ff565c 100644
--- a/includes/Parsoid/Fixer/Redlinker.php
+++ b/includes/Parsoid/Fixer/Redlinker.php
@@ -88,7 +88,7 @@
* Linker class build the link HTML (which will take redlinks into
account.)
* It will then substitute original link HTML for the one Linker
generated.
*
-* This replaces both existing and non-existant anchors because the
relative links
+* This replaces both existing and non-existent anchors because the
relative links
* output by parsoid are not usable when output within a subpage.
*
* @param DOMNode $node
diff --git a/includes/Repository/TreeRepository.php
b/includes/Repository/TreeRepository.php
index 4065fd5..029f46b 100644
--- a/includes/Repository/TreeRepository.php
+++ b/includes/Repository/TreeRepository.php
@@ -404,7 +404,7 @@
}
/**
-* Fetch the id of the immediate parent node of all ids in $nodes.
Non-existant
+* Fetch the id of the immediate parent node of all ids in $nodes.
Non-existent
* nodes are not represented in the result set.
*/
public function fetchParentMap( array $nodes ) {
diff --git a/tests/phpunit/Parsoid/ReferenceExtractorTest.php
b/tests/phpunit/Parsoid/ReferenceExtractorTest.php
index ecd11ec..07d13ee 100644
--- a/tests/phpunit/Parsoid/ReferenceExtractorTest.php
+++ b/tests/phpunit/Parsoid/ReferenceExtractorTest.php
@@ -121,7 +121,7 @@
),
array(
- 'Non-existant File',
+ 'Non-existent File',
// source wiki text
'[[File:Some/Files/Really/Should_Not_Ex/ist.png]]',
//
[MediaWiki-commits] [Gerrit] Add and use CentralAuthUser::waitForSlaves() - change (mediawiki...CentralAuth)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166953
Change subject: Add and use CentralAuthUser::waitForSlaves()
..
Add and use CentralAuthUser::waitForSlaves()
Change-Id: I51c9210882047309d712c1146a2e065d664eabcd
---
M includes/CentralAuthUser.php
M maintenance/migrateAccount.php
M maintenance/migratePass0.php
M maintenance/populateHomeDB.php
M maintenance/populateListOfUsersToRename.php
M maintenance/resetGlobalUserTokens.php
6 files changed, 10 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CentralAuth
refs/changes/53/166953/1
diff --git a/includes/CentralAuthUser.php b/includes/CentralAuthUser.php
index dbb2d4e..15fa7a9 100644
--- a/includes/CentralAuthUser.php
+++ b/includes/CentralAuthUser.php
@@ -102,6 +102,11 @@
$wgCentralAuthDatabase );
}
+ public static function waitForSlaves() {
+ global $wgCentralAuthDatabase;
+ wfWaitForSlaves( false, $wgCentralAuthDatabase );
+ }
+
/**
* @param $wikiID
* @return DatabaseBase
diff --git a/maintenance/migrateAccount.php b/maintenance/migrateAccount.php
index 7cca87b..ca4b6ae 100644
--- a/maintenance/migrateAccount.php
+++ b/maintenance/migrateAccount.php
@@ -82,7 +82,7 @@
}
if ( $this-total % $this-batchSize == 0 ) {
$this-output( Waiting for slaves to
catch up ... );
- wfWaitForSlaves( false, 'centralauth' );
+ CentralAuthUser::waitForSlaves();
$this-output( done\n );
}
}
diff --git a/maintenance/migratePass0.php b/maintenance/migratePass0.php
index e3c7ad3..1afdca4 100644
--- a/maintenance/migratePass0.php
+++ b/maintenance/migratePass0.php
@@ -52,7 +52,7 @@
if ( ( $min + $chunkSize ) % ( $chunkSize * 10 ) == 0 ) {
echo Waiting for slaves to catch up ... ;
- wfWaitForSlaves( false, 'centralauth' );
+ CentralAuthUser::waitForSlaves();
echo done\n;
}
}
diff --git a/maintenance/populateHomeDB.php b/maintenance/populateHomeDB.php
index c1d3a07..a7b568d 100644
--- a/maintenance/populateHomeDB.php
+++ b/maintenance/populateHomeDB.php
@@ -36,7 +36,7 @@
$count++;
}
$this-output( $count\n );
- wfWaitForSlaves( false, 'centralauth' );
+ CentralAuthUser::waitForSlaves();
if ( $result-numRows() $this-mBatchSize ) {
break;
}
diff --git a/maintenance/populateListOfUsersToRename.php
b/maintenance/populateListOfUsersToRename.php
index ed56179..2dd99e9 100644
--- a/maintenance/populateListOfUsersToRename.php
+++ b/maintenance/populateListOfUsersToRename.php
@@ -59,8 +59,6 @@
}
public function execute() {
- global $wgCentralAuthDatabase;
-
$dbw = CentralAuthUser::getCentralDB();
$databaseUpdates = new UsersToRenameDatabaseUpdates( $dbw );
// CentralAuthUser::chooseHomeWiki is expensive and called
@@ -95,7 +93,7 @@
$this-output( Inserted $count users who we will
rename\n );
$this-output( Waiting for slaves...\n );
- wfWaitForSlaves( false, $wgCentralAuthDatabase );
+ CentralAuthUser::waitForSlaves();
} while ( $count !== 0 );
}
diff --git a/maintenance/resetGlobalUserTokens.php
b/maintenance/resetGlobalUserTokens.php
index e4ad4a9..9753cbe 100644
--- a/maintenance/resetGlobalUserTokens.php
+++ b/maintenance/resetGlobalUserTokens.php
@@ -47,8 +47,6 @@
}
public function execute() {
- global $wgCentralAuthDatabase;
-
if ( !$this-getOption( 'nowarn' ) ) {
$this-output( The script is about to reset the
user_token for ALL USERS in the database.\n );
$this-output( This may log some of them out and is
not necessary unless you believe your\n );
@@ -88,7 +86,7 @@
$max = $maxid;
}
- wfWaitForSlaves( false, $wgCentralAuthDatabase );
+ CentralAuthUser::waitForSlaves();
} while ( $min $maxid );
--
To view, visit https://gerrit.wikimedia.org/r/166953
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I51c9210882047309d712c1146a2e065d664eabcd
[MediaWiki-commits] [Gerrit] Fixed prepare message with html footer - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: Fixed prepare message with html footer
..
Fixed prepare message with html footer
Change-Id: I3f3a7ed5c2d6f5279d2ef231acf9cf9279c043e6
---
M includes/Mailer.class.php
1 file changed, 11 insertions(+), 11 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Smuggli: Looks good to me, but someone else must approve
jenkins-bot: Checked
Objections:
Mglaser: There's a problem with this change, please improve
diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php
index f6dcc59..a27b883 100644
--- a/includes/Mailer.class.php
+++ b/includes/Mailer.class.php
@@ -107,23 +107,23 @@
$sCombinedSubject = '['.$wgSitename.'] '.$sSubject;
//Prepare message
+ if ( $this-bSendHTML ) {
+ //http(s)://link - a
href=http(s)://linkhttp(s)://link/a
+ //! already followed by /a
+ //last char ! .
+ $sMsg = preg_replace(
+ #(\s|/)(https?://[^\s]+?)\.?([\s|])#,
+ 'a href=$2$2/a',
+ $sMsg
+ );
+ }
+
$sFooter = ( $this-bSendHTML ) ? br /br
/-br /br / : \n\n-\n\n;
$sFooter .= wfMessage( 'bs-email-footer', $wgSitename
)-plain() . ( $this-bSendHTML )
? br /br /-
: \n\n-;
$sCombinedMsg = $sMsg.$sFooter;
-
- if ( $this-bSendHTML ) {
- //http(s)://link - a
href=http(s)://linkhttp(s)://link/a
- //! already followed by /a
- //last char ! .
- $sCombinedMsg = preg_replace(
- #(\s|/)(https?://[^\s]+?)\.?([\s|])#,
- 'a href=$2$2/a',
- $sCombinedMsg
- );
- }
foreach ( $aEmailTo as $aReceiver ) {
//Prepare message
--
To view, visit https://gerrit.wikimedia.org/r/166731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3f3a7ed5c2d6f5279d2ef231acf9cf9279c043e6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Open the published article in new tab when clicked on succes... - change (mediawiki...ContentTranslation)
Santhosh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166954
Change subject: Open the published article in new tab when clicked on success
message
..
Open the published article in new tab when clicked on success message
Redoing I0666ccb6481
Change-Id: Iacc91c2eb7c62939c7fc730f28b1d974ea48ad41
---
M i18n/en.json
M i18n/qqq.json
M modules/header/ext.cx.header.js
M modules/publish/ext.cx.publish.js
4 files changed, 5 insertions(+), 8 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/54/166954/1
diff --git a/i18n/en.json b/i18n/en.json
index 8812be9..48645e8 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -15,7 +15,7 @@
cx-header-progressbar-text-mt: ($1% from machine translation),
cx-header-translation-center: Translation center,
cx-source-view-page: view page,
- cx-publish-page: Page published at [$1 $2],
+ cx-publish-page: Page published at $1,
cx-publish-page-error: Error while saving page.,
cx-publish-button: Publish translation,
cx-publish-button-publishing: Publishing...,
diff --git a/i18n/qqq.json b/i18n/qqq.json
index d0a8c69..f3d4ad5 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -20,7 +20,7 @@
cx-header-progressbar-text-mt: Text to be shown with the progress
bar in [[Special:ContentTranslation]]. $1 is the estimated percent of
machine-translated text out of all the translation text that was written so
far.,
cx-header-translation-center: Text for the translation center
title.,
cx-source-view-page: A link that points to the source page under the
heading of the source article.\n{{Identical|View page}},
- cx-publish-page: Link to the published page. Parameters:\n* $1 -
URL\n* $2 - link text - a MediaWiki page title of a user subpage, such as
\User:Nike/Rabbit\,
+ cx-publish-page: Link to the published page. Parameters:\n* $1 -
Link,
cx-publish-page-error: Error message to display when page saving
fails.,
cx-publish-button: Publish button text in
[[Special:ContentTranslation]].\n\nAlso used in
{{msg-mw|Cx-tools-instructions-text6}}.,
cx-publish-button-publishing: Publish button text in
[[Special:ContentTranslation]], shown while publishing is in progress. Replaces
{{msg-mw|cx-publish-button}}.\n{{Identical|Publishing}},
diff --git a/modules/header/ext.cx.header.js b/modules/header/ext.cx.header.js
index 06f1a1c..bb884d8 100644
--- a/modules/header/ext.cx.header.js
+++ b/modules/header/ext.cx.header.js
@@ -97,8 +97,7 @@
this.$infoBar
.removeClass( 'cx-success cx-error' )
.addClass( type )
- .show()
- .find( 'a' ).attr( 'target', '_blank' );
+ .show();
};
/**
diff --git a/modules/publish/ext.cx.publish.js
b/modules/publish/ext.cx.publish.js
index bb8706f..13129f5 100644
--- a/modules/publish/ext.cx.publish.js
+++ b/modules/publish/ext.cx.publish.js
@@ -140,10 +140,8 @@
sourcerevision: mw.cx.sourceRevision,
categories: categories
} ).done( function () {
- mw.hook( 'mw.cx.success' ).fire( mw.message(
- 'cx-publish-page',
- mw.util.getUrl( targetTitle ),
- targetTitle
+ mw.hook( 'mw.cx.success' ).fire( mw.message(
'cx-publish-page',
+ 'a href=' + mw.util.getUrl( targetTitle )
+ ' target=_blank' + targetTitle + '/a'
) );
mw.hook( 'mw.cx.translation.published' ).fire(
mw.cx.sourceLanguage,
--
To view, visit https://gerrit.wikimedia.org/r/166954
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacc91c2eb7c62939c7fc730f28b1d974ea48ad41
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Santhosh santhosh.thottin...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Categories: Increase API limit on categories retrieved and a... - change (mediawiki...ContentTranslation)
jenkins-bot has submitted this change and it was merged.
Change subject: Categories: Increase API limit on categories retrieved and
adapted
..
Categories: Increase API limit on categories retrieved and adapted
* Explicitly sets the API result limit for category retrieval
and adaptation to 100 in order to handle more categories
(the default if no limit is specified is 10)
Bug: 6
Change-Id: I86b5797f813df7fd6cc6688223cb98b7efd851b9
---
M modules/tools/ext.cx.tools.categories.js
1 file changed, 2 insertions(+), 0 deletions(-)
Approvals:
Santhosh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/tools/ext.cx.tools.categories.js
b/modules/tools/ext.cx.tools.categories.js
index 649940d..226a5cf 100644
--- a/modules/tools/ext.cx.tools.categories.js
+++ b/modules/tools/ext.cx.tools.categories.js
@@ -382,6 +382,7 @@
action: 'query',
prop: 'categories',
clshow: '!hidden',
+ cllimit: 100,
indexpageids: true,
titles: title,
format: 'json'
@@ -447,6 +448,7 @@
titles: categoryTitles.join( '|' ),
prop: 'langlinks',
lllang: language,
+ lllimit: 100,
redirects: true,
format: 'json'
}, {
--
To view, visit https://gerrit.wikimedia.org/r/166755
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I86b5797f813df7fd6cc6688223cb98b7efd851b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Jsahleen jsahl...@wikimedia.org
Gerrit-Reviewer: Santhosh santhosh.thottin...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed some issues in preferences - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: Fixed some issues in preferences
..
Fixed some issues in preferences
* Multiselect and sortable fields did not work
* Added styling for sort fields
* Added own module for multiselect
* Unified some file names
* Some small cleanups
* Improved multiselect code
Change-Id: I52d2cf8a5c44d674e566dd1476ff599a6bf497b8
---
M includes/Config.class.php
M includes/Core.class.php
M includes/html/htmlformfields/HTMLMultiSelectEx.php
M includes/html/htmlformfields/HTMLMultiSelectPlusAdd.php
M includes/html/htmlformfields/HTMLMultiSelectSortList.php
M resources/Resources.php
A resources/bluespice/bluespice.html.formfields.multiselect.js
A resources/bluespice/bluespice.html.formfields.sortable.css
R resources/bluespice/bluespice.html.formfields.sortable.js
D resources/bluespice/bluespice.multiselect.js
M resources/bluespice/bluespice.util.js
11 files changed, 63 insertions(+), 55 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/includes/Config.class.php b/includes/Config.class.php
index fe14a36..d5916d7 100644
--- a/includes/Config.class.php
+++ b/includes/Config.class.php
@@ -243,9 +243,6 @@
return self::$prSettings[$key];
}
$_path = explode ( '::', $path );
- $adapter = null;
- $extension = null;
- $varname = null;
$len = count ( $_path );
if ( $len 2 || $len 3 ) {
@@ -253,9 +250,10 @@
return false;
}
+ $extension = null;
$adapter = array_shift ( $_path );
$len--;
- if ( $len == 2 ) {
+ if ( $len === 2 ) {
$extension = array_shift ( $_path );
}
$varname = array_shift ( $_path );
@@ -306,7 +304,7 @@
public static function saveSettings() {
$dbw = wfGetDB ( DB_WRITE );
- $dbw-delete('bs_settings', '*');
+ $dbw-delete( 'bs_settings', '*' );
$aSettings = array();
diff --git a/includes/Core.class.php b/includes/Core.class.php
index 6c19159..1c46950 100644
--- a/includes/Core.class.php
+++ b/includes/Core.class.php
@@ -114,8 +114,10 @@
global $wgScriptPath;
$sPath = $wgScriptPath .
/extensions/BlueSpiceFoundation/resources/bluespice/images/;
- BsConfig::registerVar( 'MW::FileExtensions', array('doc',
'docx', 'pdf', 'xls'), BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_ARRAY_STRING,
'bs-pref-fileextensions', 'multiselectplusadd' );
- BsConfig::registerVar( 'MW::ImageExtensions', array('png',
'gif', 'jpg', 'jpeg'), BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_ARRAY_STRING,
'bs-pref-imageextensions', 'multiselectplusadd' );
+ $aFiles = array( 'doc', 'docx', 'pdf', 'xls', 'xlsx' );
+ $aImages = array( 'png', 'gif', 'jpg', 'jpeg' );
+ BsConfig::registerVar( 'MW::FileExtensions', $aFiles,
BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_ARRAY_STRING,
'bs-pref-fileextensions', 'multiselectplusadd' );
+ BsConfig::registerVar( 'MW::ImageExtensions', $aImages,
BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_ARRAY_STRING,
'bs-pref-imageextensions', 'multiselectplusadd' );
BsConfig::registerVar( 'MW::LogoPath', $sPath . 'bs-logo.png',
BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING, 'bs-pref-logopath' );
BsConfig::registerVar( 'MW::FaviconPath', $sPath .
'favicon.ico', BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING,
'bs-pref-faviconpath' );
BsConfig::registerVar( 'MW::DefaultUserImage', $sPath .
'bs-user-default-image.png', BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING,
'bs-pref-defaultuserimage' );
diff --git a/includes/html/htmlformfields/HTMLMultiSelectEx.php
b/includes/html/htmlformfields/HTMLMultiSelectEx.php
index 9dd9a45..927e233 100644
--- a/includes/html/htmlformfields/HTMLMultiSelectEx.php
+++ b/includes/html/htmlformfields/HTMLMultiSelectEx.php
@@ -17,6 +17,8 @@
}
function getInputHTML( $value ) {
+ $this-mParent-getOutput()-addModules(
'ext.bluespice.html.formfields.multiselect' );
+
$aOptions = ( isset( $this-mParams['options'] ) ) ?
$this-mParams['options'] : array();
$html = $this-formatOptions( $aOptions, $value );
diff --git a/includes/html/htmlformfields/HTMLMultiSelectPlusAdd.php
b/includes/html/htmlformfields/HTMLMultiSelectPlusAdd.php
index 816e55b..0c6f0ae 100644
--- a/includes/html/htmlformfields/HTMLMultiSelectPlusAdd.php
+++ b/includes/html/htmlformfields/HTMLMultiSelectPlusAdd.php
@@ -13,8 +13,8 @@
$attrs = array(
'type' = 'button',
'id' = $this-mName . '-add',
-
[MediaWiki-commits] [Gerrit] Fixed some issues in preferences - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Fixed some issues in preferences
..
Fixed some issues in preferences
* Message was not shown in sort items
Change-Id: I0e51d6c3f87b4f6cd2d570341ddd5eee2bfa0f40
---
M ExtendedSearch/ExtendedSearch.class.php
M Preferences/resources/bluespice.preferences.js
2 files changed, 10 insertions(+), 11 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/ExtendedSearch/ExtendedSearch.class.php
b/ExtendedSearch/ExtendedSearch.class.php
index ecf28d0..29c3ce7 100644
--- a/ExtendedSearch/ExtendedSearch.class.php
+++ b/ExtendedSearch/ExtendedSearch.class.php
@@ -206,7 +206,7 @@
* @return boolean Always true to keep hook running
*/
public function onBSStateBarAddSortBodyVars( $aSortBodyVars ) {
- $aSortBodyVars['statebarbodymorelikethis'] = wfMessage(
'bs-articleinfo-statebarbodymorelikethis' )-plain();
+ $aSortBodyVars['statebarbodymorelikethis'] = wfMessage(
'bs-extendedsearch-morelikethis' )-plain();
return true;
}
diff --git a/Preferences/resources/bluespice.preferences.js
b/Preferences/resources/bluespice.preferences.js
index fbc3eb1..7746488 100644
--- a/Preferences/resources/bluespice.preferences.js
+++ b/Preferences/resources/bluespice.preferences.js
@@ -1,15 +1,14 @@
-$( document ).ready( function() {
+( function ( mw, bs, $, undefined ) {
$('.bs-prefs .bs-prefs-head').click( function() {
- var oPrefsBody = $(this).parent().find('.bs-prefs-body');
- var sCookieKey = $(this).parent().attr('id')+'-viewstate';
- if( oPrefsBody.is(:visible) == true ) {
+ var oPrefsBody = $( this ).parent().find( '.bs-prefs-body' ),
+ sCookieKey = $( this ).parent().attr( 'id'
)+'-viewstate';
+ if ( oPrefsBody.is( :visible ) == true ) {
$(oPrefsBody[0]).slideUp(500);
$(oPrefsBody[0]).parent().addClass('bs-prefs-viewstate-collapsed');
$.cookie(sCookieKey, null, {
path: '/'
});
- }
- else {
+ } else {
$(oPrefsBody[0]).slideDown(500);
$(oPrefsBody[0]).parent().removeClass('bs-prefs-viewstate-collapsed');
$.cookie(sCookieKey, 'opened', {
@@ -18,11 +17,11 @@
});
}
}).each( function() {
- var oPrefsBody = $(this).parent().find('.bs-prefs-body');
- var sCookieKey = $(this).parent().attr('id')+'-viewstate';
- if( sCookieKey != 'bluespice-viewstate' ($.cookie(
sCookieKey ) == null || $.cookie( sCookieKey ) != 'opened')) {
+ var oPrefsBody = $(this).parent().find('.bs-prefs-body'),
+ sCookieKey = $(this).parent().attr('id')+'-viewstate';
+ if ( sCookieKey != 'bluespice-viewstate' ($.cookie(
sCookieKey ) == null || $.cookie( sCookieKey ) != 'opened')) {
oPrefsBody.hide();
$(oPrefsBody[0]).parent().addClass('bs-prefs-viewstate-collapsed');
}
});
-});
\ No newline at end of file
+}( mediaWiki, blueSpice, jQuery ) );
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/166741
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0e51d6c3f87b4f6cd2d570341ddd5eee2bfa0f40
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed prepare message with html footer - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: Fixed prepare message with html footer
..
Fixed prepare message with html footer
Change-Id: I6c95d3d30aed40aea56bca78f2ad4188b43cef9b
---
M includes/Mailer.class.php
1 file changed, 5 insertions(+), 5 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/includes/Mailer.class.php b/includes/Mailer.class.php
index b29bcaa..3a0a99e 100644
--- a/includes/Mailer.class.php
+++ b/includes/Mailer.class.php
@@ -108,20 +108,20 @@
$sCombinedSubject = '['.$wgSitename.'] '.$sSubject;
//Prepare message
- $sFooter = $this-bSendHTML ? wfMessage( 'bs-mail-footer-html',
$wgSitename )-plain() : wfMessage( 'bs-mail-footer', $wgSitename )-plain() ;
- $sCombinedMsg = $sMsg.$sFooter;
-
if( $this-bSendHTML ) {
//http(s)://link - a
href=http(s)://linkhttp(s)://link/a
//! already followed by /a
//last char ! .
- $sCombinedMsg = preg_replace(
+ $sMsg = preg_replace(
#(\s|/)(https?://[^\s]+?)\.?([\s|])#,
'a href=$2$2/a',
- $sCombinedMsg
+ $sMsg
);
}
+ $sFooter = $this-bSendHTML ? wfMessage( 'bs-mail-footer-html',
$wgSitename )-plain() : wfMessage( 'bs-mail-footer', $wgSitename )-plain() ;
+ $sCombinedMsg = $sMsg.$sFooter;
+
foreach ( $aEmailTo as $aReceiver ) {
//Prepare message
if ( $aReceiver['greeting'] ) {
--
To view, visit https://gerrit.wikimedia.org/r/166730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6c95d3d30aed40aea56bca78f2ad4188b43cef9b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: REL1_22
Gerrit-Owner: Pwirth wi...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed tooltip message keys - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: Fixed tooltip message keys
..
Fixed tooltip message keys
Change-Id: I2e0a1e1cc31d1d96a1860475a5b69cf44011c580
---
M resources/bluespice.extjs/BS/CRUDPanel.js
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/resources/bluespice.extjs/BS/CRUDPanel.js
b/resources/bluespice.extjs/BS/CRUDPanel.js
index cd4c98a..2759475 100644
--- a/resources/bluespice.extjs/BS/CRUDPanel.js
+++ b/resources/bluespice.extjs/BS/CRUDPanel.js
@@ -29,7 +29,7 @@
id: this.getId()+'-btn-add',
icon: mw.config.get( 'wgScriptPath') +
'/extensions/BlueSpiceFoundation/resources/bluespice/images/bs-m_add.png',
iconCls: 'btn'+this.tbarHeight,
- tooltip: mw.message('bs-extjs-tooltip-add').plain(),
+ tooltip: mw.message('bs-extjs-add').plain(),
height: 50,
width: 52
});
@@ -39,7 +39,7 @@
id: this.getId()+'-btn-edit',
icon: mw.config.get( 'wgScriptPath') +
'/extensions/BlueSpiceFoundation/resources/bluespice/images/bs-um_config.png',
iconCls: 'btn'+this.tbarHeight,
- tooltip: mw.message('bs-extjs-tooltip-edit').plain(),
+ tooltip: mw.message('bs-extjs-edit').plain(),
height: 50,
width: 52,
disabled: true
@@ -50,7 +50,7 @@
id: this.getId()+'-btn-remove',
icon: mw.config.get( 'wgScriptPath') +
'/extensions/BlueSpiceFoundation/resources/bluespice/images/bs-m_delete.png',
iconCls: 'btn'+this.tbarHeight,
- tooltip: mw.message('bs-extjs-tooltip-remove').plain(),
+ tooltip: mw.message('bs-extjs-remove').plain(),
height: 50,
width: 52,
disabled: true
@@ -71,7 +71,7 @@
this.callParent(arguments);
},
-
+
makeTbarItems: function() {
return [
this.btnAdd,
--
To view, visit https://gerrit.wikimedia.org/r/166561
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I2e0a1e1cc31d1d96a1860475a5b69cf44011c580
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Code corrections to silence jslint - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged.
Change subject: Code corrections to silence jslint
..
Code corrections to silence jslint
- Split multiple varaiable definitions in one line into one definition per line
Change-Id: Id2659ae02218decd0645a22cccfe271fbb8be04b
---
M resources/bluespice/bluespice.ping.js
M resources/bluespice/bluespice.string.js
M resources/bluespice/bluespice.util.js
M resources/bluespice/bluespice.wikiText.js
4 files changed, 225 insertions(+), 239 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/resources/bluespice/bluespice.ping.js
b/resources/bluespice/bluespice.ping.js
index 8db5b50..a2954b6 100644
--- a/resources/bluespice/bluespice.ping.js
+++ b/resources/bluespice/bluespice.ping.js
@@ -5,20 +5,20 @@
init: function() {
$(document).triggerHandler('BSPingInit', [this]);
this.interval = bsPingInterval*1000;
- if( this.interval 1000 ) return;
+ if ( this.interval 1000 ) return;
this.ping();
},
ping: function() {
var aListenersToGo = this.calculateInterval();
- if( aListenersToGo.length 1 ) {
- BSPing.timeout = setTimeout(BSPing.ping(),
BSPing.interval);
+ if ( aListenersToGo.length 1 ) {
+ BSPing.timeout = setTimeout( BSPing.ping,
BSPing.interval);
return;
}
//do this or getJSON will auto call given callbacks (would make
BSPing totally freak out)
var BsPingData = [];
- for( var i = 0; i aListenersToGo.length; i++) {
+ for ( var i = 0; i aListenersToGo.length; i++) {
BsPingData.push({
sRef:aListenersToGo[i].sRef,
aData:aListenersToGo[i].aData
@@ -40,25 +40,25 @@
);
},
registerListener: function( sRef, iInterval, aData, callback) {
- if( typeof sRef == undefined) return false;
+ if ( typeof sRef == undefined) return false;
var o = {
- sRef: sRef,
- iInterval: ( typeof iInterval == undefined
? 1 : iInterval ),
- aData: ( typeof aData == undefined
? [] : aData ),
- callback: ( typeof callback == undefined
? false : callback )
- }
+ sRef: sRef,
+ iInterval: ( typeof iInterval == undefined ? 1 :
iInterval ),
+ aData: ( typeof aData == undefined ? [] : aData ),
+ callback: ( typeof callback == undefined ? false :
callback )
+ };
this.aListeners.push(o);
return true;
},
calculateInterval: function() {
var aReturn = [];
- if(BSPing.aListeners.length 1) return aReturn;
+ if ( BSPing.aListeners.length 1 ) return aReturn;
var currTMPListeners = [];
- for( var i = 0; i BSPing.aListeners.length; i++) {
+ for ( var i = 0; i BSPing.aListeners.length; i++) {
BSPing.aListeners[i].iInterval =
(BSPing.aListeners[i].iInterval - BSPing.interval);
- if( BSPing.aListeners[i].iInterval 0 ) {
+ if ( BSPing.aListeners[i].iInterval 0 ) {
currTMPListeners.push( BSPing.aListeners[i] );
continue;
}
@@ -67,22 +67,22 @@
BSPing.aListeners = currTMPListeners;
- return aReturn
+ return aReturn;
},
pingCallback : function( aListenersToGo ) {
return function( result ) {
result = JSON.parse( result );
- if( result['success'] !== true) return;
+ if ( result.success !== true ) return;
- for( var i = 0; i aListenersToGo.length; i++) {
- if(aListenersToGo[i].callback !== false
typeof(aListenersToGo[i].callback) == function) {
+ for ( var i = 0; i aListenersToGo.length; i++) {
+ if ( aListenersToGo[i].callback !== false
typeof(aListenersToGo[i].callback) == function ) {
aListenersToGo[i].callback(
result[aListenersToGo[i].sRef], aListenersToGo[i] );
}
}
- BSPing.timeout = setTimeout(BSPing.ping(),
BSPing.interval);
- }
+ BSPing.timeout = setTimeout(
[MediaWiki-commits] [Gerrit] Removing jquery dependency - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has submitted this change and it was merged. Change subject: Removing jquery dependency .. Removing jquery dependency Using jquery as a dependency with MW 1.24 throws an unknown module error. Jquery is loaded by default. Change-Id: I01bdc2d403a454109b6b9a5824046f21e094c956 --- M resources/Resources.php 1 file changed, 0 insertions(+), 1 deletion(-) Approvals: Robert Vogel: Verified; Looks good to me, approved diff --git a/resources/Resources.php b/resources/Resources.php index 7394fc7..38646fc 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -23,7 +23,6 @@ 'bluespice/bluespice.multiselect.js' ), 'dependencies' = array( - 'jquery', 'jquery.ui.core', 'jquery.ui.dialog', 'jquery.ui.tabs', -- To view, visit https://gerrit.wikimedia.org/r/166414 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I01bdc2d403a454109b6b9a5824046f21e094c956 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Readded contenttable styling - change (mediawiki...BlueSpiceSkin)
Robert Vogel has submitted this change and it was merged.
Change subject: Readded contenttable styling
..
Readded contenttable styling
Change-Id: Ibd493f4853cc303e261c1efecc34006822342da7
---
M resources/components/skin.content.tables.less
1 file changed, 67 insertions(+), 0 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/resources/components/skin.content.tables.less
b/resources/components/skin.content.tables.less
index 8cda935..617ee91 100644
--- a/resources/components/skin.content.tables.less
+++ b/resources/components/skin.content.tables.less
@@ -101,3 +101,70 @@
table.greyscale-narrow tbody tr:hover{
background-color: #DEDCDC;
}
+table.contenttable {
+ width:100%;
+ border:1px #ccc solid;
+ border-spacing:0;
+ border-collapse:collapse;
+}
+
+table.contenttable td,table.contenttable tr {
+ border:1px #ccc solid;
+ border-spacing:0;
+ border-collapse:collapse;
+ padding:4px;
+}
+
+table.contenttable th {
+ background-color:#E0E0E0;
+ border:1px solid #CCC;
+ padding:4px;
+}
+
+table.contenttable-black {
+ width:100%;
+ border:1px #000 solid;
+ border-spacing:0;
+ border-collapse:collapse;
+}
+
+table.contenttable-black td, table.contenttable-black tr {
+ border:1px #000 solid;
+ border-spacing:0;
+ border-collapse:collapse;
+ padding:4px;
+}
+
+table.contenttable-black th {
+ background-color:#E0E0E0;
+ border:1px solid #000;
+ padding:4px;
+}
+
+table.contenttable-blue td, table.contenttable-blue tr,
table.contenttable-darkblue td, table.contenttable-darkblue tr {
+ border:1px #B1B9CF solid;
+ border-spacing:0;
+ border-collapse:collapse;
+ padding:4px;
+}
+
+table.contenttable-blue th {
+ background-color:#EFF3F9;
+ border:1px solid #B1B9CF;
+ color:#3E5389;
+ padding:4px;
+}
+
+table.contenttable-blue, table.contenttable-darkblue {
+ width:100%;
+ border:1px #B1B9CF solid;
+ border-spacing:0;
+ border-collapse:collapse;
+}
+
+table.contenttable-darkblue th {
+ background-color:#3E5389;
+ border:1px solid #B1B9CF;
+ color:#FFF;
+ padding:4px;
+}
--
To view, visit https://gerrit.wikimedia.org/r/166403
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibd493f4853cc303e261c1efecc34006822342da7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Tweichart weich...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] InsertFile JavaApplet changes - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: InsertFile JavaApplet changes
..
InsertFile JavaApplet changes
* signed java applet
* moved .class to .jar to sign
* added .crt file for import
* decompiled .class toi make changes in the applet
* removed some unnecessary code from the applet
* changed return value to a json string
* applet inclusion in js changed
* return values are now handled in the return method in js, no js will be
called from within the applet
* renamed the applet
Change-Id: Ia989924e8f588a436b4a11a542c4ea9c0c841d72
---
M InsertLink/InsertLink.setup.php
M InsertLink/i18n/de.json
M InsertLink/i18n/en.json
M InsertLink/i18n/qqq.json
M InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
D InsertLink/resources/HWFileChooserApplet.class
A InsertLink/vendor/BsFileChooserApplet.jar
A InsertLink/vendor/src/BsFileChooserApplet.java
A InsertLink/vendor/src/insertLink
A InsertLink/vendor/src/insertLink.crt
10 files changed, 72 insertions(+), 20 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
Siebrand: Looks good to me, but someone else must approve
diff --git a/InsertLink/InsertLink.setup.php b/InsertLink/InsertLink.setup.php
index daabd68..0cb21f6 100644
--- a/InsertLink/InsertLink.setup.php
+++ b/InsertLink/InsertLink.setup.php
@@ -30,7 +30,8 @@
'bs-insertlink-label-searchfile',
'bs-insertlink-select-a-page',
'bs-insertlink-select-a-namespace',
- 'bs-insertlink-empty-field-text'
+ 'bs-insertlink-empty-field-text',
+ 'bs-insertlink-applet-title'
)
) + $aResourceModuleTemplate;
diff --git a/InsertLink/i18n/de.json b/InsertLink/i18n/de.json
index 682bcdd..c38227e 100644
--- a/InsertLink/i18n/de.json
+++ b/InsertLink/i18n/de.json
@@ -21,5 +21,6 @@
bs-insertlink-label-searchfile: Durchsuchen ...,
bs-insertlink-select-a-page: Ziel wählen ...,
bs-insertlink-select-a-namespace: (Seiten),
- bs-insertlink-empty-field-text: Um einen Link einzufügen muss ein
Ziel angegeben werden.
+ bs-insertlink-empty-field-text: Um einen Link einzufügen muss ein
Ziel angegeben werden.,
+ bs-insertlink-no-applet: Das Applet konnte nicht geladen werden.
Bitte überprüfe deine Java-Installation.
}
diff --git a/InsertLink/i18n/en.json b/InsertLink/i18n/en.json
index 5621cd2..426b1ab 100644
--- a/InsertLink/i18n/en.json
+++ b/InsertLink/i18n/en.json
@@ -21,5 +21,6 @@
bs-insertlink-label-searchfile: Search ...,
bs-insertlink-select-a-page: Choose target ...,
bs-insertlink-select-a-namespace: (Pages),
- bs-insertlink-empty-field-text: To insert a link you need to state a
destination.
+ bs-insertlink-empty-field-text: To insert a link you need to state a
destination.,
+ bs-insertlink-no-applet: The applet could not be loaded. Please
check your Java installation.
}
diff --git a/InsertLink/i18n/qqq.json b/InsertLink/i18n/qqq.json
index 03c960b..c4acaa6 100644
--- a/InsertLink/i18n/qqq.json
+++ b/InsertLink/i18n/qqq.json
@@ -22,5 +22,6 @@
bs-insertlink-label-searchfile: The text of the search file
button.\n{{Identical|Search}},
bs-insertlink-select-a-page: The empty message for the page drop
down field,
bs-insertlink-select-a-namespace: The empty message for the
namespace drop down field. Attention: this shows the mainspace label as
default.\n{{Identical|Page}},
- bs-insertlink-empty-field-text: The error message when the link
field was empty.
+ bs-insertlink-empty-field-text: The error message when the link
field was empty.,
+ bs-insertlink-no-applet: Error message if the applet could not be
loaded. Gives the user the advise to check the java settings.
}
diff --git a/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
b/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
index d55cb72..7d04cff 100644
--- a/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
+++ b/InsertLink/resources/BS.InsertLink/FormPanelFileLink.js
@@ -17,18 +17,15 @@
beforeInitComponent: function() {
this.setTitle( mw.message('bs-insertlink-tab-ext-file').plain()
);
this.on( 'beforeactivate', function(){
- oApplet = document.createElement('applet');
- oBody = document.getElementsByTagName('body')[0];
- oApplet.setAttribute('code',
'HWFileChooserApplet.class');
- oApplet.setAttribute('id', 'HWFileChooserApplet');
- oApplet.setAttribute('name', 'HWFileChooserApplet');
- oApplet.setAttribute('scriptable', 'true');
- oApplet.setAttribute('mayscript', 'true');
- oApplet.setAttribute('codebase',
wgScriptPath+'/extensions/BlueSpiceExtensions/InsertLink/resources/');
[MediaWiki-commits] [Gerrit] Make sure list item prototypes have a value method - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166955
Change subject: Make sure list item prototypes have a value method
..
Make sure list item prototypes have a value method
Change-Id: I92cda5e43f1c49deecee21169d732a307dfc3e93
---
M lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/55/166955/1
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
b/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
index 39f5a2f..7489e8e 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.listview.ListItemAdapter.js
@@ -41,6 +41,9 @@
if( !$.isFunction( this._liWidget ) ||
!this._liWidget.prototype.widgetName ) {
throw new Error( 'For a new ListItemAdapter, a jQuery
Widget constructor is required' );
}
+ if( !$.isFunction( this._liWidget.prototype.value ) ) {
+ throw new Error( 'For a new ListItemAdapter, the list
item prototype needs a value method' );
+ }
if( !$.isFunction( options.newItemOptionsFn ) ) {
throw new Error( 'For a new ListItemAdapter, the
\'newItemOptionsFn\' option is required' );
}
--
To view, visit https://gerrit.wikimedia.org/r/166955
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I92cda5e43f1c49deecee21169d732a307dfc3e93
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Optimize/add missing use clauses in Client after DM 2.0 switch - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/166956 Change subject: Optimize/add missing use clauses in Client after DM 2.0 switch .. Optimize/add missing use clauses in Client after DM 2.0 switch Plus a little bit of (hopefully non-critical) clean up with the help of PHPStorm's static code analysis. Change-Id: Id0639ce23198a6a4e949069b0ffc6f8687228c4d --- M client/WikibaseClient.hooks.php M client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php M client/includes/DataAccess/PropertyParserFunction/Runner.php M client/includes/LangLinkHandler.php M client/includes/RepoItemLinkGenerator.php M client/includes/UpdateRepo.php M client/includes/WikibaseClient.php M client/includes/hooks/ChangesPageWikibaseFilterHandler.php M client/tests/phpunit/MockPageUpdater.php M client/tests/phpunit/includes/ChangeHandlerTest.php M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/RunnerTest.php M client/tests/phpunit/includes/DataAccess/PropertyParserFunction/VariantsAwareRendererTest.php M client/tests/phpunit/includes/hooks/ChangesPageWikibaseFilterHandlerTest.php M client/tests/phpunit/includes/hooks/SidebarHookHandlersTest.php 14 files changed, 32 insertions(+), 27 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/56/166956/1 diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php index e618e45..4deaaf2 100644 --- a/client/WikibaseClient.hooks.php +++ b/client/WikibaseClient.hooks.php @@ -4,7 +4,6 @@ use Action; use BaseTemplate; -use BetaFeatures; use ChangesList; use FormOptions; use IContextSource; @@ -14,7 +13,6 @@ use MWException; use OutputPage; use Parser; -use ParserOutput; use QuickTemplate; use RecentChange; use RecursiveDirectoryIterator; @@ -23,7 +21,6 @@ use SpecialRecentChanges; use SpecialWatchlist; use SplFileInfo; -use StripState; use Title; use UnexpectedValueException; use User; @@ -31,7 +28,6 @@ use Wikibase\Client\Hooks\BeforePageDisplayHandler; use Wikibase\Client\Hooks\ChangesPageWikibaseFilterHandler; use Wikibase\Client\Hooks\InfoActionHookHandler; -use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay; use Wikibase\Client\Hooks\SpecialWatchlistQueryHandler; use Wikibase\Client\MovePageNotice; use Wikibase\Client\RecentChanges\ChangeLineFormatter; diff --git a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php index 76ce090..dc6c8a2 100644 --- a/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php +++ b/client/includes/DataAccess/PropertyParserFunction/LanguageAwareRenderer.php @@ -6,6 +6,7 @@ use Language; use Status; use Wikibase\DataModel\Entity\EntityId; +use Wikibase\DataModel\Snak\Snak; use Wikibase\Lib\PropertyLabelNotResolvedException; use Wikibase\Lib\SnakFormatter; diff --git a/client/includes/DataAccess/PropertyParserFunction/Runner.php b/client/includes/DataAccess/PropertyParserFunction/Runner.php index f62122c..9d89aa2 100644 --- a/client/includes/DataAccess/PropertyParserFunction/Runner.php +++ b/client/includes/DataAccess/PropertyParserFunction/Runner.php @@ -4,6 +4,7 @@ use Parser; use Wikibase\Client\WikibaseClient; +use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\SiteLink; use Wikibase\Lib\Store\SiteLinkLookup; diff --git a/client/includes/LangLinkHandler.php b/client/includes/LangLinkHandler.php index cc93b8b..d0a92f2 100644 --- a/client/includes/LangLinkHandler.php +++ b/client/includes/LangLinkHandler.php @@ -8,6 +8,7 @@ use Title; use Wikibase\Client\Hooks\LanguageLinkBadgeDisplay; use Wikibase\Client\Hooks\OtherProjectsSidebarGenerator; +use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\ItemId; use Wikibase\DataModel\SiteLink; use Wikibase\Lib\Store\EntityLookup; diff --git a/client/includes/RepoItemLinkGenerator.php b/client/includes/RepoItemLinkGenerator.php index b5d3296..f5d2050 100644 --- a/client/includes/RepoItemLinkGenerator.php +++ b/client/includes/RepoItemLinkGenerator.php @@ -3,7 +3,6 @@ namespace Wikibase\Client; use Title; -use Wikibase\Client\RepoLinker; use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\EntityIdParser; use Wikibase\NamespaceChecker; @@ -123,7 +122,7 @@ } /** -* @param EntityId +* @param EntityId $entityId * * @return string[] */ @@ -156,4 +155,5 @@ return $link; } + } diff --git a/client/includes/UpdateRepo.php b/client/includes/UpdateRepo.php index 58804bd..eb916e5 100644 --- a/client/includes/UpdateRepo.php +++ b/client/includes/UpdateRepo.php @@ -9,6 +9,7 @@ use RuntimeException; use Title; use User; +use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\SiteLink; use
[MediaWiki-commits] [Gerrit] i18n: fix PLURAL - change (mediawiki...ContentTranslation)
Shirayuki has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166957
Change subject: i18n: fix PLURAL
..
i18n: fix PLURAL
- cx-stats-summary
Change-Id: I40f0f8bb9f0d37266c9c4babc7acfea6e3db1056
---
M i18n/en.json
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/57/166957/1
diff --git a/i18n/en.json b/i18n/en.json
index 8812be9..0f83e65 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -68,7 +68,7 @@
cx-stats-to: Target language,
cx-stats-pages-title: Translated pages,
cx-stats-unknown: unknown,
- cx-stats-summary: {{PLURAL:$1|One page|$1/$2 pages ($3%)}} in the
main namespace.,
+ cx-stats-summary: $1/$2 {{PLURAL:$1|page|pages}} ($3%) in the main
namespace.,
cx-tools-reference-title: Reference,
cx-tools-reference-remove: Remove reference,
cx-tools-link-instruction-shortcut: Shift + click any link to open,
--
To view, visit https://gerrit.wikimedia.org/r/166957
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40f0f8bb9f0d37266c9c4babc7acfea6e3db1056
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Shirayuki shirayuk...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up Scribunto code in Client - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166958
Change subject: Clean up Scribunto code in Client
..
Clean up Scribunto code in Client
A bit of refactoring based on PHPStorm's static code analysis. Sure,
there is more to do, especially in the case where Claim(s) needs to
be replaced with Statement(s). A job for an other day.
Change-Id: Icac25536e73021d5a573c6c9429092d2e9b4c970
---
M client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
M client/includes/scribunto/WikibaseLuaBindings.php
M client/includes/scribunto/WikibaseLuaEntityBindings.php
3 files changed, 19 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/58/166958/1
diff --git a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
index ddd68ac..a5d035d 100644
--- a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
+++ b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -13,10 +13,11 @@
* @licence GNU GPL v2+
* @author Jens Ohlig jens.oh...@wikimedia.de
*/
-
class Scribunto_LuaWikibaseLibrary extends Scribunto_LuaLibraryBase {
- /* @var Wikibase\Client\WikibaseLuaBindings */
+ /**
+* @var WikibaseLuaBindings
+*/
private $wbLibrary;
/**
@@ -110,6 +111,7 @@
*
* @since 0.5
*
+* @return string[]
*/
public function getGlobalSiteId() {
return array( $this-wbLibrary-getGlobalSiteId() );
@@ -122,10 +124,11 @@
*
* @param string $setting
*
-* @return mixed
+* @return array
*/
public function getSetting( $setting ) {
$this-checkType( 'setting', 1, $setting, 'string' );
return array( $this-wbLibrary-getSetting( $setting ) );
}
+
}
diff --git a/client/includes/scribunto/WikibaseLuaBindings.php
b/client/includes/scribunto/WikibaseLuaBindings.php
index 8351ed66..571bf71 100644
--- a/client/includes/scribunto/WikibaseLuaBindings.php
+++ b/client/includes/scribunto/WikibaseLuaBindings.php
@@ -70,6 +70,7 @@
* @param SiteLinkLookup $siteLinkTable
* @param LanguageFallbackChainFactory $fallbackChainFactory
* @param Language $language
+* @param SettingsArray $settings
* @param string[] $languageCodes
* @param string $siteId
*/
@@ -224,4 +225,5 @@
public function getSetting( $setting ) {
return $this-settings-getSetting( $setting );
}
+
}
diff --git a/client/includes/scribunto/WikibaseLuaEntityBindings.php
b/client/includes/scribunto/WikibaseLuaEntityBindings.php
index 743c5cf..b73e14b 100644
--- a/client/includes/scribunto/WikibaseLuaEntityBindings.php
+++ b/client/includes/scribunto/WikibaseLuaEntityBindings.php
@@ -6,6 +6,7 @@
use Wikibase\DataModel\Claim\Claims;
use Wikibase\DataModel\Entity\Entity;
use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\Item;
use Wikibase\DataModel\Entity\ItemId;
use Wikibase\DataModel\Entity\PropertyId;
use Wikibase\DataModel\Snak\Snak;
@@ -88,15 +89,15 @@
* Returns such Claims from $entity that have a main Snak for the
property that
* is specified by $propertyLabel.
*
-* @param Entity $entity The Entity from which to get the clams
-* @param PropertyId $propertyId A prefixed property ID.
+* @param Item $item The Entity from which to get the clams
+* @param string $propertyId A prefixed property ID.
*
* @return Claims
*/
- private function getClaimsForProperty( Entity $entity, PropertyId
$propertyId ) {
- $allClaims = new Claims( $entity-getClaims() );
+ private function getClaimsForProperty( Item $item, $propertyId ) {
+ $allClaims = new Claims( $item-getClaims() );
- return $allClaims-getClaimsForProperty( $propertyId );
+ return $allClaims-getClaimsForProperty( new PropertyId(
$propertyId ) );
}
/**
@@ -129,23 +130,20 @@
*
* @since 0.5
*
-* @param string $entityId
+* @param string $itemId
* @param string $propertyId
* @param int[] $acceptableRanks
*
* @return string
*/
- public function formatPropertyValues( $entityId, $propertyId, array
$acceptableRanks = null ) {
- $entityId = new ItemId( $entityId );
- $propertyId = new PropertyId( $propertyId );
+ public function formatPropertyValues( $itemId, $propertyId, array
$acceptableRanks = null ) {
+ $item = $this-getEntity( new ItemId( $itemId ) );
- $entity = $this-getEntity( $entityId );
-
- if ( !$entity ) {
+
[MediaWiki-commits] [Gerrit] Zero: Updated 410-01 to support Opera https - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Zero: Updated 410-01 to support Opera https
..
Zero: Updated 410-01 to support Opera https
Change-Id: I53ee6e8d81f42b662e2743913df837af1ca34f5a
---
M templates/varnish/zero.inc.vcl.erb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index e4196a8..ae7a709 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -111,7 +111,7 @@
}
}
} else if (req.http.X-CS2 == 410-01) {
-if (!req.http.X-Forwarded-Proto (!req.http.X-Forwarded-By ||
req.http.X-Forwarded-By == Opera)) {
+if ((!req.http.X-Forwarded-Proto !req.http.X-Forwarded-By) ||
req.http.X-Forwarded-By == Opera) {
if (req.http.host ~ ^((en|ur)\.)?(zero|m)\.) {
set req.http.X-CS = req.http.X-CS2;
}
--
To view, visit https://gerrit.wikimedia.org/r/166936
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I53ee6e8d81f42b662e2743913df837af1ca34f5a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik yu...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dfoy d...@wikimedia.org
Gerrit-Reviewer: Dr0ptp4kt ab...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update to phpunit 3.7.37 - change (integration/phpunit)
jenkins-bot has submitted this change and it was merged. Change subject: Update to phpunit 3.7.37 .. Update to phpunit 3.7.37 $ composer update -o --no-dev Loading composer repositories with package information Updating dependencies - Removing symfony/yaml (v2.3.6) - Installing symfony/yaml (v2.5.5) Downloading: 100% - Removing phpunit/php-text-template (1.1.4) - Installing phpunit/php-text-template (1.2.0) Loading from cache - Removing phpunit/php-token-stream (1.2.1) - Installing phpunit/php-token-stream (1.2.2) Loading from cache - Removing phpunit/php-code-coverage (1.2.13) - Installing phpunit/php-code-coverage (1.2.18) Downloading: 100% - Removing phpunit/phpunit (3.7.28) - Installing phpunit/phpunit (3.7.37) Downloading: 100% Writing lock file Generating optimized autoload files $ composer show --installed phpunit/php-code-coverage1.2.18 phpunit/php-file-iterator1.3.4 phpunit/php-text-template1.2.0 phpunit/php-timer1.0.5 phpunit/php-token-stream 1.2.2 phpunit/phpunit 3.7.37 phpunit/phpunit-mock-objects 1.2.3 symfony/yaml v2.5.5 Change-Id: I9314d96b82aebbdee72b9d6fbce352f6a4cafe37 --- M composer.lock M vendor/autoload.php M vendor/composer/autoload_real.php M vendor/composer/include_paths.php M vendor/composer/installed.json M vendor/phpunit/php-code-coverage/.gitignore M vendor/phpunit/php-code-coverage/.travis.yml M vendor/phpunit/php-code-coverage/CONTRIBUTING.md M vendor/phpunit/php-code-coverage/LICENSE M vendor/phpunit/php-code-coverage/PHP/CodeCoverage.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Autoload.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Autoload.php.in M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Driver/Xdebug.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Exception.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Filter.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Clover.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Factory.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Dashboard.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Directory.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/File.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/coverage_bar.html.dist A vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/css/nv.d3.css M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/css/style.css M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/dashboard.html.dist M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory.html.dist M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/directory_item.html.dist M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/file.html.dist M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/file_item.html.dist A vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/d3.min.js D vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/highcharts.js A vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/js/nv.d3.min.js M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/HTML/Renderer/Template/method_item.html.dist M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Directory.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/File.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Node/Iterator.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/PHP.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Report/Text.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Util.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Util/InvalidArgumentHelper.php M vendor/phpunit/php-code-coverage/PHP/CodeCoverage/Version.php D vendor/phpunit/php-code-coverage/README.markdown A vendor/phpunit/php-code-coverage/README.md M vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/FilterTest.php M vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/Report/CloverTest.php M vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/Report/FactoryTest.php M vendor/phpunit/php-code-coverage/Tests/PHP/CodeCoverage/UtilTest.php M
[MediaWiki-commits] [Gerrit] Add a script to process CLDR plural rule changes - change (mediawiki...Translate)
Nikerabbit has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166959
Change subject: Add a script to process CLDR plural rule changes
..
Add a script to process CLDR plural rule changes
By default it handles languages using plural styles equivalent
to ru. With --fuzzy-only parameter it is possibly to fuzzy all
plural entries for given languages.
The script takes a couple of minutes per language to run. The
edit summary links to CLDR26 page which should be redirected to
the documentation when it is ready.
This script handles explicit plural forms by ignoring them. If
there are less than three plural forms, the plural is skipped
under the assumption that no changes are needed. If there is
more than three or the script fails to correct automatically
then the translation is fuzzied. If it can correct, then the
translation is not fuzzied.
The script prints some stats about plural usage in the language
which were useful to gauge how many translations could not be
updated automatically while developing this script.
Bug: 62861
Change-Id: Ia2868ce9f85dbce453e6931e1a9145e723ae7fae
---
A scripts/plural-convert.php
1 file changed, 229 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/59/166959/1
diff --git a/scripts/plural-convert.php b/scripts/plural-convert.php
new file mode 100644
index 000..ced4e89
--- /dev/null
+++ b/scripts/plural-convert.php
@@ -0,0 +1,229 @@
+?php
+/**
+ * Script to help processing CLDR plural rule changes.
+ *
+ * @author Niklas Laxström
+ * @license GPL-2.0+
+ * @file
+ */
+
+// Standard boilerplate to define $IP
+if ( getenv( 'MW_INSTALL_PATH' ) !== false ) {
+ $IP = getenv( 'MW_INSTALL_PATH' );
+} else {
+ $dir = __DIR__;
+ $IP = $dir/../../..;
+}
+require_once $IP/maintenance/Maintenance.php;
+
+class PluralConvert extends Maintenance {
+ public function __construct() {
+ parent::__construct();
+ $this-mDescription = 'Script to help processing CLDR plural
rule changes.';
+ $this-addOption(
+ 'group',
+ 'Comma separated list of group IDs (can use * as
wildcard)',
+ true, /*required*/
+ true /*has arg*/
+ );
+ $this-addOption(
+ 'lang',
+ 'Comma separated list of language codes or *',
+ true, /*required*/
+ true /*has arg*/
+ );
+
+ $this-addOption(
+ 'fuzzy-only',
+ 'Only fuzzy without changing anything'
+ );
+ }
+
+ public function execute() {
+ $langs = TranslateUtils::parseLanguageCodes( $this-getOption(
'lang' ) );
+ $groupIds = explode( ',', trim( $this-getOption( 'group' ) ) );
+ $groupIds = MessageGroups::expandWildcards( $groupIds );
+ $groups = MessageGroups::getGroupsById( $groupIds );
+
+ $fuzzy = $this-getOption( 'fuzzy-only', false );
+
+ if ( !count( $groups ) ) {
+ $this-error( EE1: No valid message groups
identified., 1 );
+ }
+
+ foreach ( $groups as $groupId = $group ) {
+ $sourceLanguage = $group-getSourceLanguage();
+ $collection = $group-initCollection( $sourceLanguage );
+
+ foreach ( $langs as $lang ) {
+ $collection-resetForNewLanguage( $lang );
+ $collection-loadTranslations();
+ $collection-filter( 'ignored' );
+ $collection-filter( 'hastranslation', false );
+
+ $stats = array(
+ 'total' = count( $collection ),
+ 'magic' = 0,
+ 'plural' = 0,
+ 'failed' = 0,
+ 'updated' = 0,
+ 'instances' = array(),
+ 'forms' = array(),
+ );
+
+ foreach ( $collection-keys() as $key = $title
) {
+ $m = $collection[$key];
+ if ( strpos( $m-translation(), '{{' )
=== false ) {
+ continue;
+ }
+
+ $stats['magic']++;
+
+ $plurals =
MediaWikiMessageChecker::getPluralForms( $m-translation() );
+ $c = count( $plurals );
[MediaWiki-commits] [Gerrit] Fix false new notification and remove double format - change (mediawiki...MobileFrontend)
Ebrahim has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166960
Change subject: Fix false new notification and remove double format
..
Fix false new notification and remove double format
Change-Id: Ibea3297f0bf05e9a8ae9bd5412a1aa9196c8a1b5
---
M includes/skins/SkinMinerva.php
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/60/166960/1
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 25e3241..d3d4a0c 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -220,6 +220,7 @@
$tpl-set( 'secondaryButton', '' );
$notificationsTitle = '';
$count = '';
+ $formattedCount = '';
$user = $this-getUser();
$newtalks = $this-getNewtalks();
@@ -231,7 +232,7 @@
$notificationsMsg = wfMessage(
'mobile-frontend-user-button-tooltip' );
if ( $currentTitle-getPrefixedText() !==
$notificationsTitle-getPrefixedText() ) {
$count = MWEchoNotifUser::newFromUser( $user
)-getNotificationCount();
- $count =
EchoNotificationController::formatNotificationCount( $count );
+ $formattedCount =
EchoNotificationController::formatNotificationCount( $count );
}
} elseif ( !empty( $newtalks ) ) {
$notificationsTitle = SpecialPage::getTitleFor(
'Mytalk' );
@@ -251,7 +252,7 @@
Html::element(
'span',
array( 'class' = $count ? '' : 'zero'
),
- $this-getLanguage()-formatNum( $count
) ) .
+ $formattedCount ) .
Html::closeElement( 'a' )
);
}
--
To view, visit https://gerrit.wikimedia.org/r/166960
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibea3297f0bf05e9a8ae9bd5412a1aa9196c8a1b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Ebrahim ebra...@gnu.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Added support for MW 1.24 - change (mediawiki...BlueSpiceSkin)
Smuggli has submitted this change and it was merged.
Change subject: Added support for MW 1.24
..
Added support for MW 1.24
- Removed unnecessary import statement which led to an error
- Added fallback support for MW 1.22
- Don't overwrite, add and unset array elements just overwrite the whole
module
- Removing siteSub from content
- Adding style module as dependency is not possible.
Change-Id: Ia47ebc8adbaeeb9f31f158a4626fe1d2a4905081
---
M BlueSpiceSkin.php
M BlueSpiceSkin.skin.php
M resources/components/skin.content.less
M resources/screen.layout.less
4 files changed, 20 insertions(+), 12 deletions(-)
Approvals:
Robert Vogel: Checked; Looks good to me, but someone else must approve
Smuggli: Verified; Looks good to me, approved
diff --git a/BlueSpiceSkin.php b/BlueSpiceSkin.php
index d5a3d43..772eecc 100644
--- a/BlueSpiceSkin.php
+++ b/BlueSpiceSkin.php
@@ -66,20 +66,23 @@
$wgResourceModules['skins.bluespiceskin'] = array(
'styles' = array(
- 'common/commonElements.css' = array('media' = 'screen'),
- 'common/commonContent.css' = array('media' = 'screen'),
- 'common/commonInterface.css' = array('media' = 'screen'),
- 'common/commonPrint.css' = array( 'media' = 'print' ),
-
'BlueSpiceSkin/resources/screen.less',
- 'BlueSpiceSkin/resources/print.less' = array('media' =
'print'),
+ 'BlueSpiceSkin/resources/print.less' = array( 'media' =
'print' ),
'BlueSpiceSkin/resources/bs.icons.css',
'BlueSpiceSkin/resources/fonts.css'
-
)
-)+$aResourceModuleTemplate;
+) + $aResourceModuleTemplate;
-unset($aResourceModuleTemplate);
+if ( version_compare( $GLOBALS['wgVersion'], '1.23', '' ) ) {
+ $wgResourceModules['skins.bluespiceskin']['styles'] += array(
+ 'common/commonElements.css' = array( 'media' = 'screen' ),
+ 'common/commonContent.css' = array( 'media' = 'screen' ),
+ 'common/commonInterface.css' = array( 'media' = 'screen' ),
+ 'common/commonPrint.css' = array( 'media' = 'print' )
+ );
+}
+
+unset( $aResourceModuleTemplate );
$wgDefaultSkin = 'bluespiceskin';
$wgSkipSkins = array( 'chick', 'cologneblue', 'common', 'modern', 'monobook',
diff --git a/BlueSpiceSkin.skin.php b/BlueSpiceSkin.skin.php
index 10c6026..e20d8d1 100644
--- a/BlueSpiceSkin.skin.php
+++ b/BlueSpiceSkin.skin.php
@@ -60,7 +60,11 @@
*/
function setupSkinUserCss( OutputPage $out ) {
parent::setupSkinUserCss($out);
- $out-addModuleStyles('skins.bluespiceskin');
+ $out-addModuleStyles( 'skins.bluespiceskin' );
+
+ if ( version_compare( $GLOBALS['wgVersion'], '1.23', '=' ) ) {
+ $out-addModuleStyles( 'mediawiki.skinning.interface' );
+ }
}
public function addToSidebarPlain($bar, $text) {
diff --git a/resources/components/skin.content.less
b/resources/components/skin.content.less
index 08f8045..572a81d 100644
--- a/resources/components/skin.content.less
+++ b/resources/components/skin.content.less
@@ -21,6 +21,9 @@
}
#bodyContent{
+ #siteSub {
+ display: none;
+ }
#bs-bodytext{
#mw-content-text{
a{
diff --git a/resources/screen.layout.less b/resources/screen.layout.less
index 57f4f6b..2032029 100644
--- a/resources/screen.layout.less
+++ b/resources/screen.layout.less
@@ -1,5 +1,3 @@
-@import bluespiceskin.variables.less;
-
body.mediawiki {
/*@embed*/
background:url(images/desktop/bg-lo.png) no-repeat center top #F4F4F4;
--
To view, visit https://gerrit.wikimedia.org/r/166420
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia47ebc8adbaeeb9f31f158a4626fe1d2a4905081
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/skins/BlueSpiceSkin
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] E2E tests for download menu - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: E2E tests for download menu
..
E2E tests for download menu
Change-Id: I3435366133a9b5fd6079c3a5bad270ee19da8daf
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/445
---
M resources/mmv/ui/mmv.ui.download.pane.js
D tests/browser/features/basic_mmv_navigation.feature
A tests/browser/features/mmv.download.feature
A tests/browser/features/mmv.navigation.feature
R tests/browser/features/mmv.performance.feature
D tests/browser/features/step_definitions/basic_mmv_navigation_steps.rb
A tests/browser/features/step_definitions/mmv_steps.rb
M tests/browser/features/support/pages/e2e_test_page.rb
8 files changed, 426 insertions(+), 173 deletions(-)
Approvals:
Dduvall: Looks good to me, but someone else must approve
Gilles: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mmv/ui/mmv.ui.download.pane.js
b/resources/mmv/ui/mmv.ui.download.pane.js
index d69ea3b..35cfab6 100644
--- a/resources/mmv/ui/mmv.ui.download.pane.js
+++ b/resources/mmv/ui/mmv.ui.download.pane.js
@@ -170,7 +170,13 @@
this.$attributionSection = $( 'div' )
.addClass( 'mw-mmv-download-attribution
mw-mmv-download-attribution-collapsed' )
- .appendTo( $container );
+ .appendTo( $container )
+ .click( function () {
+ if ( dl.$attributionSection.hasClass(
'mw-mmv-download-attribution-collapsed' ) ) {
+ dl.$attributionSection.removeClass(
'mw-mmv-download-attribution-collapsed' );
+ dl.attributionInput.$element.find(
'input' ).focus();
+ }
+ } );
this.$attributionCta = $( 'div' )
.addClass( 'mw-mmv-download-attribution-cta' )
@@ -182,10 +188,6 @@
.addClass(
'mw-mmv-download-attribution-cta-invite' )
.text( mw.message(
'multimediaviewer-download-attribution-cta' ).text() )
)
- .click( function () {
- dl.$attributionSection.removeClass(
'mw-mmv-download-attribution-collapsed' );
- dl.attributionInput.$element.find( 'input'
).focus();
- } )
.appendTo( this.$attributionSection );
this.$attributionHow = $( 'div' )
@@ -198,8 +200,9 @@
attributionSwitch.$element,
$( 'p' )
.addClass(
'mw-mmv-download-attribution-close-button' )
- .click( function () {
+ .click( function ( e ) {
dl.$attributionSection.addClass( 'mw-mmv-download-attribution-collapsed' );
+ e.stopPropagation();
} )
.text( ' ' )
)
diff --git a/tests/browser/features/basic_mmv_navigation.feature
b/tests/browser/features/basic_mmv_navigation.feature
deleted file mode 100644
index 249a53e..000
--- a/tests/browser/features/basic_mmv_navigation.feature
+++ /dev/null
@@ -1,18 +0,0 @@
-@en.wikipedia.beta.wmflabs.org @firefox @chrome @internet_explorer_8
@internet_explorer_9 @internet_explorer_10 @internet_explorer_11 @safari
@test2.wikipedia.org
-Feature: Basic Multimedia Viewer navigation
-
- Scenario: Multimedia Viewer (MMV)
-Given I am at a wiki article with at least two embedded pictures
-When I click on the first image in the article
-Then the image metadata and the image itself should be there
-When I click the next arrow
-Then the image and metadata of the next image should appear
-When I click the previous arrow
-Then the image and metadata of the previous image should appear
-When I close MMV
-Then I should be navigated back to the original wiki article
-Then the wiki article should be scrolled to the same position as before
opening MMV
-When I click on the first image in the article
-And I press the browser back button
-Then I should be navigated back to the original wiki article
-Then the wiki article should be scrolled to the same position as before
opening MMV
\ No newline at end of file
diff --git a/tests/browser/features/mmv.download.feature
b/tests/browser/features/mmv.download.feature
new file mode 100644
index 000..cc70839
--- /dev/null
+++ b/tests/browser/features/mmv.download.feature
@@ -0,0 +1,55 @@
+@en.wikipedia.beta.wmflabs.org @firefox @chrome
[MediaWiki-commits] [Gerrit] Fix for bluespice.util and bluespice.ping - change (mediawiki...BlueSpiceFoundation)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166961
Change subject: Fix for bluespice.util and bluespice.ping
..
Fix for bluespice.util and bluespice.ping
bluespice.ping.js
* replaced use of this
* this error seems to have its origin in the new includsion mechanism
bluespice.util.js
* Removed dependency to ArticleInfo!!!
* Fixed issues introduced by code prettyfing
Change-Id: I126bdd3c1e54076ba203a399f11bd2a9a1422d9c
---
M resources/bluespice/bluespice.ping.js
M resources/bluespice/bluespice.util.js
2 files changed, 20 insertions(+), 18 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/61/166961/1
diff --git a/resources/bluespice/bluespice.ping.js
b/resources/bluespice/bluespice.ping.js
index a2954b6..16ccd96 100644
--- a/resources/bluespice/bluespice.ping.js
+++ b/resources/bluespice/bluespice.ping.js
@@ -3,14 +3,14 @@
aListeners:[],
init: function() {
- $(document).triggerHandler('BSPingInit', [this]);
- this.interval = bsPingInterval*1000;
- if ( this.interval 1000 ) return;
+ $(document).triggerHandler('BSPingInit', [BSPing]);
+ BSPing.interval = bsPingInterval*1000;
+ if ( BSPing.interval 1000 ) return;
- this.ping();
+ BSPing.ping();
},
ping: function() {
- var aListenersToGo = this.calculateInterval();
+ var aListenersToGo = BSPing.calculateInterval();
if ( aListenersToGo.length 1 ) {
BSPing.timeout = setTimeout( BSPing.ping,
BSPing.interval);
return;
@@ -36,7 +36,7 @@
iRevision: wgCurRevisionId,
BsPingData: BsPingData
},
- this.pingCallback( aListenersToGo )
+ BSPing.pingCallback( aListenersToGo )
);
},
registerListener: function( sRef, iInterval, aData, callback) {
@@ -48,7 +48,7 @@
aData: ( typeof aData == undefined ? [] : aData ),
callback: ( typeof callback == undefined ? false :
callback )
};
- this.aListeners.push(o);
+ BSPing.aListeners.push(o);
return true;
},
calculateInterval: function() {
diff --git a/resources/bluespice/bluespice.util.js
b/resources/bluespice/bluespice.util.js
index 6c6cf1f..dbab702 100644
--- a/resources/bluespice/bluespice.util.js
+++ b/resources/bluespice/bluespice.util.js
@@ -275,10 +275,7 @@
function _timestampToAgeString( unixTimestamp ) {
//This is a js version of
adapter/Utility/FormatConverter.class.php - timestampToAgeString
//TODO: use PLURAL (probably wont work in mw 1.17)
- var start = ( new Date( unixTimestamp ) ),
- now = ( new Date() ),
- diff = now - start,
- sDateTimeOut = '',
+ var sDateTimeOut = '',
sYears = '',
sMonths = '',
sWeeks = '',
@@ -286,16 +283,21 @@
sHrs = '',
sMins = '',
sSecs = '',
- sTsPast = BsArticleInfo.lastEditTimestamp,
+ sTsPast = unixTimestamp,
sTsNow = Math.round( ( new Date() ).getTime() / 1000 ),
iDuration = sTsNow - sTsPast;
- var iYears = Math.floor( iDuration / ( 60 * 60 * 24 * 365 ) );
iDuration %= 60 * 60 * 24 * 365,
- iMonths = Math.floor( iDuration / ( 60 * 60 * 24 * 30.5
) ); iDuration %= 60 * 60 * 24 * 30.5,
- iWeeks = Math.floor( iDuration / ( 60 * 60 * 24 * 7) );
iDuration %= 60 * 60 * 24 * 7,
- iDays = Math.floor( iDuration / ( 60 * 60 * 24 ) );
iDuration %= 60 * 60 * 24,
- iHrs = Math.floor( iDuration / ( 60 * 60 ) ); iDuration
%= 60 * 60,
- iMins = Math.floor( iDuration / 60 );
+ var iYears = Math.floor( iDuration / ( 60 * 60 * 24 * 365 ) );
+ iDuration %= 60 * 60 * 24 * 365;
+ var iMonths = Math.floor( iDuration / ( 60 * 60 * 24 * 30.5 ) );
+ iDuration %= 60 * 60 * 24 * 30.5;
+ var iWeeks = Math.floor( iDuration / ( 60 * 60 * 24 * 7) );
+ iDuration %= 60 * 60 * 24 * 7;
+ var iDays = Math.floor( iDuration / ( 60 * 60 * 24 ) );
+ iDuration %= 60 * 60 * 24;
+ var iHrs = Math.floor( iDuration / ( 60 * 60 ) );
+ iDuration %= 60 * 60;
+
[MediaWiki-commits] [Gerrit] Fixed CTRL/No-CTRL issue - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166962
Change subject: Fixed CTRL/No-CTRL issue
..
Fixed CTRL/No-CTRL issue
Also made CRTL the default option
Change-Id: Ie1fd4e2f674aa73d1559f7de062856fc7b08caff
---
M ContextMenu/ContextMenu.class.php
M ContextMenu/resources/bluespice.contextmenu.js
2 files changed, 5 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/62/166962/1
diff --git a/ContextMenu/ContextMenu.class.php
b/ContextMenu/ContextMenu.class.php
index f662ddb..e7dcc30 100644
--- a/ContextMenu/ContextMenu.class.php
+++ b/ContextMenu/ContextMenu.class.php
@@ -60,7 +60,7 @@
$this-setHook('LinkEnd');
$this-setHook('ThumbnailBeforeProduceHTML');
- BsConfig::registerVar( 'MW::ContextMenu::Modus', 'no-ctrl',
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
'bs-contextmenu-pref-modus', 'radio' );
+ BsConfig::registerVar( 'MW::ContextMenu::Modus', 'ctrl',
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
'bs-contextmenu-pref-modus', 'radio' );
}
/**
@@ -72,8 +72,8 @@
public function runPreferencePlugin( $sAdapterName, $oVariable ) {
return array(
'options' = array(
- wfMessage(
'bs-contextmenu-pref-modus-just-right-mouse' )-text() = 'no-crtl',
wfMessage(
'bs-contextmenu-pref-modus-ctrl-and-right-mouse' )-text() = 'ctrl',
+ wfMessage(
'bs-contextmenu-pref-modus-just-right-mouse' )-text() = 'no-ctrl'
),
);
}
diff --git a/ContextMenu/resources/bluespice.contextmenu.js
b/ContextMenu/resources/bluespice.contextmenu.js
index f20a809..e9d5f3d 100644
--- a/ContextMenu/resources/bluespice.contextmenu.js
+++ b/ContextMenu/resources/bluespice.contextmenu.js
@@ -1,5 +1,4 @@
(function(mw, $, bs){
- var modus = mw.user.options.get('MW::ContextMenu::Modus', 'no-ctrl');
var makePageItems = function( anchor ) {
var title = anchor.data('bs-title');
@@ -210,8 +209,10 @@
return base;
};
+ var modus = mw.user.options.get('MW::ContextMenu::Modus', 'ctrl');
+
$(document).on( 'contextmenu', 'a', function( e ) {
- if( modus === 'no-ctrl' e.ctrlKey ) {
+ if( (modus === 'no-ctrl' e.ctrlKey) || (modus === 'ctrl'
!e.ctrlKey) ) {
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/166962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie1fd4e2f674aa73d1559f7de062856fc7b08caff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix for bluespice.util and bluespice.ping - change (mediawiki...BlueSpiceFoundation)
Smuggli has submitted this change and it was merged.
Change subject: Fix for bluespice.util and bluespice.ping
..
Fix for bluespice.util and bluespice.ping
bluespice.ping.js
* replaced use of this
* this error seems to have its origin in the new includsion mechanism
bluespice.util.js
* Removed dependency to ArticleInfo!!!
* Fixed issues introduced by code prettyfing
Change-Id: I126bdd3c1e54076ba203a399f11bd2a9a1422d9c
---
M resources/bluespice/bluespice.ping.js
M resources/bluespice/bluespice.util.js
2 files changed, 20 insertions(+), 18 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/resources/bluespice/bluespice.ping.js
b/resources/bluespice/bluespice.ping.js
index a2954b6..16ccd96 100644
--- a/resources/bluespice/bluespice.ping.js
+++ b/resources/bluespice/bluespice.ping.js
@@ -3,14 +3,14 @@
aListeners:[],
init: function() {
- $(document).triggerHandler('BSPingInit', [this]);
- this.interval = bsPingInterval*1000;
- if ( this.interval 1000 ) return;
+ $(document).triggerHandler('BSPingInit', [BSPing]);
+ BSPing.interval = bsPingInterval*1000;
+ if ( BSPing.interval 1000 ) return;
- this.ping();
+ BSPing.ping();
},
ping: function() {
- var aListenersToGo = this.calculateInterval();
+ var aListenersToGo = BSPing.calculateInterval();
if ( aListenersToGo.length 1 ) {
BSPing.timeout = setTimeout( BSPing.ping,
BSPing.interval);
return;
@@ -36,7 +36,7 @@
iRevision: wgCurRevisionId,
BsPingData: BsPingData
},
- this.pingCallback( aListenersToGo )
+ BSPing.pingCallback( aListenersToGo )
);
},
registerListener: function( sRef, iInterval, aData, callback) {
@@ -48,7 +48,7 @@
aData: ( typeof aData == undefined ? [] : aData ),
callback: ( typeof callback == undefined ? false :
callback )
};
- this.aListeners.push(o);
+ BSPing.aListeners.push(o);
return true;
},
calculateInterval: function() {
diff --git a/resources/bluespice/bluespice.util.js
b/resources/bluespice/bluespice.util.js
index 6c6cf1f..dbab702 100644
--- a/resources/bluespice/bluespice.util.js
+++ b/resources/bluespice/bluespice.util.js
@@ -275,10 +275,7 @@
function _timestampToAgeString( unixTimestamp ) {
//This is a js version of
adapter/Utility/FormatConverter.class.php - timestampToAgeString
//TODO: use PLURAL (probably wont work in mw 1.17)
- var start = ( new Date( unixTimestamp ) ),
- now = ( new Date() ),
- diff = now - start,
- sDateTimeOut = '',
+ var sDateTimeOut = '',
sYears = '',
sMonths = '',
sWeeks = '',
@@ -286,16 +283,21 @@
sHrs = '',
sMins = '',
sSecs = '',
- sTsPast = BsArticleInfo.lastEditTimestamp,
+ sTsPast = unixTimestamp,
sTsNow = Math.round( ( new Date() ).getTime() / 1000 ),
iDuration = sTsNow - sTsPast;
- var iYears = Math.floor( iDuration / ( 60 * 60 * 24 * 365 ) );
iDuration %= 60 * 60 * 24 * 365,
- iMonths = Math.floor( iDuration / ( 60 * 60 * 24 * 30.5
) ); iDuration %= 60 * 60 * 24 * 30.5,
- iWeeks = Math.floor( iDuration / ( 60 * 60 * 24 * 7) );
iDuration %= 60 * 60 * 24 * 7,
- iDays = Math.floor( iDuration / ( 60 * 60 * 24 ) );
iDuration %= 60 * 60 * 24,
- iHrs = Math.floor( iDuration / ( 60 * 60 ) ); iDuration
%= 60 * 60,
- iMins = Math.floor( iDuration / 60 );
+ var iYears = Math.floor( iDuration / ( 60 * 60 * 24 * 365 ) );
+ iDuration %= 60 * 60 * 24 * 365;
+ var iMonths = Math.floor( iDuration / ( 60 * 60 * 24 * 30.5 ) );
+ iDuration %= 60 * 60 * 24 * 30.5;
+ var iWeeks = Math.floor( iDuration / ( 60 * 60 * 24 * 7) );
+ iDuration %= 60 * 60 * 24 * 7;
+ var iDays = Math.floor( iDuration / ( 60 * 60 * 24 ) );
+ iDuration %= 60 * 60 * 24;
+ var iHrs = Math.floor( iDuration / ( 60 * 60 ) );
+ iDuration %= 60 * 60;
+ var iMins = Math.floor( iDuration / 60 ),
iSecs = iDuration %
[MediaWiki-commits] [Gerrit] Fixed CTRL/No-CTRL issue - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: Fixed CTRL/No-CTRL issue
..
Fixed CTRL/No-CTRL issue
Also made CRTL the default option
Change-Id: Ie1fd4e2f674aa73d1559f7de062856fc7b08caff
---
M ContextMenu/ContextMenu.class.php
M ContextMenu/resources/bluespice.contextmenu.js
2 files changed, 5 insertions(+), 4 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/ContextMenu/ContextMenu.class.php
b/ContextMenu/ContextMenu.class.php
index f662ddb..e7dcc30 100644
--- a/ContextMenu/ContextMenu.class.php
+++ b/ContextMenu/ContextMenu.class.php
@@ -60,7 +60,7 @@
$this-setHook('LinkEnd');
$this-setHook('ThumbnailBeforeProduceHTML');
- BsConfig::registerVar( 'MW::ContextMenu::Modus', 'no-ctrl',
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
'bs-contextmenu-pref-modus', 'radio' );
+ BsConfig::registerVar( 'MW::ContextMenu::Modus', 'ctrl',
BsConfig::LEVEL_USER|BsConfig::TYPE_STRING|BsConfig::USE_PLUGIN_FOR_PREFS,
'bs-contextmenu-pref-modus', 'radio' );
}
/**
@@ -72,8 +72,8 @@
public function runPreferencePlugin( $sAdapterName, $oVariable ) {
return array(
'options' = array(
- wfMessage(
'bs-contextmenu-pref-modus-just-right-mouse' )-text() = 'no-crtl',
wfMessage(
'bs-contextmenu-pref-modus-ctrl-and-right-mouse' )-text() = 'ctrl',
+ wfMessage(
'bs-contextmenu-pref-modus-just-right-mouse' )-text() = 'no-ctrl'
),
);
}
diff --git a/ContextMenu/resources/bluespice.contextmenu.js
b/ContextMenu/resources/bluespice.contextmenu.js
index f20a809..e9d5f3d 100644
--- a/ContextMenu/resources/bluespice.contextmenu.js
+++ b/ContextMenu/resources/bluespice.contextmenu.js
@@ -1,5 +1,4 @@
(function(mw, $, bs){
- var modus = mw.user.options.get('MW::ContextMenu::Modus', 'no-ctrl');
var makePageItems = function( anchor ) {
var title = anchor.data('bs-title');
@@ -210,8 +209,10 @@
return base;
};
+ var modus = mw.user.options.get('MW::ContextMenu::Modus', 'ctrl');
+
$(document).on( 'contextmenu', 'a', function( e ) {
- if( modus === 'no-ctrl' e.ctrlKey ) {
+ if( (modus === 'no-ctrl' e.ctrlKey) || (modus === 'ctrl'
!e.ctrlKey) ) {
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/166962
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie1fd4e2f674aa73d1559f7de062856fc7b08caff
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removed use of deprecated method - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Removed use of deprecated method
..
Removed use of deprecated method
- Use ErrorPageError insteadof using OutputPage
- Fixed call on non obejct
- returnto watchlist now
Change-Id: I9dec1558199f1d21c4fbac8fb14a02c38dda983c
---
M RSSStandards/RSSStandards.class.php
1 file changed, 14 insertions(+), 5 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git a/RSSStandards/RSSStandards.class.php
b/RSSStandards/RSSStandards.class.php
index b7a889d..f9c5d04 100644
--- a/RSSStandards/RSSStandards.class.php
+++ b/RSSStandards/RSSStandards.class.php
@@ -343,7 +343,7 @@
$wgEnotifWatchlist, $wgShowUpdatedMarker,
$wgEnotifWatchlist, $wgSitename;
$skin = RequestContext::getMain()-getSkin();
- $specialTitle = $wgSitename . ' - ' . SpecialPage::getTitleFor(
'Watchlist' );
+ $specialTitle = SpecialPage::getTitleFor( 'Watchlist' );
$wgOut-setRobotPolicy( 'noindex,nofollow' );
# Anons don't get a watchlist
@@ -352,10 +352,19 @@
$user = User::newFromName( $_user );
$_hash = $wgRequest-getVal( 'h', '' );
if ( !( $user $_hash == md5(
$_user.$user-getToken().$user-getId() ) ) || $user-isAnon() ) {
- $wgOut-setPageTitle( wfMessage(
'bs-rssstandards-watchnologin' )-plain() );
- $llink = $skin-makeKnownLinkObj(
SpecialPage::getTitleFor( 'Userlogin' ), wfMessage( 'loginreqlink' )-plain(),
'returnto=' . $specialTitle-getPrefixedUrl() );
- $wgOut-addHtml( wfMessage(
'watchlistanontext', $llink )-plain() );
- return;
+ $oTitle = SpecialPage::getTitleFor( 'Userlogin'
);
+ $sLink = Linker::link(
+ $oTitle,
+ wfMessage( 'loginreqlink' )-plain(),
+ array(),
+ array(
+ 'returnto' =
$specialTitle-getLocalUrl()
+ )
+ );
+
+ throw new ErrorPageError(
+ 'bs-rssstandards-watchnologin',
'watchlistanontext', array( $sLink )
+ );
}
} else {
$user = $wgUser;
--
To view, visit https://gerrit.wikimedia.org/r/158600
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I9dec1558199f1d21c4fbac8fb14a02c38dda983c
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/BlueSpiceExtensions
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
Gerrit-Reviewer: Mglaser gla...@hallowelt.biz
Gerrit-Reviewer: Pigpen reym...@hallowelt.biz
Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz
Gerrit-Reviewer: Withoutaname drevit...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fixed some runtime issues - change (mediawiki...BlueSpiceExtensions)
Robert Vogel has submitted this change and it was merged.
Change subject: Fixed some runtime issues
..
Fixed some runtime issues
Those files had runtime issues with jquery under MW 1.24.
- Changed some jQuery method calls because they do not exist anymore
- Readded removed code in widgetbar
Change-Id: I50d33f8d81828bc448b3251760e154cacf4d5581
---
M
BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js
M ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
M WantedArticle/resources/bluespice.wantedArticle.js
M WidgetBar/resources/bluespice.widgetBar.js
4 files changed, 110 insertions(+), 115 deletions(-)
Approvals:
Robert Vogel: Verified; Looks good to me, approved
diff --git
a/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js
b/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js
index 7aae4ac..6d6af31 100644
---
a/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js
+++
b/BlueSpiceProjectFeedbackHelper/resources/bluespice.blueSpiceProjectFeedbackHelper.js
@@ -1,29 +1,27 @@
-$(document).ready(function(){
- if($.cookie( 'bs-bluespiceprojectfeedbackhelperpanel-firstload' ) ==
null){
-
$('#bs-bluespiceprojectfeedbackhelperpanel').delay(1500).fadeIn( 'slow' );
+mw.loader.using( 'ext.bluespice', function() {
+ if ( $.cookie( 'bs-bluespiceprojectfeedbackhelperpanel-firstload' ) ==
null){
+ $('#bs-bluespiceprojectfeedbackhelperpanel').delay( 1500
).fadeIn( 'slow' );
- $.cookie('bs-bluespiceprojectfeedbackhelperpanel-firstload',
'false', {
+ $.cookie( 'bs-bluespiceprojectfeedbackhelperpanel-firstload',
'false', {
path: '/',
expires: 7 // remind once a week
});
- }
- else {
+ } else {
$('#bs-bluespiceprojectfeedbackhelperpanel').show();
}
- if( $.cookie('bs-bluespiceprojectfeedbackhelperpanel-hide') == 'true' ){
+ if ( $.cookie( 'bs-bluespiceprojectfeedbackhelperpanel-hide' ) ==
'true' ){
$('#bs-bluespiceprojectfeedbackhelperpanel').hide()
- }
- else{
+ } else{
$('#bs-bluespiceprojectfeedbackhelperpanel-closebutton').click(function(){
if( confirm( $(this).attr('data-confirm-msg') ) ) {
$.get(
bs.util.getAjaxDispatcherUrl('BlueSpiceProjectFeedbackHelper::disableFeedback')
);
}
- $('#bs-bluespiceprojectfeedbackhelperpanel').fadeOut(
'fast' );
- $.cookie('bs-bluespiceprojectfeedbackhelperpanel-hide',
'true', {
+ $( '#bs-bluespiceprojectfeedbackhelperpanel' ).fadeOut(
'fast' );
+ $.cookie(
'bs-bluespiceprojectfeedbackhelperpanel-hide', 'true', {
path: '/',
expires: 7 // remind once a week
});
});
}
-});
\ No newline at end of file
+} );
\ No newline at end of file
diff --git
a/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
b/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
index d2c6c72..63c7efd 100644
--- a/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
+++ b/ExtendedSearch/resources/bluespice.extendedSearch.autocompleteWidget.js
@@ -11,66 +11,64 @@
* @filesource
*/
( function( mw, $ ) {
- $( function() {
- mw.loader.using( 'jquery.ui.autocomplete', function() {
- var cache = { };
- var lastXhr = { };
+ mw.loader.using( 'jquery.ui.autocomplete', function() {
+ var cache = { };
+ var lastXhr = { };
- if ( $( #bs-extendedsearch-input,
.bs-autocomplete-field ).length 1 )
- return;
+ if ( $( #bs-extendedsearch-input, .bs-autocomplete-field
).length 1 )
+ return;
- var container = $( div
id='bs-extendedsearch-autocomplete'/div );
- $( body ).append( container );
- $( #bs-extendedsearch-input, .bs-autocomplete-field
).autocomplete( {
- appendTo: container,
- position: {
- my: right top,
- at: right bottom
- },
- source: function( req, setList ) {
- if ( req.term in cache ) {
- setList( cache[ req.term ] );
-
[MediaWiki-commits] [Gerrit] Enable wgCopyUploadsFromSpecialUpload on testwiki - change (operations/mediawiki-config)
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/166964 Change subject: Enable wgCopyUploadsFromSpecialUpload on testwiki .. Enable wgCopyUploadsFromSpecialUpload on testwiki Bug: 71897 Change-Id: I5400d523724499972c5bf5bae9e585015970e4e0 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/64/166964/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4768315..8b597f4 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10730,6 +10730,7 @@ ), 'wgCopyUploadsFromSpecialUpload' = array( 'default' = false, + 'testwiki' = true, // bug 71897 ), // For Flickr uploads via UploadWizard - 2012-11-20 'wgCopyUploadsDomains' = array( -- To view, visit https://gerrit.wikimedia.org/r/166964 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5400d523724499972c5bf5bae9e585015970e4e0 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Glaisher glaisher.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use ordereddict for bot and pagegenerators args - change (pywikibot/core)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166965
Change subject: Use ordereddict for bot and pagegenerators args
..
Use ordereddict for bot and pagegenerators args
bot and pagegenerators each contain a long string consisting of help
information for the user about each parameter which can be handled.
This change splits those into a dict with help for each argument,
and reconstructs the long string dynamically.
Change-Id: If191fc60ae1bd6d926f944ec0c4dfde3194cbecc
---
M pywikibot/bot.py
M pywikibot/pagegenerators.py
2 files changed, 168 insertions(+), 133 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core
refs/changes/65/166965/1
diff --git a/pywikibot/bot.py b/pywikibot/bot.py
index a0572aa..28a11e3 100644
--- a/pywikibot/bot.py
+++ b/pywikibot/bot.py
@@ -22,6 +22,11 @@
import json
import datetime
+try:
+from collections import OrderedDict
+except ImportError:
+from ordereddict import OrderedDict
+
_logger = bot
# logging levels
@@ -740,6 +745,80 @@
return handle_args(args)
+PARAM_HELP_INDENT_LEVEL = 19
+
+parameter_help = OrderedDict([
+('dir:PATH', u Read the bot's configuration data from directory given by
+ PATH, instead of from the default directory.),
+
+('lang:xx', u Set the language of the wiki you want to work on, overriding
+ the configuration in user-config.py. xx should be the
+ language code.),
+
+('family:xyz', uSet the family of the wiki you want to work on, e.g.
+ wikipedia, wiktionary, wikitravel, ...
+ This will override the configuration in user-config.py.),
+
+('user:xyz', u Log in as user 'xyz' instead of the default username.),
+
+('daemonize:xyz', uImmediately return control to the terminal and redirect
+ stdout and stderr to xyz (only use for bots that require
+ no input from stdin).),
+
+('help', u Show this help text.),
+
+('log[:xyz]', uEnable the log file, using the default filename
+ '%s-bot.log', or xzy as the filename.
+ Logs will be stored in the logs subdirectory.),
+
+('nolog', u Disable the log file (if it is enabled by default).),
+
+('maxlag', u Sets a new maxlag parameter to a number of seconds. Defer bot
+ edits during periods of database server lag. Default is set
by
+ config.py),
+
+(('put_throttle:n', 'putthrottle:n', 'pt:n'), u
+ Set the minimum time (in seconds) the bot will wait between
+ saving pages.),
+
+('debug[:item]', uEnable the log file and include extensive debugging data
+ for component item (for all components if the second form
+ is used).),
+
+(('verbose', 'v'), uHave the bot provide additional console output that may
be
+ useful in debugging.),
+
+(('cosmeticchanges', 'cc'), u
+ Toggles the cosmetic_changes setting made in config.py or
+ user_config.py to its inverse and overrules it. All other
+ settings and restrictions are untouched.),
+
+('simulate', u Disables writing to the server. Useful for testing and
+ debugging of new code (if given, doesn't do any real
+ changes, but only shows what would have been changed).),
+
+('config var:n', uYou may use all given numeric config variables as
option and
+ modify it with command line.),
+])
+
+
+def build_argument_help_string(arg_help, indent_level=PARAM_HELP_INDENT_LEVEL):
+
+Build a single argument help string from a dict of argument help.
+
+@type arg_help: dict
+@rtype: unicode
+
+return u'\n\n'.join(
+[names.ljust(indent_level - 2) + u' ' + description.lstrip()
+ if len(names) indent_level
+ else names + u'\n ' + description.lstrip()
+ for names, description in
+ [(u'-' + (', -'.join(name) if isinstance(name, tuple) else name),
+ arg_help[name].strip())
+ for name in arg_help]])
+
+
def showHelp(module_name=None):
Show help for the Bot.
if not module_name:
@@ -750,63 +829,10 @@
except NameError:
module_name = no_module
-globalHelp = u'''
-Global arguments available for all bots:
+globalHelp = u'\nGlobal arguments available for all bots:\n\n'
+globalHelp += build_argument_help_string(parameter_help, indent_level=19)
+globalHelp = globalHelp % module_name
--dir:PATH Read the bot's configuration data from directory given by
- PATH, instead of from the default directory.
-
--lang:xx Set the language of the wiki you want to work on, overriding
- the configuration in user-config.py. xx should be the
- language code.
-
--family:xyz
[MediaWiki-commits] [Gerrit] Optimize/add missing use clauses in Lib after DM 2.0 switch - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/166966 Change subject: Optimize/add missing use clauses in Lib after DM 2.0 switch .. Optimize/add missing use clauses in Lib after DM 2.0 switch Plus a little bit of (hopefully non-critical) clean up with the help of PHPStorm's static code analysis. Change-Id: If6f00fb6da5f2bcb04e647389c1fbf18c080e0bd --- M lib/includes/EntityFactory.php M lib/includes/Localizer/DispatchingExceptionLocalizer.php M lib/includes/Localizer/GenericExceptionLocalizer.php M lib/includes/ReferencedEntitiesFinder.php M lib/includes/SnakFactory.php M lib/includes/Term.php M lib/includes/ValuesFinder.php M lib/includes/serializers/LegacyInternalClaimSerializer.php M lib/includes/serializers/SerializerFactory.php M lib/includes/serializers/SnakSerializer.php M lib/includes/store/GenericEntityInfoBuilder.php M lib/includes/store/PropertyLabelResolver.php M lib/includes/store/TermPropertyLabelResolver.php M lib/includes/store/sql/TermSqlIndex.php M lib/tests/phpunit/LanguageWithConversionTest.php M lib/tests/phpunit/MockSiteStore.php M lib/tests/phpunit/changes/ChangeRowTest.php M lib/tests/phpunit/serializers/DataModelSerializationRoundtripTest.php M lib/tests/phpunit/serializers/ItemSerializerTest.php M lib/tests/phpunit/sites/SitesBuilderTest.php M lib/tests/phpunit/store/EntityContentDataCodecTest.php 21 files changed, 51 insertions(+), 25 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase refs/changes/66/166966/1 diff --git a/lib/includes/EntityFactory.php b/lib/includes/EntityFactory.php index 2b03a75..75e699e 100644 --- a/lib/includes/EntityFactory.php +++ b/lib/includes/EntityFactory.php @@ -4,6 +4,7 @@ use MWException; use OutOfBoundsException; +use Wikibase\DataModel\Entity\Entity; use Wikibase\DataModel\Entity\Item; use Wikibase\DataModel\Entity\Property; @@ -114,6 +115,5 @@ $class = $this-getEntityClass( $entityType ); return $class::newEmpty(); } - } diff --git a/lib/includes/Localizer/DispatchingExceptionLocalizer.php b/lib/includes/Localizer/DispatchingExceptionLocalizer.php index 6d7fb8b..4ddb093 100644 --- a/lib/includes/Localizer/DispatchingExceptionLocalizer.php +++ b/lib/includes/Localizer/DispatchingExceptionLocalizer.php @@ -4,6 +4,7 @@ use Exception; use InvalidArgumentException; +use Message; /** * ExceptionLocalizer implementing localization of some well known types of exceptions @@ -73,4 +74,5 @@ return null; } + } diff --git a/lib/includes/Localizer/GenericExceptionLocalizer.php b/lib/includes/Localizer/GenericExceptionLocalizer.php index 23cab75..1fdac61 100644 --- a/lib/includes/Localizer/GenericExceptionLocalizer.php +++ b/lib/includes/Localizer/GenericExceptionLocalizer.php @@ -3,6 +3,7 @@ namespace Wikibase\Lib\Localizer; use Exception; +use Message; /** * @license GPL 2+ diff --git a/lib/includes/ReferencedEntitiesFinder.php b/lib/includes/ReferencedEntitiesFinder.php index 87eec2b..1fcd4be 100644 --- a/lib/includes/ReferencedEntitiesFinder.php +++ b/lib/includes/ReferencedEntitiesFinder.php @@ -2,8 +2,10 @@ namespace Wikibase; +use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\Entity\EntityIdValue; use Wikibase\DataModel\Snak\PropertyValueSnak; +use Wikibase\DataModel\Snak\Snak; /** * Finds linked entities given a list of entities or a list of claims. diff --git a/lib/includes/SnakFactory.php b/lib/includes/SnakFactory.php index d0c56ce..1a1aff3 100644 --- a/lib/includes/SnakFactory.php +++ b/lib/includes/SnakFactory.php @@ -8,6 +8,7 @@ use Wikibase\DataModel\Snak\PropertyNoValueSnak; use Wikibase\DataModel\Snak\PropertySomeValueSnak; use Wikibase\DataModel\Snak\PropertyValueSnak; +use Wikibase\DataModel\Snak\Snak; /** * Factory for creating new snaks. diff --git a/lib/includes/Term.php b/lib/includes/Term.php index 6707525..acf34a7 100644 --- a/lib/includes/Term.php +++ b/lib/includes/Term.php @@ -3,6 +3,7 @@ namespace Wikibase; use MWException; +use Wikibase\DataModel\Entity\EntityId; use Wikibase\DataModel\LegacyIdInterpreter; /** diff --git a/lib/includes/ValuesFinder.php b/lib/includes/ValuesFinder.php index dec9ff4..950ce6b 100644 --- a/lib/includes/ValuesFinder.php +++ b/lib/includes/ValuesFinder.php @@ -7,6 +7,7 @@ use Wikibase\DataModel\Entity\PropertyId; use Wikibase\DataModel\Entity\PropertyNotFoundException; use Wikibase\DataModel\Snak\PropertyValueSnak; +use Wikibase\DataModel\Snak\Snak; /** * Find all data values for a specified data type in an array of snaks. diff --git a/lib/includes/serializers/LegacyInternalClaimSerializer.php b/lib/includes/serializers/LegacyInternalClaimSerializer.php index 9bdcdf7..3c227a6 100644 --- a/lib/includes/serializers/LegacyInternalClaimSerializer.php +++
[MediaWiki-commits] [Gerrit] Last commit reverted i18n changes - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166967
Change subject: Last commit reverted i18n changes
..
Last commit reverted i18n changes
Accidently the last commit was autdated in case of i18n. Reverting changes
to bring it back to the lastest i18n state
Change-Id: Ic6511cd59b7cad76ff870d6b81f6852349a9
---
M PermissionManager/i18n/br.json
M PermissionManager/i18n/de.json
M PermissionManager/i18n/en.json
M PermissionManager/i18n/es.json
M PermissionManager/i18n/fr.json
M PermissionManager/i18n/it.json
M PermissionManager/i18n/ja.json
M PermissionManager/i18n/mk.json
M PermissionManager/i18n/pl.json
M PermissionManager/i18n/qqq.json
M PermissionManager/i18n/ru.json
M PermissionManager/i18n/sv.json
M PermissionManager/i18n/tr.json
M PermissionManager/i18n/uk.json
M PermissionManager/i18n/zh-hans.json
15 files changed, 74 insertions(+), 23 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/67/166967/1
diff --git a/PermissionManager/i18n/br.json b/PermissionManager/i18n/br.json
index c1b452b..db523cc 100644
--- a/PermissionManager/i18n/br.json
+++ b/PermissionManager/i18n/br.json
@@ -4,6 +4,8 @@
Fohanno
]
},
+ prefs-permissionmanager: Merour an aotreoù,
+ bs-permissionmanager-label: Merour an aotreoù,
bs-permissionmanager-btn-group-label: Strollad :,
bs-permissionmanager-header-permissions: Aotreoù,
bs-permissionmanager-header-global: Wiki,
@@ -13,6 +15,7 @@
bs-permissionmanager-save-success: Aotreoù enrollet.,
bs-permissionmanager-labeltemplates: Patromoù,
bs-permissionmanager-btn-template-editor: Aozañ ar patromoù,
+ bs-permissionmanager-labeltpled: Aozer patromoù,
bs-permissionmanager-labeltpled-desc: Deskrivadur,
bs-permissionmanager-labeltpled-active: Oberiant,
bs-permissionmanager-labeltpled-add: Nevez,
@@ -28,5 +31,7 @@
bs-permissionmanager-msgtpled-deletefail: N'eus ket bet gallet
dilemel ar patrom.,
bs-permissionmanager-titletpled-new: Krouiñ ur patrom,
bs-permissionmanager-titletpled-edit: Adenvel ar patrom,
- bs-permissionmanager-titletpled-delete: Dilemel ar patrom
+ bs-permissionmanager-titletpled-delete: Dilemel ar patrom,
+ bs-permissionmanager-pref-lockmode: Gweredekaat ar mod prennañ,
+ bs-permissionmanager-pref-enablerealitycheck: Gweredekaat ar gwiriañ
aotreoù
}
diff --git a/PermissionManager/i18n/de.json b/PermissionManager/i18n/de.json
index 3ac879c..74a4499 100644
--- a/PermissionManager/i18n/de.json
+++ b/PermissionManager/i18n/de.json
@@ -1,10 +1,11 @@
{
@metadata: {
authors: [
- Stephan Muggli mug...@hallowelt.biz
+ Stephan Muggli mug...@hallowelt.biz,
+ Metalhead64
]
},
- bs-permissionmanager-desc: Administrationsoberfläche zur
Konfiguration von Rechten,
+ bs-permissionmanager-desc: Administrationsoberfläche zur Bearbeitung
von Benutzerrechten,
prefs-permissionmanager: Rechteverwaltung,
bs-permissionmanager-label: Rechteverwaltung,
bs-permissionmanager-grouping-global: Namensraumübergreifende
Rechte,
@@ -38,6 +39,5 @@
bs-permissionmanager-titletpled-delete: Vorlage löschen,
bs-permissionmanager-pref-lockmode: Lockmode aktivieren,
bs-permissionmanager-pref-skipsysns: Systemnamensräume bei
eingschaltetem Lockmode ignorieren,
- bs-permissionmanager-pref-enablerealitycheck: Rechteprüfung
aktivieren,
- bs-PermissionManager-unsaved-changes: Einige Änderungen wurden noch
nicht gespeichert.
+ bs-permissionmanager-pref-enablerealitycheck: Rechteprüfung
aktivieren
}
diff --git a/PermissionManager/i18n/en.json b/PermissionManager/i18n/en.json
index 8e9c5ee..edae6c1 100644
--- a/PermissionManager/i18n/en.json
+++ b/PermissionManager/i18n/en.json
@@ -4,7 +4,7 @@
Stephan Muggli mug...@hallowelt.biz
]
},
- bs-permissionmanager-desc: Administration interface for managing
permissions,
+ bs-permissionmanager-desc: Administration interface for editing user
rights,
prefs-permissionmanager: Permission manager,
bs-permissionmanager-label: Permission manager,
bs-permissionmanager-grouping-global: Namespace independent
permissions,
@@ -38,6 +38,5 @@
bs-permissionmanager-titletpled-delete: Delete template,
bs-permissionmanager-pref-lockmode: Activate lockmode,
bs-permissionmanager-pref-skipsysns: Skip system namespaces if
lockmode is active,
- bs-permissionmanager-pref-enablerealitycheck: Activate permission
check,
- bs-PermissionManager-unsaved-changes: Some changes are not saved
yet.
+
[MediaWiki-commits] [Gerrit] Last commit reverted i18n changes - change (mediawiki...BlueSpiceExtensions)
Smuggli has submitted this change and it was merged.
Change subject: Last commit reverted i18n changes
..
Last commit reverted i18n changes
Accidently the last commit was autdated in case of i18n. Reverting changes
to bring it back to the lastest i18n state
Change-Id: Ic6511cd59b7cad76ff870d6b81f6852349a9
---
M PermissionManager/i18n/br.json
M PermissionManager/i18n/de.json
M PermissionManager/i18n/en.json
M PermissionManager/i18n/es.json
M PermissionManager/i18n/fr.json
M PermissionManager/i18n/it.json
M PermissionManager/i18n/ja.json
M PermissionManager/i18n/mk.json
M PermissionManager/i18n/pl.json
M PermissionManager/i18n/qqq.json
M PermissionManager/i18n/ru.json
M PermissionManager/i18n/sv.json
M PermissionManager/i18n/tr.json
M PermissionManager/i18n/uk.json
M PermissionManager/i18n/zh-hans.json
15 files changed, 74 insertions(+), 23 deletions(-)
Approvals:
Smuggli: Verified; Looks good to me, approved
diff --git a/PermissionManager/i18n/br.json b/PermissionManager/i18n/br.json
index c1b452b..db523cc 100644
--- a/PermissionManager/i18n/br.json
+++ b/PermissionManager/i18n/br.json
@@ -4,6 +4,8 @@
Fohanno
]
},
+ prefs-permissionmanager: Merour an aotreoù,
+ bs-permissionmanager-label: Merour an aotreoù,
bs-permissionmanager-btn-group-label: Strollad :,
bs-permissionmanager-header-permissions: Aotreoù,
bs-permissionmanager-header-global: Wiki,
@@ -13,6 +15,7 @@
bs-permissionmanager-save-success: Aotreoù enrollet.,
bs-permissionmanager-labeltemplates: Patromoù,
bs-permissionmanager-btn-template-editor: Aozañ ar patromoù,
+ bs-permissionmanager-labeltpled: Aozer patromoù,
bs-permissionmanager-labeltpled-desc: Deskrivadur,
bs-permissionmanager-labeltpled-active: Oberiant,
bs-permissionmanager-labeltpled-add: Nevez,
@@ -28,5 +31,7 @@
bs-permissionmanager-msgtpled-deletefail: N'eus ket bet gallet
dilemel ar patrom.,
bs-permissionmanager-titletpled-new: Krouiñ ur patrom,
bs-permissionmanager-titletpled-edit: Adenvel ar patrom,
- bs-permissionmanager-titletpled-delete: Dilemel ar patrom
+ bs-permissionmanager-titletpled-delete: Dilemel ar patrom,
+ bs-permissionmanager-pref-lockmode: Gweredekaat ar mod prennañ,
+ bs-permissionmanager-pref-enablerealitycheck: Gweredekaat ar gwiriañ
aotreoù
}
diff --git a/PermissionManager/i18n/de.json b/PermissionManager/i18n/de.json
index 3ac879c..74a4499 100644
--- a/PermissionManager/i18n/de.json
+++ b/PermissionManager/i18n/de.json
@@ -1,10 +1,11 @@
{
@metadata: {
authors: [
- Stephan Muggli mug...@hallowelt.biz
+ Stephan Muggli mug...@hallowelt.biz,
+ Metalhead64
]
},
- bs-permissionmanager-desc: Administrationsoberfläche zur
Konfiguration von Rechten,
+ bs-permissionmanager-desc: Administrationsoberfläche zur Bearbeitung
von Benutzerrechten,
prefs-permissionmanager: Rechteverwaltung,
bs-permissionmanager-label: Rechteverwaltung,
bs-permissionmanager-grouping-global: Namensraumübergreifende
Rechte,
@@ -38,6 +39,5 @@
bs-permissionmanager-titletpled-delete: Vorlage löschen,
bs-permissionmanager-pref-lockmode: Lockmode aktivieren,
bs-permissionmanager-pref-skipsysns: Systemnamensräume bei
eingschaltetem Lockmode ignorieren,
- bs-permissionmanager-pref-enablerealitycheck: Rechteprüfung
aktivieren,
- bs-PermissionManager-unsaved-changes: Einige Änderungen wurden noch
nicht gespeichert.
+ bs-permissionmanager-pref-enablerealitycheck: Rechteprüfung
aktivieren
}
diff --git a/PermissionManager/i18n/en.json b/PermissionManager/i18n/en.json
index 8e9c5ee..edae6c1 100644
--- a/PermissionManager/i18n/en.json
+++ b/PermissionManager/i18n/en.json
@@ -4,7 +4,7 @@
Stephan Muggli mug...@hallowelt.biz
]
},
- bs-permissionmanager-desc: Administration interface for managing
permissions,
+ bs-permissionmanager-desc: Administration interface for editing user
rights,
prefs-permissionmanager: Permission manager,
bs-permissionmanager-label: Permission manager,
bs-permissionmanager-grouping-global: Namespace independent
permissions,
@@ -38,6 +38,5 @@
bs-permissionmanager-titletpled-delete: Delete template,
bs-permissionmanager-pref-lockmode: Activate lockmode,
bs-permissionmanager-pref-skipsysns: Skip system namespaces if
lockmode is active,
- bs-permissionmanager-pref-enablerealitycheck: Activate permission
check,
- bs-PermissionManager-unsaved-changes: Some changes are not saved
yet.
+ bs-permissionmanager-pref-enablerealitycheck: Activate permission
check
}
diff --git a/PermissionManager/i18n/es.json
[MediaWiki-commits] [Gerrit] Revert Revert Prerender thumbnails at upload time on all w... - change (operations/mediawiki-config)
Gilles has uploaded a new change for review. https://gerrit.wikimedia.org/r/166968 Change subject: Revert Revert Prerender thumbnails at upload time on all wikis except commons .. Revert Revert Prerender thumbnails at upload time on all wikis except commons This reverts commit b9dc5eae9275e2a8330ab1f32c589779b49ef2a2. Change-Id: I04a211b3ba320b96736c29747f41012140c1427a --- M wmf-config/InitialiseSettings.php 1 file changed, 18 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/68/166968/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9e88cdb..657fc8f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14042,6 +14042,24 @@ 'labswiki' = false, ), +// Thumbnail prerendering at upload time +'wgUploadThumbnailRenderMap' = array( + 'default' = array( 320, 640, 800, 1024, 1280, 1920, 2560, 2880 ), + 'commonswiki' = array(), +), + +'wgUploadThumbnailRenderMethod' = array( + 'default' = 'http', +), + +'wgUploadThumbnailRenderHttpCustomHost' = array( + 'default' = 'upload.wikimedia.org', +), + +'wgUploadThumbnailRenderHttpCustomDomain' = array( + 'default' = 'upload.svc.eqiad.wmnet', +), + ); -- To view, visit https://gerrit.wikimedia.org/r/166968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04a211b3ba320b96736c29747f41012140c1427a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Standardise ajax loading method - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Standardise ajax loading method
..
Standardise ajax loading method
Use one template for everything.
Change-Id: I19760db2d4848bbc973eaa59f9cfb83c50016a19
---
M includes/Resources.php
M javascripts/Overlay.js
M javascripts/modules/mediaViewer/ImageOverlay.js
M javascripts/modules/nearby/Nearby.js
M javascripts/modules/search/SearchOverlay.js
M javascripts/modules/uploads/PhotoUploadOverlay.js
M javascripts/specials/uploads.js
M less/common-js.less
M less/ui.less
M templates/LoadingOverlay.hogan
M templates/modules/articleList.hogan
M templates/modules/editor/EditorOverlayBase.hogan
M templates/modules/mediaViewer/ImageOverlay.hogan
A templates/modules/nearby/nearby.hogan
M templates/modules/notifications/NotificationsOverlayContent.hogan
M templates/modules/search/SearchOverlay.hogan
M templates/modules/talk/talk.hogan
M templates/modules/talk/talkSection.hogan
M templates/modules/uploads/PhotoUploadOverlay.hogan
M templates/specials/userGallery.hogan
A templates/spinner.hogan
21 files changed, 49 insertions(+), 39 deletions(-)
Approvals:
Phuedx: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Resources.php b/includes/Resources.php
index 4f16633..e6fa354 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -152,6 +152,12 @@
'position' = 'top',
),
+ 'mobile.ajax' = $wgMFMobileResourceBoilerplate + array(
+ 'templates' = array(
+ 'spinner.hogan',
+ ),
+ ),
+
'mobile.startup' = $wgMFMobileResourceBoilerplate + array(
'dependencies' = array(
'mobile.head',
@@ -168,6 +174,7 @@
'scripts' = array(
'javascripts/Router.js',
'javascripts/OverlayManager.js',
+ // FIXME: Remove api code to mobile.ajax
'javascripts/api.js',
'javascripts/PageApi.js',
'javascripts/Panel.js',
@@ -560,6 +567,7 @@
'dependencies' = array(
'mobile.templates',
'mobile.startup',
+ 'mobile.ajax',
),
'scripts' = array(
'javascripts/Overlay.js',
@@ -813,6 +821,7 @@
'mobile.nearby' = $wgMFMobileResourceBoilerplate + array(
'dependencies' = array(
+ 'mobile.ajax',
'mobile.stable.common',
// @todo FIXME: Kill this dependency!
'mobile.special.nearby.styles',
@@ -842,6 +851,9 @@
'javascripts/modules/nearby/NearbyApi.js',
'javascripts/modules/nearby/Nearby.js',
),
+ 'templates' = array(
+ 'modules/nearby/nearby.hogan',
+ ),
),
'mobile.notifications' = $wgMFMobileResourceBoilerplate + array(
diff --git a/javascripts/Overlay.js b/javascripts/Overlay.js
index 6d1d159..539b005 100644
--- a/javascripts/Overlay.js
+++ b/javascripts/Overlay.js
@@ -39,7 +39,8 @@
className: 'overlay',
templatePartials: {
backButton: M.template.get( 'backButton.hogan' ),
- cancelButton: M.template.get( 'cancelButton.hogan' )
+ cancelButton: M.template.get( 'cancelButton.hogan' ),
+ spinner: M.template.get( 'spinner.hogan' )
},
template: M.template.get( 'Overlay.hogan' ),
defaults: {
diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js
b/javascripts/modules/mediaViewer/ImageOverlay.js
index b25f0aa..cb0d06d 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -30,7 +30,7 @@
var author, url = data.descriptionurl +
'#mw-jump-to-license';
function removeLoader() {
- self.$( '.image-wrapper' ).removeClass(
'loading' );
+ self.$( '.spinner' ).hide();
}
self.thumbWidth = data.thumbwidth;
diff --git a/javascripts/modules/nearby/Nearby.js
b/javascripts/modules/nearby/Nearby.js
index c3384ef..da13a9a 100644
--- a/javascripts/modules/nearby/Nearby.js
+++ b/javascripts/modules/nearby/Nearby.js
@@ -30,6 +30,11 @@
guidance: mw.msg(
'mobile-frontend-nearby-requirements-guidance' )
}
},
+ templatePartials: {
+ spinner: M.template.get( 'spinner.hogan' ),
+
[MediaWiki-commits] [Gerrit] Add initial Debian packaging - change (operations...cg3)
Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Add initial Debian packaging
..
Add initial Debian packaging
Change-Id: I640eb5a0d9158aa6820e8a81895e40e59d893c0c
---
A debian/cg3.install
A debian/cg3.links
A debian/cg3.lintian-overrides
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/libcg3-0.install
A debian/libcg3-0.postinst
A debian/libcg3-0.symbols
A debian/libcg3-dev.install
A debian/rules
A debian/source/format
A debian/watch
15 files changed, 306 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/debian/cg3.install b/debian/cg3.install
new file mode 100644
index 000..a833141
--- /dev/null
+++ b/debian/cg3.install
@@ -0,0 +1,2 @@
+debian/tmp/usr/bin
+debian/tmp/usr/share
diff --git a/debian/cg3.links b/debian/cg3.links
new file mode 100644
index 000..448b8a6
--- /dev/null
+++ b/debian/cg3.links
@@ -0,0 +1,2 @@
+/usr/bin/vislcg3 /usr/bin/cg3
+/usr/share/man/man1/vislcg3.1.gz /usr/share/man/man1/cg3.1.gz
diff --git a/debian/cg3.lintian-overrides b/debian/cg3.lintian-overrides
new file mode 100644
index 000..44af6cf
--- /dev/null
+++ b/debian/cg3.lintian-overrides
@@ -0,0 +1,3 @@
+# cg3-autobin.pl is already widely used by tools building on CG-3,
+# so it would be quite messy to rename it
+script-with-language-extension
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..ad6164a
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+cg3 (0.9.9~r10190-1) trusty; urgency=low
+
+ * Initial release (Closes: #475452)
+
+ -- Kartik Mistry kar...@debian.org Mon, 06 Oct 2014 21:33:43 +0530
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 000..ec63514
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+9
diff --git a/debian/control b/debian/control
new file mode 100644
index 000..40c9896
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,60 @@
+Source: cg3
+Section: science
+Priority: optional
+Maintainer: Debian Science Team
debian-science-maintain...@lists.alioth.debian.org
+Uploaders: Tino Didriksen m...@tinodidriksen.com,
+ Kartik Mistry kar...@debian.org
+Build-Depends: cmake (= 2.8.9),
+ debhelper (= 9.0),
+ libboost1.48-dev | libboost-dev (= 1.49.0),
+ libicu-dev (= 4.8)
+Standards-Version: 3.9.6
+Homepage: http://visl.sdu.dk/cg3.html
+Vcs-Git: git://anonscm.debian.org/debian-science/packages/cg3.git
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/cg3.git
+
+Package: cg3
+Architecture: any
+Depends: libcg3-0 (= ${binary:Version}),
+ ${misc:Depends},
+ ${perl:Depends},
+ ${shlibs:Depends}
+Provides: vislcg3
+Conflicts: vislcg3
+Description: Tools for using the 3rd edition of Constraint Grammar (CG-3)
+ Constraint Grammar compiler and applicator for the 3rd edition of CG
+ that is developed and maintained by VISL SDU and GrammarSoft ApS.
+ .
+ CG-3 can be used for disambiguation of morphology, syntax, semantics, etc;
+ dependency markup, target language lemma choice for MT, QA systems, and
+ much more. The core idea is that you choose what to do based on the whole
+ available context, as opposed to n-grams.
+ .
+ See http://visl.sdu.dk/cg3.html for more documentation
+
+Package: libcg3-0
+Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: libcg3
+Conflicts: libcg3
+Description: Runtime for CG-3
+ Runtime library for applications using the CG-3 API.
+ .
+ It is recommended to instrument the CLI tools instead of using this API.
+ .
+ See http://visl.sdu.dk/cg3.html for more documentation
+
+Package: libcg3-dev
+Architecture: any
+Multi-Arch: same
+Section: libdevel
+Pre-Depends: ${misc:Pre-Depends}
+Depends: libcg3-0 (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Description: Headers and static library to develop using the CG-3 library
+ Development files to use the CG-3 API.
+ .
+ It is recommended to instrument the CLI tools instead of using this API.
+ .
+ See http://visl.sdu.dk/cg3.html for more documentation
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..5db8595
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,132 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: cg3
+Upstream-Contact: Tino Didriksen m...@tinodidriksen.com
+Source: http://visl.sdu.dk/cg3.html
+
+Files: *
+Copyright: 2007-2014 GrammarSoft ApS i...@grammarsoft.com
+License: GPL-3+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed
[MediaWiki-commits] [Gerrit] Add commons to wgImportSources for sewikimedia - change (operations/mediawiki-config)
Glaisher has uploaded a new change for review. https://gerrit.wikimedia.org/r/166969 Change subject: Add commons to wgImportSources for sewikimedia .. Add commons to wgImportSources for sewikimedia Bug: 72125 Change-Id: I2eb6120a3c3004d02bc8a1929abd6ade8f6fc0f1 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/69/166969/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 4768315..9ad2b02 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8998,7 +8998,7 @@ 'nycwikimedia' = array( 'wikipedia:en', 'meta' ), 'plwikimedia' = array( 'b', 'n', 'q', 's', 'voy', 'w', 'wikt', ), // bug 65908 'ruwikimedia' = array( 'meta', 'foundation', 'wikipedia:ru', ), - 'sewikimedia' = array( 'wikipedia:sv' ), + 'sewikimedia' = array( 'wikipedia:sv', 'commons' ), 'trwikimedia' = array( 'wikipedia:tr', 'meta' ), 'ukwikimedia' = array( 'meta' ), -- To view, visit https://gerrit.wikimedia.org/r/166969 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2eb6120a3c3004d02bc8a1929abd6ade8f6fc0f1 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Glaisher glaisher.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Rubocop to Gemfile - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/166970 Change subject: Add Rubocop to Gemfile .. Add Rubocop to Gemfile Change-Id: I546d6ea19a575123dedcde823199278e01c96eda --- M tests/browser/Gemfile M tests/browser/Gemfile.lock 2 files changed, 23 insertions(+), 6 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation refs/changes/70/166970/1 diff --git a/tests/browser/Gemfile b/tests/browser/Gemfile index b49e41d..1fccc57 100755 --- a/tests/browser/Gemfile +++ b/tests/browser/Gemfile @@ -1,8 +1,8 @@ -#ruby=ruby-2.1.1 -#ruby-gemset=ContentTranslation +# ruby=ruby-2.1.1 +# ruby-gemset=ContentTranslation -source https://rubygems.org; +source 'https://rubygems.org' -gem mediawiki_selenium -gem mediawiki_api - +gem 'rubocop' +gem 'mediawiki_selenium' +gem 'mediawiki_api' diff --git a/tests/browser/Gemfile.lock b/tests/browser/Gemfile.lock index 1ef472c..e3004ef 100644 --- a/tests/browser/Gemfile.lock +++ b/tests/browser/Gemfile.lock @@ -1,6 +1,9 @@ GEM remote: https://rubygems.org/ specs: +ast (2.0.0) +astrolabe (1.3.0) + parser (= 2.2.0.pre.3, 3.0) builder (3.2.2) childprocess (0.5.3) ffi (~ 1.0, = 1.0.11) @@ -54,16 +57,29 @@ watir-webdriver (= 0.6.8) page_navigation (0.9) data_magic (= 0.14) +parser (2.2.0.pre.5) + ast (= 1.1, 3.0) + slop (~ 3.4, = 3.4.5) +powerpack (0.0.9) +rainbow (2.0.0) rest-client (1.6.7) mime-types (= 1.16) rspec-expectations (2.14.5) diff-lcs (= 1.1.3, 2.0) +rubocop (0.26.1) + astrolabe (~ 1.3) + parser (= 2.2.0.pre.4, 3.0) + powerpack (~ 0.0.6) + rainbow (= 1.99.1, 3.0) + ruby-progressbar (~ 1.4) +ruby-progressbar (1.6.0) rubyzip (1.1.3) selenium-webdriver (2.41.0) childprocess (= 0.5.0) multi_json (~ 1.0) rubyzip (~ 1.0) websocket (~ 1.0.4) +slop (3.6.0) syntax (1.2.0) unf (0.1.4) unf_ext @@ -79,3 +95,4 @@ DEPENDENCIES mediawiki_api mediawiki_selenium + rubocop -- To view, visit https://gerrit.wikimedia.org/r/166970 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I546d6ea19a575123dedcde823199278e01c96eda Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/ContentTranslation Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix floating of property name - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166971
Change subject: Fix floating of property name
..
Fix floating of property name
This has been broken since I changed the DOM structure of claims.
Bug: 72075
Change-Id: I18dbdda3213b795a83b4c4f892dcaf2bfd184a80
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
1 file changed, 3 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/71/166971/1
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
index 7cdae4f..39f5697 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
@@ -210,10 +210,9 @@
function findFirstVisibleMainSnakElement( $searchRange ) {
var result = null;
- // .wb-snak-value-container is better than using
.wb-claim-mainsnak since we don't
- // care about whether the margin/padding around the value is
within viewport or not.
- var $mainSnaks =
- $searchRange.find( '.wb-claim-mainsnak'
).children( '.wb-snak-value-container' );
+ // Caring about the visibility of .wb-snak-value-container is
better than about .wb-statement
+ // or .wb-claim-mainsnak since the label will align with the
.wb-snak-value-container.
+ var $mainSnaks = $searchRange.find( '.wb-claim-mainsnak
.wb-snak-value-container' );
$mainSnaks.each( function( i, mainSnakNode ) {
// Take first Main Snak value in viewport. If value is
not fully visible in viewport,
--
To view, visit https://gerrit.wikimedia.org/r/166971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I18dbdda3213b795a83b4c4f892dcaf2bfd184a80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] JS and CSS clean up based on static code analysis - change (mediawiki...Wikibase)
Thiemo Mättig (WMDE) has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166973
Change subject: JS and CSS clean up based on static code analysis
..
JS and CSS clean up based on static code analysis
Thanks to PHPStorm. I actually found a few bugs, but most stuff is
just unused parameters and such.
Change-Id: Ie6e9fc6dc8e0b63d47b3695ec75dcd68f065e06d
---
M client/resources/wikibase.client.getMwApiForRepo.js
M client/resources/wikibase.client.linkitem.init.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M
lib/resources/jquery.wikibase/themes/default/jquery.wikibase.statementview.RankSelector.css
M lib/resources/jquery.wikibase/themes/default/jquery.wikibase.wbtooltip.css
M lib/resources/jquery.wikibase/toolbar/toolbar.js
M lib/resources/wikibase.RepoApi/wikibase.RepoApi.js
M lib/resources/wikibase.sites.js
M lib/resources/wikibase.utilities/wikibase.utilities.ui.js
M repo/resources/wikibase.ui.entityViewInit.js
M repo/resources/wikibase.ui.entitysearch.js
15 files changed, 21 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/73/166973/1
diff --git a/client/resources/wikibase.client.getMwApiForRepo.js
b/client/resources/wikibase.client.getMwApiForRepo.js
index e8238c4..d0646fb 100644
--- a/client/resources/wikibase.client.getMwApiForRepo.js
+++ b/client/resources/wikibase.client.getMwApiForRepo.js
@@ -5,15 +5,13 @@
( function( mw, wb ) {
'use strict';
- var MODULE = wb;
-
/**
* @return {mediaWiki.Api}
*/
- MODULE.getMwApiForRepo = function() {
+ wb.getMwApiForRepo = function() {
var repoConfig = mw.config.get( 'wbRepo' ),
- repoApiEndpoint = repoConfig.url +
repoConfig.scriptPath + '/api.php',
- mwApiForRepo = wikibase.api.getLocationAgnosticMwApi(
repoApiEndpoint );
- return mwApiForRepo;
+ repoApiEndpoint = repoConfig.url +
repoConfig.scriptPath + '/api.php';
+
+ return wikibase.api.getLocationAgnosticMwApi( repoApiEndpoint );
};
}( mediaWiki, wikibase ) );
diff --git a/client/resources/wikibase.client.linkitem.init.js
b/client/resources/wikibase.client.linkitem.init.js
index a99922f..e24ef4b 100644
--- a/client/resources/wikibase.client.linkitem.init.js
+++ b/client/resources/wikibase.client.linkitem.init.js
@@ -21,7 +21,7 @@
'jquery.wikibase.linkitem',
'mediawiki.Title',
'mw.config.values.wbRepo',
- 'wikibase.client.getMwApiForRepo',
+ 'wikibase.client.getMwApiForRepo'
],
function() {
$spinner.remove();
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
index 7cdae4f..65b8fab 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
@@ -244,7 +244,7 @@
*
* @param {jQuery} $element
* @param {jQuery} $target
-* @return {false|string} false if the position requires no update,
otherwise the string of
+* @return {bool|string} false if the position requires no update,
otherwise the string of
* the top css style after the animation will be complete.
*/
function positionElementInOneLineWithAnother( $element, $target ) {
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
index fe337ec..eccf834 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplistview.js
@@ -485,7 +485,7 @@
$claimgrouplistview =
$claimlistview.closest( ':wikibase-claimgrouplistview' ),
claimgrouplistview =
$claimgrouplistview.data( 'claimgrouplistview' ),
claimgrouplistviewListview =
claimgrouplistview.$listview.data( 'listview' ),
- $claimlistviews =
claimgrouplistviewListview.items();
+ $claimlistviews;
// Determine whether the whole
[MediaWiki-commits] [Gerrit] Improve claimgrouplabelscroll code - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166972
Change subject: Improve claimgrouplabelscroll code
..
Improve claimgrouplabelscroll code
Use jQuery and jQuery UI where possible.
Change-Id: I507a9e411210ef1b2215da70343d918f2ad6942b
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
1 file changed, 32 insertions(+), 59 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/72/166972/1
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
index 7cdae4f..89a0e69 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
@@ -114,12 +114,12 @@
expensiveChecks = 0;
- var $visibleMainSnaks =
-
findFirstVisibleMainSnakElementsWithinClaimList( this.element );
+ var $visibleClaims =
+
findFirstVisibleMainSnakElementsWithinClaimList( this.element ).closest(
'.wb-claim' );
- for( var i = 0; i $visibleMainSnaks.length; i++ ) {
- var $visibleMainSnak = $visibleMainSnaks.eq( i
),
- $claimGroup = $visibleMainSnak.closest(
'.wb-claimlistview' ),
+ for( var i = 0; i $visibleClaims.length; i++ ) {
+ var $visibleClaim = $visibleClaims.eq( i ),
+ $claimGroup = $visibleClaim.closest(
'.wb-claimlistview' ),
$claimNameSection =
$claimGroup.children( '.wb-claimgrouplistview-groupname' ),
$claimGroupLabel =
$claimNameSection.children( '.wb-claim-name' );
@@ -132,16 +132,10 @@
'positioning',
$claimGroupLabel.get( 0 ),
'on',
- $visibleMainSnak.get( 0 )
+ $visibleClaim.get( 0 )
);
- var newLabelPosition =
- positionElementInOneLineWithAnother(
$claimGroupLabel, $visibleMainSnak );
-
- this._log( newLabelPosition
- ? ( 'moving label to ' +
newLabelPosition )
- : 'no position update required'
- );
+ positionElementInOneLineWithAnother(
$claimGroupLabel, $visibleClaim, $claimGroup );
var endTime = new Date().getTime();
this._log( expensiveChecks + ' expensive
checks, execution time '
@@ -219,21 +213,24 @@
// Take first Main Snak value in viewport. If value is
not fully visible in viewport,
// check whether the next one is fully visible, if so,
take that one.
if( elementPartlyVerticallyInViewport( mainSnakNode ) )
{
- result = $( mainSnakNode );
+ result = mainSnakNode;
if( !elementFullyVerticallyInViewport(
mainSnakNode ) ) {
- var nextMainSnakNode = $mainSnaks.get(
i+1 );
+ // Current element would be ok, but
maybe the next one is even better
+ var nextMainSnakNode = $mainSnaks.get(
i + 1 );
if( nextMainSnakNode
elementFullyVerticallyInViewport( nextMainSnakNode ) ) {
- result = $( nextMainSnakNode );
+ result = nextMainSnakNode;
}
}
- return false;
}
+
+ // Stop iterating as soon as we have a result
+ return !result;
} );
if( result ) {
// Don't forget to get the actual Snak node rather than
the value container.
- result = result.closest( '.wb-claim-mainsnak');
+ result = $( result ).closest( '.wb-claim-mainsnak');
}
return result;
}
@@ -244,53 +241,29 @@
*
* @param {jQuery} $element
* @param {jQuery} $target
-* @return {false|string} false if the
[MediaWiki-commits] [Gerrit] Actually put wb.client.getMwApiForRepo in wb.client - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166974
Change subject: Actually put wb.client.getMwApiForRepo in wb.client
..
Actually put wb.client.getMwApiForRepo in wb.client
Change-Id: Iada8cd41bdf531223ea29dee71904c477aaf945c
---
M client/resources/wikibase.client.getMwApiForRepo.js
M client/resources/wikibase.client.linkitem.init.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/74/166974/1
diff --git a/client/resources/wikibase.client.getMwApiForRepo.js
b/client/resources/wikibase.client.getMwApiForRepo.js
index e8238c4..e455165 100644
--- a/client/resources/wikibase.client.getMwApiForRepo.js
+++ b/client/resources/wikibase.client.getMwApiForRepo.js
@@ -5,7 +5,7 @@
( function( mw, wb ) {
'use strict';
- var MODULE = wb;
+ var MODULE = wb.client;
/**
* @return {mediaWiki.Api}
diff --git a/client/resources/wikibase.client.linkitem.init.js
b/client/resources/wikibase.client.linkitem.init.js
index a99922f..a01ae7f 100644
--- a/client/resources/wikibase.client.linkitem.init.js
+++ b/client/resources/wikibase.client.linkitem.init.js
@@ -31,7 +31,7 @@
$linkItemLink
.show()
.linkitem( {
- mwApiForRepo:
wikibase.getMwApiForRepo(),
+ mwApiForRepo:
wikibase.client.getMwApiForRepo(),
pageTitle: ( new mw.Title(
mw.config.get( 'wgTitle' ),
mw.config.get(
'wgNamespaceNumber' )
--
To view, visit https://gerrit.wikimedia.org/r/166974
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iada8cd41bdf531223ea29dee71904c477aaf945c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Auto-correct simple Rubocop errors in Ruby files - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166975
Change subject: Auto-correct simple Rubocop errors in Ruby files
..
Auto-correct simple Rubocop errors in Ruby files
Change-Id: I552bc603b8a6e7968958a4f07552311bcafd8f82
---
M tests/browser/features/step_definitions/basic_mt_steps.rb
M tests/browser/features/step_definitions/red_link_steps.rb
M tests/browser/features/step_definitions/special_content_translation_steps.rb
M tests/browser/features/support/env.rb
M tests/browser/features/support/pages/anon_error_page.rb
M tests/browser/features/support/pages/content_translation_page.rb
M tests/browser/features/support/pages/page_creation_page.rb
M tests/browser/features/support/pages/red_link_page.rb
M tests/browser/features/support/pages/translated_page.rb
M tests/browser/features/support/pages/translated_page_history.rb
10 files changed, 179 insertions(+), 179 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/75/166975/1
diff --git a/tests/browser/features/step_definitions/basic_mt_steps.rb
b/tests/browser/features/step_definitions/basic_mt_steps.rb
index 69e77b6..0ae5650 100644
--- a/tests/browser/features/step_definitions/basic_mt_steps.rb
+++ b/tests/browser/features/step_definitions/basic_mt_steps.rb
@@ -1,7 +1,7 @@
When(/^I click the translation column$/) do
- on(ContentTranslationPage).translation_editor_element.click
+ on(ContentTranslationPage).translation_editor_element.click
end
Then(/^I see the text (.*?) in the editing area in the translation column$/)
do |text|
- on(ContentTranslationPage).translation_editor_element.text.should ==
text
+ on(ContentTranslationPage).translation_editor_element.text.should == text
end
diff --git a/tests/browser/features/step_definitions/red_link_steps.rb
b/tests/browser/features/step_definitions/red_link_steps.rb
index bd5c0ed..4af1d70 100644
--- a/tests/browser/features/step_definitions/red_link_steps.rb
+++ b/tests/browser/features/step_definitions/red_link_steps.rb
@@ -1,107 +1,107 @@
When(/^I am on a page with an interlanguage link to (.+?)$/) do |code|
- on(RedLinkPage).create_page(This is a red interlanguage link test
page. [[#{code}:Target]])
- visit(RedLinkPage)
+ on(RedLinkPage).create_page(This is a red interlanguage link test page.
[[#{code}:Target]])
+ visit(RedLinkPage)
end
When(/^I am on a page without interlanguage links$/) do
- on(RedLinkPage).create_page(This is a red interlanguage link test page
without links.)
- visit(RedLinkPage)
+ on(RedLinkPage).create_page('This is a red interlanguage link test page
without links.')
+ visit(RedLinkPage)
end
When(/^I click on the red link to (.*?) in the list of the interlanguage
links$/) do |autonym|
-
on(RedLinkPage).red_interlanguage_item_with_autonym(autonym).when_present.click
+
on(RedLinkPage).red_interlanguage_item_with_autonym(autonym).when_present.click
end
When(/^I click outside of the red link dialog$/) do
- on(RedLinkPage).article_content_element.click
+ on(RedLinkPage).article_content_element.click
end
When(/^I click the Create from scratch button$/) do
- on(RedLinkPage).create_from_scratch_element.when_visible.click
+ on(RedLinkPage).create_from_scratch_element.when_visible.click
end
When(/^I click the Translate from English button$/) do
- on(RedLinkPage).translate_from_element.when_visible.click
+ on(RedLinkPage).translate_from_element.when_visible.click
end
When(/^I click the input box in the red link dialog$/) do
- on(RedLinkPage).translated_title_element.when_visible.click
+ on(RedLinkPage).translated_title_element.when_visible.click
end
When(/^I click on the X button in the red link dialog$/) do
- on(RedLinkPage).dialog_close_button.click
+ on(RedLinkPage).dialog_close_button.click
end
When(/^I set (.*?) as the interface language$/) do |code|
- on(RedLinkPage) do |page|
- page.trigger_cog_element.click
- page.uls_more_languages_element.when_present.click
- page.language_filter = code
- # Because one browser wants :enter and other :return -- sigh
- page.language_filter_element.send_keys [:enter, \n]
- page.uls_settings_apply_element.click
- page.wait_until do
- @browser.url.match /setlang=#{code}/
- end
- end
+ on(RedLinkPage) do |page|
+page.trigger_cog_element.click
+page.uls_more_languages_element.when_present.click
+page.language_filter = code
+# Because one browser wants :enter and other :return -- sigh
+page.language_filter_element.send_keys [:enter, \n]
+page.uls_settings_apply_element.click
+page.wait_until do
+ @browser.url.match /setlang=#{code}/
+end
+ end
end
When(/^I write (.+) in the input box
[MediaWiki-commits] [Gerrit] Fix ambiguous regexps, suggested by Rubocop - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166976
Change subject: Fix ambiguous regexps, suggested by Rubocop
..
Fix ambiguous regexps, suggested by Rubocop
Change-Id: I00205d4fce56b2110c90ecfef1020bfb48cbd88b
---
M tests/browser/features/step_definitions/red_link_steps.rb
1 file changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/76/166976/1
diff --git a/tests/browser/features/step_definitions/red_link_steps.rb
b/tests/browser/features/step_definitions/red_link_steps.rb
index 4af1d70..85175ec 100644
--- a/tests/browser/features/step_definitions/red_link_steps.rb
+++ b/tests/browser/features/step_definitions/red_link_steps.rb
@@ -41,7 +41,7 @@
page.language_filter_element.send_keys [:enter, \n]
page.uls_settings_apply_element.click
page.wait_until do
- @browser.url.match /setlang=#{code}/
+ @browser.url.match(/setlang=#{code}/)
end
end
end
@@ -79,11 +79,11 @@
end
Then(/^the name of the page should appear in the main title$/) do
- on(PageCreationPage).first_heading.should match /Red interlanguage link test/
+ on(PageCreationPage).first_heading.should match(/Red interlanguage link
test/)
end
Then(/^the name (.+?) should appear in the main title$/) do |target_title|
- on(PageCreationPage).first_heading.should match /#{target_title}/
+ on(PageCreationPage).first_heading.should match(/#{target_title}/)
end
Then(/^the name of the page should appear in the (.+) column$/) do
|column_type|
--
To view, visit https://gerrit.wikimedia.org/r/166976
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00205d4fce56b2110c90ecfef1020bfb48cbd88b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Extract browsertests related things from macro.yaml - change (integration/config)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166977
Change subject: Extract browsertests related things from macro.yaml
..
Extract browsertests related things from macro.yaml
Create new macro-browsertests.yaml file.
Change-Id: Ie3385a034af79c668dd25f70a5de7d785c7b0fca
Paired-With: Tobi Gritschacher
Bug: T669
---
A jjb/macro-browsertests.yaml
M jjb/macro.yaml
2 files changed, 259 insertions(+), 258 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/77/166977/1
diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
new file mode 100644
index 000..720bf67
--- /dev/null
+++ b/jjb/macro-browsertests.yaml
@@ -0,0 +1,259 @@
+- builder:
+name: browsertest-website
+builders:
+ - shell: |
+ # set up environment variables
+ export BROWSER={browser}
+ export BROWSER_TIMEOUT={browser_timeout}
+ export CUCUMBER_TAGS={cucumber_tags}
+ export HEADLESS={headless}
+ export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
+ export MEDIAWIKI_PASSWORD_VARIABLE={mediawiki_password_variable}
+ export MEDIAWIKI_URL=http://{mediawiki_url}/wiki/
+ export MEDIAWIKI_USER={mediawiki_user}
+ export PLATFORM='{platform}'
+ # Replace PLATFORM underscores (Jenkins) to spaces (SauceLabs)
+ export PLATFORM=${{PLATFORM//_/ }}
+ export SCREENSHOT_FAILURES=true
+ export SCREENSHOT_FAILURES_PATH=$WORKSPACE/log
+
+ # We only care about one version of our browser and do not need a job
+ # per version. Thus the versions to use are hardcoded there.
+ #
+ # VERSION is used for SauceLabs
+ #
+ case $BROWSER in
+'chrome')
+# Until upstream problem of bug 69399 is resolved we have to
use 28
+export VERSION=28
+;;
+'firefox')
+export VERSION=32
+;;
+'internet_explorer')
+export VERSION=10
+;;
+'phantomjs')
+export VERSION=''
+;;
+'safari')
+export VERSION=7
+;;
+*)
+echo Browser '$BROWSER' unsupported. Can not determine
version
+exit 1
+;;
+ esac
+ echo Using browser: $BROWSER at version $VERSION
+
+ if [ $BROWSER == internet_explorer ]
+ then
+BROWSER_TAG=${{BROWSER}}_$VERSION
+ else
+BROWSER_TAG=$BROWSER
+ fi
+
+ # Shared cache of gems to avoid hitting rubygems all the time
+ # See https://github.com/bundler/bundler/issues/2856
+ export GEM_HOME=$WORKSPACE/../gems
+
+ # Attempt to figure out MediaWiki branch being used and fetch it out
+ # if the extension has the same branch
+
MEDIAWIKI_GIT_BRANCH=$(/srv/deployment/integration/slave-scripts/bin/mw-api-siteinfo.py
$MEDIAWIKI_API_URL git_branch)
+
+
+ git checkout -f origin/$MEDIAWIKI_GIT_BRANCH || {{
+ echo origin/$MEDIAWIKI_GIT_BRANCH branch does not exist.
+ echo Fallbacking to master branch...
+ MEDIAWIKI_GIT_BRANCH='master'
+ git checkout -f origin/$MEDIAWIKI_GIT_BRANCH
+ }}
+ git reset --hard origin/$MEDIAWIKI_GIT_BRANCH
+ git clean -x -q -d -f
+
+ # install ruby dependencies
+ mkdir -p vendor
+ gem1.9.3 install --env-shebang -i vendor bundler --no-ri --no-rdoc
+ # Prepare some paths lookup
+ export GEM_PATH=`pwd`/vendor
+
+ cd {folder}/browser/
+ $WORKSPACE/vendor/bin/bundle install --verbose
+
+ if [[ ! -z $LANGUAGE_SCREENSHOT_CODE ]]; then
+CUCUMBER_PARAMETER=@language_screenshot
+export LANGUAGE_SCREENSHOT_PATH=$WORKSPACE/log
+ elif [[ $JOB_NAME == browsertests-Core-* ]]; then
+CUCUMBER_PARAMETER=@clean
+ elif [[ ! -z $CUCUMBER_TAGS ]]; then
+CUCUMBER_PARAMETER=$CUCUMBER_TAGS
+ else
+CUCUMBER_PARAMETER=@{mediawiki_url}
+ fi
+
+ if [ $BROWSER == 'phantomjs' ]; then
+ npm install 'phantomjs@=1.9.7-0 1.9.8'
+ export PATH=`pwd`/node_modules/.bin:$PATH
+ phantomjs --version
+ fi
+
+ # provide config.yml
+ if [ -e $WORKSPACE/tests/browser/config/config_ci.yml ] [ ! -e
$WORKSPACE/tests/browser/config/config.yml ]; then
+ cp $WORKSPACE/tests/browser/config/config_ci.yml
$WORKSPACE/tests/browser/config/config.yml
+ fi
+
+ # run tests
+ $WORKSPACE/vendor/bin/bundle exec cucumber \
+--backtrace \
+--color \
+--verbose
[MediaWiki-commits] [Gerrit] Avoid some TypeErrors in strict mode - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166978
Change subject: Avoid some TypeErrors in strict mode
..
Avoid some TypeErrors in strict mode
Change-Id: I8ebe7d486c2b43d8c96ce58116e5c38cf769fa79
---
M lib/resources/jquery.ui/jquery.ui.tagadata.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.snaklistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.RankSelector.js
8 files changed, 29 insertions(+), 27 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/78/166978/1
diff --git a/lib/resources/jquery.ui/jquery.ui.tagadata.js
b/lib/resources/jquery.ui/jquery.ui.tagadata.js
index 084f579..a9ed41f 100644
--- a/lib/resources/jquery.ui/jquery.ui.tagadata.js
+++ b/lib/resources/jquery.ui/jquery.ui.tagadata.js
@@ -215,8 +215,10 @@
var $tag = $( this );
if( self._formatLabel( label ) === self._formatLabel(
self.getTagLabel( $tag ) ) ) {
result = $tag;
- return false;
}
+
+ // Abort if we found something
+ return result === null;
} );
return result;
},
@@ -585,8 +587,10 @@
if( self._getTags( label ).length 1 ) {
hasConflict = true;
- return false;
}
+
+ // Abort if we found a conflict
+ return !hasConflict;
} );
return hasConflict;
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
index a535865..65542bd 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimview.js
@@ -937,7 +937,7 @@
// Item might be about to be
removed not being a list item instance.
if( !snakview || !removeToolbar
) {
- return true;
+ return;
}
$snakview.data( 'removetoolbar'
).toolbar[parentView.option( 'disabled' )
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
index b754d0c..9cb137c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintlistview.js
@@ -149,11 +149,10 @@
isValid = true;
listview.items().each( function() {
- var fingerprintview = lia.liInstance( $( this ) );
- if( !fingerprintview.isValid() ) {
- isValid = false;
- return false;
- }
+ isValid = lia.liInstance( $( this ) ).isValid();
+
+ // Abort if we found something invalid
+ return isValid;
} );
return isValid;
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
index 2cdd71e..97d9a3c 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.referenceview.js
@@ -919,7 +919,7 @@
if( !toolbar ) {
//
Continue if the movetoolbar is not present (the snakview is
//
pending).
- return
true;
+ return;
}
var
isOverallFirst = ( i === 0 j === 0 ),
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
index 5ae6b8a..3723dba 100644
---
[MediaWiki-commits] [Gerrit] Added update routine for new images - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166979
Change subject: Added update routine for new images
..
Added update routine for new images
Change-Id: I525d7240be2b848c3bedd5d81212f4377d4eb0d5
---
M includes/CoreHooks.php
1 file changed, 18 insertions(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/79/166979/1
diff --git a/includes/CoreHooks.php b/includes/CoreHooks.php
index 5dabc4f..1b5ec7d 100755
--- a/includes/CoreHooks.php
+++ b/includes/CoreHooks.php
@@ -260,9 +260,26 @@
public static function onLoadExtensionSchemaUpdates( $updater ) {
global $wgDBtype;
- $dbw = wfGetDB( DB_WRITE );
+ $dbw = wfGetDB( DB_MASTER );
if ( $dbw-tableExists( 'bs_settings' ) ) {
+ BsConfig::loadSettings();
+ if ( preg_match( '#.*?BlueSpiceSkin.*?bs-logo.png#',
BsConfig::get( 'MW::LogoPath' ) ) ) {
+ $dbw-delete( 'bs_settings', array(
$dbw-addIdentifierQuotes( 'key' ) = 'MW::LogoPath' ) );
+ }
+ if ( preg_match( '#.*?BlueSpiceSkin.*?favicon.ico#',
BsConfig::get( 'MW::FaviconPath' ) ) ) {
+ $dbw-delete( 'bs_settings', array(
$dbw-addIdentifierQuotes( 'key' ) = 'MW::FaviconPath' ) );
+ }
+ if ( preg_match(
'#.*?BlueSpiceSkin.*?bs-user-default-image.png#', BsConfig::get(
'MW::DefaultUserImage' ) ) ) {
+ $dbw-delete( 'bs_settings', array(
$dbw-addIdentifierQuotes( 'key' ) = 'MW::DefaultUserImage' ) );
+ }
+ if ( preg_match(
'#.*?BlueSpiceSkin.*?bs-user-anon-image.png#', BsConfig::get(
'MW::AnonUserImage' ) ) ) {
+ $dbw-delete( 'bs_settings', array(
$dbw-addIdentifierQuotes( 'key' ) = 'MW::AnonUserImage' ) );
+ }
+ if ( preg_match(
'#.*?BlueSpiceSkin.*?bs-user-deleted-image.png#', BsConfig::get(
'MW::DeletedUserImage' ) ) ) {
+ $dbw-delete( 'bs_settings', array(
$dbw-addIdentifierQuotes( 'key' ) = 'MW::DeletedUserImage' ) );
+ }
+
return true;
}
--
To view, visit https://gerrit.wikimedia.org/r/166979
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I525d7240be2b848c3bedd5d81212f4377d4eb0d5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Improved caching - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166980
Change subject: Improved caching
..
Improved caching
* Invalidate settings cache directly after insertion not kinda additional in a
hook
Change-Id: Ie3cb9508ebd0614a74e5ef136584d27f6be3405e
---
M BlueSpice.hooks.php
M includes/Config.class.php
M includes/utility/CacheHelper.class.php
3 files changed, 11 insertions(+), 19 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation
refs/changes/80/166980/1
diff --git a/BlueSpice.hooks.php b/BlueSpice.hooks.php
index d3f9342..6d6a654 100644
--- a/BlueSpice.hooks.php
+++ b/BlueSpice.hooks.php
@@ -15,7 +15,6 @@
// START cache invalidation hooks
$wgHooks['PageContentSaveComplete'][] =
'BsCacheHelper::onPageContentSaveComplete';
-$wgHooks['BsSettingsAfterSaveSettings'][] =
'BsCacheHelper::onBsSettingsAfterSaveSettings';
// END cache invalidation hooks
if ( !isset( $wgHooks['EditPage::showEditForm:initial'] ) ) {
diff --git a/includes/Config.class.php b/includes/Config.class.php
index d5916d7..da5a355 100644
--- a/includes/Config.class.php
+++ b/includes/Config.class.php
@@ -271,10 +271,10 @@
* loads all settings from the database and saves the instances for
every variable internal.
*/
public static function loadSettings() {
- $sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'BsConfig',
'loadSettings' );
+ $sKey = BsCacheHelper::getCacheKey( 'BlueSpice', 'BsConfig',
'settings' );
$aData = BsCacheHelper::get( $sKey );
- if( $aData !== false ) {
+ if ( $aData !== false ) {
wfDebugLog( 'BsMemcached' , __CLASS__.': Fetching
settings from cache' );
$aRows = $aData;
} else {
@@ -323,7 +323,7 @@
# if the setting is a boolean type then make sure, it
# gets saved as boolean type
if ( $setting-getOptions () self::TYPE_BOOL ) {
- $value = ( bool ) $setting-getValue ();
+ $value = (bool) $setting-getValue ();
} else {
$value = $setting-getValue ();
}
@@ -334,10 +334,17 @@
);
}
- # write the settings array to the database
wfRunHooks( 'BsSettingsBeforeSaveSettings', array( $aSettings
) );
+
+ # write the settings array to the database
$bReturn = $dbw-insert('bs_settings', $aSettings);
+
wfRunHooks( 'BsSettingsAfterSaveSettings', array( $aSettings )
);
+
+ BsCacheHelper::invalidateCache(
+ BsCacheHelper::getCacheKey( 'BlueSpice', 'BsConfig',
'settings' )
+ );
+
return $bReturn;
}
diff --git a/includes/utility/CacheHelper.class.php
b/includes/utility/CacheHelper.class.php
index 14f41d3..770c379 100644
--- a/includes/utility/CacheHelper.class.php
+++ b/includes/utility/CacheHelper.class.php
@@ -116,18 +116,4 @@
return true;
}
- /**
-* Invalidates bs settings cache
-* @param type $aSettings
-*/
- public static function onBsSettingsAfterSaveSettings( $aSettings ) {
- $aKeys = array(
- BsCacheHelper::getCacheKey( 'BlueSpice', 'BsConfig',
'loadSettings' )
- );
-
- BsCacheHelper::invalidateCache( $aKeys );
-
- return true;
- }
-
}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/166980
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3cb9508ebd0614a74e5ef136584d27f6be3405e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation
Gerrit-Branch: master
Gerrit-Owner: Smuggli mug...@hallowelt.biz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] WIP Merge browsertest-website and browsertest-website-versio... - change (integration/config)
Zfilipin has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166981
Change subject: WIP Merge browsertest-website and browsertest-website-version
builders
..
WIP Merge browsertest-website and browsertest-website-version builders
Change-Id: I09c7819eb19fe64b865163ac85a601f9c8683a8c
Paired-With: Tobi Gritschacher
Bug: T669
---
M jjb/job-templates-browsertests.yaml
M jjb/macro-browsertests.yaml
2 files changed, 3 insertions(+), 128 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/81/166981/1
diff --git a/jjb/job-templates-browsertests.yaml
b/jjb/job-templates-browsertests.yaml
index f2a7ae0..3cc08e4 100644
--- a/jjb/job-templates-browsertests.yaml
+++ b/jjb/job-templates-browsertests.yaml
@@ -25,20 +25,6 @@
name:
'browsertests-{name}-{mediawiki_url}-{platform}-{browser}-{version}-sauce'
defaults: browsertests
-builders:
- - shell: mkdir -p $WORKSPACE/log/junit
- - browsertest-website-version:
- browser: '{browser}'
- browser_timeout: '{browser_timeout}'
- cucumber_tags: '{cucumber_tags}'
- headless: '{headless}'
- folder: '{folder}'
- mediawiki_password_variable: '{mediawiki_password_variable}'
- mediawiki_url: '{mediawiki_url}'
- mediawiki_user: '{mediawiki_user}'
- platform: '{platform}'
- version: '{version}'
-
triggers:
- timed: 'H 3,18 * * *'
@@ -82,6 +68,7 @@
browser_timeout: ''
repository_host: 'gerrit.wikimedia.org/r'
cucumber_tags: ''
+version: '10'
properties:
- throttle:
@@ -116,6 +103,7 @@
mediawiki_url: '{mediawiki_url}'
mediawiki_user: '{mediawiki_user}'
platform: '{platform}'
+ version: '{version}'
publishers:
- junit:
diff --git a/jjb/macro-browsertests.yaml b/jjb/macro-browsertests.yaml
index 720bf67..62315e8 100644
--- a/jjb/macro-browsertests.yaml
+++ b/jjb/macro-browsertests.yaml
@@ -31,7 +31,7 @@
export VERSION=32
;;
'internet_explorer')
-export VERSION=10
+export VERSION={version}
;;
'phantomjs')
export VERSION=''
@@ -100,119 +100,6 @@
# provide config.yml
if [ -e $WORKSPACE/tests/browser/config/config_ci.yml ] [ ! -e
$WORKSPACE/tests/browser/config/config.yml ]; then
cp $WORKSPACE/tests/browser/config/config_ci.yml
$WORKSPACE/tests/browser/config/config.yml
- fi
-
- # run tests
- $WORKSPACE/vendor/bin/bundle exec cucumber \
---backtrace \
---color \
---verbose \
---format pretty \
---format Cucumber::Formatter::Sauce \
---out $WORKSPACE/log/junit \
---tags $CUCUMBER_PARAMETER \
---tags @$BROWSER_TAG \
-|| (echo -e \nJob has failed (exit code: $?).; false)
-
- if [[ ! -z $LANGUAGE_SCREENSHOT_CODE ]]; then
-$WORKSPACE/vendor/bin/bundle exec ruby1.9.1 upload.rb
- fi
-
-- builder:
-name: browsertest-website-version
-builders:
- - shell: |
- # set up environment variables
- export BROWSER={browser}
- export BROWSER_TIMEOUT={browser_timeout}
- export CUCUMBER_TAGS={cucumber_tags}
- export HEADLESS={headless}
- export MEDIAWIKI_API_URL=http://{mediawiki_url}/w/api.php
- export MEDIAWIKI_PASSWORD_VARIABLE={mediawiki_password_variable}
- export MEDIAWIKI_URL=http://{mediawiki_url}/wiki/
- export MEDIAWIKI_USER={mediawiki_user}
- export PLATFORM='{platform}'
- # Replace PLATFORM underscores (Jenkins) to spaces (SauceLabs)
- export PLATFORM=${{PLATFORM//_/ }}
- export SCREENSHOT_FAILURES=true
- export SCREENSHOT_FAILURES_PATH=$WORKSPACE/log
-
- # We only care about one version of our browser and do not need a job
- # per version. Thus the versions to use are hardcoded there.
- #
- # VERSION is used for SauceLabs
- #
- case $BROWSER in
-'chrome')
-# Until upstream problem of bug 69399 is resolved we have to
use 28
-export VERSION=28
-;;
-'firefox')
-export VERSION=27
-;;
-'internet_explorer')
-export VERSION={version}
-;;
-'phantomjs')
-export VERSION=''
-;;
-'safari')
-export VERSION=7
-;;
-*)
-echo Browser '$BROWSER' unsupported. Can not determine
version
-exit 1
-;;
- esac
- echo Using browser: $BROWSER at version
[MediaWiki-commits] [Gerrit] Performance: Increased ping interval - change (mediawiki...BlueSpiceFoundation)
Smuggli has uploaded a new change for review. https://gerrit.wikimedia.org/r/166982 Change subject: Performance: Increased ping interval .. Performance: Increased ping interval A ping call all two seconds is way to much! Increased interval to 10 seconds. Change-Id: Ie95876ace1b9e41ecb7b06eee69e5a5b7a084745 --- M includes/Core.class.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceFoundation refs/changes/82/166982/1 diff --git a/includes/Core.class.php b/includes/Core.class.php index 1c46950..a587010 100644 --- a/includes/Core.class.php +++ b/includes/Core.class.php @@ -125,7 +125,7 @@ BsConfig::registerVar( 'MW::AnonUserImage', $sPath . 'bs-user-anon-image.png', BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING, 'bs-pref-anonuserimage' ); BsConfig::registerVar( 'MW::DeletedUserImage', $sPath . 'bs-user-deleted-image.png', BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING, 'bs-pref-deleteduserimage' ); BsConfig::registerVar( 'MW::UserImage', '', BsConfig::LEVEL_USER | BsConfig::TYPE_STRING | BsConfig::NO_DEFAULT, 'bs-authors-profileimage' ); - BsConfig::registerVar( 'MW::PingInterval', 2, BsConfig::LEVEL_PUBLIC | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_INT, 'bs-pref-bspinginterval' ); + BsConfig::registerVar( 'MW::PingInterval', 10, BsConfig::LEVEL_PUBLIC | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_INT, 'bs-pref-bspinginterval' ); BsConfig::registerVar( 'MW::SortAlph', false, BsConfig::LEVEL_PUBLIC | BsConfig::LEVEL_USER | BsConfig::TYPE_BOOL, 'bs-pref-sortalph', 'toggle' ); BsConfig::registerVar( 'MW::TestMode', false, BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_BOOL, 'bs-pref-testmode', 'toggle' ); -- To view, visit https://gerrit.wikimedia.org/r/166982 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie95876ace1b9e41ecb7b06eee69e5a5b7a084745 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update to new saved pages icon. - change (apps...wikipedia)
Dbrant has submitted this change and it was merged. Change subject: Update to new saved pages icon. .. Update to new saved pages icon. We switched the saved pages icon on iOS to be something different, so that if we decided to implement the watchlist in the future then we wouldn't have issues with already using the star. This patch switches the Android icon to be consistent with iOS. Change-Id: I5a8ec3443eb15b1db0b42a15e9f4db5a1622355c --- M icon-svgs/128/savedpages.noflip.svg M wikipedia/res/drawable-hdpi/savedpages.png M wikipedia/res/drawable-ldpi/savedpages.png M wikipedia/res/drawable-mdpi/savedpages.png M wikipedia/res/drawable-xhdpi/savedpages.png M wikipedia/res/drawable-xxhdpi/savedpages.png 6 files changed, 12 insertions(+), 81 deletions(-) Approvals: Dbrant: Looks good to me, approved diff --git a/icon-svgs/128/savedpages.noflip.svg b/icon-svgs/128/savedpages.noflip.svg index 8a589dd..51eed9a 100644 --- a/icon-svgs/128/savedpages.noflip.svg +++ b/icon-svgs/128/savedpages.noflip.svg @@ -1,82 +1,13 @@ -?xml version=1.0 encoding=UTF-8 standalone=no? +?xml version=1.0 encoding=utf-8? !-- Generator: Adobe Illustrator 18.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -- - -svg - xmlns:dc=http://purl.org/dc/elements/1.1/; - xmlns:cc=http://creativecommons.org/ns#; - xmlns:rdf=http://www.w3.org/1999/02/22-rdf-syntax-ns#; - xmlns:svg=http://www.w3.org/2000/svg; - xmlns=http://www.w3.org/2000/svg; - xmlns:sodipodi=http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd; - xmlns:inkscape=http://www.inkscape.org/namespaces/inkscape; - version=1.1 - id=Layer_1 - x=0px - y=0px - viewBox=0 0 256 256 - enable-background=new 0 0 255.8 246.8 - xml:space=preserve - inkscape:version=0.48.1 - width=100% - height=100% - sodipodi:docname=savedpages.svgmetadata - id=metadata17rdf:RDFcc:Work - rdf:about=dc:formatimage/svg+xml/dc:formatdc:type - rdf:resource=http://purl.org/dc/dcmitype/StillImage; //cc:Work/rdf:RDF/metadatadefs - id=defs15 /sodipodi:namedview - pagecolor=#ff - bordercolor=#66 - borderopacity=1 - objecttolerance=10 - gridtolerance=10 - guidetolerance=10 - inkscape:pageopacity=0 - inkscape:pageshadow=2 - inkscape:window-width=885 - inkscape:window-height=737 - id=namedview13 - showgrid=false - inkscape:zoom=1.1790924 - inkscape:cx=127.9 - inkscape:cy=123.4 - inkscape:window-x=0 - inkscape:window-y=0 - inkscape:window-maximized=0 - inkscape:current-layer=Layer_1 / -g - id=g3 - transform=matrix(1.1137166,0,0,1.1137166,-13.999407,-10.770925) - path - stroke-miterlimit=10 - d=m 134.1,26.9 27.1,54.9 c 1,2.1 3,3.5 5.2,3.8 l 60.6,8.8 c 5.7,0.8 8,7.8 3.9,11.9 L 187,149.1 c -1.6,1.6 -2.4,3.9 -2,6.2 l 10.4,60.4 c 1,5.7 -5,10 -10.1,7.3 l -54.2,-28.5 c -2,-1.1 -4.5,-1.1 -6.5,0 L 70.4,223 c -5.1,2.7 -11.1,-1.7 -10.1,-7.3 l 10.4,-60.4 c 0.4,-2.3 -0.4,-4.6 -2,-6.2 L 24.8,106.3 c -4.1,-4 -1.9,-11 3.9,-11.9 l 60.6,-8.8 c 2.3,-0.3 4.2,-1.8 5.2,-3.8 l 27.1,-54.9 c 2.6,-5.2 10,-5.2 12.5,0 z - id=path5 - inkscape:connector-curvature=0 - style=fill:none;stroke:#00;stroke-width:8;stroke-miterlimit:10 / - circle - cx=104.4 - cy=113.8 - r=9 - id=circle7 - sodipodi:cx=104.4 - sodipodi:cy=113.8 - sodipodi:rx=9 - sodipodi:ry=9 - d=m 113.4,113.8 c 0,4.97057 -4.02944,9 -9,9 -4.970561,0 -8.98,-4.02943 -8.98,-9 0,-4.97056 4.029437,-9 8.98,-9 4.97056,0 9,4.02944 9,9 z / - circle - cx=158.3 - cy=113.8 - r=9 - id=circle9 - sodipodi:cx=158.3 - sodipodi:cy=113.8 - sodipodi:rx=9 - sodipodi:ry=9 - d=m 167.3,113.8 c 0,4.97057 -4.02943,9 -9,9 -4.97056,0 -9,-4.02943 -9,-9 0,-4.97056 4.02944,-9 9,-9 4.97057,0 9,4.02944 9,9 z / - path - stroke-miterlimit=10 - d=m 98.2,153.3 c 18.4,-18.4 48.1,-18.4 66.5,0 - id=path11 - inkscape:connector-curvature=0 - style=fill:none;stroke:#00;stroke-width:5;stroke-linecap:round;stroke-miterlimit:10 / -/g -/svg \ No newline at end of file +!DOCTYPE svg PUBLIC -//W3C//DTD SVG 1.1//EN http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd; +svg version=1.1 id=Layer_1 xmlns=http://www.w3.org/2000/svg; xmlns:xlink=http://www.w3.org/1999/xlink; x=0px y=0px +viewBox=0 0 240 232 enable-background=new 0 0 240 232 xml:space=preserve +circle fill=#010101 cx=90 cy=94.6 r=9/ +circle fill=#010101 cx=148 cy=94.6 r=9/ +path fill=none stroke=#010101 stroke-width=7 stroke-linecap=round stroke-miterlimit=10 d=M92,137.1 + c14.9-14.9,39.1-14.9,54,0/ +path fill=none stroke=#010101 stroke-width=9 stroke-miterlimit=10 d=M188.8,37.8C164,26.3,131.5,37.1,120,61.9 + c-11.5-24.8-44-35.6-68.8-24.1C24.7,50,12,81.4,32.9,118.4c14.8,26.3,41.2,46.2,87.1,81.7c45.9-35.6,72.2-55.4,87.1-81.7 + C228,81.4,215.3,50,188.8,37.8z/ +/svg diff --git a/wikipedia/res/drawable-hdpi/savedpages.png
[MediaWiki-commits] [Gerrit] MySQLPageGenerator fails due to wrong classname - change (pywikibot/core)
John Vandenberg has uploaded a new change for review. https://gerrit.wikimedia.org/r/166983 Change subject: MySQLPageGenerator fails due to wrong classname .. MySQLPageGenerator fails due to wrong classname The generator tries to compare against pywikibot.site.Site, which doesnt exist. Use BaseSite instead. Bug introduced in Aug 2013 - 2e35403. Bug: 72127 Change-Id: I4876b53baebf656e196682c203c45e65551f200e --- M pywikibot/pagegenerators.py 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/pywikibot/core refs/changes/83/166983/1 diff --git a/pywikibot/pagegenerators.py b/pywikibot/pagegenerators.py index ea34ddd..f6e3687 100644 --- a/pywikibot/pagegenerators.py +++ b/pywikibot/pagegenerators.py @@ -1448,7 +1448,7 @@ import MySQLdb as mysqldb if site is None: site = pywikibot.Site() -if isinstance(site, pywikibot.site.Site): +if isinstance(site, pywikibot.site.BaseSite): # We want to let people to set a custom dbname # since the master dbname might not be exactly # equal to the name on the replicated site -- To view, visit https://gerrit.wikimedia.org/r/166983 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4876b53baebf656e196682c203c45e65551f200e Gerrit-PatchSet: 1 Gerrit-Project: pywikibot/core Gerrit-Branch: master Gerrit-Owner: John Vandenberg jay...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Cleanup ext.cx.tools.categories.js according to coding conve... - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166984
Change subject: Cleanup ext.cx.tools.categories.js according to coding
conventions
..
Cleanup ext.cx.tools.categories.js according to coding conventions
Change-Id: I66f691fe588f7063eae8b159dee14946d6812ced
---
M modules/tools/ext.cx.tools.categories.js
1 file changed, 35 insertions(+), 18 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/84/166984/1
diff --git a/modules/tools/ext.cx.tools.categories.js
b/modules/tools/ext.cx.tools.categories.js
index 226a5cf..eed4cff 100644
--- a/modules/tools/ext.cx.tools.categories.js
+++ b/modules/tools/ext.cx.tools.categories.js
@@ -18,8 +18,9 @@
* @return {boolean} false
*/
function jump( e ) {
- var id, url = location.href;
- id = e.data.id;
+ var id = e.data.id,
+ url = location.href;
+
location.href = '#' + id;
history.replaceState( null, null, url );
@@ -69,8 +70,10 @@
$view = $( 'div' )
.addClass( 'cx-category-widget cx-category-counter' );
+
$button = $( 'button' )
.addClass( 'cx-category-counterbutton mw-ui-button
mw-ui-quiet' );
+
if ( this.language === mw.cx.sourceLanguage ) {
$button.on( 'click', {
id: 'cx-category-listing-anchor--source'
@@ -88,7 +91,8 @@
.addClass( 'cx-category-count' );
$button.append( $icon, $count );
- $view.append( $button )
+ $view
+ .append( $button )
.hide();
return $view;
@@ -101,6 +105,7 @@
*/
CXCategoryCounter.prototype.update = function ( count ) {
var text;
+
count = mw.language.convertNumber( count );
text = mw.message( 'cx-tools-categories-count-message', count
).text();
this.$view.find( 'span.cx-category-count' ).text( text );
@@ -154,13 +159,14 @@
if ( categoryTool.categories.adapted.hasOwnProperty( categoryId
)
!categoryTool.categories.target.hasOwnProperty(
categoryId )
) {
-
title = categoryTool.categories.adapted[ categoryId ];
categoryTool.categories.target[ categoryId ] = title;
count = Object.keys( categoryTool.categories.target
).length;
categoryTool.widgets.target.listing.addCategory(
categoryId, title );
+
$( '.cx-category--translation[cx-category-id=' +
categoryId + ']' )
.addClass( 'cx-category-highlight' );
+
categoryTool.widgets.target.counter.update( count );
}
}
@@ -182,8 +188,10 @@
$listItem.remove();
delete categoryTool.categories.target[ categoryId ];
count = Object.keys( categoryTool.categories.target ).length;
+
$( '.cx-category--source[cx-category-id=' + categoryId + ']' )
.removeClass( 'cx-category-highlight' );
+
categoryTool.widgets.target.counter.update( count );
}
@@ -192,7 +200,8 @@
*/
function highlightCategory() {
/*jshint validthis:true */
- var categoryId, $category = $( this );
+ var categoryId,
+ $category = $( this );
if ( $category.hasClass( 'cx-category-disabled' ) ) {
return;
@@ -209,11 +218,13 @@
*/
function removeCategoryHighlight() {
/*jshint validthis:true */
- var categoryId, $category = $( this );
+ var categoryId,
+ $category = $( this );
if ( $category.hasClass( 'cx-category-disabled' ) ) {
return;
}
+
categoryId = $category.attr( 'cx-category-id' );
$( '[cx-category-id=' + categoryId + ']' )
@@ -247,7 +258,8 @@
}, targetClickHandler );
}
- $categoryList.on( 'mouseover', '.cx-category',
highlightCategory )
+ $categoryList
+ .on( 'mouseover', '.cx-category', highlightCategory )
.on( 'mouseout', '.cx-category',
removeCategoryHighlight );
$view.append( $anchor, $icon, $categoryList )
@@ -370,7 +382,8 @@
* @return {jQuery.Promise}
*/
CXCategoryTool.prototype.getArticleCategories = function ( title,
language ) {
- var categoryTool, deferred
[MediaWiki-commits] [Gerrit] Performance: Increased ping interval - change (mediawiki...BlueSpiceFoundation)
Mglaser has submitted this change and it was merged. Change subject: Performance: Increased ping interval .. Performance: Increased ping interval A ping call all two seconds is way to much! Increased interval to 10 seconds. Change-Id: Ie95876ace1b9e41ecb7b06eee69e5a5b7a084745 --- M includes/Core.class.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Mglaser: Verified; Looks good to me, approved diff --git a/includes/Core.class.php b/includes/Core.class.php index 1c46950..a587010 100644 --- a/includes/Core.class.php +++ b/includes/Core.class.php @@ -125,7 +125,7 @@ BsConfig::registerVar( 'MW::AnonUserImage', $sPath . 'bs-user-anon-image.png', BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING, 'bs-pref-anonuserimage' ); BsConfig::registerVar( 'MW::DeletedUserImage', $sPath . 'bs-user-deleted-image.png', BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_STRING, 'bs-pref-deleteduserimage' ); BsConfig::registerVar( 'MW::UserImage', '', BsConfig::LEVEL_USER | BsConfig::TYPE_STRING | BsConfig::NO_DEFAULT, 'bs-authors-profileimage' ); - BsConfig::registerVar( 'MW::PingInterval', 2, BsConfig::LEVEL_PUBLIC | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_INT, 'bs-pref-bspinginterval' ); + BsConfig::registerVar( 'MW::PingInterval', 10, BsConfig::LEVEL_PUBLIC | BsConfig::RENDER_AS_JAVASCRIPT | BsConfig::TYPE_INT, 'bs-pref-bspinginterval' ); BsConfig::registerVar( 'MW::SortAlph', false, BsConfig::LEVEL_PUBLIC | BsConfig::LEVEL_USER | BsConfig::TYPE_BOOL, 'bs-pref-sortalph', 'toggle' ); BsConfig::registerVar( 'MW::TestMode', false, BsConfig::LEVEL_PUBLIC | BsConfig::TYPE_BOOL, 'bs-pref-testmode', 'toggle' ); -- To view, visit https://gerrit.wikimedia.org/r/166982 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie95876ace1b9e41ecb7b06eee69e5a5b7a084745 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/BlueSpiceFoundation Gerrit-Branch: master Gerrit-Owner: Smuggli mug...@hallowelt.biz Gerrit-Reviewer: Mglaser gla...@hallowelt.biz Gerrit-Reviewer: Pigpen reym...@hallowelt.biz Gerrit-Reviewer: Robert Vogel vo...@hallowelt.biz Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Updating and debugging the extension - change (mediawiki...MsUpload)
Luis Felipe Schenone has uploaded a new change for review. https://gerrit.wikimedia.org/r/166986 Change subject: Updating and debugging the extension .. Updating and debugging the extension Change-Id: I9ff37f40237ad4e77323f6ee728e4808d654ed4c --- M .gitignore A MsUpload.css A MsUpload.js M README.TXT D css/images/ui-bg_flat_0_aa_40x100.png D css/images/ui-bg_flat_75_ff_40x100.png D css/images/ui-bg_glass_55_fbf9ee_1x400.png D css/images/ui-bg_glass_65_ff_1x400.png D css/images/ui-bg_glass_75_dadada_1x400.png D css/images/ui-bg_glass_75_e6e6e6_1x400.png D css/images/ui-bg_glass_95_fef1ec_1x400.png D css/images/ui-bg_highlight-soft_75_cc_1x100.png D css/jquery.css D css/msupload.css M i18n/de.json M i18n/en.json M i18n/es.json A i18n/fr.json A i18n/he.json M i18n/it.json M i18n/ja.json A i18n/lt.json M i18n/pt-br.json M i18n/ru.json M i18n/zh-hans.json M i18n/zh-hant.json M images/msu_close.png M images/msu_document-film.png M images/msu_document-globe.png M images/msu_document-image.png M images/msu_document-music.png M images/msu_document-pdf.png M images/msu_document.png M images/msu_error-small.png M images/msu_error.png M images/msu_loading.png M images/msu_progress_stripe.png M images/msu_tick.png M images/msu_upload_button.png A images/msu_upload_button_old.gif M images/msu_upload_icon.png D js/msupload.insert.js D js/msupload.js D js/plupload/plupload.flash.js D js/plupload/plupload.flash.swf D js/plupload/plupload.full.js D js/plupload/plupload.html4.js D js/plupload/plupload.html5.js D js/plupload/plupload.js D js/plupload/plupload.silverlight.js D js/plupload/plupload.silverlight.xap M msupload.body.php M msupload.i18n.php M msupload.php A plupload/Moxie.swf A plupload/Moxie.xap A plupload/plupload.full.min.js 57 files changed, 1,170 insertions(+), 1,514 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MsUpload refs/changes/86/166986/1 -- To view, visit https://gerrit.wikimedia.org/r/166986 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ff37f40237ad4e77323f6ee728e4808d654ed4c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/MsUpload Gerrit-Branch: master Gerrit-Owner: Luis Felipe Schenone scheno...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Bus register/unregister balance. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166985
Change subject: Fix Bus register/unregister balance.
..
Fix Bus register/unregister balance.
Change-Id: Ifbf29ed08d577ebfa34e655bb6ba62017ed46c9a
---
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
1 file changed, 3 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/85/166985/1
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 679c6db..ef534a3 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -131,7 +131,6 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
app = WikipediaApp.getInstance();
-app.getBus().register(this);
setHasOptionsMenu(true);
searchTerm = getArguments().getString(KEY_SEARCH_TERM);
}
@@ -139,6 +138,7 @@
@Override
public View onCreateView(final LayoutInflater inflater, ViewGroup
container, Bundle savedInstanceState) {
app = (WikipediaApp)getActivity().getApplicationContext();
+app.getBus().register(this);
LinearLayout parentLayout = (LinearLayout)
inflater.inflate(R.layout.fragment_search, container, false);
if (savedInstanceState != null) {
@@ -201,8 +201,8 @@
}
@Override
-public void onStop() {
-super.onStop();
+public void onDestroyView() {
+super.onDestroyView();
app.getBus().unregister(this);
}
--
To view, visit https://gerrit.wikimedia.org/r/166985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifbf29ed08d577ebfa34e655bb6ba62017ed46c9a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Catch more general ApiException in Nearby task. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166987
Change subject: Catch more general ApiException in Nearby task.
..
Catch more general ApiException in Nearby task.
Change-Id: Ic23e46ee0f5ddd1a33cc3bb1f333cd5ee68bfe2a
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
1 file changed, 6 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/87/166987/1
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index e79575b..7e620a1 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -312,8 +312,12 @@
if (!isAdded()) {
return;
}
-if (caught instanceof ApiException caught.getCause()
instanceof UnknownHostException) {
-Crouton.makeText(getActivity(),
R.string.nearby_no_network, Style.ALERT).show();
+if (caught instanceof ApiException) {
+if (caught.getCause() instanceof UnknownHostException)
{
+Crouton.makeText(getActivity(),
R.string.nearby_no_network, Style.ALERT).show();
+} else {
+Crouton.makeText(getActivity(),
R.string.error_network_error, Style.ALERT).show();
+}
} else if (caught instanceof NearbyFetchException) {
Log.e(Wikipedia, Could not get list of nearby
places: + caught.toString());
Crouton.makeText(getActivity(),
R.string.nearby_server_error, Style.ALERT).show();
--
To view, visit https://gerrit.wikimedia.org/r/166987
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic23e46ee0f5ddd1a33cc3bb1f333cd5ee68bfe2a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata, add/fix badges css - change (mediawiki...Wikidata)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166988
Change subject: Update Wikidata, add/fix badges css
..
Update Wikidata, add/fix badges css
Change-Id: If8f945456fc43d74cbff58461d6d3b265f731eda
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
M extensions/WikimediaBadges/resources/skins/cologneblue/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/modern/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/monobook/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/vector/wikimedia-badges.css
M vendor/composer/autoload_files.php
M vendor/composer/installed.json
10 files changed, 125 insertions(+), 120 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/88/166988/1
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index 4ef960e..0bba608 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412881061;
\ No newline at end of file
+$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1413462629;
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index bb05f0f..874330c 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412881061;
\ No newline at end of file
+$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1413462629;
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 33a4f57..e974b9e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -835,12 +835,12 @@
source: {
type: git,
url: https://github.com/wmde/Wikidata.org.git;,
-reference: 381190e89865e9d0fadcc490ca6f7c7dfdaefb04
+reference: 217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wmde/Wikidata.org/zipball/381190e89865e9d0fadcc490ca6f7c7dfdaefb04;,
-reference: 381190e89865e9d0fadcc490ca6f7c7dfdaefb04,
+url:
https://api.github.com/repos/wmde/Wikidata.org/zipball/217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1;,
+reference: 217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1,
shasum:
},
require: {
@@ -874,7 +874,7 @@
source: https://github.com/wmde/Wikidata.org/tree/master;,
issues: https://github.com/wmde/Wikidata.org/issues;
},
-time: 2014-09-26 07:02:41
+time: 2014-10-06 14:34:12
},
{
name: wikibase/data-model,
@@ -1262,7 +1262,7 @@
issues: https://bugzilla.wikimedia.org/;,
irc: irc://irc.freenode.net/wikidata
},
-time: 2014-10-09 18:34:12
+time: 2014-10-09 18:24:20
},
{
name: wikibase/wikimedia-badges,
@@ -1270,12 +1270,12 @@
source: {
type: git,
url: https://github.com/wmde/WikimediaBadges.git;,
-reference: 0fae9f0c106fedc5550994a5fc825e866944e999
+reference: 119353f0c3bcb39714df26ea74885f60b00df14d
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wmde/WikimediaBadges/zipball/0fae9f0c106fedc5550994a5fc825e866944e999;,
-reference: 0fae9f0c106fedc5550994a5fc825e866944e999,
+url:
https://api.github.com/repos/wmde/WikimediaBadges/zipball/119353f0c3bcb39714df26ea74885f60b00df14d;,
+reference: 119353f0c3bcb39714df26ea74885f60b00df14d,
shasum:
},
require: {
@@ -1312,7 +1312,7 @@
source:
https://github.com/wmde/WikimediaBadges/tree/master;,
issues: https://github.com/wmde/WikimediaBadges/issues;
},
-time: 2014-09-26 02:48:21
+time: 2014-10-16 12:27:50
}
],
packages-dev: [
diff --git
a/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
b/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
index c1a845d..8e825a1 100644
--- a/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
+++ b/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
@@ -11,7 +11,7 @@
* compatibility (browsers able to understand gradient syntax support also
SVG).
* http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
-.wb-badge-featuredarticle {
+.wb-badge.wb-badge-featuredarticle {
background-image:
[MediaWiki-commits] [Gerrit] UnicodeDecodeError in pwb.py creating logfile - change (pywikibot/compat)
John Vandenberg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166989
Change subject: UnicodeDecodeError in pwb.py creating logfile
..
UnicodeDecodeError in pwb.py creating logfile
Need to decode the command line arguments before using them.
Bug 72129
Change-Id: I8b6d22ca1c1db323763efb2ce2d8825158bc8b7e
---
M pwb.py
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/pywikibot/compat
refs/changes/89/166989/1
diff --git a/pwb.py b/pwb.py
index 577ba98..7a53ae9 100755
--- a/pwb.py
+++ b/pwb.py
@@ -139,7 +139,8 @@
raise RuntimeError(Not enough arguments defined.)
else:
logname = pywikibot.config.datafilepath('logs', '%s.log')
-logfile = logname % ''.join([os.path.basename(sys.argv[0])] + sys.argv[1:])
+logfile = logname % (os.path.basename(sys.argv[0]) + u''.join(
+[x.decode('utf-8') for x in sys.argv[1:]]))
arg = pywikibot.handleArgs()# '-family' and
'-lang' have to be known for log-header
sys.stdout = BotLoggerObject(layer='stdout')# handle stdout
--
To view, visit https://gerrit.wikimedia.org/r/166989
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8b6d22ca1c1db323763efb2ce2d8825158bc8b7e
Gerrit-PatchSet: 1
Gerrit-Project: pywikibot/compat
Gerrit-Branch: master
Gerrit-Owner: John Vandenberg jay...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ffs/JavaScriptFFS.php Replaced unnecessary use of str_replace - change (mediawiki...Translate)
Prianka has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166990
Change subject: ffs/JavaScriptFFS.php Replaced unnecessary use of str_replace
..
ffs/JavaScriptFFS.php Replaced unnecessary use of str_replace
Brought changes in /*Concatenate separated strings.* block by deleting
line for replacing '+' by ' +' which was later
used for splitting string. Instead directly used '+' for
splliting purpose.
Signed-off-by: Priyanka priyankajayaswal...@gmail.com
Change-Id: I5f68ac1c03b32b042eab76715d7fff2ef2926ecd
Bug: 31331
---
M ffs/JavaScriptFFS.php
1 file changed, 1 insertion(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Translate
refs/changes/90/166990/1
diff --git a/ffs/JavaScriptFFS.php b/ffs/JavaScriptFFS.php
index ecbec78..0962496 100644
--- a/ffs/JavaScriptFFS.php
+++ b/ffs/JavaScriptFFS.php
@@ -96,8 +96,7 @@
/**
* Concatenate separated strings.
*/
- $segment = str_replace( '+', ' +', $segment );
- $segment = explode( ' +', $segment );
+ $segment = explode( '+', $segment );
$count = count( $segment );
for ( $i = 0; $i $count; $i++ ) {
$segment[$i] = ltrim( ltrim( $segment[$i] ),
'' );
--
To view, visit https://gerrit.wikimedia.org/r/166990
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5f68ac1c03b32b042eab76715d7fff2ef2926ecd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Translate
Gerrit-Branch: master
Gerrit-Owner: Prianka priyankajayaswal...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Manage save button state when changing referenceview state - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Manage save button state when changing referenceview state
..
Manage save button state when changing referenceview state
Like for all other edittoolbars, the save button shall not be enabled when
the input is invalid
or is the initial value. Consequently, when enabling the widget/toolbar, the
save button needs
special handling.
Change-Id: Ie2f3347b395d2e93ace80e8a44f0c7a95f517dbe
---
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
1 file changed, 18 insertions(+), 0 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index 2fd9b70..c9468a7 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -519,6 +519,24 @@
enableSave = referenceview.isValid()
!referenceview.isInitialValue();
btnSave[enableSave ? 'enable' : 'disable']();
+ },
+ referenceviewdisable: function( event ) {
+ var $referenceview = $( event.target ),
+ referenceview = $referenceview.data(
'referenceview' );
+
+ if( !referenceview ) {
+ return;
+ }
+
+ var disable = referenceview.option( 'disabled' ),
+ edittoolbar = $referenceview.data(
'edittoolbar' ),
+ btnSave = edittoolbar.getButton( 'save' ),
+ enableSave = ( referenceview.isValid()
!referenceview.isInitialValue() );
+
+ edittoolbar.option( 'disabled', disable );
+ if( !disable ) {
+ btnSave.option( 'disabled', !enableSave );
+ }
}
// Destroying the referenceview will destroy the toolbar.
Trying to destroy the toolbar
--
To view, visit https://gerrit.wikimedia.org/r/161914
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie2f3347b395d2e93ace80e8a44f0c7a95f517dbe
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata, add/fix badges css - change (mediawiki...Wikidata)
Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166991
Change subject: Update Wikidata, add/fix badges css
..
Update Wikidata, add/fix badges css
Change-Id: If8f945456fc43d74cbff58461d6d3b265f731eda
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
M extensions/WikimediaBadges/resources/skins/cologneblue/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/modern/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/monobook/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/vector/wikimedia-badges.css
M vendor/composer/autoload_files.php
M vendor/composer/installed.json
10 files changed, 125 insertions(+), 120 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikidata
refs/changes/91/166991/1
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index 4ef960e..0bba608 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412881061;
\ No newline at end of file
+$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1413462629;
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index bb05f0f..874330c 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412881061;
\ No newline at end of file
+$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1413462629;
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 33a4f57..e974b9e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -835,12 +835,12 @@
source: {
type: git,
url: https://github.com/wmde/Wikidata.org.git;,
-reference: 381190e89865e9d0fadcc490ca6f7c7dfdaefb04
+reference: 217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wmde/Wikidata.org/zipball/381190e89865e9d0fadcc490ca6f7c7dfdaefb04;,
-reference: 381190e89865e9d0fadcc490ca6f7c7dfdaefb04,
+url:
https://api.github.com/repos/wmde/Wikidata.org/zipball/217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1;,
+reference: 217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1,
shasum:
},
require: {
@@ -874,7 +874,7 @@
source: https://github.com/wmde/Wikidata.org/tree/master;,
issues: https://github.com/wmde/Wikidata.org/issues;
},
-time: 2014-09-26 07:02:41
+time: 2014-10-06 14:34:12
},
{
name: wikibase/data-model,
@@ -1262,7 +1262,7 @@
issues: https://bugzilla.wikimedia.org/;,
irc: irc://irc.freenode.net/wikidata
},
-time: 2014-10-09 18:34:12
+time: 2014-10-09 18:24:20
},
{
name: wikibase/wikimedia-badges,
@@ -1270,12 +1270,12 @@
source: {
type: git,
url: https://github.com/wmde/WikimediaBadges.git;,
-reference: 0fae9f0c106fedc5550994a5fc825e866944e999
+reference: 119353f0c3bcb39714df26ea74885f60b00df14d
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wmde/WikimediaBadges/zipball/0fae9f0c106fedc5550994a5fc825e866944e999;,
-reference: 0fae9f0c106fedc5550994a5fc825e866944e999,
+url:
https://api.github.com/repos/wmde/WikimediaBadges/zipball/119353f0c3bcb39714df26ea74885f60b00df14d;,
+reference: 119353f0c3bcb39714df26ea74885f60b00df14d,
shasum:
},
require: {
@@ -1312,7 +1312,7 @@
source:
https://github.com/wmde/WikimediaBadges/tree/master;,
issues: https://github.com/wmde/WikimediaBadges/issues;
},
-time: 2014-09-26 02:48:21
+time: 2014-10-16 12:27:50
}
],
packages-dev: [
diff --git
a/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
b/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
index c1a845d..8e825a1 100644
--- a/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
+++ b/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
@@ -11,7 +11,7 @@
* compatibility (browsers able to understand gradient syntax support also
SVG).
* http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
-.wb-badge-featuredarticle {
+.wb-badge.wb-badge-featuredarticle {
background-image:
[MediaWiki-commits] [Gerrit] Initialize toolbars on existing DOM - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Initialize toolbars on existing DOM
..
Initialize toolbars on existing DOM
Initializing the toolbars on the static DOM rendered by the back-end does not
yet involve
the inner toolbar structure. (Still, the buttons will be removed and re-added
to the DOM.)
Along with this change, the sitelinkgroup add buttons available in non-JS are
removed in
order to receive a matching toolbar structure between JS and non-JS again.
Change-Id: I859dcc21cd17bffbb7fb265603d4d77b5fd74cf2
---
M lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
M lib/resources/jquery.wikibase/jquery.wikibase.descriptionview.js
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.labelview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
M lib/resources/jquery.wikibase/toolbar/jquery.wikibase.edittoolbar.js
M repo/includes/View/FingerprintView.php
M repo/includes/View/SiteLinksView.php
M repo/resources/wikibase.ui.entityViewInit.js
M repo/tests/phpunit/includes/View/SiteLinksViewTest.php
12 files changed, 91 insertions(+), 93 deletions(-)
Approvals:
Adrian Lang: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
index e90b26d..058cc26 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.aliasesview.js
@@ -447,10 +447,15 @@
events: {
aliasesviewcreate: function( event, toolbarcontroller ) {
var $aliasesview = $( event.target ),
- aliasesview = $aliasesview.data( 'aliasesview'
);
+ aliasesview = $aliasesview.data( 'aliasesview'
),
+ $container = $aliasesview.find( 'ul' ).next(
'span' );
+
+ if( !$container.length ) {
+ $container = $( 'span/' ).insertAfter(
$aliasesview.find( 'ul' ) );
+ }
$aliasesview.edittoolbar( {
- $container: $( 'div/' ).insertAfter(
$aliasesview.find( 'ul' ) ),
+ $container: $container,
interactionWidget: aliasesview
} );
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 543e10a..b05ef8b 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -406,18 +406,23 @@
events: {
claimlistviewcreate: function( event, toolbarcontroller ) {
var $claimlistview = $( event.target ),
- claimlistview = $claimlistview.data(
'claimlistview' );
+ claimlistview = $claimlistview.data(
'claimlistview' ),
+ $container = $claimlistview.children(
'.wikibase-toolbar-wrapper' )
+ .children(
'.wikibase-toolbar-container' );
+
+ if( !$container.length ) {
+ // TODO: Remove layout-specific toolbar wrapper
+ $container = $( 'div/' ).appendTo(
+ mw.template(
'wikibase-toolbar-wrapper', '' ).appendTo( $claimlistview )
+ );
+ }
if( !claimlistview.value() ) {
return;
}
$claimlistview.addtoolbar( {
- // TODO: Remove layout-specific toolbar wrapper
- $container: $( 'div/' ).appendTo(
- mw.template(
'wikibase-toolbar-wrapper', '' )
- .appendTo( $claimlistview )
- )
+ $container: $container
} )
.on( 'addtoolbaradd.addtoolbar', function( e ) {
if( e.target !== $claimlistview.get( 0 ) ) {
@@ -466,9 +471,15 @@
$view = $( event.target ),
view = $view.data( viewType ),
options = {
- interactionWidget: view,
- $container: $( 'div/' ).appendTo(
$view
[MediaWiki-commits] [Gerrit] Remove legacy jshintignore file and fix hidden jshint errors - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166994
Change subject: Remove legacy jshintignore file and fix hidden jshint errors
..
Remove legacy jshintignore file and fix hidden jshint errors
Change-Id: I7f7e9fbbb2e694a41cee32b55faf914529739e69
---
D .jshintignore
M lib/tests/qunit/templates.tests.js
M lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
3 files changed, 1 insertion(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/94/166994/1
diff --git a/.jshintignore b/.jshintignore
deleted file mode 100644
index c64fa25..000
--- a/.jshintignore
+++ /dev/null
@@ -1,13 +0,0 @@
-./lib/tests/qunit/templates.tests.js
-./lib/tests/qunit/wikibase.Site.tests.js
-./lib/tests/qunit/wikibase.tests.js
-./lib/tests/qunit/data/testrunner.js
-./lib/tests/qunit/parsers/EntityIdParser.tests.js
-./lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApiError.tests.js
-./lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
-./lib/tests/qunit/wikibase.utilities/wikibase.utilities.ClaimGuidGenerator.tests.js
-./lib/tests/qunit/wikibase.utilities/wikibase.utilities.GuidGenerator.tests.js
-./lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.NativeEventHandler.tests.js
-./lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.NativeEventHandler.testsOnObject.js
-./lib/tests/qunit/wikibase.utilities/wikibase.utilities.jQuery.NativeEventHandler.testsOnWidget.js
-./tests/browser/vendor/
diff --git a/lib/tests/qunit/templates.tests.js
b/lib/tests/qunit/templates.tests.js
index 6079df0..cb9c7d5 100644
--- a/lib/tests/qunit/templates.tests.js
+++ b/lib/tests/qunit/templates.tests.js
@@ -201,7 +201,7 @@
if ( expected === '' ) {
assert.throws(
- function() { $( 'div/' ).append(
mw.template( key, params ) ).html() },
+ function() { $( 'div/' ).append(
mw.template( key, params ) ).html(); },
'Triggered error when trying to create
invalid HTML filling single param template ' + template + ' with ' +
paramMessage + ''
);
} else {
diff --git a/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
b/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
index 6c459f6..d2a69b8 100644
--- a/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
+++ b/lib/tests/qunit/wikibase.RepoApi/wikibase.RepoApi.tests.js
@@ -16,13 +16,6 @@
var api = new wb.RepoApi();
/**
-* wb.AbstractedRepoApi object
-* @var {Object}
-*/
- // @FIXME: Don't mix the plain RepoApi with the abstracted one
- var abstractedApi = new wb.AbstractedRepoApi( api );
-
- /**
* Queue used run asynchronous tests synchronously.
* @var {jQuery}
*/
--
To view, visit https://gerrit.wikimedia.org/r/166994
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f7e9fbbb2e694a41cee32b55faf914529739e69
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fingerprint-/sitelinkgroupview: Fixed event handler parameters - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166993
Change subject: fingerprint-/sitelinkgroupview: Fixed event handler parameters
..
fingerprint-/sitelinkgroupview: Fixed event handler parameters
Change-Id: I619b3b6d3c609e963e783084b4c173a5e2d0e05a
---
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/93/166993/1
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
index 320eef4..43e6975 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
@@ -194,7 +194,7 @@
this.$fingerprintlistview.one(
'fingerprintlistviewafterstopediting',
- function( dropValue ) {
+ function( event, dropValue ) {
self._afterStopEditing( dropValue );
}
);
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
index 26f37a6..a6df15a 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -242,7 +242,7 @@
this.$sitelinklistview.one(
'sitelinklistviewafterstopediting',
- function( dropValue ) {
+ function( event, dropValue ) {
self._afterStopEditing( dropValue );
}
);
--
To view, visit https://gerrit.wikimedia.org/r/166993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I619b3b6d3c609e963e783084b4c173a5e2d0e05a
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Show home-as-up icon instead of hamburger when searching. - change (apps...wikipedia)
Dbrant has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166992
Change subject: Show home-as-up icon instead of hamburger when searching.
..
Show home-as-up icon instead of hamburger when searching.
Also added one more case for ensuring visibility of the ActionBar.
Change-Id: I3aeeb68b57d5624d22a9aa460bd1f7670da75a48
---
M wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
1 file changed, 16 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/92/166992/1
diff --git a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
index f8b561b..e5020ec 100644
--- a/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
+++ b/wikipedia/src/main/java/org/wikipedia/page/PageActivity.java
@@ -245,6 +245,13 @@
if (mDrawerToggle.onOptionsItemSelected(item)) {
return true;
}
+switch (item.getItemId()) {
+case android.R.id.home:
+onBackPressed();
+return true;
+default:
+break;
+}
// Handle other action bar items...
return super.onOptionsItemSelected(item);
}
@@ -322,6 +329,12 @@
*/
public void popFragment() {
getSupportFragmentManager().popBackStack();
+// make sure the ActionBar is showing, since we could be currently
scrolled down far enough
+// within a Page fragment that the ActionBar is hidden, and if the
previous fragment was
+// a different type of fragment (e.g. History), the ActionBar would
remain hidden.
+if (!getSupportActionBar().isShowing()) {
+getSupportActionBar().show();
+}
}
public void search(final String searchTerm) {
@@ -338,12 +351,15 @@
SearchArticlesFragment searchFragment =
SearchArticlesFragment.newInstance();
pushFragment(searchFragment);
}
+mDrawerToggle.setDrawerIndicatorEnabled(false);
}
public void closeSearch() {
if (getTopFragment() instanceof SearchArticlesFragment) {
popFragment();
}
+Utils.hideSoftKeyboard(this);
+mDrawerToggle.setDrawerIndicatorEnabled(true);
}
public void searchFullText(final String searchTerm) {
--
To view, visit https://gerrit.wikimedia.org/r/166992
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3aeeb68b57d5624d22a9aa460bd1f7670da75a48
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata, add/fix badges css - change (mediawiki...Wikidata)
jenkins-bot has submitted this change and it was merged.
Change subject: Update Wikidata, add/fix badges css
..
Update Wikidata, add/fix badges css
Change-Id: If8f945456fc43d74cbff58461d6d3b265f731eda
---
M WikibaseClient.settings.php
M WikibaseRepo.settings.php
M composer.lock
M extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
M extensions/WikimediaBadges/resources/skins/cologneblue/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/modern/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/monobook/wikimedia-badges.css
M extensions/WikimediaBadges/resources/skins/vector/wikimedia-badges.css
M vendor/composer/autoload_files.php
M vendor/composer/installed.json
10 files changed, 125 insertions(+), 120 deletions(-)
Approvals:
Aude: Looks good to me, approved
jenkins-bot: Verified
diff --git a/WikibaseClient.settings.php b/WikibaseClient.settings.php
index 4ef960e..0bba608 100644
--- a/WikibaseClient.settings.php
+++ b/WikibaseClient.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412881061;
\ No newline at end of file
+$wgWBClientSettings[sharedCacheKeyPrefix] = wikibase:WBL/1413462629;
\ No newline at end of file
diff --git a/WikibaseRepo.settings.php b/WikibaseRepo.settings.php
index bb05f0f..874330c 100644
--- a/WikibaseRepo.settings.php
+++ b/WikibaseRepo.settings.php
@@ -1,2 +1,2 @@
?php
-$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1412881061;
\ No newline at end of file
+$wgWBRepoSettings[sharedCacheKeyPrefix] = wikibase:WBL/1413462629;
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 33a4f57..e974b9e 100644
--- a/composer.lock
+++ b/composer.lock
@@ -835,12 +835,12 @@
source: {
type: git,
url: https://github.com/wmde/Wikidata.org.git;,
-reference: 381190e89865e9d0fadcc490ca6f7c7dfdaefb04
+reference: 217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wmde/Wikidata.org/zipball/381190e89865e9d0fadcc490ca6f7c7dfdaefb04;,
-reference: 381190e89865e9d0fadcc490ca6f7c7dfdaefb04,
+url:
https://api.github.com/repos/wmde/Wikidata.org/zipball/217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1;,
+reference: 217ed7ece8c02fb1474b6ba0cabb936e3ef6c9f1,
shasum:
},
require: {
@@ -874,7 +874,7 @@
source: https://github.com/wmde/Wikidata.org/tree/master;,
issues: https://github.com/wmde/Wikidata.org/issues;
},
-time: 2014-09-26 07:02:41
+time: 2014-10-06 14:34:12
},
{
name: wikibase/data-model,
@@ -1262,7 +1262,7 @@
issues: https://bugzilla.wikimedia.org/;,
irc: irc://irc.freenode.net/wikidata
},
-time: 2014-10-09 18:34:12
+time: 2014-10-09 18:24:20
},
{
name: wikibase/wikimedia-badges,
@@ -1270,12 +1270,12 @@
source: {
type: git,
url: https://github.com/wmde/WikimediaBadges.git;,
-reference: 0fae9f0c106fedc5550994a5fc825e866944e999
+reference: 119353f0c3bcb39714df26ea74885f60b00df14d
},
dist: {
type: zip,
-url:
https://api.github.com/repos/wmde/WikimediaBadges/zipball/0fae9f0c106fedc5550994a5fc825e866944e999;,
-reference: 0fae9f0c106fedc5550994a5fc825e866944e999,
+url:
https://api.github.com/repos/wmde/WikimediaBadges/zipball/119353f0c3bcb39714df26ea74885f60b00df14d;,
+reference: 119353f0c3bcb39714df26ea74885f60b00df14d,
shasum:
},
require: {
@@ -1312,7 +1312,7 @@
source:
https://github.com/wmde/WikimediaBadges/tree/master;,
issues: https://github.com/wmde/WikimediaBadges/issues;
},
-time: 2014-09-26 02:48:21
+time: 2014-10-16 12:27:50
}
],
packages-dev: [
diff --git
a/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
b/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
index c1a845d..8e825a1 100644
--- a/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
+++ b/extensions/Wikidata.org/resources/themes/default/wikidata-org.badges.css
@@ -11,7 +11,7 @@
* compatibility (browsers able to understand gradient syntax support also
SVG).
* http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
-.wb-badge-featuredarticle {
+.wb-badge.wb-badge-featuredarticle {
background-image: url(../../images/wb-badges-gold.png);
/*
[MediaWiki-commits] [Gerrit] Update Wikidata branch - change (mediawiki...release)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/166995 Change subject: Update Wikidata branch .. Update Wikidata branch only thing new here is some badges css changes Change-Id: I5a4eef64062ba58c5d51b699ab2c0638971a7282 --- M make-wmf-branch/default.conf 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/tools/release refs/changes/95/166995/1 diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf index 67ed410..4e1a30c 100644 --- a/make-wmf-branch/default.conf +++ b/make-wmf-branch/default.conf @@ -175,7 +175,7 @@ 'CentralNotice' = 'wmf_deploy', // to use instead of the above - 'Wikidata' = 'wmf/1.25wmf1', + 'Wikidata' = 'wmf/1.25wmf3', // For wikitech use only! 'SemanticMediaWiki' = '1.8.x', -- To view, visit https://gerrit.wikimedia.org/r/166995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5a4eef64062ba58c5d51b699ab2c0638971a7282 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata branch - change (mediawiki...release)
jenkins-bot has submitted this change and it was merged. Change subject: Update Wikidata branch .. Update Wikidata branch only thing new here is some badges css changes Change-Id: I5a4eef64062ba58c5d51b699ab2c0638971a7282 --- M make-wmf-branch/default.conf 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Reedy: Looks good to me, approved jenkins-bot: Verified diff --git a/make-wmf-branch/default.conf b/make-wmf-branch/default.conf index 67ed410..4e1a30c 100644 --- a/make-wmf-branch/default.conf +++ b/make-wmf-branch/default.conf @@ -175,7 +175,7 @@ 'CentralNotice' = 'wmf_deploy', // to use instead of the above - 'Wikidata' = 'wmf/1.25wmf1', + 'Wikidata' = 'wmf/1.25wmf3', // For wikitech use only! 'SemanticMediaWiki' = '1.8.x', -- To view, visit https://gerrit.wikimedia.org/r/166995 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5a4eef64062ba58c5d51b699ab2c0638971a7282 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/tools/release Gerrit-Branch: master Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata, add/fix badges css - change (mediawiki/core)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/166996 Change subject: Update Wikidata, add/fix badges css .. Update Wikidata, add/fix badges css See If8f9454 for actual changes Change-Id: I7f5bff967991d8bf22cf4a36cd325e758f78744d --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/96/166996/1 diff --git a/extensions/Wikidata b/extensions/Wikidata index 9ba9260..db9dc8b 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit 9ba9260638893ab5c98b12a3985fef9a89955829 +Subproject commit db9dc8b1a03f08f2d97ee483115cde196d4e8c1b -- To view, visit https://gerrit.wikimedia.org/r/166996 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f5bff967991d8bf22cf4a36cd325e758f78744d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf3 Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata, fix/add badges css - change (mediawiki/core)
Aude has uploaded a new change for review. https://gerrit.wikimedia.org/r/166997 Change subject: Update Wikidata, fix/add badges css .. Update Wikidata, fix/add badges css See If8f9454 for actual extension changes. Change-Id: I5689a35d3a5fcc42c6ee838f04e5bc6231376247 --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/97/166997/1 diff --git a/extensions/Wikidata b/extensions/Wikidata index 9ba9260..db9dc8b 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit 9ba9260638893ab5c98b12a3985fef9a89955829 +Subproject commit db9dc8b1a03f08f2d97ee483115cde196d4e8c1b -- To view, visit https://gerrit.wikimedia.org/r/166997 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5689a35d3a5fcc42c6ee838f04e5bc6231376247 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf2 Gerrit-Owner: Aude aude.w...@gmail.com ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] claimview edittoolbar definition: Register all events by def... - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166998
Change subject: claimview edittoolbar definition: Register all events by default
..
claimview edittoolbar definition: Register all events by default
Instead of attaching the destroy and change event handlers dynamically when
triggering edit
mode on the toolbar, the handlers are attached directly when creating the
toolbar.
The events have been missing when a toolbar was created being in edit mode
already (instantly adding
a completely new value).
Change-Id: I83545b508860a3a7791dd34aa06796293dcbcd78
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
1 file changed, 34 insertions(+), 49 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/98/166998/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index 543e10a..5698ab0 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -481,60 +481,45 @@
}
$view.edittoolbar( options );
+ },
+ 'claimviewdestroy statementviewdestroy': function( event,
toolbarController ) {
+ toolbarController.destroyToolbar( $( event.target
).data( 'editoolbar' ) );
+ },
+ 'claimviewchange statementviewchange': function( event ) {
+ var $target = $( event.target ),
+ viewType = event.type.replace( /change$/, '' ),
+ view = $target.data( viewType ),
+ edittoolbar = $target.data( 'edittoolbar' ),
+ btnSave = edittoolbar.getButton( 'save' );
- $view.one( 'edittoolbaredit', function() {
+ /**
+* Claimview's/Statementview's isValid() validates the
qualifiers already.
+* However, the information whether all qualifiers
(grouped by property)
+* have changed, needs to be gathered separately which,
in addition, is done
+* by this function.
+*
+* @param {$.wikibase.claimview} claimview
+* @return {boolean}
+*/
+ function shouldEnableSaveButton( claimview ) {
+ var enable = claimview.isValid()
!claimview.isInitialValue(),
+ snaklistviews = ( claimview._qualifiers
)
+ ? claimview._qualifiers.value()
+ : [],
+ areInitialQualifiers = true;
- toolbarcontroller.registerEventHandler(
- event.data.toolbar.type,
- event.data.toolbar.id,
- viewType + 'destroy',
- function( event, toolbarController ) {
-
toolbarController.destroyToolbar( $( event.target ).data( 'editoolbar' ) );
- }
- );
-
- toolbarcontroller.registerEventHandler(
- event.data.toolbar.type,
- event.data.toolbar.id,
- viewType + 'change',
- function( event ) {
- var $target = $( event.target ),
- view = $target.data(
viewType ),
- edittoolbar =
$target.data( 'edittoolbar' ),
- btnSave =
edittoolbar.getButton( 'save' );
-
- /**
-* Claimview's/Statementview's
isValid() validates the qualifiers already.
-* However, the information
whether all qualifiers (grouped by property)
-* have changed, needs to be
gathered separately which, in addition, is done
-* by this function.
-*
-* @param
{$.wikibase.claimview} claimview
-* @return {boolean}
-
[MediaWiki-commits] [Gerrit] Small code update - change (mediawiki...BlueSpiceExtensions)
Smuggli has uploaded a new change for review.
https://gerrit.wikimedia.org/r/166999
Change subject: Small code update
..
Small code update
Improved code a little
* Updated jquery events listeners
* Some CCs
Change-Id: I4779fe72c6fc93e5ad8cef07da46abac13f7d814
---
M SaferEdit/SaferEdit.class.php
M SaferEdit/resources/bluespice.SaferEdit.editmode.js
2 files changed, 32 insertions(+), 26 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/BlueSpiceExtensions
refs/changes/99/166999/1
diff --git a/SaferEdit/SaferEdit.class.php b/SaferEdit/SaferEdit.class.php
index 62a96fa..26cb10d 100644
--- a/SaferEdit/SaferEdit.class.php
+++ b/SaferEdit/SaferEdit.class.php
@@ -307,18 +307,18 @@
se_text = $sText,
);
$aConditions = array(
- se_user_name = $sUsername,
- se_page_title = $oTitle-getDBkey(),
+ se_user_name = $sUsername,
+ se_page_title = $oTitle-getDBkey(),
se_page_namespace = $oTitle-getNamespace(),
- se_edit_section = $iSection,
+ se_edit_section = $iSection,
);
$aOptions = array( //needed for update reason
'ORDER BY' = 'se_id DESC',
'LIMIT' = 1,
);
- if( $oRow = $db-selectRow($sTable, array( 'se_id' ),
$aConditions, __METHOD__, $aOptions) ) {
- if( empty($sText) ) unset($aFields['se_text']);
+ if ( $oRow = $db-selectRow( $sTable, array( 'se_id' ),
$aConditions, __METHOD__, $aOptions ) ) {
+ if ( empty( $sText ) ) unset( $aFields['se_text'] );
$oTitle-invalidateCache();
return $db-update(
@@ -329,7 +329,7 @@
}
$oTitle-invalidateCache();
- return $db-insert($sTable, $aConditions + $aFields);
+ return $db-insert( $sTable, $aConditions + $aFields );
}
/**
@@ -393,6 +393,7 @@
'',
array( ORDER BY = se_id DESC )
);
+
if ( $oDbw-numRows( $res ) 0 ) {
$row = $oDbw-fetchRow( $res );
@@ -419,11 +420,13 @@
} elseif ( strcmp( $sOrigText,
urldecode($row['se_text'] ) ) == 0 ) {
$aData = array( notexts = 1 );
} else {
+ global $wgParser;
+ $oParserOptions = new ParserOptions();
$str = urldecode( $row['se_text'] );
$aData = array(
time = $oLang-time(
$row['se_timestamp'] ),
date = $oLang-date(
$row['se_timestamp'] ),
- html =
BsCore::getInstance()-parseWikiText( $str,
RequestContext::getMain()-getTitle() ), //breaks on Mainpage
+ html = $wgParser-parse( $str,
RequestContext::getMain()-getTitle(), $oParserOptions )-getText(), //breaks
on Mainpage
wiki = $str,
section = $row['se_edit_section'],
notexts = 0
@@ -530,7 +533,7 @@
if( !in_array($sRef, array('SaferEditIsSomeoneEditing',
'SaferEditSave')) ) return true;
$oTitle = Title::newFromText( $sTitle, $iNamespace );
- if( is_null($oTitle) || !$oTitle-userCan('read') ) return true;
+ if ( is_null($oTitle) || !$oTitle-userCan('read') ) return
true;
global $wgUser;
@@ -543,21 +546,24 @@
$aSingleResult['someoneEditingView'] =
$aSingleResult['safereditView'] = '';
$oArticle = Article::newFromID( $iArticleId );
+ $bUseSE = BsConfig::get( 'MW::SaferEdit::UseSE'
);
+ $sText =
BsPageContentProvider::getInstance()-getContentFromTitle( $oTitle );
foreach ( $aIntermediateEdits as $oEdit ) {
- if ( BsConfig::get(
'MW::SaferEdit::UseSE' ) !== false $oEdit-se_user_name == $wgUser-getName()
-trim($oEdit-se_text) !=
trim( BsPageContentProvider::getInstance()-getContentFromTitle( $oTitle ) ) ) {
+ if ( $bUseSE !== false
$oEdit-se_user_name == $wgUser-getName()
+trim( $oEdit-se_text ) !=
trim( $sText ) ) {
[MediaWiki-commits] [Gerrit] Doc param updates - change (mediawiki...DynamicSidebar)
jenkins-bot has submitted this change and it was merged.
Change subject: Doc param updates
..
Doc param updates
Change-Id: I418f1bf868f815dc3336787aac03ba1c2eeb81b6
---
M DynamicSidebar.body.php
1 file changed, 10 insertions(+), 8 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/DynamicSidebar.body.php b/DynamicSidebar.body.php
index e0084e0..a206dc2 100644
--- a/DynamicSidebar.body.php
+++ b/DynamicSidebar.body.php
@@ -19,8 +19,9 @@
* Called from SkinBuildSidebar hook. Modifies the sidebar
* via callbacks.
*
-* @param $skin Skin
-* @param $sidebar String
+* @param Skin $skin
+* @param array $sidebar
+* @return bool
*/
public static function modifySidebar( $skin, $sidebar ) {
global $wgDynamicSidebarUseGroups,
$wgDynamicSidebarUseUserpages;
@@ -79,7 +80,6 @@
* Grabs the sidebar for the current user
* User:username/Sidebar
*
-* @access private
* @return string
*/
private static function doUserSidebar() {
@@ -101,7 +101,6 @@
/**
* Grabs the sidebar for the current user's groups
*
-* @access private
* @return string
*/
private static function doGroupSidebar() {
@@ -132,6 +131,10 @@
return $text;
}
+ /**
+* @param Title $title
+* @return string
+*/
private static function doPageCategorySidebar( $title ) {
return self::doCategorySidebar( $title-getParentCategories() );
}
@@ -139,7 +142,7 @@
/**
* Grabs the sidebar for the current user's categories
*
-* @access private
+* @param array|null $categories
* @return string
*/
private static function doCategorySidebar( $categories = null ) {
@@ -147,11 +150,11 @@
self::printDebug( User name: {$wgUser-getName()} );
if( $categories === null ) {
- $categories = $wgUser-getUserPage()-getParentCategories();
+ $categories =
$wgUser-getUserPage()-getParentCategories();
}
// Did we find any categories?
- if ( !is_array( $categories) || count( $categories ) == 0 ) {
+ if ( !is_array( $categories ) || count( $categories ) == 0 ) {
// Remove this sidebar if not.
return '';
}
@@ -188,7 +191,6 @@
*
* @param string $debugText
* @param array $debugArr
-* @access private
*/
private static function printDebug( $debugText, $debugArr = null ) {
if ( isset( $debugArr ) ) {
--
To view, visit https://gerrit.wikimedia.org/r/160985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I418f1bf868f815dc3336787aac03ba1c2eeb81b6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/DynamicSidebar
Gerrit-Branch: master
Gerrit-Owner: Reedy re...@wikimedia.org
Gerrit-Reviewer: Addshore addshorew...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Update phpdoc for FeatureIndex - change (mediawiki...Flow)
Addshore has submitted this change and it was merged.
Change subject: Hygiene: Update phpdoc for FeatureIndex
..
Hygiene: Update phpdoc for FeatureIndex
Primarily adds documentation to FeatureIndex and the Index interface
it implements.
Made a minor tweak to the Index::compareRowToOffset method, it should
have always reqiured an array as the first parameter. Also made a
couple @todo notes for things that look like they could be simplified.
Change-Id: Ib94a889be54cccf45def60341e31d013ce510cac
---
M includes/Data/Index.php
M includes/Data/Index/FeatureIndex.php
2 files changed, 162 insertions(+), 43 deletions(-)
Approvals:
Addshore: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Data/Index.php b/includes/Data/Index.php
index 439cb0d..88ef47e 100644
--- a/includes/Data/Index.php
+++ b/includes/Data/Index.php
@@ -57,7 +57,11 @@
function getLimit();
/**
-* @return array|false Sorting order, either 'ASC' or 'DESC'
+* Rows are first sorted based on the first term of the result, then
ties
+* are broken by evaluating the second term and so on.
+*
+* @todo choose a default sort instead of false?
+* @return array|false Sorting order of either 'ASC', 'DESC' or false
*/
function getSort();
@@ -74,9 +78,11 @@
function canAnswer( array $keys, array $options );
/**
-* @param $row
-* @param $offset
-* @return mixed
+* @param array $row
+* @param string $offset
+* @return integer An integer less than, equal to, or greater than zero
+* if $row is considered to be respectively less than, equal to, or
+* greater than $offset
*/
- function compareRowToOffset( $row, $offset );
+ function compareRowToOffset( array $row, $offset );
}
diff --git a/includes/Data/Index/FeatureIndex.php
b/includes/Data/Index/FeatureIndex.php
index 14ab5f0..6596ee3 100644
--- a/includes/Data/Index/FeatureIndex.php
+++ b/includes/Data/Index/FeatureIndex.php
@@ -4,6 +4,7 @@
use Flow\Container;
use Flow\Data\BufferedCache;
+use Flow\Data\Compactor;
use Flow\Data\Compactor\FeatureCompactor;
use Flow\Data\Compactor\ShallowCompactor;
use Flow\Data\Index;
@@ -18,27 +19,83 @@
*/
abstract class FeatureIndex implements Index {
+ /**
+* @var BufferedCache
+*/
protected $cache;
+
+ /**
+* @var ObjectStorage
+*/
protected $storage;
+
+ /**
+* @var string
+*/
protected $prefix;
+
+ /**
+* @var Compactor
+*/
protected $rowCompactor;
+
+ /**
+* @var string[]
+*/
protected $indexed;
+
+ /**
+* @var string[] The indexed columns in alphabetical order. This is
+* ordered so that cache keys can be generated in a stable manner.
+*/
protected $indexedOrdered;
+
+ /**
+* @var array
+*/
protected $options;
- // This exists in the Index interface and as such can't be abstract
- // until php 5.3.9, but some of our test machines are on 5.3.3
+ /**
+* {@inheritDoc}
+*
+* This exists in the Index interface and as such can't be abstract
+* until php 5.3.9, but some of our test machines are on 5.3.3. It
+* is included here to a complete list of unimplemented methods are seen
+* by looking at just this class.
+*/
//abstract public function getLimit();
+
+ /**
+* @return array The options used for querying self::$storage
+*/
abstract public function queryOptions();
+
+ /**
+* @todo this doesn't need to be abstract
+* @param array $values The current contents of a single feature bucket
+* @return array $values trimmed to respect self::getLimit()
+*/
abstract public function limitIndexSize( array $values );
+
+ /**
+* @todo Could the cache key be passed in instead of $indexed?
+* @param array $indexed The portion of $row that makes up the cache key
+* @param array $row A single row of data to add to its related feature
bucket
+*/
abstract protected function addToIndex( array $indexed, array $row );
+
+ /**
+* @todo Similar, Could the cache key be passed in instead of $indexed?
+* @param array $indexed The portion of $row that makes up the cache key
+* @param array $row A single row of data to remove from its related
feature bucket
+*/
abstract protected function removeFromIndex( array $indexed, array $row
);
/**
* @param BufferedCache $cache
* @param ObjectStorage $storage
-* @param string$prefix
-* @param array $indexedColumns List of columns to index,
+
[MediaWiki-commits] [Gerrit] Add lang and dir to category counters and lists - change (mediawiki...ContentTranslation)
Amire80 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/167000
Change subject: Add lang and dir to category counters and lists
..
Add lang and dir to category counters and lists
Change-Id: I7b7586ab9f8f58035fdc16bf308dfa14109c3055
---
M modules/tools/ext.cx.tools.categories.js
1 file changed, 14 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ContentTranslation
refs/changes/00/167000/1
diff --git a/modules/tools/ext.cx.tools.categories.js
b/modules/tools/ext.cx.tools.categories.js
index 226a5cf..25d0e14 100644
--- a/modules/tools/ext.cx.tools.categories.js
+++ b/modules/tools/ext.cx.tools.categories.js
@@ -26,6 +26,13 @@
return false;
}
+ function languageProps( code ) {
+ return {
+ lang: code,
+ dir: $.uls.data.getDir( code )
+ };
+ }
+
/**
* CXCategoryCounter Class
* @class
@@ -68,6 +75,7 @@
var $view, $button, $icon, $count;
$view = $( 'div' )
+ .prop( languageProps( $( 'html' ).prop( 'lang' ) ) )
.addClass( 'cx-category-widget cx-category-counter' );
$button = $( 'button' )
.addClass( 'cx-category-counterbutton mw-ui-button
mw-ui-quiet' );
@@ -230,9 +238,13 @@
categoryTool = this.categoryTool;
- $view = $( 'div' ).addClass( 'cx-category-widget
cx-category-listing' );
+ $view = $( 'div' )
+ .prop( languageProps( $( 'html' ).prop( 'lang' ) ) )
+ .addClass( 'cx-category-widget cx-category-listing' );
$icon = $( 'span' ).addClass( 'cx-category-icon' );
- $categoryList = $( 'ul' ).addClass(
'cx-category-categorylist' );
+ $categoryList = $( 'ul' )
+ .prop( languageProps( this.language ) )
+ .addClass( 'cx-category-categorylist' );
$anchor = $( 'a' );
if ( this.language === mw.cx.sourceLanguage ) {
--
To view, visit https://gerrit.wikimedia.org/r/167000
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7b7586ab9f8f58035fdc16bf308dfa14109c3055
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ContentTranslation
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] zuul: move rubocop jobs to experimental - change (integration/config)
Hashar has submitted this change and it was merged.
Change subject: zuul: move rubocop jobs to experimental
..
zuul: move rubocop jobs to experimental
The rubocop (ruby style checkers) jobs are far from being ready to be
triggered on all patchset proposed.
Move rubocop jobs to the experimental pipeline
Comment them out from the other pipelines
Remove occurences of such jobs in the 'check' pipeline since that is run
for everyone.
Bug: 69245
Change-Id: I32439934bf48c55b74bb728fa9c92346507fc184
---
M zuul/layout.yaml
1 file changed, 24 insertions(+), 17 deletions(-)
Approvals:
Zfilipin: Looks good to me, approved
jenkins-bot: Verified
diff --git a/zuul/layout.yaml b/zuul/layout.yaml
index 17fb959..78481fb 100644
--- a/zuul/layout.yaml
+++ b/zuul/layout.yaml
@@ -1798,14 +1798,16 @@
# Run Ruby linter.
- name: extension-rubylint
check:
- - 'mwext-{name}-bundle-rubocop'
+ #- 'mwext-{name}-bundle-rubocop'
- 'mwext-{name}-ruby1.9.3lint'
test:
- - 'mwext-{name}-bundle-rubocop'
+ #- 'mwext-{name}-bundle-rubocop'
- 'mwext-{name}-ruby1.9.3lint'
gate-and-submit:
- - 'mwext-{name}-bundle-rubocop'
+ #- 'mwext-{name}-bundle-rubocop'
- 'mwext-{name}-ruby1.9.3lint'
+experimental:
+ - 'mwext-{name}-bundle-rubocop'
# Register the Gerrit project name, apply them pipelines that in turn trigger
# a set of jobs.
@@ -1866,7 +1868,6 @@
- mediawiki-core-phpcs-strict-HEAD
- mediawiki-core-jslint
- mediawiki-core-phplint
- - mediawiki-core-bundle-rubocop
- mediawiki-core-ruby1.9.3lint
- php-composer-validate
test:
@@ -1877,7 +1878,7 @@
- mediawiki-core-phplint:
- mediawiki-vendor-integration
- mediawiki-core-qunit
- - mediawiki-core-bundle-rubocop
+ #- mediawiki-core-bundle-rubocop
- mediawiki-core-ruby1.9.3lint
- php-composer-validate
gate-and-submit:
@@ -1890,10 +1891,11 @@
- mediawiki-core-phplint:
- mediawiki-vendor-integration
- mediawiki-core-qunit
- - mediawiki-core-bundle-rubocop
+ #- mediawiki-core-bundle-rubocop
- mediawiki-core-ruby1.9.3lint
- php-composer-validate
experimental:
+ - mediawiki-core-bundle-rubocop
- mediawiki-core-extensions-integration
- mediawiki-language-extension-bundle-integration
postmerge:
@@ -2102,33 +2104,33 @@
- name: mediawiki/ruby/api
check:
- - mediawiki-ruby-api-bundle-rubocop
- mediawiki-ruby-api-ruby1.9.3lint
test:
- - mediawiki-ruby-api-bundle-rubocop
+ #- mediawiki-ruby-api-bundle-rubocop
- mediawiki-ruby-api-ruby1.9.3lint
- mediawiki-ruby-api-gembuild
- mediawiki-ruby-api-bundle-yard
gate-and-submit:
- - mediawiki-ruby-api-bundle-rubocop
+ #- mediawiki-ruby-api-bundle-rubocop
- mediawiki-ruby-api-ruby1.9.3lint
- mediawiki-ruby-api-gembuild
- mediawiki-ruby-api-bundle-yard
postmerge:
- mediawiki-ruby-api-gembuild
- mediawiki-ruby-api-bundle-yard-publish
+experimental:
+ - mediawiki-ruby-api-bundle-rubocop
- name: mediawiki/selenium
check:
- - mediawiki-selenium-bundle-rubocop
- mediawiki-selenium-ruby1.9.3lint
test:
- - mediawiki-selenium-bundle-rubocop
+ #- mediawiki-selenium-bundle-rubocop
- mediawiki-selenium-ruby1.9.3lint
- mediawiki-selenium-gembuild
- mediawiki-selenium-bundle-yard
gate-and-submit:
- - mediawiki-selenium-bundle-rubocop
+ #- mediawiki-selenium-bundle-rubocop
- mediawiki-selenium-ruby1.9.3lint
- mediawiki-selenium-gembuild
- mediawiki-selenium-bundle-yard
@@ -2137,6 +2139,7 @@
- mediawiki-selenium-bundle-yard-publish
experimental:
- mediawiki-selenium-bundle-rspec
+ - mediawiki-selenium-bundle-rubocop
- name: mediawiki/skins/apex
template:
@@ -2898,7 +2901,7 @@
- mwext-ContentTranslation-phpcs-strict-HEAD # Experiment, bug 48420
- mwext-ContentTranslation-jslint
- mwext-ContentTranslation-lint
- - mwext-ContentTranslation-bundle-rubocop
+ #- mwext-ContentTranslation-bundle-rubocop
- mwext-ContentTranslation-ruby1.9.3lint
- mwext-ContentTranslation-yamllint
- mwext-ContentTranslation-qunit
@@ -2907,10 +2910,12 @@
- mwext-ContentTranslation-phpcs-strict-HEAD # Experiment, bug 48420
- mwext-ContentTranslation-jslint
- mwext-ContentTranslation-lint
- - mwext-ContentTranslation-bundle-rubocop
+ #- mwext-ContentTranslation-bundle-rubocop
- mwext-ContentTranslation-ruby1.9.3lint
- mwext-ContentTranslation-yamllint
- mwext-ContentTranslation-qunit
+experimental:
+ - mwext-ContentTranslation-bundle-rubocop
- name: mediawiki/extensions/ContributionScores
template:
@@ -5875,18 +5880,20 @@
- name:
[MediaWiki-commits] [Gerrit] Adjust caching times for svg images - change (mediawiki...Math)
GWicke has submitted this change and it was merged.
Change subject: Adjust caching times for svg images
..
Adjust caching times for svg images
In the first period we set the caching time for server-side
caching to 1 week and the value for client-side caching
to 1 hour.
Change-Id: Ieab63dfe9a00f31d64945180d7b0d98b9fe62b39
---
M SpecialMathShowImage.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
GWicke: Verified; Looks good to me, approved
diff --git a/SpecialMathShowImage.php b/SpecialMathShowImage.php
index 32f2f08..d919e38 100644
--- a/SpecialMathShowImage.php
+++ b/SpecialMathShowImage.php
@@ -32,7 +32,7 @@
$request-response()-header( Content-type:
image/svg+xml; charset=utf-8 );
}
if ( $success !( $this-noRender ) ) {
- $request-response()-header( 'Cache-Control: public
max-age=2419200' ); // 4 weeks
+ $request-response()-header( 'Cache-Control: public,
s-maxage=604800, max-age=3600' ); // 1 week (server) 1 hour (client)
$request-response()-header( 'Vary: User-Agent' );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/166775
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieab63dfe9a00f31d64945180d7b0d98b9fe62b39
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Physikerwelt w...@physikerwelt.de
Gerrit-Reviewer: GWicke gwi...@wikimedia.org
Gerrit-Reviewer: TheDJ hartman.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix notice; missing var - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/167001
Change subject: Fix notice; missing var
..
Fix notice; missing var
Change-Id: I026595c7b0d496b3c1712583dd34b3a06816d6e7
---
M includes/Data/Index/FeatureIndex.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/01/167001/1
diff --git a/includes/Data/Index/FeatureIndex.php
b/includes/Data/Index/FeatureIndex.php
index 6596ee3..d930914 100644
--- a/includes/Data/Index/FeatureIndex.php
+++ b/includes/Data/Index/FeatureIndex.php
@@ -151,7 +151,7 @@
* {@inheritDoc}
*/
public function getOrder() {
- if ( isset( $this-options['order'] ) strtoupper(
$options['order'] ) === 'ASC' ) {
+ if ( isset( $this-options['order'] ) strtoupper(
$this-options['order'] ) === 'ASC' ) {
return 'ASC';
} else {
return 'DESC';
--
To view, visit https://gerrit.wikimedia.org/r/167001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I026595c7b0d496b3c1712583dd34b3a06816d6e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] referencveview edittoolbar definition: Fixed $container leng... - change (mediawiki...Wikibase)
Henning Snater has uploaded a new change for review.
https://gerrit.wikimedia.org/r/167002
Change subject: referencveview edittoolbar definition: Fixed $container length
detection
..
referencveview edittoolbar definition: Fixed $container length detection
Change-Id: Icfcdf2a79585ff65807c816e6ad42076d4e4888f
---
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/02/167002/1
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index 694f003..609d2db 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -497,7 +497,7 @@
},
$container = $referenceview.find(
'.wikibase-toolbar-container' );
- if( $container.length ) {
+ if( !$container.length ) {
$container = $( 'div/' ).appendTo(
$referenceview.find(
'.wb-referenceview-heading' )
);
--
To view, visit https://gerrit.wikimedia.org/r/167002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icfcdf2a79585ff65807c816e6ad42076d4e4888f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix floating of property name - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix floating of property name
..
Fix floating of property name
This has been broken since I changed the DOM structure of claims.
Bug: 72075
Change-Id: I18dbdda3213b795a83b4c4f892dcaf2bfd184a80
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
1 file changed, 3 insertions(+), 4 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
index 7cdae4f..39f5697 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimgrouplabelscroll.js
@@ -210,10 +210,9 @@
function findFirstVisibleMainSnakElement( $searchRange ) {
var result = null;
- // .wb-snak-value-container is better than using
.wb-claim-mainsnak since we don't
- // care about whether the margin/padding around the value is
within viewport or not.
- var $mainSnaks =
- $searchRange.find( '.wb-claim-mainsnak'
).children( '.wb-snak-value-container' );
+ // Caring about the visibility of .wb-snak-value-container is
better than about .wb-statement
+ // or .wb-claim-mainsnak since the label will align with the
.wb-snak-value-container.
+ var $mainSnaks = $searchRange.find( '.wb-claim-mainsnak
.wb-snak-value-container' );
$mainSnaks.each( function( i, mainSnakNode ) {
// Take first Main Snak value in viewport. If value is
not fully visible in viewport,
--
To view, visit https://gerrit.wikimedia.org/r/166971
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18dbdda3213b795a83b4c4f892dcaf2bfd184a80
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Adrian Lang adrian.l...@wikimedia.de
Gerrit-Reviewer: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fingerprint-/sitelinkgroupview: Fixed event handler parameters - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: fingerprint-/sitelinkgroupview: Fixed event handler parameters
..
fingerprint-/sitelinkgroupview: Fixed event handler parameters
Change-Id: I619b3b6d3c609e963e783084b4c173a5e2d0e05a
---
M lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
M lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
index 1994f37..e51fc85 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.fingerprintgroupview.js
@@ -194,7 +194,7 @@
this.$fingerprintlistview.one(
'fingerprintlistviewafterstopediting',
- function( dropValue ) {
+ function( event, dropValue ) {
self._afterStopEditing( dropValue );
}
);
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
index 320fcee..85450b0 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.sitelinkgroupview.js
@@ -242,7 +242,7 @@
this.$sitelinklistview.one(
'sitelinklistviewafterstopediting',
- function( dropValue ) {
+ function( event, dropValue ) {
self._afterStopEditing( dropValue );
}
);
--
To view, visit https://gerrit.wikimedia.org/r/166993
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I619b3b6d3c609e963e783084b4c173a5e2d0e05a
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] claimview edittoolbar definition: Register all events by def... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: claimview edittoolbar definition: Register all events by default
..
claimview edittoolbar definition: Register all events by default
Instead of attaching the destroy and change event handlers dynamically when
triggering edit
mode on the toolbar, the handlers are attached directly when creating the
toolbar.
The events have been missing when a toolbar was created being in edit mode
already (instantly adding
a completely new value).
Change-Id: I83545b508860a3a7791dd34aa06796293dcbcd78
---
M lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
1 file changed, 34 insertions(+), 49 deletions(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
index b05ef8b..18abca2 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.claimlistview.js
@@ -492,60 +492,45 @@
}
$view.edittoolbar( options );
+ },
+ 'claimviewdestroy statementviewdestroy': function( event,
toolbarController ) {
+ toolbarController.destroyToolbar( $( event.target
).data( 'editoolbar' ) );
+ },
+ 'claimviewchange statementviewchange': function( event ) {
+ var $target = $( event.target ),
+ viewType = event.type.replace( /change$/, '' ),
+ view = $target.data( viewType ),
+ edittoolbar = $target.data( 'edittoolbar' ),
+ btnSave = edittoolbar.getButton( 'save' );
- $view.one( 'edittoolbaredit', function() {
+ /**
+* Claimview's/Statementview's isValid() validates the
qualifiers already.
+* However, the information whether all qualifiers
(grouped by property)
+* have changed, needs to be gathered separately which,
in addition, is done
+* by this function.
+*
+* @param {$.wikibase.claimview} claimview
+* @return {boolean}
+*/
+ function shouldEnableSaveButton( claimview ) {
+ var enable = claimview.isValid()
!claimview.isInitialValue(),
+ snaklistviews = ( claimview._qualifiers
)
+ ? claimview._qualifiers.value()
+ : [],
+ areInitialQualifiers = true;
- toolbarcontroller.registerEventHandler(
- event.data.toolbar.type,
- event.data.toolbar.id,
- viewType + 'destroy',
- function( event, toolbarController ) {
-
toolbarController.destroyToolbar( $( event.target ).data( 'editoolbar' ) );
- }
- );
-
- toolbarcontroller.registerEventHandler(
- event.data.toolbar.type,
- event.data.toolbar.id,
- viewType + 'change',
- function( event ) {
- var $target = $( event.target ),
- view = $target.data(
viewType ),
- edittoolbar =
$target.data( 'edittoolbar' ),
- btnSave =
edittoolbar.getButton( 'save' );
-
- /**
-* Claimview's/Statementview's
isValid() validates the qualifiers already.
-* However, the information
whether all qualifiers (grouped by property)
-* have changed, needs to be
gathered separately which, in addition, is done
-* by this function.
-*
-* @param
{$.wikibase.claimview} claimview
-* @return {boolean}
-*/
-
[MediaWiki-commits] [Gerrit] referencveview edittoolbar definition: Fixed $container leng... - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: referencveview edittoolbar definition: Fixed $container length
detection
..
referencveview edittoolbar definition: Fixed $container length detection
Change-Id: Icfcdf2a79585ff65807c816e6ad42076d4e4888f
---
M lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Tobias Gritschacher: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
index 694f003..609d2db 100644
--- a/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
+++ b/lib/resources/jquery.wikibase/jquery.wikibase.statementview.js
@@ -497,7 +497,7 @@
},
$container = $referenceview.find(
'.wikibase-toolbar-container' );
- if( $container.length ) {
+ if( !$container.length ) {
$container = $( 'div/' ).appendTo(
$referenceview.find(
'.wb-referenceview-heading' )
);
--
To view, visit https://gerrit.wikimedia.org/r/167002
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icfcdf2a79585ff65807c816e6ad42076d4e4888f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Henning Snater henning.sna...@wikimedia.de
Gerrit-Reviewer: Tobias Gritschacher tobias.gritschac...@wikimedia.de
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix clipboardData API path on copy - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/167005
Change subject: Fix clipboardData API path on copy
..
Fix clipboardData API path on copy
Newer versions of Chrome return undefined for DataTansfer#setData
however we can still check for the presence of a fully featured
DataTransfer object is to check for the 'items' property.
Unfortunately this isn't robust feature detection so we'll need to
monitor the situation.
Change-Id: I52fbbe7597f4779b07c619a1ce601b9a7f504cc4
---
M src/ce/ve.ce.Surface.js
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/05/167005/1
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 4508c43..ae7488f 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1186,11 +1186,9 @@
clipboardItem = { slice: slice, hash: null };
clipboardIndex = this.clipboard.push( clipboardItem ) - 1;
- // Check we have setData and that it actually works (returns true)
+ // Check we have a W3C clipboardData API
if (
- clipboardData clipboardData.setData
- clipboardData.setData( 'text/xcustom', '' )
- clipboardData.setData( 'text/html', '' )
+ clipboardData clipboardData.items
) {
// Webkit allows us to directly edit the clipboard
// Disable the default event so we can override the data
--
To view, visit https://gerrit.wikimedia.org/r/167005
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I52fbbe7597f4779b07c619a1ce601b9a7f504cc4
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Prevent observeration during copy and paste - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/167003
Change subject: Prevent observeration during copy and paste
..
Prevent observeration during copy and paste
Change-Id: I2b368b0d0ecf487b1559be85447ce36debe1effa
---
M src/ce/ve.ce.Surface.js
M src/ce/ve.ce.SurfaceObserver.js
2 files changed, 25 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/03/167003/1
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 681f0f1..767767e 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -59,6 +59,7 @@
this.lastDropPosition = null;
this.$pasteTarget = this.$( 'div' );
this.pasting = false;
+ this.copying = false;
this.pasteSpecial = false;
this.focusedNode = null;
// This is set on entering changeModel, then unset when leaving.
@@ -1206,6 +1207,8 @@
this.$pasteTarget.prepend(
this.$( 'span' ).attr( 'data-ve-clipboard-key',
this.clipboardId + '-' + clipboardIndex )
);
+
+ this.surfaceObserver.disable();
// If direct clipboard editing is not allowed, we must use the
pasteTarget to
// select the data we want to go in the clipboard
nativeRange = this.getElementDocument().createRange();
@@ -1224,11 +1227,13 @@
setTimeout( function () {
// Change focus back
- view.nativeSelection.removeAllRanges();
view.$documentNode[0].focus();
+ view.nativeSelection.removeAllRanges();
view.nativeSelection.addRange( originalRange );
// Restore scroll position
view.$window.scrollTop( scrollTop );
+ view.surfaceObserver.clear();
+ view.surfaceObserver.enable();
} );
}
};
@@ -1243,10 +1248,13 @@
if ( this.pasting ) {
return false;
}
+ this.surfaceObserver.disable();
this.pasting = true;
this.beforePaste( e );
setTimeout( ve.bind( function () {
this.afterPaste( e );
+ this.surfaceObserver.clear();
+ this.surfaceObserver.enable();
// Allow pasting again
this.pasting = false;
@@ -1282,9 +1290,6 @@
.replace( /!-- *EndFragment *--[\s\S]*$/, ''
);
}
}
-
- // TODO: no pollOnce here: but should we add one?
- this.surfaceObserver.stopTimerLoop();
range = selection.getRange();
// Pasting into a range? Remove first.
diff --git a/src/ce/ve.ce.SurfaceObserver.js b/src/ce/ve.ce.SurfaceObserver.js
index 0f5f904..35a6d1c 100644
--- a/src/ce/ve.ce.SurfaceObserver.js
+++ b/src/ce/ve.ce.SurfaceObserver.js
@@ -22,6 +22,7 @@
this.documentView = surface.getDocument();
this.domDocument =
this.documentView.getDocumentNode().getElementDocument();
this.polling = false;
+ this.disabled = false;
this.timeoutId = null;
this.pollInterval = 250; // ms
@@ -142,6 +143,20 @@
};
/**
+ * Disable the surface observer
+ */
+ve.ce.SurfaceObserver.prototype.disable = function () {
+ this.disabled = true;
+};
+
+/**
+ * Enable the surface observer
+ */
+ve.ce.SurfaceObserver.prototype.enable = function () {
+ this.disabled = false;
+};
+
+/**
* Poll for changes.
*
* TODO: fixing selection in certain cases, handling selection across multiple
nodes in Firefox
@@ -200,7 +215,7 @@
leftSlug = false,
observer = this;
- if ( !this.domDocument || this.surface.pasting ) {
+ if ( !this.domDocument || this.disabled ) {
return;
}
--
To view, visit https://gerrit.wikimedia.org/r/167003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b368b0d0ecf487b1559be85447ce36debe1effa
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Factor out selection of entire pasteTarget - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/167004
Change subject: Factor out selection of entire pasteTarget
..
Factor out selection of entire pasteTarget
Change-Id: I9fe66a8c60aacaa09617ff72fb2bf58a151d0652
---
M src/ce/ve.ce.Surface.js
M src/ve.js
2 files changed, 17 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/04/167004/1
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 767767e..4508c43 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1137,7 +1137,7 @@
return;
}
- var nativeRange, originalRange,
+ var originalRange,
clipboardIndex, clipboardItem, pasteData,
scrollTop, unsafeSelector,
view = this,
@@ -1211,17 +1211,12 @@
this.surfaceObserver.disable();
// If direct clipboard editing is not allowed, we must use the
pasteTarget to
// select the data we want to go in the clipboard
- nativeRange = this.getElementDocument().createRange();
- nativeRange.setStart( this.$pasteTarget[0], 0 );
- nativeRange.setEnd( this.$pasteTarget[0],
this.$pasteTarget[0].childNodes.length );
// Save scroll position before changing focus to offscreen
paste target
scrollTop = this.$window.scrollTop();
originalRange = this.getNativeRange().cloneRange();
- this.nativeSelection.removeAllRanges();
- this.$pasteTarget[0].focus();
- this.nativeSelection.addRange( nativeRange );
+ ve.selectElement( this.$pasteTarget[0] );
// Restore scroll position after changing focus
this.$window.scrollTop( scrollTop );
@@ -1659,12 +1654,8 @@
// a dummy selection of one space in the
pasteTarget.
// onCopy will ignore this native selection and
use the DM selection
this.$pasteTarget.text( ' ' );
- nativeRange =
this.getElementDocument().createRange();
- nativeRange.setStart( this.$pasteTarget[0], 0 );
- nativeRange.setEnd( this.$pasteTarget[0], 1 );
- this.nativeSelection.removeAllRanges();
+ ve.selectElement( this.$pasteTarget[0] );
this.$pasteTarget[0].focus();
- this.nativeSelection.addRange( nativeRange );
// Since the selection is no longer in the
documentNode, clear the SurfaceObserver's
// selection state. Otherwise, if the user
places the selection back into the documentNode
// in exactly the same place where it was
before, the observer won't consider that a change.
diff --git a/src/ve.js b/src/ve.js
index 5661093..0786819 100644
--- a/src/ve.js
+++ b/src/ve.js
@@ -396,6 +396,20 @@
};
/**
+* Select the contents of an element
+*
+* @param {HTMLElement} element Element
+*/
+ ve.selectElement = function ( element ) {
+ var nativeRange = OO.ui.Element.getDocument( element
).createRange(),
+ nativeSelection = OO.ui.Element.getWindow( element
).getSelection();
+ nativeRange.setStart( element, 0 );
+ nativeRange.setEnd( element, element.childNodes.length );
+ nativeSelection.removeAllRanges();
+ nativeSelection.addRange( nativeRange );
+ };
+
+ /**
* Move the selection to the end of an input.
*
* @param {HTMLElement} element Input element
--
To view, visit https://gerrit.wikimedia.org/r/167004
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9fe66a8c60aacaa09617ff72fb2bf58a151d0652
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert Revert Prerender thumbnails at upload time on all w... - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Revert Revert Prerender thumbnails at upload time on all wikis except commons .. Revert Revert Prerender thumbnails at upload time on all wikis except commons This reverts commit b9dc5eae9275e2a8330ab1f32c589779b49ef2a2. Change-Id: I04a211b3ba320b96736c29747f41012140c1427a --- M wmf-config/InitialiseSettings.php 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 9e88cdb..657fc8f 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -14042,6 +14042,24 @@ 'labswiki' = false, ), +// Thumbnail prerendering at upload time +'wgUploadThumbnailRenderMap' = array( + 'default' = array( 320, 640, 800, 1024, 1280, 1920, 2560, 2880 ), + 'commonswiki' = array(), +), + +'wgUploadThumbnailRenderMethod' = array( + 'default' = 'http', +), + +'wgUploadThumbnailRenderHttpCustomHost' = array( + 'default' = 'upload.wikimedia.org', +), + +'wgUploadThumbnailRenderHttpCustomDomain' = array( + 'default' = 'upload.svc.eqiad.wmnet', +), + ); -- To view, visit https://gerrit.wikimedia.org/r/166968 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04a211b3ba320b96736c29747f41012140c1427a Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Gilles gdu...@wikimedia.org Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Clean up Scribunto code in Client - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Clean up Scribunto code in Client
..
Clean up Scribunto code in Client
A bit of refactoring based on PHPStorm's static code analysis. Sure,
there is more to do, especially in the case where Claim(s) needs to
be replaced with Statement(s). A job for an other day.
Change-Id: Icac25536e73021d5a573c6c9429092d2e9b4c970
---
M client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
M client/includes/scribunto/WikibaseLuaBindings.php
M client/includes/scribunto/WikibaseLuaEntityBindings.php
3 files changed, 10 insertions(+), 5 deletions(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
index ddd68ac..a5d035d 100644
--- a/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
+++ b/client/includes/scribunto/Scribunto_LuaWikibaseLibrary.php
@@ -13,10 +13,11 @@
* @licence GNU GPL v2+
* @author Jens Ohlig jens.oh...@wikimedia.de
*/
-
class Scribunto_LuaWikibaseLibrary extends Scribunto_LuaLibraryBase {
- /* @var Wikibase\Client\WikibaseLuaBindings */
+ /**
+* @var WikibaseLuaBindings
+*/
private $wbLibrary;
/**
@@ -110,6 +111,7 @@
*
* @since 0.5
*
+* @return string[]
*/
public function getGlobalSiteId() {
return array( $this-wbLibrary-getGlobalSiteId() );
@@ -122,10 +124,11 @@
*
* @param string $setting
*
-* @return mixed
+* @return array
*/
public function getSetting( $setting ) {
$this-checkType( 'setting', 1, $setting, 'string' );
return array( $this-wbLibrary-getSetting( $setting ) );
}
+
}
diff --git a/client/includes/scribunto/WikibaseLuaBindings.php
b/client/includes/scribunto/WikibaseLuaBindings.php
index 8351ed66..571bf71 100644
--- a/client/includes/scribunto/WikibaseLuaBindings.php
+++ b/client/includes/scribunto/WikibaseLuaBindings.php
@@ -70,6 +70,7 @@
* @param SiteLinkLookup $siteLinkTable
* @param LanguageFallbackChainFactory $fallbackChainFactory
* @param Language $language
+* @param SettingsArray $settings
* @param string[] $languageCodes
* @param string $siteId
*/
@@ -224,4 +225,5 @@
public function getSetting( $setting ) {
return $this-settings-getSetting( $setting );
}
+
}
diff --git a/client/includes/scribunto/WikibaseLuaEntityBindings.php
b/client/includes/scribunto/WikibaseLuaEntityBindings.php
index 743c5cf..381afff 100644
--- a/client/includes/scribunto/WikibaseLuaEntityBindings.php
+++ b/client/includes/scribunto/WikibaseLuaEntityBindings.php
@@ -88,8 +88,8 @@
* Returns such Claims from $entity that have a main Snak for the
property that
* is specified by $propertyLabel.
*
-* @param Entity $entity The Entity from which to get the clams
-* @param PropertyId $propertyId A prefixed property ID.
+* @param Entity $entity
+* @param PropertyId $propertyId
*
* @return Claims
*/
--
To view, visit https://gerrit.wikimedia.org/r/166958
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icac25536e73021d5a573c6c9429092d2e9b4c970
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Wikibase
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE) thiemo.maet...@wikimedia.de
Gerrit-Reviewer: Hoo man h...@online.de
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable wgCopyUploadsFromSpecialUpload on testwiki - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Enable wgCopyUploadsFromSpecialUpload on testwiki .. Enable wgCopyUploadsFromSpecialUpload on testwiki Bug: 71897 Change-Id: I5400d523724499972c5bf5bae9e585015970e4e0 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 3645197..517db81 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10730,6 +10730,7 @@ ), 'wgCopyUploadsFromSpecialUpload' = array( 'default' = false, + 'testwiki' = true, // bug 71897 ), // For Flickr uploads via UploadWizard - 2012-11-20 'wgCopyUploadsDomains' = array( -- To view, visit https://gerrit.wikimedia.org/r/166964 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5400d523724499972c5bf5bae9e585015970e4e0 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Glaisher glaisher.w...@gmail.com Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add commons to wgImportSources for sewikimedia - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add commons to wgImportSources for sewikimedia .. Add commons to wgImportSources for sewikimedia Bug: 72125 Change-Id: I2eb6120a3c3004d02bc8a1929abd6ade8f6fc0f1 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Calak: Looks good to me, but someone else must approve MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 517db81..e123e6c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -8998,7 +8998,7 @@ 'nycwikimedia' = array( 'wikipedia:en', 'meta' ), 'plwikimedia' = array( 'b', 'n', 'q', 's', 'voy', 'w', 'wikt', ), // bug 65908 'ruwikimedia' = array( 'meta', 'foundation', 'wikipedia:ru', ), - 'sewikimedia' = array( 'wikipedia:sv' ), + 'sewikimedia' = array( 'wikipedia:sv', 'commons' ), 'trwikimedia' = array( 'wikipedia:tr', 'meta' ), 'ukwikimedia' = array( 'meta' ), -- To view, visit https://gerrit.wikimedia.org/r/166969 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2eb6120a3c3004d02bc8a1929abd6ade8f6fc0f1 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Glaisher glaisher.w...@gmail.com Gerrit-Reviewer: Calak calakw...@yahoo.com Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata, add/fix badges css - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Wikidata, add/fix badges css .. Update Wikidata, add/fix badges css See If8f9454 for actual changes Change-Id: I7f5bff967991d8bf22cf4a36cd325e758f78744d --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Wikidata b/extensions/Wikidata index 9ba9260..db9dc8b 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit 9ba9260638893ab5c98b12a3985fef9a89955829 +Subproject commit db9dc8b1a03f08f2d97ee483115cde196d4e8c1b -- To view, visit https://gerrit.wikimedia.org/r/166996 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7f5bff967991d8bf22cf4a36cd325e758f78744d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf3 Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Wikidata, fix/add badges css - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update Wikidata, fix/add badges css .. Update Wikidata, fix/add badges css See If8f9454 for actual extension changes. Change-Id: I5689a35d3a5fcc42c6ee838f04e5bc6231376247 --- M extensions/Wikidata 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/Wikidata b/extensions/Wikidata index 9ba9260..db9dc8b 16 --- a/extensions/Wikidata +++ b/extensions/Wikidata -Subproject commit 9ba9260638893ab5c98b12a3985fef9a89955829 +Subproject commit db9dc8b1a03f08f2d97ee483115cde196d4e8c1b -- To view, visit https://gerrit.wikimedia.org/r/166997 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5689a35d3a5fcc42c6ee838f04e5bc6231376247 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.25wmf2 Gerrit-Owner: Aude aude.w...@gmail.com Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Define client CSS classes for new wikidata badges - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Define client CSS classes for new wikidata badges .. Define client CSS classes for new wikidata badges Change-Id: I35990aa0e84aa89beb29d972bd43610e50c9a554 --- M wmf-config/Wikibase.php 1 file changed, 3 insertions(+), 1 deletion(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/wmf-config/Wikibase.php b/wmf-config/Wikibase.php index b3f947c..2a7ae4d 100644 --- a/wmf-config/Wikibase.php +++ b/wmf-config/Wikibase.php @@ -154,7 +154,9 @@ $wgWBClientSettings['badgeClassNames'] = array( 'Q17437796' = 'badge-featuredarticle', - 'Q17437798' = 'badge-goodarticle' + 'Q17437798' = 'badge-goodarticle', + 'Q17559452' = 'badge-recommendedarticle', // bug 70268 + 'Q17506997' = 'badge-featuredlist' // bug 70332 ); $wgHooks['SetupAfterCache'][] = 'wmfWBClientExcludeNS'; -- To view, visit https://gerrit.wikimedia.org/r/166801 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I35990aa0e84aa89beb29d972bd43610e50c9a554 Gerrit-PatchSet: 2 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: Reedy re...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wikidata: Also search in NS_PROPERTY per default - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Wikidata: Also search in NS_PROPERTY per default .. Wikidata: Also search in NS_PROPERTY per default Change-Id: I801f9ec58ae61cf225b0c5b38409dd202c914858 --- M wmf-config/InitialiseSettings.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: MarkTraceur: Looks good to me, approved Lydia Pintscher: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index 6853a4c..ffe89a6 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -6553,6 +6553,7 @@ '+vecwikisource' = array( 100 = 1, 104 = 1 ), '+viwikibooks' = array( 102 = 1, 104 = 1, 106 = 1 ), '+viwikisource' = array( 102 = 1, 106 = 1 ), + '+wikidatawiki' = array( 120 = 1 ), '+zhwikisource' = array( 102 = 1, 106 = 1, 114 = 1 ), // bug 64127 ), # @} end of wgNamespacesToBeSearchedDefault -- To view, visit https://gerrit.wikimedia.org/r/166785 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I801f9ec58ae61cf225b0c5b38409dd202c914858 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Hoo man h...@online.de Gerrit-Reviewer: Aude aude.w...@gmail.com Gerrit-Reviewer: Lydia Pintscher lydia.pintsc...@wikimedia.de Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix Bus register/unregister balance. - change (apps...wikipedia)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix Bus register/unregister balance.
..
Fix Bus register/unregister balance.
Change-Id: Ifbf29ed08d577ebfa34e655bb6ba62017ed46c9a
---
M wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
BearND: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
index 679c6db..ef534a3 100644
--- a/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/search/SearchArticlesFragment.java
@@ -131,7 +131,6 @@
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
app = WikipediaApp.getInstance();
-app.getBus().register(this);
setHasOptionsMenu(true);
searchTerm = getArguments().getString(KEY_SEARCH_TERM);
}
@@ -139,6 +138,7 @@
@Override
public View onCreateView(final LayoutInflater inflater, ViewGroup
container, Bundle savedInstanceState) {
app = (WikipediaApp)getActivity().getApplicationContext();
+app.getBus().register(this);
LinearLayout parentLayout = (LinearLayout)
inflater.inflate(R.layout.fragment_search, container, false);
if (savedInstanceState != null) {
@@ -201,8 +201,8 @@
}
@Override
-public void onStop() {
-super.onStop();
+public void onDestroyView() {
+super.onDestroyView();
app.getBus().unregister(this);
}
--
To view, visit https://gerrit.wikimedia.org/r/166985
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbf29ed08d577ebfa34e655bb6ba62017ed46c9a
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Dbrant dbr...@wikimedia.org
Gerrit-Reviewer: BearND bsitzm...@wikimedia.org
Gerrit-Reviewer: Brion VIBBER br...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Catch MissingResourceException because of [Developer] Accent... - change (apps...wikipedia)
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/167006
Change subject: Catch MissingResourceException because of [Developer] Accented
English locale in Nearby
..
Catch MissingResourceException because of [Developer] Accented English locale
in Nearby
Can't get this language on my device, but should be safe to ignore...
Change-Id: I30076659409aeb44a72718cf08614bbe3c40ca35
OTRS: 7881035
---
M wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
1 file changed, 8 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/06/167006/1
diff --git a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
index e79575b..7dd3043 100644
--- a/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
+++ b/wikipedia/src/main/java/org/wikipedia/nearby/NearbyFragment.java
@@ -51,6 +51,7 @@
import java.util.Date;
import java.util.List;
import java.util.Locale;
+import java.util.MissingResourceException;
/**
* Displays a list of nearby pages.
@@ -216,8 +217,13 @@
setImperialUnits(prefs.getBoolean(PREF_KEY_UNITS, false));
} else {
//if our locale is set to US, then use imperial units by default.
-if
(Locale.getDefault().getISO3Country().equalsIgnoreCase(Locale.US.getISO3Country()))
{
-setImperialUnits(true);
+try {
+if
(Locale.getDefault().getISO3Country().equalsIgnoreCase(Locale.US.getISO3Country()))
{
+setImperialUnits(true);
+}
+} catch ( MissingResourceException e ) {
+// getISO3Country can throw MissingResourceException: No
3-letter country code for locale: zz_ZZ
+// Just ignore it.
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/167006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I30076659409aeb44a72718cf08614bbe3c40ca35
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Alex Monk kren...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: avoid having mysqld running on trusty. - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/167007
Change subject: mediawiki: avoid having mysqld running on trusty.
..
mediawiki: avoid having mysqld running on trusty.
Change-Id: I7f6b2d4a41dd4dad0ce27558734fe419f2b1ea30
Signed-off-by: Giuseppe Lavagetto glavage...@wikimedia.org
---
M modules/mediawiki/manifests/packages.pp
1 file changed, 11 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/07/167007/1
diff --git a/modules/mediawiki/manifests/packages.pp
b/modules/mediawiki/manifests/packages.pp
index c707a3c..220123d 100644
--- a/modules/mediawiki/manifests/packages.pp
+++ b/modules/mediawiki/manifests/packages.pp
@@ -47,6 +47,17 @@
ensure = present,
}
+# on trusty, mediawiki-math-texvc brings mysql with it!
+if ubuntu_version('= trusty') {
+package { [
+'mysql-server',
+'mysql-server-5.5',
+]:
+ensure = absent,
+}
+}
+
+
# PDF and DjVu
package { [
'djvulibre-bin',
--
To view, visit https://gerrit.wikimedia.org/r/167007
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7f6b2d4a41dd4dad0ce27558734fe419f2b1ea30
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix notice; missing var - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix notice; missing var
..
Fix notice; missing var
Change-Id: I026595c7b0d496b3c1712583dd34b3a06816d6e7
---
M includes/Data/Index/FeatureIndex.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
EBernhardson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Data/Index/FeatureIndex.php
b/includes/Data/Index/FeatureIndex.php
index 6596ee3..d930914 100644
--- a/includes/Data/Index/FeatureIndex.php
+++ b/includes/Data/Index/FeatureIndex.php
@@ -151,7 +151,7 @@
* {@inheritDoc}
*/
public function getOrder() {
- if ( isset( $this-options['order'] ) strtoupper(
$options['order'] ) === 'ASC' ) {
+ if ( isset( $this-options['order'] ) strtoupper(
$this-options['order'] ) === 'ASC' ) {
return 'ASC';
} else {
return 'DESC';
--
To view, visit https://gerrit.wikimedia.org/r/167001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I026595c7b0d496b3c1712583dd34b3a06816d6e7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
