[MediaWiki-commits] [Gerrit] MWTidy: use "procedural style" of tidy extension - change (mediawiki/core)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175195
Change subject: MWTidy: use "procedural style" of tidy extension
..
MWTidy: use "procedural style" of tidy extension
The tidy PHP extension ships with two functionally-equivalent APIs:
object-oriented and procedural. Tim Starling got the extension to compile
for HHVM, but only the procedural API works. So use that one instead, since
it ought to work with either runtime.
Change-Id: I49711424950fc3f542a54d8361f57a37ee3b45d7
---
M includes/parser/MWTidy.php
1 file changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/95/175195/1
diff --git a/includes/parser/MWTidy.php b/includes/parser/MWTidy.php
index b310862..828bec4 100644
--- a/includes/parser/MWTidy.php
+++ b/includes/parser/MWTidy.php
@@ -260,18 +260,17 @@
return null;
}
- $tidy = new tidy;
- $tidy->parseString( $text, $wgTidyConf, 'utf8' );
+ $tidy = tidy_parse_string( $text, $wgTidyConf, 'utf8' );
if ( $stderr ) {
- $retval = $tidy->getStatus();
+ $retval = tidy_get_status( $tidy );
wfProfileOut( __METHOD__ );
- return $tidy->errorBuffer;
+ return tidy_get_error_buffer( $tidy );
}
- $tidy->cleanRepair();
- $retval = $tidy->getStatus();
+ tidy_clean_repair( $tidy );
+ $retval = tidy_get_status( $tidy );
if ( $retval == 2 ) {
// 2 is magic number for fatal error
//
http://www.php.net/manual/en/function.tidy-get-status.php
@@ -280,7 +279,7 @@
$cleansource = tidy_get_output( $tidy );
if ( $wgDebugTidy && $retval > 0 ) {
$cleansource .= "', '-->',
$tidy->errorBuffer ) .
+ str_replace( '-->', '-->',
tidy_get_error_buffer( $tidy ) ) .
"\n-->";
}
}
--
To view, visit https://gerrit.wikimedia.org/r/175195
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I49711424950fc3f542a54d8361f57a37ee3b45d7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add .gitreview - change (mediawiki...tidy)
Ori.livneh has submitted this change and it was merged. Change subject: Add .gitreview .. Add .gitreview Change-Id: Idc4a6178211564b1caa048c88f7e76408eced2a0 --- A .gitreview 1 file changed, 6 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Verified; Looks good to me, approved diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..b0e275f --- /dev/null +++ b/.gitreview @@ -0,0 +1,6 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=mediawiki/php/tidy.git +defaultbranch=master +defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/175193 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Idc4a6178211564b1caa048c88f7e76408eced2a0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/php/tidy Gerrit-Branch: master Gerrit-Owner: Ori.livneh Gerrit-Reviewer: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Debian packaging. - change (mediawiki...tidy)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175194
Change subject: Add Debian packaging.
..
Add Debian packaging.
Change-Id: I27dcce8f49074e504b2ae323bf9458fc0996a94a
---
A debian/changelog
A debian/compat
A debian/control
A debian/copyright
A debian/docs
A debian/hhvm-tidy.substvars
A debian/rules
A debian/source/format
8 files changed, 158 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/tidy
refs/changes/94/175194/1
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 000..94c1a68
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+hhvm-tidy (0.1-1) trusty-wikimedia; urgency=medium
+
+ * Initial release.
+
+ -- Ori Livneh Sat, 22 Nov 2014 03:38:29 +
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..a35907a
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,13 @@
+Source: hhvm-tidy
+Section: web
+Priority: optional
+Maintainer: Ori Livneh
+Build-Depends: debhelper (>= 9), hhvm-dev, cmake, libtidy-dev
+Standards-Version: 3.9.5
+
+Package: hhvm-tidy
+Architecture: any
+Depends: ${hhvm:ApiVersion}, libtidy-0.99-0
+Description: tidy module for HHVM
+ This is a HHVM extension based on Libtidy (http://tidy.sf.net). It allows
+ a PHP developer to clean, repair, and traverse HTML, XHTML and XML documents.
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 000..21d5176
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,98 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: hhvm-tidy
+Source: https://github.com/wikimedia/mediawiki-php-tidy
+
+
+Files: *
+Copyright: 1999 - 2014 The PHP Group
+ 2014 Tim Starling
+License: PHP
+
+ The PHP License, version 3.01
+ Copyright (c) 1999 - 2010 The PHP Group. All rights reserved.
+
+ .
+ Redistribution and use in source and binary forms, with or without
+ modification, is permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+ .
+ 3. The name "PHP" must not be used to endorse or promote products
+ derived from this software without prior written permission. For
+ written permission, please contact gr...@php.net.
+ .
+ 4. Products derived from this software may not be called "PHP", nor
+ may "PHP" appear in their name, without prior written permission
+ from gr...@php.net. You may indicate that your software works in
+ conjunction with PHP by saying "Foo for PHP" instead of calling
+ it "PHP Foo" or "phpfoo"
+ .
+ 5. The PHP Group may publish revised and/or new versions of the
+ license from time to time. Each version will be given a
+ distinguishing version number.
+ Once covered code has been published under a particular version
+ of the license, you may always continue to use it under the terms
+ of that version. You may also choose to use such covered code
+ under the terms of any subsequent version of the license
+ published by the PHP Group. No one other than the PHP Group has
+ the right to modify the terms applicable to covered code created
+ under this License.
+ .
+ 6. Redistributions of any form whatsoever must retain the following
+ acknowledgment:
+ "This product includes PHP software, freely available from
+
[MediaWiki-commits] [Gerrit] Add .gitreview - change (mediawiki...tidy)
Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/175193 Change subject: Add .gitreview .. Add .gitreview Change-Id: Idc4a6178211564b1caa048c88f7e76408eced2a0 --- A .gitreview 1 file changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/php/tidy refs/changes/93/175193/1 diff --git a/.gitreview b/.gitreview new file mode 100644 index 000..b0e275f --- /dev/null +++ b/.gitreview @@ -0,0 +1,6 @@ +[gerrit] +host=gerrit.wikimedia.org +port=29418 +project=mediawiki/php/tidy.git +defaultbranch=master +defaultrebase=0 -- To view, visit https://gerrit.wikimedia.org/r/175193 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Idc4a6178211564b1caa048c88f7e76408eced2a0 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/php/tidy Gerrit-Branch: master Gerrit-Owner: Ori.livneh ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use the right DB in getOriginalEmail() instead of the sharedDb - change (mediawiki...BounceHandler)
jenkins-bot has submitted this change and it was merged.
Change subject: Use the right DB in getOriginalEmail() instead of the sharedDb
..
Use the right DB in getOriginalEmail() instead of the sharedDb
Change-Id: I344cb6f115824d9c8f4da4b8ac9b6ae9e8aae5a4
---
M includes/ProcessBounceEmails.php
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Hoo man: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ProcessBounceEmails.php b/includes/ProcessBounceEmails.php
index d52ed91..16f7757 100644
--- a/includes/ProcessBounceEmails.php
+++ b/includes/ProcessBounceEmails.php
@@ -121,7 +121,8 @@
// the required database.
$wikiId = $failedUser['wikiId'];
$rawUserId = $failedUser['rawUserId'];
- $dbr = self::getBounceRecordDB( DB_SLAVE, $wikiId );
+ $lb = wfGetLB( $wikiId );
+ $dbr = $lb->getConnection( DB_SLAVE, array(), $wikiId );
$res = $dbr->selectRow(
'user',
@@ -131,6 +132,7 @@
),
__METHOD__
);
+ wfGetLB( $wikiId )->reuseConnection( $dbr );
if( $res !== false ) {
$rawEmail = $res->user_email;
return $rawEmail;
--
To view, visit https://gerrit.wikimedia.org/r/175003
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I344cb6f115824d9c8f4da4b8ac9b6ae9e8aae5a4
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/BounceHandler
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: 01tonythomas <01tonytho...@gmail.com>
Gerrit-Reviewer: Chad
Gerrit-Reviewer: Hoo man
Gerrit-Reviewer: Jgreen
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Reedy
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 autocomplete to Recentchangeslinked - change (mediawiki/core)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175192
Change subject: Add autocomplete to Recentchangeslinked
..
Add autocomplete to Recentchangeslinked
* Adds autocomplete to the target input box
* Adds search autocomplete
Change-Id: I9e7461e2947153f45f85616c72a299d9d518c81c
---
M includes/specials/SpecialRecentchangeslinked.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/92/175192/1
diff --git a/includes/specials/SpecialRecentchangeslinked.php
b/includes/specials/SpecialRecentchangeslinked.php
index 3ad9f0f..75a4191 100644
--- a/includes/specials/SpecialRecentchangeslinked.php
+++ b/includes/specials/SpecialRecentchangeslinked.php
@@ -240,7 +240,7 @@
$opts->consumeValues( array( 'showlinkedto', 'target' ) );
$extraOpts['target'] = array( $this->msg(
'recentchangeslinked-page' )->escaped(),
- Xml::input( 'target', 40, str_replace( '_', ' ',
$opts['target'] ) ) .
+ Xml::input( 'target', 40, str_replace( '_', ' ',
$opts['target'] ), array( 'class' => 'mw-searchInput' ) ) .
Xml::check( 'showlinkedto', $opts['showlinkedto'],
array( 'id' => 'showlinkedto' ) ) . ' ' .
Xml::label( $this->msg( 'recentchangeslinked-to'
)->text(), 'showlinkedto' ) );
@@ -262,4 +262,8 @@
return $this->rclTargetTitle;
}
+
+ public function prefixSearchSubpages( $search, $limit = 10 ) {
+ return PrefixSearch::titleSearch( $search, $limit );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/175192
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9e7461e2947153f45f85616c72a299d9d518c81c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader
Gerrit-Reviewer: Gerrit Patch Uploader
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Blacklist all VisualEditor contentEditables, not just the ma... - change (mediawiki...UniversalLanguageSelector)
jenkins-bot has submitted this change and it was merged. Change subject: Blacklist all VisualEditor contentEditables, not just the main one .. Blacklist all VisualEditor contentEditables, not just the main one With the introduction of table editing support, ULS is now activating on table cells, which have contentEditable=true, but do not have the ve-ce-documentNode class. So instead, expand the blacklist to include all descendants of .ve-ce-surface. Bug: 72824 Change-Id: I974d7ab2726bbe15606f43d7713627eed623435e --- M UniversalLanguageSelector.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Santhosh: Looks good to me, approved Jforrester: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php index 47e6b03..4d57274 100644 --- a/UniversalLanguageSelector.php +++ b/UniversalLanguageSelector.php @@ -154,7 +154,7 @@ * * @since 2013.07 */ -$GLOBALS['wgULSNoImeSelectors'] = array( '#wpCaptchaWord', '.ve-ce-documentNode' ); +$GLOBALS['wgULSNoImeSelectors'] = array( '#wpCaptchaWord', '.ve-ce-surface *' ); /** * Array of jQuery selectors of elements on which webfonts must not be applied. -- To view, visit https://gerrit.wikimedia.org/r/175190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I974d7ab2726bbe15606f43d7713627eed623435e Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Jforrester Gerrit-Reviewer: Santhosh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] README.md: Update introduction, badges, advice - change (oojs/ui)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175191
Change subject: README.md: Update introduction, badges, advice
..
README.md: Update introduction, badges, advice
Change-Id: I9b9053069e1b9e68eb964e18ed024d7687bfe7ce
---
M README.md
1 file changed, 20 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/91/175191/1
diff --git a/README.md b/README.md
index fff4cbd..6a75daf 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,21 @@
-[](https://badge.fury.io/js/oojs-ui)
[](https://david-dm.org/wikimedia/oojs-ui#info=devDependencies)
+[](https://badge.fury.io/js/oojs-ui)
[](https://david-dm.org/wikimedia/oojs-ui#info=devDependencies)
+OOjs UI
=
+
+OOjs UI is a modern JavaScript UI toolkit for browsers. It provides a library
of common widgets, layouts and windows that are ready to use, as well as many
foundational classes for constructing custom user interfaces. The library was
originally created for use by
[VisualEditor](https://www.mediawiki.org/wiki/VisualEditor), which uses it for
its entire user interface, and is now completely independent, and more useful
and convenient for other use cases.
Quick start
--
+
+Quick start
+--
+
+This library is available as an [npm](https://npmjs.org/) package! Install it
right away:
+
+npm install oojs-ui
+
+
+If you don't want to use npm, you can:
1. Clone the repo, `git clone https://git.wikimedia.org/git/oojs/ui.git`.
@@ -11,6 +24,7 @@
1. Install dev dependencies and build the distribution files:`$ npm
install`
1. You can now copy the distribution files from the dist directory into your
project.
+
Versioning
--
@@ -23,16 +37,17 @@
For more information on SemVer, please visit http://semver.org/.
+
Bug tracker
---
Found a bug? Please report it in the [issue
tracker](https://bugzilla.wikimedia.org/enter_bug.cgi?product=OOjs+UI)!
+
Release
--
Release process:
-
$ cd path/to/oojs-ui/
$ git remote update
@@ -47,9 +62,11 @@
# Update release notes
# Copy the resulting list into a new section on History.md
-$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e
'console.log(JSON.parse(require("fs").readFileSync("package.json")).version);')...HEAD
+$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e
'console.log(require("./package.json").version);')...HEAD
$ edit History.md
+node -e 'console.log(require(package.json).version);'
+
# Update the version number
$ edit package.json
--
To view, visit https://gerrit.wikimedia.org/r/175191
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b9053069e1b9e68eb964e18ed024d7687bfe7ce
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Blacklist all VisualEditor contentEditables, not just the ma... - change (mediawiki...UniversalLanguageSelector)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/175190 Change subject: Blacklist all VisualEditor contentEditables, not just the main one .. Blacklist all VisualEditor contentEditables, not just the main one With the introduction of table editing support, ULS is now activating on table cells, which have contentEditable=true, but do not have the ve-ce-documentNode class. So instead, expand the blacklist to include all descendants of .ve-ce-surface. Change-Id: I974d7ab2726bbe15606f43d7713627eed623435e --- M UniversalLanguageSelector.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/UniversalLanguageSelector refs/changes/90/175190/1 diff --git a/UniversalLanguageSelector.php b/UniversalLanguageSelector.php index 47e6b03..4d57274 100644 --- a/UniversalLanguageSelector.php +++ b/UniversalLanguageSelector.php @@ -154,7 +154,7 @@ * * @since 2013.07 */ -$GLOBALS['wgULSNoImeSelectors'] = array( '#wpCaptchaWord', '.ve-ce-documentNode' ); +$GLOBALS['wgULSNoImeSelectors'] = array( '#wpCaptchaWord', '.ve-ce-surface *' ); /** * Array of jQuery selectors of elements on which webfonts must not be applied. -- To view, visit https://gerrit.wikimedia.org/r/175190 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I974d7ab2726bbe15606f43d7713627eed623435e Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/UniversalLanguageSelector Gerrit-Branch: master Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Close panel on canvas click + fullscreen mouseleave - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175189
Change subject: [WIP] Close panel on canvas click + fullscreen mouseleave
..
[WIP] Close panel on canvas click + fullscreen mouseleave
Also remove the unused mmv-image-click event.
Change-Id: If538ac420da4aae3908ac96978491f89c5b53493
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/983
---
M resources/mmv/mmv.lightboxinterface.js
M resources/mmv/ui/mmv.ui.canvas.js
M resources/mmv/ui/mmv.ui.canvas.less
3 files changed, 26 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/89/175189/1
diff --git a/resources/mmv/mmv.lightboxinterface.js
b/resources/mmv/mmv.lightboxinterface.js
index 92aa5cc..0adc144 100644
--- a/resources/mmv/mmv.lightboxinterface.js
+++ b/resources/mmv/mmv.lightboxinterface.js
@@ -202,6 +202,16 @@
this.canvas.attach();
+ // cross-communication between panel and canvas, sort of
+ this.$postDiv.on( 'mmv-metadata-open.lip', function () {
+ ui.$main.addClass( 'metadata-panel-is-open' );
+ } ).on( 'mmv-metadata-close.lip', function () {
+ ui.$main.removeClass( 'metadata-panel-is-open' );
+ } );
+ this.$wrapper.on( 'mmv-panel-close-area-click.lip', function ()
{
+ ui.panel.scroller.toggle( 'down' );
+ } );
+
// Buttons fading might not had been reset properly after a
hard fullscreen exit
// This needs to happen after the parent attach() because the
buttons need to be attached
// to the DOM for $.fn.stop() to work
@@ -235,6 +245,9 @@
this.buttons.unattach();
+ this.$postDiv.off( '.lip' );
+ this.$wrapper.off( 'mmv-panel-close-area-click.lip' );
+
this.fileReuse.unattach();
this.fileReuse.closeDialog();
diff --git a/resources/mmv/ui/mmv.ui.canvas.js
b/resources/mmv/ui/mmv.ui.canvas.js
index 75e4f2d..1a45ee1 100644
--- a/resources/mmv/ui/mmv.ui.canvas.js
+++ b/resources/mmv/ui/mmv.ui.canvas.js
@@ -200,7 +200,13 @@
this.handleEvent( 'mmv-options-closed', $.proxy(
this.handleDialogEvent, this ) );
this.$image.on( 'click.mmv-canvas', function ( e ) {
- if ( !canvas.dialogOpen ) {
+ // ignore clicks if the metadata panel or one of the
dialogs is open - assume the intent is to
+ // close it in this case; that will be handled elsewhere
+ if (
+ !canvas.dialogOpen
+ // FIXME a UI component should not know about
its parents
+ && canvas.$container.closest(
'.metadata-panel-is-open').length === 0
+ ) {
e.stopPropagation(); // don't let $imageWrapper
handle this
mw.mmv.actionLogger.log( 'view-original-file'
).always( function() {
$( document ).trigger( 'mmv-viewfile' );
@@ -219,8 +225,10 @@
canvas.$mainWrapper.trigger( $.Event( 'mmv-resize-end'
) );
} ) );
- this.$imageDiv.on( 'click.mmv-canvas', 'img', function () {
- canvas.$mainWrapper.trigger( $.Event( 'mmv-image-click'
) );
+ this.$imageWrapper.on( 'click.mmv-canvas', function () {
+ if ( canvas.$container.closest(
'.metadata-panel-is-open').length > 0 ) {
+ canvas.$mainWrapper.trigger(
'mmv-panel-close-area-click' );
+ }
} );
};
@@ -232,7 +240,7 @@
$( window ).off( 'resize.mmv-canvas' );
- this.$imageDiv.off( 'click.mmv-canvas' );
+ this.$imageWrapper.off( 'click.mmv-canvas' );
};
/**
diff --git a/resources/mmv/ui/mmv.ui.canvas.less
b/resources/mmv/ui/mmv.ui.canvas.less
index ac20bc0..01ce953 100644
--- a/resources/mmv/ui/mmv.ui.canvas.less
+++ b/resources/mmv/ui/mmv.ui.canvas.less
@@ -49,7 +49,7 @@
cursor: pointer;
cursor: zoom-in;
- &.mw-mmv-dialog-is-open {
+ &.mw-mmv-dialog-is-open, .metadata-panel-is-open & {
cursor: default;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/175189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If538ac420da4aae3908ac96978491f89c5b53493
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza
___
MediaWiki-commits mailing list
Me
[MediaWiki-commits] [Gerrit] Follow-up I19da270a: Make overlay appear above non-VE skin i... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Follow-up I19da270a: Make overlay appear above non-VE skin
items in Monobook
..
Follow-up I19da270a: Make overlay appear above non-VE skin items in Monobook
In I19da270a we bumped the z-index for the overlay from 4 down to 2, to avoid
clashing with the toolbar. However, the site logo, search box and personal
tools all have a z-index of 3, so 4 is required. Instead, bump the toolbar's
z-index up by 1 to 5.
Change-Id: I7e1edcf05cde054c7bcb8c13b5633930fb5ed3b5
---
M modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
index 0a30863..7a2d7ef 100644
--- a/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
+++ b/modules/ve-mw/init/styles/ve.init.mw.ViewPageTarget-monobook.css
@@ -7,6 +7,8 @@
.ve-init-mw-viewPageTarget-toolbar {
margin: -0.6em -0.8em 1em -0.8em;
+ /* So that the toolbar always appears over the overlay */
+ z-index: 5;
}
/* Correct for Monobook's small font in toolbars and contexts, but beware:
@@ -21,6 +23,7 @@
}
.ve-ui-overlay {
- z-index: 2;
+ /* So that the overlay always appears over the site logo, search box
and personal tools */
+ z-index: 4;
font-size: 127%;
}
--
To view, visit https://gerrit.wikimedia.org/r/175111
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e1edcf05cde054c7bcb8c13b5633930fb5ed3b5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e2d4f5b..268a852 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: e2d4f5b..268a852 .. Syncronize VisualEditor: e2d4f5b..268a852 Change-Id: I9b48dcc6067545f8dc3162c108fbf9fdcc83 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index e2d4f5b..268a852 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit e2d4f5b5333821b6aa073347dd8fb8b4b3db73ae +Subproject commit 268a85245504a4ac7d06fe26df07b50d973faa45 -- To view, visit https://gerrit.wikimedia.org/r/175188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I9b48dcc6067545f8dc3162c108fbf9fdcc83 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: e2d4f5b..268a852 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/175188 Change subject: Syncronize VisualEditor: e2d4f5b..268a852 .. Syncronize VisualEditor: e2d4f5b..268a852 Change-Id: I9b48dcc6067545f8dc3162c108fbf9fdcc83 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/88/175188/1 diff --git a/VisualEditor b/VisualEditor index e2d4f5b..268a852 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit e2d4f5b5333821b6aa073347dd8fb8b4b3db73ae +Subproject commit 268a85245504a4ac7d06fe26df07b50d973faa45 -- To view, visit https://gerrit.wikimedia.org/r/175188 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9b48dcc6067545f8dc3162c108fbf9fdcc83 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix rubocop style complaints - change (mediawiki...Flow)
Spage has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175187
Change subject: Fix rubocop style complaints
..
Fix rubocop style complaints
Rubocop wants no space inside parenthese, while spaces within braces.
Change-Id: I8783fc6c8ced20b43e23e007feb73b677e7c3de3
---
M tests/browser/features/step_definitions/flow_no_javascript_steps.rb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/87/175187/1
diff --git
a/tests/browser/features/step_definitions/flow_no_javascript_steps.rb
b/tests/browser/features/step_definitions/flow_no_javascript_steps.rb
index cb1d083..765c458 100644
--- a/tests/browser/features/step_definitions/flow_no_javascript_steps.rb
+++ b/tests/browser/features/step_definitions/flow_no_javascript_steps.rb
@@ -3,13 +3,13 @@
# Therefore it should run without any "when_present" clauses
# If you need a "when_present" to make the test run, that is a bug
-Given(/^I am on a Flow page without JavaScript$/ ) do
+Given(/^I am on a Flow page without JavaScript$/) do
visit(FlowPage)
end
Given(/^I am using user agent "(.+)"$/) do |user_agent|
@user_agent = user_agent
- @browser = browser(test_name(@scenario), {user_agent: user_agent})
+ @browser = browser(test_name(@scenario), { user_agent: user_agent })
$session_id = @browser.driver.instance_variable_get(:@bridge).session_id
end
--
To view, visit https://gerrit.wikimedia.org/r/175187
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8783fc6c8ced20b43e23e007feb73b677e7c3de3
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Spage
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make the private modules of TMH pass jshint - change (mediawiki...TimedMediaHandler)
jenkins-bot has submitted this change and it was merged.
Change subject: Make the private modules of TMH pass jshint
..
Make the private modules of TMH pass jshint
Change-Id: I41cf1bf6a1a2406d2d4731492747bb9a6b8d9803
---
A .jshintignore
A .jshintrc
M resources/ext.tmh.transcodetable.js
M resources/mw.MediaWikiPlayerSupport.js
M resources/mw.PopUpThumbVideo.js
M resources/mw.TMHGalleryHook.js
6 files changed, 160 insertions(+), 115 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/.jshintignore b/.jshintignore
new file mode 100644
index 000..0f77f29
--- /dev/null
+++ b/.jshintignore
@@ -0,0 +1 @@
+MwEmbedModules
diff --git a/.jshintrc b/.jshintrc
new file mode 100644
index 000..ef9af3d
--- /dev/null
+++ b/.jshintrc
@@ -0,0 +1,39 @@
+{
+ /* Common */
+
+ // Enforcing
+ "camelcase": true,
+ "curly": true,
+ "eqeqeq": true,
+ "immed": true,
+ "latedef": true,
+ "newcap": true,
+ "noarg": true,
+ "noempty": true,
+ "nonew": true,
+ "quotmark": "single",
+ "trailing": true,
+ "undef": true,
+ "unused": true,
+ // Legacy
+ "onevar": true,
+
+ /* Local */
+
+ // Enforcing
+ "bitwise": true,
+ "es3": true,
+ // Relaxing
+ "laxbreak": true,
+ "smarttabs": true,
+ "multistr": true,
+ // Environment
+ "browser": true,
+ // Legacy
+ "nomen": true,
+
+ "predef": [
+ "mediaWiki",
+ "jQuery"
+ ]
+}
diff --git a/resources/ext.tmh.transcodetable.js
b/resources/ext.tmh.transcodetable.js
index 1a4d65a..a8c8f98 100644
--- a/resources/ext.tmh.transcodetable.js
+++ b/resources/ext.tmh.transcodetable.js
@@ -1,86 +1,90 @@
/**
* Javascript to support transcode table on image page
*/
-$( document ).ready( function () {
- var errorPopup, $errorLink;
+( function ( mw, $ ) {
+ $( document ).ready( function () {
+ var errorPopup, $errorLink;
- errorPopup = function () {
- // pop up dialog
- mw.addDialog( {
- 'width': '640',
- 'height': '480',
- 'title': $(this).attr( 'title' ),
- 'content': $('')
- .css( {
- 'width':'99%',
- 'height':'99%'
- } )
- .text( $(this).attr('data-error') )
- } )
- .css( 'overflow', 'hidden' );
- return false;
- }
-
- // Old version. Need to keep for a little while in case of cached pages.
- $( '.mw-filepage-transcodestatus .errorlink' ).click( errorPopup );
- // New version.
- $errorLink = $( '.mw-filepage-transcodestatus
.mw-tmh-pseudo-error-link' );
- $errorLink.wrapInner( function () {
- var $this = $( this );
- return $( '' ).attr( {
- href: '#',
- title: $this.text(),
- 'data-error': $this.attr( 'data-error' )
- } ).click( errorPopup );
- } );
-
- // Reset transcode action:
- $( '.mw-filepage-transcodereset a' ).click( function () {
- var tKey = $( this ).attr( 'data-transcodekey' );
- var buttons = {};
- buttons[ mw.msg( 'mwe-ok' ) ] = function () {
- var _thisDialog = this;
-
- // Only show cancel button while loading:
- var cancelBtn = {};
- cancelBtn[ mw.msg( 'mwe-cancel' ) ] = function () {
- $(this).dialog( 'close' );
- }
- $( _thisDialog ).dialog( 'option', 'buttons', cancelBtn
);
-
- $( this ).loadingSpinner();
-
- var api = new mw.Api();
- api.postWithEditToken( {
- 'action' : 'transcodereset',
- 'transcodekey' : tKey,
- 'title' : mw.config.get('wgPageName')
- } ).done( function ( data ) {
- // refresh the page
- window.location.reload();
- } ).fail( function ( code, data ) {
- if( data.error && data.error.info ){
- $( _thisDialog ).text( data.error.info
);
- } else {
- $( _thisDialog ).text( mw.msg(
'timedmedia-reset-error' ) );
- }
- var okBtn = {};
- okBtn[ m
[MediaWiki-commits] [Gerrit] Fix the "you are now logged in/out" warning - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175186
Change subject: Fix the "you are now logged in/out" warning
..
Fix the "you are now logged in/out" warning
It would tell you you were logged out when you were actually
logged in, and when I looked into it, I found lots of broken
things, including lots of confusion between the current
anon-ness and username and the new anon-ness and username.
ve.init.mw.Target:
* Check the new isAnon value, not the old one
* Pass the username to the event, rather than just anon-ness
ve.init.mw.ViewPageTarget:
* Use the passed username (new username) rather than the
username from mw.config (which is updated, but confusing)
Change-Id: Icf406d49100d81e87c677fd6b57ff93cc29f601f
---
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
2 files changed, 8 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/86/175186/1
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
index a475e56..e45dbee 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
@@ -560,17 +560,16 @@
* Update save dialog when token fetch indicates another user is logged in
*
* @method
- * @param {boolean|undefined} isAnon Is newly logged in user anonymous. If
- * undefined, user is logged in
+ * @param {string|null} username Name of newly logged-in user, or null if
anonymous
*/
-ve.init.mw.ViewPageTarget.prototype.onSaveErrorNewUser = function ( isAnon ) {
+ve.init.mw.ViewPageTarget.prototype.onSaveErrorNewUser = function ( username )
{
var badToken, userMsg;
badToken = document.createTextNode( mw.msg(
'visualeditor-savedialog-error-badtoken' ) + ' ' );
// mediawiki.jqueryMsg has a bug with [[User:$1|$1]] (bug 51388)
- if ( isAnon ) {
+ if ( username === null ) {
userMsg = 'visualeditor-savedialog-identify-anon';
} else {
- userMsg = 'visualeditor-savedialog-identify-user---' +
mw.config.get( 'wgUserName' );
+ userMsg = 'visualeditor-savedialog-identify-user---' + username;
}
this.showSaveError(
$( badToken ).add( $.parseHTML( mw.message( userMsg ).parse() )
)
diff --git a/modules/ve-mw/init/ve.init.mw.Target.js
b/modules/ve-mw/init/ve.init.mw.Target.js
index 0ab2be2..71d2658 100644
--- a/modules/ve-mw/init/ve.init.mw.Target.js
+++ b/modules/ve-mw/init/ve.init.mw.Target.js
@@ -125,8 +125,7 @@
/**
* @event saveErrorNewUser
* Fired when user is logged in as a new user
- * @param {boolean|undefined} isAnon Is newly logged in user anonymous. If
- * undefined, user is logged in
+ * @param {string|null} username Name of newly logged-in user, or null if
anonymous
*/
/**
@@ -652,7 +651,7 @@
viewPage.save( doc, saveData );
} else {
// The now current session is a
different user
- if ( isAnon ) {
+ if ( userInfo.anon !==
undefined ) {
// New session is an
anonymous user
mw.config.set( {
// wgUserId is
unset for anonymous users, not set to null
@@ -661,6 +660,7 @@
// functions
like mw.user.isAnon rely on this.
wgUserName: null
} );
+ viewPage.emit(
'saveErrorNewUser', null );
} else {
// New session is a
different user
mw.config.set( {
wgUserId: userInfo.id, wgUserName: userInfo.name } );
@@ -670,10 +670,9 @@
mw.messages.get( 'visualeditor-savedialog-identify-user' )
.replace( /\$1/g, userInfo.name )
);
+ viewPage.emit(
'saveErrorNewUser', userInfo.name );
}
- viewPage.emit(
'saveErrorNewUser', isAnon );
}
-
[MediaWiki-commits] [Gerrit] Maintainance: Update OOjs UI pull-through script to use rele... - change (mediawiki/core)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175185
Change subject: Maintainance: Update OOjs UI pull-through script to use release
versions
..
Maintainance: Update OOjs UI pull-through script to use release versions
Change-Id: I9e441064be2e28daaf55435e783a0318358bb565
---
M maintenance/resources/update-oojs-ui.sh
1 file changed, 32 insertions(+), 71 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/85/175185/1
diff --git a/maintenance/resources/update-oojs-ui.sh
b/maintenance/resources/update-oojs-ui.sh
index 651f211..0e72a47 100755
--- a/maintenance/resources/update-oojs-ui.sh
+++ b/maintenance/resources/update-oojs-ui.sh
@@ -1,95 +1,56 @@
#!/usr/bin/env bash
-# This script generates a commit that updates our distribution copy of OOjs UI
+# This script generates a commit that updates our release copy of OOjs UI
-if [ -z "$1" ]
+if [ -n "$2" ]
then
- # Missing required parameter
- echo >&2 "Usage: $0 path/to/repo/for/oojs-ui"
+ # Too many parameters
+ echo >&2 "Usage: $0 []"
exit 1
fi
-TARGET_REPO=$(cd "$(dirname $0)/../.."; pwd)
-TARGET_DIR=resources/lib/oojs-ui
-UI_REPO=$1
-
-function oojsuihash() {
- grep "OOjs UI v" "$TARGET_REPO/$TARGET_DIR/oojs-ui.js" \
- | head -n 1 \
- | grep -Eo '\([a-z0-9]+\)' \
- | sed 's/^(//' \
- | sed 's/)$//'
-}
-
-function oojsuitag() {
- grep "OOjs UI v" "$TARGET_REPO/$TARGET_DIR/oojs-ui.js" \
- | head -n 1 \
- | grep -Eo '\bv[0-9a-z.-]+\b'
-}
-
-function oojsuiversion() {
- grep "OOjs UI v" "$TARGET_REPO/$TARGET_DIR/oojs-ui.js" \
- | head -n 1 \
- | grep -Eo '\bv[0-9a-z.-]+\b.*$'
-}
+REPO_DIR=$(cd "$(dirname $0)/../.."; pwd) # Root dir of the git repo working
tree
+TARGET_DIR="resources/lib/oojs-ui" # Destination relative to the root of the
repo
+NPM_DIR=$(mktemp -d 2>/dev/null || mktemp -d -t 'update-oojs-ui') # e.g.
/tmp/update-oojs-ui.rI0I5Vir
# Prepare working tree
-cd "$TARGET_REPO" &&
+cd "$REPO_DIR" &&
git reset $TARGET_DIR && git checkout $TARGET_DIR && git fetch origin &&
-git checkout -B upstream-oojsui origin/master || exit 1
+git checkout -B upstream-oojs-ui origin/master || exit 1
-cd $UI_REPO || exit 1
-
-# Read the old version and check for changes
-OLDHASH=$(oojsuihash)
-if [ -z "$OLDHASH" ]
+# Fetch upstream version
+cd $NPM_DIR
+if [ -n "$1" ]
then
- OLDTAG=$(oojsuitag)
-fi
-if [ "$OLDHASH" == "" ]
-then
- OLDHASH=$(git rev-parse "$OLDTAG")
- if [ $? != 0 ]
- then
- echo "Could not find OOjs UI version"
- cd -
- exit 1
- fi
-fi
-if [ "$(git rev-parse $OLDHASH)" == "$(git rev-parse HEAD)" ]
-then
- echo "No changes (already at $OLDHASH)"
- cd -
- exit 0
+ npm install "oojs-ui@$1" || exit 1
+else
+ npm install oojs-ui || exit 1
fi
-# Build the distribution
-npm install && grunt git-build || exit 1
-
-# Get the list of changes
-NEWCHANGES=$(git log $OLDHASH.. --oneline --no-merges --reverse --color=never)
-NEWCHANGESDISPLAY=$(git log $OLDHASH.. --oneline --no-merges --reverse
--color=always)
+OOJSUI_VERSION=$(node -e
'console.log(JSON.parse(require("fs").readFileSync("./node_modules/oojs-ui/package.json")).version);')
+if [ "$OOJSUI_VERSION" == "" ]
+then
+ echo 'Could not find OOjs UI version'
+ exit 1
+fi
# Copy files
# - Exclude the minimised distribution files and RTL sheets for non-CSSJanus
environments
-rsync --recursive --delete --force --exclude 'oojs-ui*.min.*' --exclude
'oojs-ui*.rtl.css' ./dist/ "$TARGET_REPO/$TARGET_DIR" || exit 1
+rsync --recursive --delete --force --exclude 'oojs-ui*.min.*' --exclude
'oojs-ui*.rtl.css' ./node_modules/oojs-ui/dist/ "$REPO_DIR/$TARGET_DIR" || exit
1
-# Read the new version
-NEWVERSION=$(oojsuiversion)
+# Clean up temporary area
+rm -rf "$NPM_DIR"
# Generate commit
-cd "$TARGET_REPO"
-COMMITMSG=$(cat &2
[MediaWiki-commits] [Gerrit] Tweak some ContextSelectWidget code after item→option update - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Tweak some ContextSelectWidget code after item→option update
..
Tweak some ContextSelectWidget code after item→option update
Follow-up to 029fc7e22cfc551f5bde344d78bf734178a20387. Seems to have
slipped through the cracks, caused no visible issues.
Change-Id: I3d28feec3b3202dfdc771ea771d138e5e8bb00d7
---
M src/ui/styles/widgets/ve.ui.ContextOptionWidget.css
M src/ui/styles/widgets/ve.ui.ContextSelectWidget.css
M src/ui/styles/widgets/ve.ui.MobileContextOptionWidget.css
M src/ui/widgets/ve.ui.ContextSelectWidget.js
4 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ui/styles/widgets/ve.ui.ContextOptionWidget.css
b/src/ui/styles/widgets/ve.ui.ContextOptionWidget.css
index 2660ea9..2276a70 100644
--- a/src/ui/styles/widgets/ve.ui.ContextOptionWidget.css
+++ b/src/ui/styles/widgets/ve.ui.ContextOptionWidget.css
@@ -1,5 +1,5 @@
/*!
- * VisualEditor UserInterface ContextItemWidget styles.
+ * VisualEditor UserInterface ContextOptionWidget styles.
*
* @copyright 2011-2014 VisualEditor Team and others; see
http://ve.mit-license.org
*/
diff --git a/src/ui/styles/widgets/ve.ui.ContextSelectWidget.css
b/src/ui/styles/widgets/ve.ui.ContextSelectWidget.css
index fd02ff3..d2debf6 100644
--- a/src/ui/styles/widgets/ve.ui.ContextSelectWidget.css
+++ b/src/ui/styles/widgets/ve.ui.ContextSelectWidget.css
@@ -1,5 +1,5 @@
/*!
- * VisualEditor UserInterface ContextMenuWidget styles.
+ * VisualEditor UserInterface ContextSelectWidget styles.
*
* @copyright 2011-2014 VisualEditor Team and others; see
http://ve.mit-license.org
*/
diff --git a/src/ui/styles/widgets/ve.ui.MobileContextOptionWidget.css
b/src/ui/styles/widgets/ve.ui.MobileContextOptionWidget.css
index bd3c69c..bccd881 100644
--- a/src/ui/styles/widgets/ve.ui.MobileContextOptionWidget.css
+++ b/src/ui/styles/widgets/ve.ui.MobileContextOptionWidget.css
@@ -1,21 +1,21 @@
/*!
- * VisualEditor UserInterface MobileContextItemWidget styles.
+ * VisualEditor UserInterface MobileContextOptionWidget styles.
*
* @copyright 2011-2014 VisualEditor Team and others; see
http://ve.mit-license.org
*/
-.ve-ui-mobileContextItemWidget .oo-ui-labelElement-label {
+.ve-ui-mobileContextOptionWidget .oo-ui-labelElement-label {
max-width: none;
text-overflow: clip;
}
-.ve-ui-mobileContextItemWidget-label-primary {
+.ve-ui-mobileContextOptionWidget-label-primary {
display: block;
text-overflow: ellipsis;
overflow: hidden;
}
-.ve-ui-mobileContextItemWidget-label-secondary {
+.ve-ui-mobileContextOptionWidget-label-secondary {
float: right;
margin-left: 1em;
color: #347bff;
diff --git a/src/ui/widgets/ve.ui.ContextSelectWidget.js
b/src/ui/widgets/ve.ui.ContextSelectWidget.js
index 7fe0cc2..225b855 100644
--- a/src/ui/widgets/ve.ui.ContextSelectWidget.js
+++ b/src/ui/widgets/ve.ui.ContextSelectWidget.js
@@ -25,7 +25,7 @@
this.connect( this, { choose: 'onChooseItem' } );
// Initialization
- this.$element.addClass( 've-ui-contextMenuSelectWidget' );
+ this.$element.addClass( 've-ui-contextSelectWidget' );
};
/* Setup */
--
To view, visit https://gerrit.wikimedia.org/r/175173
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3d28feec3b3202dfdc771ea771d138e5e8bb00d7
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Delete src/ui/widgets/ve.ui.ContextWidget.js - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Delete src/ui/widgets/ve.ui.ContextWidget.js
..
Delete src/ui/widgets/ve.ui.ContextWidget.js
Unused. Follow-up to b141a7d23fc47938030cb6a742db51229770025e,
which copied a file instead of renaming.
Change-Id: I3ed8617b03b953b5c0e6d5374428329289272aec
---
D src/ui/widgets/ve.ui.ContextWidget.js
1 file changed, 0 insertions(+), 43 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ui/widgets/ve.ui.ContextWidget.js
b/src/ui/widgets/ve.ui.ContextWidget.js
deleted file mode 100644
index e6b7642..000
--- a/src/ui/widgets/ve.ui.ContextWidget.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * VisualEditor Context widget class.
- *
- * @copyright 2011-2014 VisualEditor Team and others; see
http://ve.mit-license.org
- */
-
-/**
- * List of context items, displaying information about the current context.
- *
- * Use with ve.ui.ContextOptionWidget.
- *
- * @class
- * @extends OO.ui.SelectWidget
- *
- * @constructor
- * @param {Object} [config] Configuration options
- */
-ve.ui.ContextWidget = function VeUiContextWidget( config ) {
- // Config initialization
- config = config || {};
-
- // Parent constructor
- ve.ui.ContextWidget.super.call( this, config );
-
- this.connect( this, { choose: 'onChooseItem' } );
-
- // Initialization
- this.$element.addClass( 've-ui-contextWidget' );
-};
-
-/* Setup */
-
-OO.inheritClass( ve.ui.ContextWidget, OO.ui.SelectWidget );
-
-/* Methods */
-
-/**
- * Handle choose item events.
- */
-ve.ui.ContextWidget.prototype.onChooseItem = function () {
- // Auto-deselect
- this.selectItem( null );
-};
--
To view, visit https://gerrit.wikimedia.org/r/175172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3ed8617b03b953b5c0e6d5374428329289272aec
Gerrit-PatchSet: 2
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Focus the bookletLayout on ready in the template dialog - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175184
Change subject: Focus the bookletLayout on ready in the template dialog
..
Focus the bookletLayout on ready in the template dialog
Depends on I60377cb5 in oojs-ui
Change-Id: I5d8b73f878bf136efdc97493ef1f6e7bd6f56066
---
M modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
1 file changed, 10 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/84/175184/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
index 8d16988..7226f52 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWTemplateDialog.js
@@ -492,6 +492,16 @@
/**
* @inheritdoc
*/
+ve.ui.MWTemplateDialog.prototype.getReadyProcess = function ( data ) {
+ return ve.ui.MWTemplateDialog.super.prototype.getReadyProcess.call(
this, data )
+ .next( function () {
+ this.bookletLayout.focus();
+ }, this );
+};
+
+/**
+ * @inheritdoc
+ */
ve.ui.MWTemplateDialog.prototype.getTeardownProcess = function ( data ) {
return ve.ui.MWTemplateDialog.super.prototype.getTeardownProcess.call(
this, data )
.first( function () {
--
To view, visit https://gerrit.wikimedia.org/r/175184
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5d8b73f878bf136efdc97493ef1f6e7bd6f56066
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing History.md file now we're a proper repo - change (oojs/ui)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/175183 Change subject: Add missing History.md file now we're a proper repo .. Add missing History.md file now we're a proper repo Change-Id: If9e1138ba6663c1503d88cfb2eb6c6c6c9b28d3b --- A History.md 1 file changed, 8 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/83/175183/1 diff --git a/History.md b/History.md new file mode 100644 index 000..80817d6 --- /dev/null +++ b/History.md @@ -0,0 +1,8 @@ +# OOjs UI Release History + +## v0.2.0 / 2014-11-17 +* Initial versioned release + +## v0.1.0 / 2013-11-13 + +* Initial export of repo -- To view, visit https://gerrit.wikimedia.org/r/175183 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If9e1138ba6663c1503d88cfb2eb6c6c6c9b28d3b Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Jforrester ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix some metadata panel scrolling/text truncation bugs - change (mediawiki...MultimediaViewer)
Gergő Tisza has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175182
Change subject: Fix some metadata panel scrolling/text truncation bugs
..
Fix some metadata panel scrolling/text truncation bugs
* isOpening was calculated too early, so whenever the panel was
partially open and opened up fully via the forceDirection
parameter of toggle(), it was logged as the wrong direction.
(I think the only way for this to happen is via clicking on
"view terms" while the panel is partially open.)
* scrolling did not go all the way to the bottom when text was
truncated as the target position was calculated before untruncating.
* panel position was not preserved in some cases where it could have
been because the attempt to restore it happened before untruncating
the text, when the panel was not high enough.
Change-Id: I47a96d42c80e0a00d95023526ede3b5bbf18a52c
Mingle: https://wikimedia.mingle.thoughtworks.com/projects/multimedia/cards/983
---
M resources/mmv/ui/mmv.ui.canvas.js
M resources/mmv/ui/mmv.ui.metadataPanel.js
M resources/mmv/ui/mmv.ui.metadataPanelScroller.js
3 files changed, 25 insertions(+), 31 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/82/175182/1
diff --git a/resources/mmv/ui/mmv.ui.canvas.js
b/resources/mmv/ui/mmv.ui.canvas.js
index af86e3b..032e419 100644
--- a/resources/mmv/ui/mmv.ui.canvas.js
+++ b/resources/mmv/ui/mmv.ui.canvas.js
@@ -246,7 +246,7 @@
* @param {mw.mmv.model.ThumbnailWidth} imageWidths
* @returns {boolean} Whether the image was blured or not
*/
-C.maybeDisplayPlaceholder = function ( size, $imagePlaceholder,
imageWidths ) {
+ C.maybeDisplayPlaceholder = function ( size, $imagePlaceholder,
imageWidths ) {
var targetWidth,
targetHeight,
blowupFactor,
diff --git a/resources/mmv/ui/mmv.ui.metadataPanel.js
b/resources/mmv/ui/mmv.ui.metadataPanel.js
index 320ef14..5c3bc34 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanel.js
+++ b/resources/mmv/ui/mmv.ui.metadataPanel.js
@@ -61,6 +61,9 @@
.add( this.$authorAndSource )
.add( this.title.$ellipsis )
.add( this.creditField.$ellipsis )
+ .each( function () {
+ $( this ).tipsy( 'enable' );
+ } )
.on( 'click.mmv-mp', function ( e ) {
var clickTargetIsLink = $( e.target ).is( 'a' ),
clickTargetIsTruncated = !!$( e.target
).closest( '.mw-mmv-ttf-truncated' ).length,
@@ -76,23 +79,15 @@
panel.scroller.toggle( 'up' );
} );
- $( this.$container ).on( 'mmv-metadata-open', function () {
+ $( this.$container ).on( 'mmv-metadata-open.mmv-mp
mmv-metadata-reveal-truncated-text.mmv-mp', function () {
panel.revealTruncatedText();
- } ).on( 'mmv-metadata-close', function () {
+ } ).on( 'mmv-metadata-close.mmv-mp', function () {
panel.hideTruncatedText();
} );
this.handleEvent( 'jq-fullscreen-change.lip', function() {
panel.hideTruncatedText();
} );
-
- this.$title
- .add( this.title.$ellipsis )
- .add( this.$authorAndSource )
- .add( this.creditField.$ellipsis )
- .each( function () {
- $( this ).tipsy( 'enable' );
- } );
};
MPP.unattach = function() {
@@ -104,12 +99,13 @@
.add( this.creditField.$ellipsis )
.each( function () {
$( this ).tipsy( 'hide' ).tipsy( 'disable' );
- } );
+ } )
+ .off( 'click.mmv-mp' );
+
+ $( this.$container ).off( '.mmv-mp' );
this.scroller.unattach();
this.buttons.unattach();
-
- this.$title.add( this.$authorAndSource ).off( 'click.mmv-mp' );
this.clearEvents();
};
@@ -671,8 +667,8 @@
this.setUserPageLink( repoData, imageData.lastUploader,
user.gender );
}
- this.scroller.unfreezeHeight();
this.resetTruncatedText();
+ this.scroller.unfreezeHeight();
};
/**
diff --git a/resources/mmv/ui/mmv.ui.metadataPanelScroller.js
b/resources/mmv/ui/mmv.ui.metadataPanelScroller.js
index 0992c1e..3e7416c 100644
--- a/resources/mmv/ui/mmv.ui.metadataPanelScroller.js
+++ b/resources/mmv/ui/mmv.ui.m
[MediaWiki-commits] [Gerrit] [BrowserTests] Fix class name: ve-ui-contextMenuWidget → ve-... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: [BrowserTests] Fix class name: ve-ui-contextMenuWidget → ve-ui-contextSelectWidget .. [BrowserTests] Fix class name: ve-ui-contextMenuWidget → ve-ui-contextSelectWidget Change-Id: I70f44e71819e9147886bd70baf3460daf9ebbaf2 --- M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb 1 file changed, 2 insertions(+), 2 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb index 161f3cc..5470d80 100644 --- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb @@ -72,7 +72,7 @@ div(:link_overlay_does_not_exist, text: /New page/) div(:link_overlay_external_link, text: /External link.+New page/m) div(:link_overlay_wiki_page, text: /Matching page/) - unordered_list(:media_caption, class: 've-ui-contextMenuWidget') + unordered_list(:media_caption, class: 've-ui-contextSelectWidget') span(:media_exit, text: 'Return to save form') figure(:media_image, index: 0) span(:media_insert_menu, class: 'oo-ui-tool-name-media') @@ -98,7 +98,7 @@ a(:page_title, text: /Page title/) a(:paragraph, text: /Paragraph/) div(:parameter_icon, text: 'q') - unordered_list(:popup_icon, class: 've-ui-contextMenuWidget') + unordered_list(:popup_icon, class: 've-ui-contextSelectWidget') a(:preformatted, text: /Preformatted/) label(:prevent_redirect, class: 'oo-ui-layout oo-ui-labelElement oo-ui-fieldLayout oo-ui-fieldLayout-align-inline oo-ui-fieldLayout-disabled') span(:ref_list_insert_menu, class: 'oo-ui-tool-name-referencesList') -- To view, visit https://gerrit.wikimedia.org/r/175174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I70f44e71819e9147886bd70baf3460daf9ebbaf2 Gerrit-PatchSet: 3 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński Gerrit-Reviewer: Jforrester Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: a8b4fc4..e2d4f5b - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: a8b4fc4..e2d4f5b .. Syncronize VisualEditor: a8b4fc4..e2d4f5b Change-Id: I04f860310c3afd73bbd9efd2113b5cebc2a458c3 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index a8b4fc4..e2d4f5b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit a8b4fc49667d78adb2227c74a7b44ca082ef1a45 +Subproject commit e2d4f5b5333821b6aa073347dd8fb8b4b3db73ae -- To view, visit https://gerrit.wikimedia.org/r/175181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I04f860310c3afd73bbd9efd2113b5cebc2a458c3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: a8b4fc4..e2d4f5b - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/175181 Change subject: Syncronize VisualEditor: a8b4fc4..e2d4f5b .. Syncronize VisualEditor: a8b4fc4..e2d4f5b Change-Id: I04f860310c3afd73bbd9efd2113b5cebc2a458c3 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/81/175181/1 diff --git a/VisualEditor b/VisualEditor index a8b4fc4..e2d4f5b 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit a8b4fc49667d78adb2227c74a7b44ca082ef1a45 +Subproject commit e2d4f5b5333821b6aa073347dd8fb8b4b3db73ae -- To view, visit https://gerrit.wikimedia.org/r/175181 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I04f860310c3afd73bbd9efd2113b5cebc2a458c3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update for OOUI OptionWidget (and subclasses) changes - change (mediawiki...MultimediaViewer)
jenkins-bot has submitted this change and it was merged.
Change subject: Update for OOUI OptionWidget (and subclasses) changes
..
Update for OOUI OptionWidget (and subclasses) changes
OptionWidget constructor now accepts a 'data' config option instead of
a separate 'data' parameter.
See I7ee78b6d.
Change-Id: Ie54e9db788cbe846cd2d173498c7fe17bafc126e
---
M resources/mmv/ui/mmv.ui.download.pane.js
M resources/mmv/ui/mmv.ui.reuse.dialog.js
M resources/mmv/ui/mmv.ui.reuse.dialog.less
M resources/mmv/ui/mmv.ui.reuse.embed.js
M resources/mmv/ui/mmv.ui.utils.js
5 files changed, 23 insertions(+), 20 deletions(-)
Approvals:
Jforrester: 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 66919a7..7d635d1 100644
--- a/resources/mmv/ui/mmv.ui.download.pane.js
+++ b/resources/mmv/ui/mmv.ui.download.pane.js
@@ -148,17 +148,19 @@
attributionSwitch = new oo.ui.ButtonSelectWidget( {
classes: [ 'mw-mmv-download-attr-select' ]
} ),
- plainOption = new oo.ui.ButtonOptionWidget( 'plain', {
+ plainOption = new oo.ui.ButtonOptionWidget( {
+ data: 'plain',
label: mw.message(
'multimediaviewer-attr-plain' ).text()
} ),
- htmlOption = new oo.ui.ButtonOptionWidget( 'html', {
+ htmlOption = new oo.ui.ButtonOptionWidget( {
+ data: 'html',
label: mw.message( 'multimediaviewer-attr-html'
).text()
} );
attributionSwitch.addItems( [
- plainOption,
- htmlOption
- ] );
+ plainOption,
+ htmlOption
+ ] );
attributionSwitch.selectItem( plainOption );
diff --git a/resources/mmv/ui/mmv.ui.reuse.dialog.js
b/resources/mmv/ui/mmv.ui.reuse.dialog.js
index 1b4ce4e..a257693 100644
--- a/resources/mmv/ui/mmv.ui.reuse.dialog.js
+++ b/resources/mmv/ui/mmv.ui.reuse.dialog.js
@@ -54,7 +54,8 @@
// FIXME this should happen outside the dialog and the tabs, but we
need to improve
DP.initTabs = function () {
function makeTab( type ) {
- return new oo.ui.MenuOptionWidget( type, {
+ return new oo.ui.MenuOptionWidget( {
+ data: type,
label: mw.message( 'multimediaviewer-' + type +
'-tab' ).text()
} );
}
diff --git a/resources/mmv/ui/mmv.ui.reuse.dialog.less
b/resources/mmv/ui/mmv.ui.reuse.dialog.less
index 6dc1e99..2a06377 100644
--- a/resources/mmv/ui/mmv.ui.reuse.dialog.less
+++ b/resources/mmv/ui/mmv.ui.reuse.dialog.less
@@ -19,7 +19,7 @@
display: none;
}
- .oo-ui-optionWidget {
+ .oo-ui-optionWidget {
@tab-border-height: 3px;
@highlighted-tab-color: rgb(225, 243, 255);
@selected-tab-color: rgb(0, 113, 188);
diff --git a/resources/mmv/ui/mmv.ui.reuse.embed.js
b/resources/mmv/ui/mmv.ui.reuse.embed.js
index 824f4b7..75bddc8 100644
--- a/resources/mmv/ui/mmv.ui.reuse.embed.js
+++ b/resources/mmv/ui/mmv.ui.reuse.embed.js
@@ -158,12 +158,14 @@
classes: [ 'mw-mmv-embed-select' ]
} );
- wikitextButtonOption = new oo.ui.ButtonOptionWidget(
'wikitext', {
- label: mw.message( 'multimediaviewer-embed-wt'
).text()
- } );
- htmlButtonOption = new oo.ui.ButtonOptionWidget( 'html', {
- label: mw.message(
'multimediaviewer-embed-html' ).text()
- } );
+ wikitextButtonOption = new oo.ui.ButtonOptionWidget( {
+ data: 'wikitext',
+ label: mw.message( 'multimediaviewer-embed-wt' ).text()
+ } );
+ htmlButtonOption = new oo.ui.ButtonOptionWidget( {
+ data: 'html',
+ label: mw.message( 'multimediaviewer-embed-html'
).text()
+ } );
this.embedSwitch.addItems( [
wikitextButtonOption,
diff --git a/resources/mmv/ui/mmv.ui.utils.js b/resources/mmv/ui/mmv.ui.utils.js
index 492689f..9d03900 100644
--- a/resources/mmv/ui/mmv.ui.utils.js
+++ b/resources/mmv/ui/mmv.ui.utils.js
@@ -50,17 +50,15 @@
for ( i = 0; i < options.length; i++ ) {
option = options[ i ];
- choices
[MediaWiki-commits] [Gerrit] Add dependency upon oojs/ui's PHP port - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175180
Change subject: Add dependency upon oojs/ui's PHP port
..
Add dependency upon oojs/ui's PHP port
Depends upon Ibca93b in mediawiki/vendor
Change-Id: Ibca93b05623377dc645a28ddd337027e53983552
---
M composer.json
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/80/175180/1
diff --git a/composer.json b/composer.json
index 38f7f62..ca33398 100644
--- a/composer.json
+++ b/composer.json
@@ -19,7 +19,8 @@
"php": ">=5.3.3",
"psr/log": "1.0.0",
"cssjanus/cssjanus": "1.1.1",
- "cdb/cdb": "1.0.0"
+ "cdb/cdb": "1.0.0",
+ "oojs/ui": "0.2.0",
},
"require-dev": {
"phpunit/phpunit": "*"
--
To view, visit https://gerrit.wikimedia.org/r/175180
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibca93b05623377dc645a28ddd337027e53983552
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0ed86dd..a8b4fc4 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/175179 Change subject: Syncronize VisualEditor: 0ed86dd..a8b4fc4 .. Syncronize VisualEditor: 0ed86dd..a8b4fc4 Change-Id: I23f91cd2eabe372e1b03de03a237319c217a0f1a --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/79/175179/1 diff --git a/VisualEditor b/VisualEditor index 0ed86dd..a8b4fc4 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0ed86dd9da295b963d9528e03b4a0387ccc01fab +Subproject commit a8b4fc49667d78adb2227c74a7b44ca082ef1a45 -- To view, visit https://gerrit.wikimedia.org/r/175179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I23f91cd2eabe372e1b03de03a237319c217a0f1a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (c8201dd) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (c8201dd)
..
Update VE core submodule to master (c8201dd)
New changes:
ff237d4 Fix z-indexes in core
e88d43e Localisation updates from https://translatewiki.net.
cf61803 Consistently use ve.ui.WindowManager everywhere
f9dfdb8 Update OOjs UI to v0.1.0-pre (23565e7519)
f79f7e3 Update OOjs UI to v0.1.0-pre (8f8896196f)
c8201dd Update OOjs UI to v0.1.0-pre (9ed4cf2557)
Local changes for the breaking change to OptionWidget and sub-classes.
Change-Id: Ife6abd312d4dc97be67cb84eea4cb9c6a0a31b1d
---
M lib/ve
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMoreParametersResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWNoParametersResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWParameterResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWReferenceResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
18 files changed, 173 insertions(+), 138 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ve b/lib/ve
index fb57e24..c8201dd 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit fb57e2441744897f9370235b5f5cfa1df120638b
+Subproject commit c8201dddc99334481ef939606753c283dc69c3ed
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index ed52c70..f96700a 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -268,18 +268,21 @@
$: this.$
} );
- alignLeftButton = new OO.ui.ButtonOptionWidget( 'left', {
+ alignLeftButton = new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'left',
icon: 'align-float-left',
label: ve.msg( 'visualeditor-dialog-media-position-left' )
} );
- alignCenterButton = new OO.ui.ButtonOptionWidget( 'center', {
+ alignCenterButton = new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'center',
icon: 'align-center',
label: ve.msg( 'visualeditor-dialog-media-position-center' )
} );
- alignRightButton = new OO.ui.ButtonOptionWidget( 'right', {
+ alignRightButton = new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'right',
icon: 'align-float-right',
label: ve.msg( 'visualeditor-dialog-media-position-right' )
} );
@@ -323,23 +326,27 @@
} );
this.typeSelect.addItems( [
// TODO: Inline images require a bit of further work, will be
coming soon
- new OO.ui.ButtonOptionWidget( 'thumb', {
+ new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'thumb',
icon: 'image-thumbnail',
label: ve.msg( 'visualeditor-dialog-media-type-thumb' )
} ),
- new OO.ui.ButtonOptionWidget( 'frameless', {
+ new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'frameless',
icon: 'image-frameless',
label: ve.msg(
'visualeditor-dialog-media-type-frameless' )
} ),
- new OO.ui.ButtonOptionWidget( 'frame', {
+ new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'frame',
icon: 'image-frame',
label: ve.msg( 'visualeditor-dialog-media-type-frame' )
} ),
- new OO.ui.ButtonOptionWidget( 'none', {
+ new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'none',
icon: 'image-none',
label: ve.msg( 'visualeditor-dialog-media-type-none' )
} )
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
index e358b12..fc1d91f 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
+++ b/modules/ve-mw/u
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0ed86dd..a8b4fc4 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 0ed86dd..a8b4fc4 .. Syncronize VisualEditor: 0ed86dd..a8b4fc4 Change-Id: I23f91cd2eabe372e1b03de03a237319c217a0f1a --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index 0ed86dd..a8b4fc4 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0ed86dd9da295b963d9528e03b4a0387ccc01fab +Subproject commit a8b4fc49667d78adb2227c74a7b44ca082ef1a45 -- To view, visit https://gerrit.wikimedia.org/r/175179 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I23f91cd2eabe372e1b03de03a237319c217a0f1a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add oojs/ui 0.2.0 - change (mediawiki/vendor)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/175178 Change subject: Add oojs/ui 0.2.0 .. Add oojs/ui 0.2.0 Security review is bug 73156. Change-Id: Ibca93b05623377dc645a28ddd337027e53983552 --- M composer.json M composer.lock M composer/autoload_classmap.php M composer/installed.json A oojs/ui/.csscomb.json A oojs/ui/.csslintrc A oojs/ui/.gitignore A oojs/ui/.gitreview A oojs/ui/.jscsrc A oojs/ui/.jshintignore A oojs/ui/.jshintrc A oojs/ui/.rubocop.yml A oojs/ui/.rubocop_todo.yml A oojs/ui/AUTHORS.txt A oojs/ui/Doxyfile A oojs/ui/Gemfile A oojs/ui/Gemfile.lock A oojs/ui/Gruntfile.js A oojs/ui/LICENSE-MIT A oojs/ui/README.md A oojs/ui/bin/doccomparer.rb A oojs/ui/bin/docparser.rb A oojs/ui/bin/testsuitegenerator.rb A oojs/ui/build/banner.txt A oojs/ui/build/images.json A oojs/ui/build/modules.json A oojs/ui/build/tasks/colorize-svg.js A oojs/ui/build/tasks/copy.js A oojs/ui/build/tasks/typos.js A oojs/ui/build/typos.json A oojs/ui/composer.json A oojs/ui/demos/demo.js A oojs/ui/demos/index.html A oojs/ui/demos/pages/dialogs.js A oojs/ui/demos/pages/icons.js A oojs/ui/demos/pages/toolbars.js A oojs/ui/demos/pages/widgets.js A oojs/ui/demos/styles/demo.css A oojs/ui/demos/widgets.php A oojs/ui/i18n/ace.json A oojs/ui/i18n/af.json A oojs/ui/i18n/am.json A oojs/ui/i18n/ar.json A oojs/ui/i18n/arc.json A oojs/ui/i18n/arq.json A oojs/ui/i18n/ast.json A oojs/ui/i18n/az.json A oojs/ui/i18n/ba.json A oojs/ui/i18n/bcc.json A oojs/ui/i18n/bcl.json A oojs/ui/i18n/be-tarask.json A oojs/ui/i18n/be.json A oojs/ui/i18n/bg.json A oojs/ui/i18n/bn.json A oojs/ui/i18n/br.json A oojs/ui/i18n/bs.json A oojs/ui/i18n/ca.json A oojs/ui/i18n/ce.json A oojs/ui/i18n/ckb.json A oojs/ui/i18n/co.json A oojs/ui/i18n/cs.json A oojs/ui/i18n/cu.json A oojs/ui/i18n/cy.json A oojs/ui/i18n/da.json A oojs/ui/i18n/de.json A oojs/ui/i18n/diq.json A oojs/ui/i18n/dsb.json A oojs/ui/i18n/egl.json A oojs/ui/i18n/el.json A oojs/ui/i18n/eml.json A oojs/ui/i18n/en.json A oojs/ui/i18n/eo.json A oojs/ui/i18n/es.json A oojs/ui/i18n/et.json A oojs/ui/i18n/eu.json A oojs/ui/i18n/fa.json A oojs/ui/i18n/fi.json A oojs/ui/i18n/fo.json A oojs/ui/i18n/fr.json A oojs/ui/i18n/frr.json A oojs/ui/i18n/fur.json A oojs/ui/i18n/fy.json A oojs/ui/i18n/gd.json A oojs/ui/i18n/gl.json A oojs/ui/i18n/gu.json A oojs/ui/i18n/he.json A oojs/ui/i18n/hi.json A oojs/ui/i18n/hr.json A oojs/ui/i18n/hsb.json A oojs/ui/i18n/hu.json A oojs/ui/i18n/hy.json A oojs/ui/i18n/ia.json A oojs/ui/i18n/id.json A oojs/ui/i18n/ie.json A oojs/ui/i18n/ilo.json A oojs/ui/i18n/is.json A oojs/ui/i18n/it.json A oojs/ui/i18n/ja.json A oojs/ui/i18n/jv.json A oojs/ui/i18n/ka.json A oojs/ui/i18n/kk-cyrl.json A oojs/ui/i18n/km.json A oojs/ui/i18n/kn.json A oojs/ui/i18n/ko.json A oojs/ui/i18n/krc.json A oojs/ui/i18n/kw.json A oojs/ui/i18n/ky.json A oojs/ui/i18n/lb.json A oojs/ui/i18n/lmo.json A oojs/ui/i18n/lt.json A oojs/ui/i18n/lv.json A oojs/ui/i18n/lzh.json A oojs/ui/i18n/mg.json A oojs/ui/i18n/min.json A oojs/ui/i18n/mk.json A oojs/ui/i18n/ml.json A oojs/ui/i18n/mr.json A oojs/ui/i18n/ms.json A oojs/ui/i18n/nap.json A oojs/ui/i18n/nb.json A oojs/ui/i18n/nds-nl.json A oojs/ui/i18n/nds.json A oojs/ui/i18n/ne.json A oojs/ui/i18n/nl.json A oojs/ui/i18n/nn.json A oojs/ui/i18n/oc.json A oojs/ui/i18n/om.json A oojs/ui/i18n/or.json A oojs/ui/i18n/pa.json A oojs/ui/i18n/pfl.json A oojs/ui/i18n/pl.json A oojs/ui/i18n/pms.json A oojs/ui/i18n/ps.json A oojs/ui/i18n/pt-br.json A oojs/ui/i18n/pt.json A oojs/ui/i18n/qqq.json A oojs/ui/i18n/qu.json A oojs/ui/i18n/ro.json A oojs/ui/i18n/roa-tara.json A oojs/ui/i18n/ru.json A oojs/ui/i18n/sah.json A oojs/ui/i18n/scn.json A oojs/ui/i18n/sco.json A oojs/ui/i18n/sh.json A oojs/ui/i18n/si.json A oojs/ui/i18n/sk.json A oojs/ui/i18n/sl.json A oojs/ui/i18n/sq.json A oojs/ui/i18n/sr-ec.json A oojs/ui/i18n/sr-el.json A oojs/ui/i18n/sv.json A oojs/ui/i18n/sw.json A oojs/ui/i18n/ta.json A oojs/ui/i18n/te.json A oojs/ui/i18n/tg-cyrl.json A oojs/ui/i18n/th.json A oojs/ui/i18n/tl.json A oojs/ui/i18n/tr.json A oojs/ui/i18n/tt-cyrl.json A oojs/ui/i18n/ug-arab.json A oojs/ui/i18n/uk.json A oojs/ui/i18n/uz.json A oojs/ui/i18n/vec.json A oojs/ui/i18n/vi.json A oojs/ui/i18n/vo.json A oojs/ui/i18n/wuu.json A oojs/ui/i18n/yi.json A oojs/ui/i18n/yo.json A oojs/ui/i18n/yue.json A oojs/ui/i18n/zh-hans.json A oojs/ui/i18n/zh-hant.json A oojs/ui/jsduck.categories.json A oojs/ui/jsduck.external.js A oojs/ui/jsduck.json A oojs/ui/lib/jquery.js A oojs/ui/lib/oojs.js A oojs/ui/package.json A oojs/ui/php/Element.php A oojs/ui/php/ElementMixin.php A oojs/ui/php/Exception.php A oojs/ui/php/HtmlSnippet.php A oojs/ui/php/Layout.php A oojs/ui/php/Tag.php A oojs/ui/php/Theme.php A oojs/ui/php/Widget.php A oojs/ui/php/elements/ButtonElement.php A oojs/ui/php/elements/FlaggedElement.php A oojs/ui/php/elements/GroupElement.php A oojs/ui/php/elements/IconElement.php A oojs/ui/php/elements/IndicatorElement.php
[MediaWiki-commits] [Gerrit] Bump to latest restbase master - change (mediawiki...deploy)
GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/175176 Change subject: Bump to latest restbase master .. Bump to latest restbase master Change-Id: Ib6d429ed6889157f3d27710ff76ab8be68d7ecc2 --- M node_modules/node-uuid/node_modules/bignum/build/Release/bignum.node M node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum.node M node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum/bignum.o M node_modules/node-uuid/node_modules/microtime/build/Release/microtime.node M node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime.node M node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime/src/microtime.o M restbase 7 files changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/restbase/deploy refs/changes/76/175176/1 diff --git a/node_modules/node-uuid/node_modules/bignum/build/Release/bignum.node b/node_modules/node-uuid/node_modules/bignum/build/Release/bignum.node index 9caf63a..9c93cbf 100755 --- a/node_modules/node-uuid/node_modules/bignum/build/Release/bignum.node +++ b/node_modules/node-uuid/node_modules/bignum/build/Release/bignum.node Binary files differ diff --git a/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum.node b/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum.node index 9caf63a..9c93cbf 100755 --- a/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum.node +++ b/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum.node Binary files differ diff --git a/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum/bignum.o b/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum/bignum.o index d1664e6..2ad530d 100644 --- a/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum/bignum.o +++ b/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum/bignum.o Binary files differ diff --git a/node_modules/node-uuid/node_modules/microtime/build/Release/microtime.node b/node_modules/node-uuid/node_modules/microtime/build/Release/microtime.node index a77a8e3..a828924 100755 --- a/node_modules/node-uuid/node_modules/microtime/build/Release/microtime.node +++ b/node_modules/node-uuid/node_modules/microtime/build/Release/microtime.node Binary files differ diff --git a/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime.node b/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime.node index a77a8e3..a828924 100755 --- a/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime.node +++ b/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime.node Binary files differ diff --git a/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime/src/microtime.o b/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime/src/microtime.o index f2f8e17..d330b63 100644 --- a/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime/src/microtime.o +++ b/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime/src/microtime.o Binary files differ diff --git a/restbase b/restbase index 1883a9e..5949504 16 --- a/restbase +++ b/restbase -Subproject commit 1883a9ee5a85272ef8d0ab9cbef5b757396dd645 +Subproject commit 5949504d4f84b1037447c769b58ef366db6d275b -- To view, visit https://gerrit.wikimedia.org/r/175176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib6d429ed6889157f3d27710ff76ab8be68d7ecc2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: GWicke ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump to latest restbase master - change (mediawiki...deploy)
GWicke has submitted this change and it was merged. Change subject: Bump to latest restbase master .. Bump to latest restbase master Change-Id: Ib6d429ed6889157f3d27710ff76ab8be68d7ecc2 --- M node_modules/node-uuid/node_modules/bignum/build/Release/bignum.node M node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum.node M node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum/bignum.o M node_modules/node-uuid/node_modules/microtime/build/Release/microtime.node M node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime.node M node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime/src/microtime.o M restbase 7 files changed, 0 insertions(+), 0 deletions(-) Approvals: GWicke: Verified; Looks good to me, approved diff --git a/node_modules/node-uuid/node_modules/bignum/build/Release/bignum.node b/node_modules/node-uuid/node_modules/bignum/build/Release/bignum.node index 9caf63a..9c93cbf 100755 --- a/node_modules/node-uuid/node_modules/bignum/build/Release/bignum.node +++ b/node_modules/node-uuid/node_modules/bignum/build/Release/bignum.node Binary files differ diff --git a/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum.node b/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum.node index 9caf63a..9c93cbf 100755 --- a/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum.node +++ b/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum.node Binary files differ diff --git a/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum/bignum.o b/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum/bignum.o index d1664e6..2ad530d 100644 --- a/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum/bignum.o +++ b/node_modules/node-uuid/node_modules/bignum/build/Release/obj.target/bignum/bignum.o Binary files differ diff --git a/node_modules/node-uuid/node_modules/microtime/build/Release/microtime.node b/node_modules/node-uuid/node_modules/microtime/build/Release/microtime.node index a77a8e3..a828924 100755 --- a/node_modules/node-uuid/node_modules/microtime/build/Release/microtime.node +++ b/node_modules/node-uuid/node_modules/microtime/build/Release/microtime.node Binary files differ diff --git a/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime.node b/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime.node index a77a8e3..a828924 100755 --- a/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime.node +++ b/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime.node Binary files differ diff --git a/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime/src/microtime.o b/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime/src/microtime.o index f2f8e17..d330b63 100644 --- a/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime/src/microtime.o +++ b/node_modules/node-uuid/node_modules/microtime/build/Release/obj.target/microtime/src/microtime.o Binary files differ diff --git a/restbase b/restbase index 1883a9e..5949504 16 --- a/restbase +++ b/restbase -Subproject commit 1883a9ee5a85272ef8d0ab9cbef5b757396dd645 +Subproject commit 5949504d4f84b1037447c769b58ef366db6d275b -- To view, visit https://gerrit.wikimedia.org/r/175176 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib6d429ed6889157f3d27710ff76ab8be68d7ecc2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/restbase/deploy Gerrit-Branch: master Gerrit-Owner: GWicke Gerrit-Reviewer: GWicke ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] composer: Rename package to 'oojs-ui' and require php 5.3.3 - change (oojs/ui)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175177
Change subject: composer: Rename package to 'oojs-ui' and require php 5.3.3
..
composer: Rename package to 'oojs-ui' and require php 5.3.3
The composer name is composed of publisher/package-name (similar
to GitHub paths). To allow easy forking and avoid name clashing,
consistently use 'oojs-ui' as the package name.
This hasn't been tested with PHP 5.3.2. MediaWiki and CSSJanus
both support PHP 5.3.3. and higher. Might as well match that.
Change-Id: Ib021b5524e15b3b3ba65110b6c23d214388a4758
---
M composer.json
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/77/175177/1
diff --git a/composer.json b/composer.json
index 7d0c612..bc3200a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,9 @@
{
- "name": "oojs/ui",
+ "name": "wikimedia/oojs-ui",
"homepage": "https://www.mediawiki.org/wiki/OOjs_UI";,
"license": "MIT",
"require": {
- "php": ">=5.3.2"
+ "php": ">=5.3.3"
},
"autoload": {
"classmap": ["php/"]
--
To view, visit https://gerrit.wikimedia.org/r/175177
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib021b5524e15b3b3ba65110b6c23d214388a4758
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Krinkle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (9ed4cf2557) - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (9ed4cf2557)
..
Update OOjs UI to v0.1.0-pre (9ed4cf2557)
New changes:
649a6c6 [BREAKING CHANGE] Allow options with similar data
afbedc7 Add a getMenu() getter to ComboBoxWidget
Change-Id: I23782a6e728951dab8cde3d28e30cfe0a2074b50
---
M resources/lib/oojs-ui/oojs-ui-apex.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-apex.svg.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
M resources/lib/oojs-ui/oojs-ui.js
7 files changed, 110 insertions(+), 92 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css
b/resources/lib/oojs-ui/oojs-ui-apex.css
index 0b168c2..961fef6 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:38Z
+ * Date: 2014-11-22T01:21:24Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js
b/resources/lib/oojs-ui/oojs-ui-apex.js
index 150c0f2..2ccc076 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:28Z
+ * Date: 2014-11-22T01:21:13Z
*/
/* Instantiation */
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
index 2ccec13..e6a3ac3 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:38Z
+ * Date: 2014-11-22T01:21:24Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
index 4d14376..1c8da20 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:38Z
+ * Date: 2014-11-22T01:21:24Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js
b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
index d119fc7..aadc497 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:28Z
+ * Date: 2014-11-22T01:21:13Z
*/
/**
* @class
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
index efd997a..ae350a4 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:38Z
+ * Date: 2014-11-22T01:21:24Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js
index 30e5e4e..7c0c343 100644
--- a/resources/lib/oojs-ui/oojs-ui.js
+++ b/resources/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* htt
[MediaWiki-commits] [Gerrit] Tag v0.2.0 - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Tag v0.2.0
..
Tag v0.2.0
Change-Id: Ie8b6a09e28a5cd16c5cc639750910e6715178adb
---
M README.md
M package.json
2 files changed, 12 insertions(+), 5 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/README.md b/README.md
index 5e45ad4..fff4cbd 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@
Release process:
-~~~bash
+
$ cd path/to/oojs-ui/
$ git remote update
$ git checkout -b release -t origin/master
@@ -45,9 +45,16 @@
# both a commit and a tag, and we shouldn't tag until after
# the commit is merged.
-# Change the version number
+# Update release notes
+# Copy the resulting list into a new section on History.md
+$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e
'console.log(JSON.parse(require("fs").readFileSync("package.json")).version);')...HEAD
+$ edit History.md
+
+# Update the version number
$ edit package.json
-$ git add package.json && git commit -m "Tag vX.X.X"
+
+$ git add -p
+$ git commit -m "Tag vX.X.X"
$ git review
# After merging:
@@ -56,4 +63,4 @@
$ git tag "vX.X.X"
$ git push --tags
$ npm publish
-~~~
+
diff --git a/package.json b/package.json
index febb450..b78b286 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.1.0",
+ "version": "0.2.0",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
--
To view, visit https://gerrit.wikimedia.org/r/175175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie8b6a09e28a5cd16c5cc639750910e6715178adb
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Tag v0.2.0 - change (oojs/ui)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175175
Change subject: Tag v0.2.0
..
Tag v0.2.0
Change-Id: Ie8b6a09e28a5cd16c5cc639750910e6715178adb
---
M README.md
M package.json
2 files changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/75/175175/1
diff --git a/README.md b/README.md
index 5e45ad4..fff4cbd 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@
Release process:
-~~~bash
+
$ cd path/to/oojs-ui/
$ git remote update
$ git checkout -b release -t origin/master
@@ -45,9 +45,16 @@
# both a commit and a tag, and we shouldn't tag until after
# the commit is merged.
-# Change the version number
+# Update release notes
+# Copy the resulting list into a new section on History.md
+$ git log --format='* %s (%aN)' --no-merges --reverse v$(node -e
'console.log(JSON.parse(require("fs").readFileSync("package.json")).version);')...HEAD
+$ edit History.md
+
+# Update the version number
$ edit package.json
-$ git add package.json && git commit -m "Tag vX.X.X"
+
+$ git add -p
+$ git commit -m "Tag vX.X.X"
$ git review
# After merging:
@@ -56,4 +63,4 @@
$ git tag "vX.X.X"
$ git push --tags
$ npm publish
-~~~
+
diff --git a/package.json b/package.json
index febb450..b78b286 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "oojs-ui",
- "version": "0.1.0",
+ "version": "0.2.0",
"description": "User interface classes built on the OOjs framework.",
"keywords": [
"oojs-plugin",
--
To view, visit https://gerrit.wikimedia.org/r/175175
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie8b6a09e28a5cd16c5cc639750910e6715178adb
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Jforrester
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Browser tests: Fix class name: ve-ui-contextMenuWidget → ve-... - change (mediawiki...VisualEditor)
Bartosz Dziewoński has uploaded a new change for review. https://gerrit.wikimedia.org/r/175174 Change subject: Browser tests: Fix class name: ve-ui-contextMenuWidget → ve-ui-contextSelectWidget .. Browser tests: Fix class name: ve-ui-contextMenuWidget → ve-ui-contextSelectWidget Change-Id: I70f44e71819e9147886bd70baf3460daf9ebbaf2 --- M modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/74/175174/1 diff --git a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb index 161f3cc..5470d80 100644 --- a/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb +++ b/modules/ve-mw/tests/browser/features/support/pages/visual_editor_page.rb @@ -72,7 +72,7 @@ div(:link_overlay_does_not_exist, text: /New page/) div(:link_overlay_external_link, text: /External link.+New page/m) div(:link_overlay_wiki_page, text: /Matching page/) - unordered_list(:media_caption, class: 've-ui-contextMenuWidget') + unordered_list(:media_caption, class: 've-ui-contextSelectWidget') span(:media_exit, text: 'Return to save form') figure(:media_image, index: 0) span(:media_insert_menu, class: 'oo-ui-tool-name-media') @@ -98,7 +98,7 @@ a(:page_title, text: /Page title/) a(:paragraph, text: /Paragraph/) div(:parameter_icon, text: 'q') - unordered_list(:popup_icon, class: 've-ui-contextMenuWidget') + unordered_list(:popup_icon, class: 've-ui-contextSelectWidget') a(:preformatted, text: /Preformatted/) label(:prevent_redirect, class: 'oo-ui-layout oo-ui-labelElement oo-ui-fieldLayout oo-ui-fieldLayout-align-inline oo-ui-fieldLayout-disabled') span(:ref_list_insert_menu, class: 'oo-ui-tool-name-referencesList') -- To view, visit https://gerrit.wikimedia.org/r/175174 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I70f44e71819e9147886bd70baf3460daf9ebbaf2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Bartosz Dziewoński ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (9ed4cf2557) - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (9ed4cf2557)
..
Update OOjs UI to v0.1.0-pre (9ed4cf2557)
New changes:
649a6c6 [BREAKING CHANGE] Allow options with similar data
afbedc7 Add a getMenu() getter to ComboBoxWidget
Local changes for the breaking change to OptionWidget and sub-classes.
Change-Id: I7acd87722c063084f88b5ce9436ba156debe29a8
---
M demos/ve/demo.js
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-apex.svg.css
M lib/oojs-ui/oojs-ui-apex.svg.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css
M lib/oojs-ui/oojs-ui.js
M src/ui/ve.ui.Context.js
M src/ui/ve.ui.MobileContext.js
M src/ui/ve.ui.TableContext.js
M src/ui/widgets/ve.ui.ContextOptionWidget.js
M src/ui/widgets/ve.ui.LanguageInputWidget.js
M src/ui/widgets/ve.ui.LanguageResultWidget.js
M src/ui/widgets/ve.ui.LanguageSearchWidget.js
M src/ui/widgets/ve.ui.MediaSizeWidget.js
M src/ui/widgets/ve.ui.MobileContextOptionWidget.js
21 files changed, 149 insertions(+), 125 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/ve/demo.js b/demos/ve/demo.js
index 8346d01..363d1c9 100644
--- a/demos/ve/demo.js
+++ b/demos/ve/demo.js
@@ -11,7 +11,10 @@
var name, items = [];
for ( name in ve.demoPages ) {
items.push(
- new OO.ui.MenuOptionWidget(
ve.demoPages[name], { label: name } )
+ new OO.ui.MenuOptionWidget( {
+ data: ve.demoPages[name],
+ label: name
+ } )
);
}
return items;
@@ -43,9 +46,9 @@
pageMenu = pageDropdown.getMenu(),
modeSelect = new OO.ui.ButtonSelectWidget().addItems( [
- new OO.ui.ButtonOptionWidget( 've', { label:
'VE' } ),
- new OO.ui.ButtonOptionWidget( 'edit', { label:
'Edit HTML' } ),
- new OO.ui.ButtonOptionWidget( 'read', { label:
'Read' } )
+ new OO.ui.ButtonOptionWidget( { data: 've',
label: 'VE' } ),
+ new OO.ui.ButtonOptionWidget( { data: 'edit',
label: 'Edit HTML' } ),
+ new OO.ui.ButtonOptionWidget( { data: 'read',
label: 'Read' } )
] ),
languageInput = new ve.ui.LanguageInputWidget( {
requireDir: true,
diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css
index 02116d0..11a5c74 100644
--- a/lib/oojs-ui/oojs-ui-apex.css
+++ b/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:01Z
+ * Date: 2014-11-22T01:18:44Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
diff --git a/lib/oojs-ui/oojs-ui-apex.js b/lib/oojs-ui/oojs-ui-apex.js
index bff36f8..d2244ac 100644
--- a/lib/oojs-ui/oojs-ui-apex.js
+++ b/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:31:51Z
+ * Date: 2014-11-22T01:18:34Z
*/
/* Instantiation */
diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css
index c9eab99..c3c7b0a 100644
--- a/lib/oojs-ui/oojs-ui-apex.rtl.css
+++ b/lib/oojs-ui/oojs-ui-apex.rtl.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:01Z
+ * Date: 2014-11-22T01:18:44Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-right: -40%;
diff --git a/lib/oojs-ui/oojs-ui-apex.svg.css b/lib/oojs-ui/oojs-ui-apex.svg.css
index 118f062..758fdd3 100644
--- a/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.
[MediaWiki-commits] [Gerrit] Delete src/ui/widgets/ve.ui.ContextWidget.js - change (VisualEditor/VisualEditor)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175172
Change subject: Delete src/ui/widgets/ve.ui.ContextWidget.js
..
Delete src/ui/widgets/ve.ui.ContextWidget.js
Unused. Follow-up to b141a7d23fc47938030cb6a742db51229770025e,
which copied a file instead of renaming.
Change-Id: I3ed8617b03b953b5c0e6d5374428329289272aec
---
D src/ui/widgets/ve.ui.ContextWidget.js
1 file changed, 0 insertions(+), 43 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/72/175172/1
diff --git a/src/ui/widgets/ve.ui.ContextWidget.js
b/src/ui/widgets/ve.ui.ContextWidget.js
deleted file mode 100644
index e6b7642..000
--- a/src/ui/widgets/ve.ui.ContextWidget.js
+++ /dev/null
@@ -1,43 +0,0 @@
-/*!
- * VisualEditor Context widget class.
- *
- * @copyright 2011-2014 VisualEditor Team and others; see
http://ve.mit-license.org
- */
-
-/**
- * List of context items, displaying information about the current context.
- *
- * Use with ve.ui.ContextOptionWidget.
- *
- * @class
- * @extends OO.ui.SelectWidget
- *
- * @constructor
- * @param {Object} [config] Configuration options
- */
-ve.ui.ContextWidget = function VeUiContextWidget( config ) {
- // Config initialization
- config = config || {};
-
- // Parent constructor
- ve.ui.ContextWidget.super.call( this, config );
-
- this.connect( this, { choose: 'onChooseItem' } );
-
- // Initialization
- this.$element.addClass( 've-ui-contextWidget' );
-};
-
-/* Setup */
-
-OO.inheritClass( ve.ui.ContextWidget, OO.ui.SelectWidget );
-
-/* Methods */
-
-/**
- * Handle choose item events.
- */
-ve.ui.ContextWidget.prototype.onChooseItem = function () {
- // Auto-deselect
- this.selectItem( null );
-};
--
To view, visit https://gerrit.wikimedia.org/r/175172
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3ed8617b03b953b5c0e6d5374428329289272aec
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (9ed4cf2557) - change (mediawiki/core)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175171
Change subject: Update OOjs UI to v0.1.0-pre (9ed4cf2557)
..
Update OOjs UI to v0.1.0-pre (9ed4cf2557)
New changes:
649a6c6 [BREAKING CHANGE] Allow options with similar data
afbedc7 Add a getMenu() getter to ComboBoxWidget
Change-Id: I23782a6e728951dab8cde3d28e30cfe0a2074b50
---
M resources/lib/oojs-ui/oojs-ui-apex.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-apex.svg.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
M resources/lib/oojs-ui/oojs-ui.js
7 files changed, 110 insertions(+), 92 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/71/175171/1
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css
b/resources/lib/oojs-ui/oojs-ui-apex.css
index 0b168c2..961fef6 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:38Z
+ * Date: 2014-11-22T01:21:24Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js
b/resources/lib/oojs-ui/oojs-ui-apex.js
index 150c0f2..2ccc076 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:28Z
+ * Date: 2014-11-22T01:21:13Z
*/
/* Instantiation */
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
index 2ccec13..e6a3ac3 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:38Z
+ * Date: 2014-11-22T01:21:24Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
index 4d14376..1c8da20 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:38Z
+ * Date: 2014-11-22T01:21:24Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.js
b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
index d119fc7..aadc497 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.js
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:28Z
+ * Date: 2014-11-22T01:21:13Z
*/
/**
* @class
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
index efd997a..ae350a4 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:32:38Z
+ * Date: 2014-11-22T01:21:24Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
diff --git a/resources/lib/oojs-ui/oojs-ui.js b/resources/lib/oojs-ui/oojs-ui.js
index 30e5e4e..7c0c343 100644
--- a/resources/lib/oojs-ui/oojs-ui.js
+++ b/resources/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (8f8896196f)
+ * OOjs UI v0.1.0-pre (9ed4cf2557)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Allow options with similar data - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: [BREAKING CHANGE] Allow options with similar data
..
[BREAKING CHANGE] Allow options with similar data
Problems:
1. OptionWidgets were required to have unique data within a select,
which can cause problems and confusion, especially since conflicts
were handled silently in unintuitive ways.
2. Item data was hashed when the item was added, essentially freezing
the value at the time of adding. If the item's data changes, the hash
is invalid and stops working.
Thoughts:
1. It's actually not necessary for options to have unique data, and it
may be generally useful for other kinds of elements to have data, and
other kinds of groups to be able to access elements by that data.
2. While thus far we've not had an issue with items having unique data,
it seems that we are destined to need this eventually, especially
with drag and drop between groups on the horizon.
Solution:
1. Add 'data' config option to Element, stored as 'data' property,
accessed using 'getData' method and modified using 'setData' method;
store data property in Element
2. Remove data argument, data property and 'getData' method from
OptionWidget
3. Move getItemFromData from SelectWidget to GroupElement - make it
return first matching item
4. Add getItemsFromData method to GroupElement, which returns all
matching items
5. Remove logic in SelectWidget that indexed item data and enforced
unique item data constraints
6. Update subclasses of OptionWidget to no longer pass through the data
argument
7. Update callers to use the 'data' config option instead of an initial
argument
Change-Id: I7ee78b6d0b734c32fc6dd3760c6ec45362ef8571
---
M demos/demo.js
M demos/pages/dialogs.js
M demos/pages/widgets.js
M src/Element.js
M src/elements/GroupElement.js
M src/layouts/BookletLayout.js
M src/widgets/ButtonOptionWidget.js
M src/widgets/DecoratedOptionWidget.js
M src/widgets/MenuOptionWidget.js
M src/widgets/MenuSectionOptionWidget.js
M src/widgets/OptionWidget.js
M src/widgets/OutlineOptionWidget.js
M src/widgets/RadioOptionWidget.js
M src/widgets/SelectWidget.js
14 files changed, 163 insertions(+), 126 deletions(-)
Approvals:
Catrope: Looks good to me, but someone else must approve
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/demos/demo.js b/demos/demo.js
index ce36e15..7349673 100644
--- a/demos/demo.js
+++ b/demos/demo.js
@@ -19,26 +19,26 @@
$: this.$,
menu: {
items: [
- new OO.ui.MenuOptionWidget( 'dialogs', { $:
this.$, label: 'Dialogs' } ),
- new OO.ui.MenuOptionWidget( 'icons', { $:
this.$, label: 'Icons' } ),
- new OO.ui.MenuOptionWidget( 'toolbars', { $:
this.$, label: 'Toolbars' } ),
- new OO.ui.MenuOptionWidget( 'widgets', { $:
this.$, label: 'Widgets' } )
+ new OO.ui.MenuOptionWidget( { $: this.$, data:
'dialogs', label: 'Dialogs' } ),
+ new OO.ui.MenuOptionWidget( { $: this.$, data:
'icons', label: 'Icons' } ),
+ new OO.ui.MenuOptionWidget( { $: this.$, data:
'toolbars', label: 'Toolbars' } ),
+ new OO.ui.MenuOptionWidget( { $: this.$, data:
'widgets', label: 'Widgets' } )
]
},
classes: [ 'oo-ui-demo-pageDropdown' ]
} );
this.pageMenu = this.pageDropdown.getMenu();
this.themeSelect = new OO.ui.ButtonSelectWidget( { $: this.$ }
).addItems( [
- new OO.ui.ButtonOptionWidget( 'apex', { $: this.$, label:
'Apex' } ),
- new OO.ui.ButtonOptionWidget( 'mediawiki', { $: this.$, label:
'MediaWiki' } )
+ new OO.ui.ButtonOptionWidget( { $: this.$, data: 'apex', label:
'Apex' } ),
+ new OO.ui.ButtonOptionWidget( { $: this.$, data: 'mediawiki',
label: 'MediaWiki' } )
] );
this.graphicsSelect = new OO.ui.ButtonSelectWidget( { $: this.$ }
).addItems( [
- new OO.ui.ButtonOptionWidget( 'vector', { $: this.$, label:
'Vector' } ),
- new OO.ui.ButtonOptionWidget( 'raster', { $: this.$, label:
'Raster' } )
+ new OO.ui.ButtonOptionWidget( { $: this.$, data: 'vector',
label: 'Vector' } ),
+ new OO.ui.ButtonOptionWidget( { $: this.$, data: 'raster',
label: 'Raster' } )
] );
this.directionSelect = new OO.ui.ButtonSelectWidget( { $: this.$ }
).addItems( [
- new OO.ui.ButtonOptionWidget( 'ltr', { $: this.$, label: 'LTR'
} ),
- new OO.ui.ButtonOptionWidget( 'rtl', { $: this.$, label: 'RTL'
} )
+ new OO.ui.ButtonOptionWidget( { $: this.$, data: 'ltr', label:
'LTR' } ),
+
[MediaWiki-commits] [Gerrit] Added custom frame support to Profiler - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175170
Change subject: Added custom frame support to Profiler
..
Added custom frame support to Profiler
* Made use of it in the DatabaseBase classes
* For the xhprof class, this only works in HHVM for now
Change-Id: I95d7cc128d4a770328fbdd2b546972d3fc2e2e8a
---
M includes/db/Database.php
M includes/profiler/Profiler.php
M includes/profiler/ProfilerStandard.php
M includes/profiler/ProfilerStub.php
M includes/profiler/ProfilerXhprof.php
5 files changed, 51 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/70/175170/1
diff --git a/includes/db/Database.php b/includes/db/Database.php
index e5332d2..a8ecdc4 100644
--- a/includes/db/Database.php
+++ b/includes/db/Database.php
@@ -962,7 +962,8 @@
$totalProf = '';
$isMaster = !is_null( $this->getLBInfo( 'master' ) );
- if ( !Profiler::instance()->isStub() ) {
+ $profiler = Profiler::instance();
+ if ( !$profiler->isStub() ) {
# generalizeSQL will probably cut down the query to
reasonable
# logging size most of the time. The substr is really
just a sanity check.
if ( $isMaster ) {
@@ -976,8 +977,8 @@
$queryProf .= $this->mTrxShortId ? "
[TRX#{$this->mTrxShortId}]" : "";
$trx = $this->mTrxLevel ? 'TRX=yes' : 'TRX=no';
- wfProfileIn( $totalProf );
- wfProfileIn( $queryProf );
+ $totalProfSection = $profiler->scopedProfileIn(
$totalProf );
+ $queryProfSection = $profiler->scopedProfileIn(
$queryProf );
}
if ( $this->debug() ) {
diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index 2b3b616..9650ff5 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -140,6 +140,23 @@
abstract public function profileOut( $functionname );
/**
+* Mark the start of a custom profiling frame (e.g. DB queries).
+* The frame ends when the result of this method falls out of scope.
+*
+* @param string $section
+* @return ScopedCallback|null
+* @since 1.25
+*/
+ abstract public function scopedProfileIn( $section );
+
+ /**
+* @param ScopedCallback $section
+*/
+ public function scopedProfileOut( ScopedCallback &$section ) {
+ $section = null;
+ }
+
+ /**
* @return TransactionProfiler
* @since 1.25
*/
diff --git a/includes/profiler/ProfilerStandard.php
b/includes/profiler/ProfilerStandard.php
index 15c5cdd..ab5e3ab 100644
--- a/includes/profiler/ProfilerStandard.php
+++ b/includes/profiler/ProfilerStandard.php
@@ -227,6 +227,15 @@
}
}
+ public function scopedProfileIn( $section ) {
+ $this->profileIn( $section );
+
+ $that = $this;
+ return new ScopedCallback( function() use ( $that, $section ) {
+ $that->profileOut( $section );
+ } );
+ }
+
/**
* Close opened profiling sections
*/
diff --git a/includes/profiler/ProfilerStub.php
b/includes/profiler/ProfilerStub.php
index 510a0a0..6fc74ef 100644
--- a/includes/profiler/ProfilerStub.php
+++ b/includes/profiler/ProfilerStub.php
@@ -37,6 +37,10 @@
public function profileOut( $fn ) {
}
+ public function scopedProfileIn( $section ) {
+ return null;
+ }
+
public function getFunctionStats() {
}
diff --git a/includes/profiler/ProfilerXhprof.php
b/includes/profiler/ProfilerXhprof.php
index d67806b..cbd081d 100644
--- a/includes/profiler/ProfilerXhprof.php
+++ b/includes/profiler/ProfilerXhprof.php
@@ -122,6 +122,23 @@
public function profileOut( $functionname ) {
}
+ public function scopedProfileIn( $section ) {
+ static $exists = null;
+ // Only HHVM supports this, not the standard PECL extension
+ if ( $exists === null ) {
+ $exists = function_exists( 'xhprof_frame_begin' );
+ }
+
+ if ( $exists ) {
+ xhprof_frame_begin( $section );
+ return new ScopedCallback( function() use ( $section ) {
+ xhprof_frame_end( $section );
+ } );
+ }
+
+ return null;
+ }
+
/**
* No-op for xhprof profiling.
*/
--
To view, visit https://gerrit.wikimedia.org/r/175170
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
G
[MediaWiki-commits] [Gerrit] Add support for timezones while creating reports - change (analytics/wikimetrics)
Bmansurov has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175169
Change subject: Add support for timezones while creating reports
..
Add support for timezones while creating reports
Bug: 72116
Change-Id: I5651dc6753f834c6cdc94df6a102a5dc683b80be
---
M wikimetrics/static/js/reportCreate.js
M wikimetrics/templates/report.html
2 files changed, 30 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/wikimetrics
refs/changes/69/175169/1
diff --git a/wikimetrics/static/js/reportCreate.js
b/wikimetrics/static/js/reportCreate.js
index 78b1d99..3983fef 100644
--- a/wikimetrics/static/js/reportCreate.js
+++ b/wikimetrics/static/js/reportCreate.js
@@ -21,6 +21,8 @@
return true;
},
+timezone: ko.observable('+'),
+
metrics: ko.observableArray([]),
toggleMetric: function(metric){
@@ -41,9 +43,16 @@
},
save: function(formElement){
-
+var timezone = this.timezone();
+
if (site.hasValidationErrors()){
site.showWarning('Please configure and click Save
Configuration for each selected metric.');
+return;
+}
+
+// timezone must be in the + or - form
+if (!/^[+-][0-9]{4}$/.test(timezone)) {
+site.showWarning('Please enter a valid timezone.');
return;
}
@@ -69,7 +78,7 @@
var form = $(formElement);
var data = ko.toJSON(vm.request().responses);
data = JSON.parse(data);
-
+
ko.utils.arrayForEach(data, function(response){
delete response.metric.configure;
delete response.cohort.wikiusers;
@@ -80,9 +89,15 @@
delete response.metric.tabIdSelector;
delete response.metric.selected;
delete response.metric.description;
+// apply timezone info
+ko.utils.arrayForEach(response.metric.dateTimeFieldNames,
function(name) {
+response.metric[name] = moment(response.metric[name] + ' '
+ timezone)
+.utc()
+.format('-MM-DD hh:mm:ss');
+});
});
data = JSON.stringify(data);
-
+
$.ajax({ type: 'post', url: form.attr('action'), data: {responses:
data, recurrent: vm.request().recurrent()} })
.done(site.handleWith(function(response){
// should redirect to the reports page, so show an error
otherwise
@@ -235,6 +250,11 @@
var parentId = metric.tabId();
var controls = $('#' + parentId + ' div.datetimepicker');
controls.datetimepicker({language: 'en'});
+// save datetime field names for later use (timezone conversion)
+metric.dateTimeFieldNames = [];
+controls.each(function () {
+metric.dateTimeFieldNames.push($(this).find('input').attr('name'));
+});
// TODO: this might be cleaner if it metric[name] was an observable
controls.on('changeDate', function(){
var input = $(this).find('input');
diff --git a/wikimetrics/templates/report.html
b/wikimetrics/templates/report.html
index 4775d82..2d35fae 100644
--- a/wikimetrics/templates/report.html
+++ b/wikimetrics/templates/report.html
@@ -32,6 +32,13 @@
+
+
+ Pick Timezone
+
+e.g. +0100
+
+
Pick Metrics
--
To view, visit https://gerrit.wikimedia.org/r/175169
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5651dc6753f834c6cdc94df6a102a5dc683b80be
Gerrit-PatchSet: 1
Gerrit-Project: analytics/wikimetrics
Gerrit-Branch: master
Gerrit-Owner: Bmansurov
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki.action.view.dblClickEdit: Do not call click on und... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki.action.view.dblClickEdit: Do not call click on
undefined
..
mediawiki.action.view.dblClickEdit: Do not call click on undefined
Not all pages in a MediaWiki installation have an edit link. For
example the pages in Wikidata do not have it.
Bug: 57713
Change-Id: I842c1224d15887d59eab73f2b222c232a05c0bd9
---
M resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
index 3c22851..2be29f0 100644
--- a/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
+++ b/resources/src/mediawiki.action/mediawiki.action.view.dblClickEdit.js
@@ -8,7 +8,11 @@
if ( parseInt( mw.user.options.get( 'editondblclick' ),
10 ) ) {
e.preventDefault();
// Trigger native HTMLElement click instead of
opening URL (bug 43052)
- $( '#ca-edit a' ).get( 0 ).click();
+ var $a = $( '#ca-edit a' );
+ // Not every page has an edit link (bug 57713)
+ if ( $a.length ) {
+ $a.get( 0 ).click();
+ }
}
} );
} );
--
To view, visit https://gerrit.wikimedia.org/r/174679
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I842c1224d15887d59eab73f2b222c232a05c0bd9
Gerrit-PatchSet: 6
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Thiemo Mättig (WMDE)
Gerrit-Reviewer: He7d3r
Gerrit-Reviewer: Helder.wiki
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: Thiemo Mättig (WMDE)
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Disable new Notifications for simple Patrol actions - change (mediawiki...PageTriage)
Ragesoss has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175168
Change subject: Disable new Notifications for simple Patrol actions
..
Disable new Notifications for simple Patrol actions
Remove the triggering of Notifications for the case when the
page was simply patrolled but not tagged with specific issues,
since newcomers find these message very confusing and they are
not actionable.
Change-Id: I173d5cdd5f6cfd948904d65393080f737b6e8b8c
---
M PageTriage.hooks.php
M api/ApiPageTriageAction.php
2 files changed, 0 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageTriage
refs/changes/68/175168/1
diff --git a/PageTriage.hooks.php b/PageTriage.hooks.php
index d600050..a6db2f5 100644
--- a/PageTriage.hooks.php
+++ b/PageTriage.hooks.php
@@ -419,9 +419,6 @@
}
}
$article = Article::newFromID( $rc->getAttribute(
'rc_cur_id' ) );
- if ( $article ) {
- PageTriageUtil::createNotificationEvent(
$article, $user, 'pagetriage-mark-as-reviewed' );
- }
}
return true;
diff --git a/api/ApiPageTriageAction.php b/api/ApiPageTriageAction.php
index 7cf0d13..149dbf7 100644
--- a/api/ApiPageTriageAction.php
+++ b/api/ApiPageTriageAction.php
@@ -27,11 +27,6 @@
$pageTriage = new PageTriage( $params['pageid'] );
$pageTriage->setTriageStatus( $params['reviewed'],
$this->getUser() );
- // notification on mark as reviewed
- if ( !$params['skipnotif'] && $params['reviewed'] ) {
- PageTriageUtil::createNotificationEvent( $article,
$this->getUser(), 'pagetriage-mark-as-reviewed' );
- }
-
// logging
$logEntry = new ManualLogEntry( 'pagetriage-curation',
$params['reviewed'] ? 'reviewed' : 'unreviewed' );
$logEntry->setPerformer( $this->getUser() );
--
To view, visit https://gerrit.wikimedia.org/r/175168
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I173d5cdd5f6cfd948904d65393080f737b6e8b8c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageTriage
Gerrit-Branch: master
Gerrit-Owner: Ragesoss
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update for OOUI OptionWidget (and subclasses) changes - change (VisualEditor/VisualEditor)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175167
Change subject: Update for OOUI OptionWidget (and subclasses) changes
..
Update for OOUI OptionWidget (and subclasses) changes
OptionWidget constructor now accepts a 'data' config option instead of
a separate 'data' parameter.
See I7ee78b6d.
Change-Id: I7acd87722c063084f88b5ce9436ba156debe29a8
---
M demos/ve/demo.js
M src/ui/ve.ui.Context.js
M src/ui/ve.ui.MobileContext.js
M src/ui/ve.ui.TableContext.js
M src/ui/widgets/ve.ui.ContextOptionWidget.js
M src/ui/widgets/ve.ui.LanguageInputWidget.js
M src/ui/widgets/ve.ui.LanguageResultWidget.js
M src/ui/widgets/ve.ui.LanguageSearchWidget.js
M src/ui/widgets/ve.ui.MediaSizeWidget.js
M src/ui/widgets/ve.ui.MobileContextOptionWidget.js
10 files changed, 31 insertions(+), 25 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/67/175167/1
diff --git a/demos/ve/demo.js b/demos/ve/demo.js
index 8346d01..363d1c9 100644
--- a/demos/ve/demo.js
+++ b/demos/ve/demo.js
@@ -11,7 +11,10 @@
var name, items = [];
for ( name in ve.demoPages ) {
items.push(
- new OO.ui.MenuOptionWidget(
ve.demoPages[name], { label: name } )
+ new OO.ui.MenuOptionWidget( {
+ data: ve.demoPages[name],
+ label: name
+ } )
);
}
return items;
@@ -43,9 +46,9 @@
pageMenu = pageDropdown.getMenu(),
modeSelect = new OO.ui.ButtonSelectWidget().addItems( [
- new OO.ui.ButtonOptionWidget( 've', { label:
'VE' } ),
- new OO.ui.ButtonOptionWidget( 'edit', { label:
'Edit HTML' } ),
- new OO.ui.ButtonOptionWidget( 'read', { label:
'Read' } )
+ new OO.ui.ButtonOptionWidget( { data: 've',
label: 'VE' } ),
+ new OO.ui.ButtonOptionWidget( { data: 'edit',
label: 'Edit HTML' } ),
+ new OO.ui.ButtonOptionWidget( { data: 'read',
label: 'Read' } )
] ),
languageInput = new ve.ui.LanguageInputWidget( {
requireDir: true,
diff --git a/src/ui/ve.ui.Context.js b/src/ui/ve.ui.Context.js
index 65f16a6..eb4086f 100644
--- a/src/ui/ve.ui.Context.js
+++ b/src/ui/ve.ui.Context.js
@@ -289,7 +289,7 @@
*/
ve.ui.Context.prototype.createItem = function ( tool ) {
return new ve.ui.ContextOptionWidget(
- tool.tool.static.name, tool.tool, tool.model, { $: this.$ }
+ tool.tool, tool.model, { $: this.$, data: tool.tool.static.name
}
);
};
diff --git a/src/ui/ve.ui.MobileContext.js b/src/ui/ve.ui.MobileContext.js
index e0d8c0b..5706079 100644
--- a/src/ui/ve.ui.MobileContext.js
+++ b/src/ui/ve.ui.MobileContext.js
@@ -60,7 +60,7 @@
*/
ve.ui.Context.prototype.createItem = function ( tool ) {
return new ve.ui.MobileContextOptionWidget(
- tool.tool.static.name, tool.tool, tool.model, { $: this.$ }
+ tool.tool, tool.model, { $: this.$, data: tool.tool.static.name
}
);
};
diff --git a/src/ui/ve.ui.TableContext.js b/src/ui/ve.ui.TableContext.js
index 273a2c1..91d0c2c 100644
--- a/src/ui/ve.ui.TableContext.js
+++ b/src/ui/ve.ui.TableContext.js
@@ -71,7 +71,7 @@
for ( i = 0, l = toolList.length; i < l; i++ ) {
tool = ve.ui.toolFactory.lookup( toolList[i] );
items.push( new ve.ui.ContextOptionWidget(
- tool.static.name, tool, this.tableNode.getModel(), { $:
this.$ }
+ tool, this.tableNode.getModel(), { $: this.$, data:
tool.static.name }
) );
}
this.menu.addItems( items );
diff --git a/src/ui/widgets/ve.ui.ContextOptionWidget.js
b/src/ui/widgets/ve.ui.ContextOptionWidget.js
index cd512e3..896bbe3 100644
--- a/src/ui/widgets/ve.ui.ContextOptionWidget.js
+++ b/src/ui/widgets/ve.ui.ContextOptionWidget.js
@@ -13,17 +13,16 @@
* @extends OO.ui.DecoratedOptionWidget
*
* @constructor
- * @param {Object} data Item data
* @param {Function} tool Tool item is a proxy for
* @param {ve.dm.Node|ve.dm.Annotation} model Node or annotation item is
related to
* @param {Object} [config] Configuration options
*/
-ve.ui.ContextOptionWidget = function VeUiContextOptionWidget( data, tool,
model, config ) {
+ve.ui.ContextOptionWidget = function VeUiContextOptionWidget( tool, model,
config ) {
// Config initialization
config = config || {};
[MediaWiki-commits] [Gerrit] Update for OOUI OptionWidget (and subclasses) changes - change (mediawiki...VisualEditor)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175166
Change subject: Update for OOUI OptionWidget (and subclasses) changes
..
Update for OOUI OptionWidget (and subclasses) changes
OptionWidget constructor now accepts a 'data' config option instead of
a separate 'data' parameter.
See I7ee78b6d.
Change-Id: Ife6abd312d4dc97be67cb84eea4cb9c6a0a31b1d
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWInternalLinkMenuOptionWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWLinkMenuOptionWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWLinkTargetInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWMoreParametersResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWNoParametersResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWParameterResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWParameterSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWReferenceGroupInputWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWReferenceResultWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWReferenceSearchWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWTitleInputWidget.js
17 files changed, 173 insertions(+), 138 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/66/175166/1
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index ed52c70..f96700a 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -268,18 +268,21 @@
$: this.$
} );
- alignLeftButton = new OO.ui.ButtonOptionWidget( 'left', {
+ alignLeftButton = new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'left',
icon: 'align-float-left',
label: ve.msg( 'visualeditor-dialog-media-position-left' )
} );
- alignCenterButton = new OO.ui.ButtonOptionWidget( 'center', {
+ alignCenterButton = new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'center',
icon: 'align-center',
label: ve.msg( 'visualeditor-dialog-media-position-center' )
} );
- alignRightButton = new OO.ui.ButtonOptionWidget( 'right', {
+ alignRightButton = new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'right',
icon: 'align-float-right',
label: ve.msg( 'visualeditor-dialog-media-position-right' )
} );
@@ -323,23 +326,27 @@
} );
this.typeSelect.addItems( [
// TODO: Inline images require a bit of further work, will be
coming soon
- new OO.ui.ButtonOptionWidget( 'thumb', {
+ new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'thumb',
icon: 'image-thumbnail',
label: ve.msg( 'visualeditor-dialog-media-type-thumb' )
} ),
- new OO.ui.ButtonOptionWidget( 'frameless', {
+ new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'frameless',
icon: 'image-frameless',
label: ve.msg(
'visualeditor-dialog-media-type-frameless' )
} ),
- new OO.ui.ButtonOptionWidget( 'frame', {
+ new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'frame',
icon: 'image-frame',
label: ve.msg( 'visualeditor-dialog-media-type-frame' )
} ),
- new OO.ui.ButtonOptionWidget( 'none', {
+ new OO.ui.ButtonOptionWidget( {
$: this.$,
+ data: 'none',
icon: 'image-none',
label: ve.msg( 'visualeditor-dialog-media-type-none' )
} )
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
index e358b12..fc1d91f 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWAdvancedSettingsPage.js
@@ -38,18 +38,18 @@
this.indexing = new OO.ui.FieldLayout(
new OO.ui.ButtonSelectWidget( { $: this.$ } )
.addItems( [
- new OO.ui.ButtonOptionWidget(
- 'mwIndexForce',
- { label: ve.msg(
'visualeditor
[MediaWiki-commits] [Gerrit] Hygiene: Add getTalkpageManager() to interface - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175165
Change subject: Hygiene: Add getTalkpageManager() to interface
..
Hygiene: Add getTalkpageManager() to interface
We are starting to use this more, it should be part of the interface
to keep down false positive static analysis warnings.
Change-Id: Ibb0a575897c39f0b45f82864601728a77a1b649c
---
M includes/TalkpageManager.php
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/65/175165/1
diff --git a/includes/TalkpageManager.php b/includes/TalkpageManager.php
index 699c6de..e68718f 100644
--- a/includes/TalkpageManager.php
+++ b/includes/TalkpageManager.php
@@ -24,6 +24,14 @@
* @return Revision|null
*/
public function ensureFlowRevision( Article $title, Workflow $workflow
);
+
+ /**
+* Gives a user object used to manage talk pages
+*
+* @return User User to manage talkpages
+* @throws MWException If a user cannot be created.
+*/
+ public function getTalkpageManager();
}
class TalkpageManager implements OccupationController {
--
To view, visit https://gerrit.wikimedia.org/r/175165
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibb0a575897c39f0b45f82864601728a77a1b649c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove addParserOutputMetadata() from formHTML(), add it to ... - change (mediawiki...SemanticForms)
Foxtrott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175164
Change subject: Remove addParserOutputMetadata() from formHTML(), add it to
callers as necessary
..
Remove addParserOutputMetadata() from formHTML(), add it to callers as necessary
This will fix the issue where JavaScript parts of inputs are called twice.
Tried and works for
* action=formedit
* Special:FormEdit/Form (1-click page creation)
* Special:FormEdit/Form/Page (page editing)
* Special:RunQuery
* transposed Special:RunQuery
* preview of page containing transposed Special:RunQuery
Does not work for
* preview of Form editing (did not work before either)
Change-Id: I9dd224da28a06e624ecddf138d58715698e49422
---
M includes/SF_AutoeditAPI.php
M includes/SF_FormPrinter.php
M includes/SF_Utils.php
3 files changed, 17 insertions(+), 26 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/64/175164/1
diff --git a/includes/SF_AutoeditAPI.php b/includes/SF_AutoeditAPI.php
index 7b22092..d2f2dd2 100644
--- a/includes/SF_AutoeditAPI.php
+++ b/includes/SF_AutoeditAPI.php
@@ -745,7 +745,7 @@
* @throws MWException
*/
public function doAction() {
- global $wgOut, $wgRequest, $sfgFormPrinter;
+ global $wgOut, $wgParser, $wgRequest, $sfgFormPrinter;
// if the wiki is read-only, do not save
if ( wfReadOnly() ) {
@@ -843,8 +843,6 @@
$formContent, $isFormSubmitted,
$pageExists, $formArticleId, $preloadContent, $targetName, $targetNameFormula
);
- $formHtmlHasRun = true;
-
// parse the data to be preloaded from the form html of
the
// existing page
$data = $this->parseDataFromHTMLFrag( $formHTML );
@@ -866,22 +864,9 @@
// Spoof $wgRequest for SFFormPrinter::formHTML().
$wgRequest = new FauxRequest( $this->mOptions, true );
- // if necessary spoof wgOut; if we took the general $wgOut
again some JS
- // modules might attach themselves twice and thus be called
twice
- if ( $formHtmlHasRun ) {
- // save wgOut for later restoration
- $oldOut = $wgOut;
- $wgOut = new OutputPage( RequestContext::getMain() );
- }
-
// get wikitext for submitted data and form
list ( $formHTML, $formJS, $targetContent, $generatedFormName,
$generatedTargetNameFormula ) =
$sfgFormPrinter->formHTML( $formContent,
$isFormSubmitted, $pageExists, $formArticleId, $preloadContent, $targetName,
$targetNameFormula );
-
- if ( $formHtmlHasRun ) {
- // restore wgOut
- $wgOut = $oldOut;
- }
// restore original request
$wgRequest = $oldRequest;
@@ -922,6 +907,14 @@
$this->doStore( $editor );
}
} else if ( $this->mAction === self::ACTION_FORMEDIT ) {
+
+ $parserOutput = $wgParser->getOutput();
+ if( method_exists( $wgOut, 'addParserOutputMetadata' )
){
+ $wgOut->addParserOutputMetadata( $parserOutput
);
+ } else {
+ $wgOut->addParserOutputNoText( $parserOutput );
+ }
+
$this->doFormEdit( $formHTML, $formJS );
}
}
diff --git a/includes/SF_FormPrinter.php b/includes/SF_FormPrinter.php
index 2c14f5a..e35fe88 100644
--- a/includes/SF_FormPrinter.php
+++ b/includes/SF_FormPrinter.php
@@ -1802,15 +1802,6 @@
$javascript_text = '';
}
- $parserOutput = $wgParser->getOutput();
-
- // addParserOutputMetadata was introduced in 1.24 when
addParserOutputNoText was deprecated
- if( method_exists( $wgOut, 'addParserOutputMetadata' ) ){
- $wgOut->addParserOutputMetadata( $parserOutput );
- } else {
- $wgOut->addParserOutputNoText( $parserOutput );
- }
-
// $wgParser = $oldParser;
wfProfileOut( __METHOD__ );
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 482daa9..ae4cfb3 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -882,7 +882,7 @@
* @return true
*/
public static function showFormPreview( EditPage $editpage, WebRequest
$request ) {
- global $wgOut, $sfgFormPrinter;
+ global $wgOut, $wgParser, $sfgFormPrinter;
wfDebug( __METHOD__ .
[MediaWiki-commits] [Gerrit] Calculate latest donation data even for opt-outs - change (wikimedia...tools)
Ejegg has uploaded a new change for review. https://gerrit.wikimedia.org/r/175163 Change subject: Calculate latest donation data even for opt-outs .. Calculate latest donation data even for opt-outs We were skipping calculating latest donation amounts and dates for opted out donors because we wouldn't need to use it in emails. Now that we're using the export table for the LYBUNT report, we should calculate the latest donation data for all donors. Change-Id: I1e5b5e5904137c3330a03aaa85aeacfd04713873 --- M silverpop_export/update_table.sql 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/tools refs/changes/63/175163/1 diff --git a/silverpop_export/update_table.sql b/silverpop_export/update_table.sql index 402a5b1..6b91398 100755 --- a/silverpop_export/update_table.sql +++ b/silverpop_export/update_table.sql @@ -247,10 +247,10 @@ latest_usd_amount = ct.total_amount, latest_donation = ct.receive_date WHERE - ex.last_ctid = ct.id AND - ex.opted_out = 0; + ex.last_ctid = ct.id; -- Remove contacts who apparently have no contributions +-- Leave opted out non-contributors so we don't spam anyone DELETE FROM temp_silverpop_export WHERE temp_silverpop_export.latest_donation IS NULL AND -- To view, visit https://gerrit.wikimedia.org/r/175163 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1e5b5e5904137c3330a03aaa85aeacfd04713873 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/tools Gerrit-Branch: master Gerrit-Owner: Ejegg ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bugzilla: install old-bugzilla SSL cert - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175162
Change subject: bugzilla: install old-bugzilla SSL cert
..
bugzilla: install old-bugzilla SSL cert
this cert doesn't exist yet, but it will be needed
for old-bugilla to work without throwing a cert
error
RT to request this cert is:
Change-Id: Id6d107838ec731c97ee5bda9c632221934140110
RT: 8922
---
M modules/bugzilla/manifests/apache.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/62/175162/1
diff --git a/modules/bugzilla/manifests/apache.pp
b/modules/bugzilla/manifests/apache.pp
index a36876f..0c032b3 100644
--- a/modules/bugzilla/manifests/apache.pp
+++ b/modules/bugzilla/manifests/apache.pp
@@ -8,7 +8,7 @@
include ::apache::mod::env
# separate cert and ServerName for attachments for security
-install_certificate{ 'bugzilla.wikimedia.org': }
+install_certificate{ 'old-bugzilla.wikimedia.org': }
install_certificate{ $attach_svc_name: }
$ssl_settings = ssl_ciphersuite('apache-2.2', 'compat', '365')
--
To view, visit https://gerrit.wikimedia.org/r/175162
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id6d107838ec731c97ee5bda9c632221934140110
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Force Class['::keyholder'] to apply before Keyholder::Privat... - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Force Class['::keyholder'] to apply before
Keyholder::Private_key because WTF labs
..
Force Class['::keyholder'] to apply before Keyholder::Private_key because WTF
labs
Change-Id: I3712a70f63ceac6c02c22f72f7608c9f99540d59
---
M manifests/role/deployment.pp
M modules/keyholder/manifests/private_key.pp
2 files changed, 3 insertions(+), 7 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 1654169..638d17b 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -148,12 +148,10 @@
remote_branch => 'readonly/master'
}
-class { '::keyholder':
-trusted_group => 'wikidev',
-} -> class { '::keyholder::monitoring': }
-
+class { '::keyholder': trusted_group => 'wikidev', } ->
+class { '::keyholder::monitoring': } ->
keyholder::private_key { 'mwdeploy_rsa':
-source => 'puppet:///private/ssh/tin/mwdeploy_rsa',
+source => 'puppet:///private/ssh/tin/mwdeploy_rsa',
}
}
diff --git a/modules/keyholder/manifests/private_key.pp
b/modules/keyholder/manifests/private_key.pp
index b562e5d..fec9d50 100644
--- a/modules/keyholder/manifests/private_key.pp
+++ b/modules/keyholder/manifests/private_key.pp
@@ -37,8 +37,6 @@
fail('"source" and "content" are mutually exclusive')
}
-include ::keyholder
-
$title_safe = regsubst($title, '\W', '_', 'G')
file { "/etc/keyholder.d/${title_safe}":
--
To view, visit https://gerrit.wikimedia.org/r/175158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3712a70f63ceac6c02c22f72f7608c9f99540d59
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Ori.livneh
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 submodule checkout for restbase - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Enable submodule checkout for restbase
..
Enable submodule checkout for restbase
Change-Id: I266e219d89ad3378a1a7463313eb194a17e7bdd1
---
M manifests/role/deployment.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 21127cc..1654169 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -61,6 +61,7 @@
'restbase/deploy' => {
'upstream' =>
'https://gerrit.wikimedia.org/r/mediawiki/services/restbase/deploy',
'service_name' => 'restbase',
+'checkout_submodules' => true,
},
'fluoride/fluoride' => {
'upstream' =>
'https://gerrit.wikimedia.org/r/mediawiki/tools/fluoride',
--
To view, visit https://gerrit.wikimedia.org/r/175159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I266e219d89ad3378a1a7463313eb194a17e7bdd1
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: GWicke
Gerrit-Reviewer: Ori.livneh
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 board stats piece - change (wikimedia...dash)
Ssmith has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175161
Change subject: Add board stats piece
..
Add board stats piece
Change-Id: I9c7bb0efae992cd36bfe1052aa19a7a90a6264d0
---
M bower.json
M src/app/require.config.js
M src/components/app-content/app-content.html
M src/components/boards/bigEnglish/bigEnglishBoard.html
M src/components/boards/bigEnglish/bigEnglishBoard.js
M src/css/style.css
6 files changed, 189 insertions(+), 37 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/61/175161/1
diff --git a/bower.json b/bower.json
index 4fdb0a7..5cf8f1b 100644
--- a/bower.json
+++ b/bower.json
@@ -29,7 +29,7 @@
"chartjs": "~1.0.0",
"crossroads": "~0.12.0",
"gauge.js": "~1.2.1",
-"fontawesome": "~4.1.0",
+"fontawesome": "4.2",
"hasher": "~1.2.0",
"knockout-projections": "~1.1.0-pre",
"knockout": "~3.2.0",
@@ -39,7 +39,8 @@
"lato": "~0.2.1",
"requirejs-text": "~2.0.12",
"jquery": "~2.1.1",
-"nouislider": "~7.0.7"
+"nouislider": "~7.0.7",
+"numeraljs": "~1.5.3"
},
"keywords": [
"dash"
@@ -48,7 +49,6 @@
"private": true,
"resolutions": {
"bootstrap": ">=3.0 <4.0",
-"jquery": "2.1.1",
-"chartjs": "~1.0.0"
+"jquery": "2.1.1"
}
}
diff --git a/src/app/require.config.js b/src/app/require.config.js
index db0c0c7..8568383 100644
--- a/src/app/require.config.js
+++ b/src/app/require.config.js
@@ -20,7 +20,8 @@
'sifter': 'bower_modules/sifter/sifter',
'microplugin': 'bower_modules/microplugin/src/microplugin',
'selectize':'bower_modules/selectize/dist/js/selectize',
-'c3': 'bower_modules/c3/c3'
+'c3': 'bower_modules/c3/c3',
+'numeraljs':'bower_modules/numeraljs/numeral'
},
shim: {
'bootstrap': {
diff --git a/src/components/app-content/app-content.html
b/src/components/app-content/app-content.html
index 8bb9718..4e79491 100644
--- a/src/components/app-content/app-content.html
+++ b/src/components/app-content/app-content.html
@@ -1,6 +1,6 @@
-
+
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.html
b/src/components/boards/bigEnglish/bigEnglishBoard.html
index 32f82b8..f4a9029 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.html
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.html
@@ -6,10 +6,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+2014 Big English Goal
+
+
+
+
+
+
+
+
+
+
+
+
+Total To Date
+
+
+
+
+
+
+
+
+
+
+
+
+Remaining To Raise
+
+
+
+
+
+
+
+
+
@@ -25,4 +76,28 @@
+
+
+
+
+
+
+
+×Close
+Options
+
+
+Change Big English goal
+
+ $
+
+ .00
+
+
+
+Cancel
+Submit
+
+
+
\ No newline at end of file
diff --git a/src/components/boards/bigEnglish/bigEnglishBoard.js
b/src/components/boards/bigEnglish/bigEnglishBoard.js
index c0ac4d9..dedda02 100644
--- a/src/components/boards/bigEnglish/bigEnglishBoard.js
+++ b/src/components/boards/bigEnglish/bigEnglishBoard.js
@@ -1,8 +1,9 @@
define( [
'knockout',
'text!components/boards/bigEnglish/bigEnglishBoard.html',
-'momentjs'
-], function( ko, template, moment ){
+'momentjs',
+'numeraljs'
+], function( ko, template, moment, numeral ){
function BigEnglishBoardViewModel( params ){
@@ -19,6 +20,23 @@
location.reload();
};
+// TODO
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: adb186e..0ed86dd - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: adb186e..0ed86dd .. Syncronize VisualEditor: adb186e..0ed86dd Change-Id: Ic769945c8bc1e8aa4ecf8ac3cc5fe7c11454a080 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jenkins-mwext-sync: Verified; Looks good to me, approved diff --git a/VisualEditor b/VisualEditor index adb186e..0ed86dd 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit adb186e4549902fe2b483bf5c208191098e454f3 +Subproject commit 0ed86dd9da295b963d9528e03b4a0387ccc01fab -- To view, visit https://gerrit.wikimedia.org/r/175160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic769945c8bc1e8aa4ecf8ac3cc5fe7c11454a080 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync Gerrit-Reviewer: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add instrumentation for edit schema - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Add instrumentation for edit schema
..
Add instrumentation for edit schema
Move ve.track() subscriber to its own file, and have it
route mwtiming.* events (for TimingData) and mwedit.* events
(for Edit schema) differently. Most of the data population
lives in the subscriber, so actual ve.track() calls are
pretty lightweight.
Existing ve.track() calls with timing data were kept with
their names intact for backwards compatibility, but
we may eventually want to throw them out and start from scratch.
ve.init.mw.ViewPageTarget.init.js:
* Remove old track subscriber
* Track init and ready events
* Remove old ve.track( 'Edit', ... ) crap that didn't work
ve.init.mw.ViewPageTarget.js:
* Fire the saveWorkflowBegin event before the save dialog
loads rather than after
* Remove unnecessary this.events.trackSaveError() calls:
TargetEvents already listens to these events itself
* Remove badtoken handler because all it was was an
unnecessary trackSaveError() call
* Add abort tracking
** Pass trackMechanism through deactivate() and cancel()
ve.init.mw.Target.js:
* Add static.integrationType to populate the 'integration'
field in the schema
ve.init.mw.TargetEvents.js:
* Simplify onSaveError* methods away into connect bindings
* Map track topics to mwtiming.* so they can be routed separately
* Track save-related mwedit.* events
Depends on I978eda96c in WikimediaEvents
Change-Id: Iae677d9b15c71d2b18e795bd5179d11876c06abd
---
M VisualEditor.php
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js
M modules/ve-mw/init/ve.init.mw.Target.js
M modules/ve-mw/init/ve.init.mw.TargetEvents.js
A modules/ve-mw/init/ve.init.mw.trackSubscriber.js
6 files changed, 229 insertions(+), 113 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index 0fe6a1c..1af5366 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -297,6 +297,7 @@
'modules/ve-mw/init/ve.init.mw.Platform.js',
'modules/ve-mw/init/ve.init.mw.Target.js',
'modules/ve-mw/init/ve.init.mw.TargetEvents.js',
+ 'modules/ve-mw/init/ve.init.mw.trackSubscriber.js',
),
'dependencies' => array(
'jquery.visibleText',
diff --git a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
index 2a07df9..e0b0b57 100644
--- a/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
+++ b/modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.init.js
@@ -31,13 +31,6 @@
.then( function () {
var target = new
ve.init.mw.ViewPageTarget();
- // Tee tracked events to MediaWiki
firehose, if available (1.23+).
- if ( mw.track ) {
- ve.trackSubscribeAll( function
( topic, data ) {
- mw.track.call( null,
've.' + topic, data );
- } );
- }
-
// Transfer methods
ve.init.mw.ViewPageTarget.prototype.setupSectionEditLinks =
init.setupSectionLinks;
@@ -342,6 +335,7 @@
}
init.showLoading();
+ ve.track( 'mwedit.init', { type: 'page', mechanism:
'click' } );
if ( history.pushState && uri.query.veaction !== 'edit'
) {
// Replace the current state with one that is
tagged as ours, to prevent the
@@ -357,8 +351,11 @@
e.preventDefault();
getTarget().done( function ( target ) {
- ve.track( 'Edit', { action: 'edit-link-click' }
);
- target.activate().always( init.hideLoading );
+ target.activate()
+ .done( function () {
+ ve.track( 'mwedit.ready' );
+ } )
+ .always( init.hideLoading );
} );
},
@@ -368,6 +365,7 @@
}
init.showLoading();
+ ve.track( 'mwedit.init', { type: 'section', mechanism:
'click' } );
if ( history.pushState && uri.query.veaction !== 'edit'
) {
// Replace the current
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: adb186e..0ed86dd - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/175160 Change subject: Syncronize VisualEditor: adb186e..0ed86dd .. Syncronize VisualEditor: adb186e..0ed86dd Change-Id: Ic769945c8bc1e8aa4ecf8ac3cc5fe7c11454a080 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/60/175160/1 diff --git a/VisualEditor b/VisualEditor index adb186e..0ed86dd 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit adb186e4549902fe2b483bf5c208191098e454f3 +Subproject commit 0ed86dd9da295b963d9528e03b4a0387ccc01fab -- To view, visit https://gerrit.wikimedia.org/r/175160 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic769945c8bc1e8aa4ecf8ac3cc5fe7c11454a080 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable submodule checkout for restbase - change (operations/puppet)
GWicke has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175159
Change subject: Enable submodule checkout for restbase
..
Enable submodule checkout for restbase
Change-Id: I266e219d89ad3378a1a7463313eb194a17e7bdd1
---
M manifests/role/deployment.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/59/175159/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 5e55f60..159d0e9 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -61,6 +61,7 @@
'restbase/deploy' => {
'upstream' =>
'https://gerrit.wikimedia.org/r/mediawiki/services/restbase/deploy',
'service_name' => 'restbase',
+'checkout_submodules' => true,
},
'fluoride/fluoride' => {
'upstream' =>
'https://gerrit.wikimedia.org/r/mediawiki/tools/fluoride',
--
To view, visit https://gerrit.wikimedia.org/r/175159
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I266e219d89ad3378a1a7463313eb194a17e7bdd1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: GWicke
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Force Class['::keyholder'] to apply before Keyholder::Privat... - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175158
Change subject: Force Class['::keyholder'] to apply before
Keyholder::Private_key because WTF labs
..
Force Class['::keyholder'] to apply before Keyholder::Private_key because WTF
labs
Change-Id: I3712a70f63ceac6c02c22f72f7608c9f99540d59
---
M manifests/role/deployment.pp
1 file changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/58/175158/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 21127cc..8bc1e65 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -147,12 +147,12 @@
remote_branch => 'readonly/master'
}
-class { '::keyholder':
-trusted_group => 'wikidev',
-} -> class { '::keyholder::monitoring': }
+class { '::keyholder': trusted_group => 'wikidev', } ->
+
+class { '::keyholder::monitoring': } ->
keyholder::private_key { 'mwdeploy_rsa':
-source => 'puppet:///private/ssh/tin/mwdeploy_rsa',
+source => 'puppet:///private/ssh/tin/mwdeploy_rsa',
}
}
--
To view, visit https://gerrit.wikimedia.org/r/175158
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3712a70f63ceac6c02c22f72f7608c9f99540d59
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ensure ::keyholder is applied before ::keyholder::monitoring - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: ensure ::keyholder is applied before ::keyholder::monitoring
..
ensure ::keyholder is applied before ::keyholder::monitoring
Change-Id: I59289f9f7d97ee82f21c846f60b96064bf32630c
---
M manifests/role/deployment.pp
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 5e55f60..21127cc 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -149,9 +149,7 @@
class { '::keyholder':
trusted_group => 'wikidev',
-}
-
-include ::keyholder::monitoring
+} -> class { '::keyholder::monitoring': }
keyholder::private_key { 'mwdeploy_rsa':
source => 'puppet:///private/ssh/tin/mwdeploy_rsa',
--
To view, visit https://gerrit.wikimedia.org/r/175157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I59289f9f7d97ee82f21c846f60b96064bf32630c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ensure ::keyholder is applied before ::keyholder::monitoring - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175157
Change subject: ensure ::keyholder is applied before ::keyholder::monitoring
..
ensure ::keyholder is applied before ::keyholder::monitoring
Change-Id: I59289f9f7d97ee82f21c846f60b96064bf32630c
---
M manifests/role/deployment.pp
1 file changed, 1 insertion(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/175157/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 5e55f60..21127cc 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -149,9 +149,7 @@
class { '::keyholder':
trusted_group => 'wikidev',
-}
-
-include ::keyholder::monitoring
+} -> class { '::keyholder::monitoring': }
keyholder::private_key { 'mwdeploy_rsa':
source => 'puppet:///private/ssh/tin/mwdeploy_rsa',
--
To view, visit https://gerrit.wikimedia.org/r/175157
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I59289f9f7d97ee82f21c846f60b96064bf32630c
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a getMenu() getter to ComboBoxWidget - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Add a getMenu() getter to ComboBoxWidget
..
Add a getMenu() getter to ComboBoxWidget
Change-Id: Iac778dd7d077c054dd71aa3fe929747a30b11448
---
M src/widgets/ComboBoxWidget.js
1 file changed, 8 insertions(+), 0 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/ComboBoxWidget.js b/src/widgets/ComboBoxWidget.js
index 863e3b2..24704fa 100644
--- a/src/widgets/ComboBoxWidget.js
+++ b/src/widgets/ComboBoxWidget.js
@@ -58,6 +58,14 @@
/* Methods */
/**
+ * Get the combobox's menu.
+ * @return {OO.ui.TextInputMenuSelectWidget} Menu widget
+ */
+OO.ui.ComboBoxWidget.prototype.getMenu = function () {
+ return this.menu;
+};
+
+/**
* Handle input change events.
*
* @param {string} value New value
--
To view, visit https://gerrit.wikimedia.org/r/175154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac778dd7d077c054dd71aa3fe929747a30b11448
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
Gerrit-Reviewer: Trevor Parscal
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Auto-link EventLogging SCIDs in Gerrit - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Auto-link EventLogging SCIDs in Gerrit
..
Auto-link EventLogging SCIDs in Gerrit
Map 'SCID 10374055' -> https://meta.wikimedia.org/w/index.php?oldid=10374055
Change-Id: I4b030e989b9e087c735b4631c8074d245c0105c6
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 3 insertions(+), 0 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index f619c41..d5d27f8 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -85,6 +85,9 @@
[commentlink "rt"]
match = "\\b[rR][tT]\\:?\\s+#?(\\d+)\\b"
link = https://rt.wikimedia.org/Ticket/Display.html?id=$1
+[commentlink "scid"]
+match = "\\b[sS][cC][iI][dD]\\:?\\s+#?(\\d+)\\b"
+link = https://meta.wikimedia.org/w/index.php?oldid=$1
[commentlink "cve"]
match = "\\b(CVE\\-\\d{4}\\-\\d+)\\b"
link = https://cve.mitre.org/cgi-bin/cvename.cgi?name=$1
--
To view, visit https://gerrit.wikimedia.org/r/175156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4b030e989b9e087c735b4631c8074d245c0105c6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Auto-link EventLogging SCIDs in Gerrit - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175156
Change subject: Auto-link EventLogging SCIDs in Gerrit
..
Auto-link EventLogging SCIDs in Gerrit
Map 'SCID 10374055' -> https://meta.wikimedia.org/w/index.php?oldid=10374055
Change-Id: I4b030e989b9e087c735b4631c8074d245c0105c6
---
M modules/gerrit/templates/gerrit.config.erb
1 file changed, 3 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/56/175156/1
diff --git a/modules/gerrit/templates/gerrit.config.erb
b/modules/gerrit/templates/gerrit.config.erb
index f619c41..d5d27f8 100644
--- a/modules/gerrit/templates/gerrit.config.erb
+++ b/modules/gerrit/templates/gerrit.config.erb
@@ -85,6 +85,9 @@
[commentlink "rt"]
match = "\\b[rR][tT]\\:?\\s+#?(\\d+)\\b"
link = https://rt.wikimedia.org/Ticket/Display.html?id=$1
+[commentlink "scid"]
+match = "\\b[sS][cC][iI][dD]\\:?\\s+#?(\\d+)\\b"
+link = https://meta.wikimedia.org/w/index.php?oldid=$1
[commentlink "cve"]
match = "\\b(CVE\\-\\d{4}\\-\\d+)\\b"
link = https://cve.mitre.org/cgi-bin/cvename.cgi?name=$1
--
To view, visit https://gerrit.wikimedia.org/r/175156
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4b030e989b9e087c735b4631c8074d245c0105c6
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update for OOUI OptionWidget (and subclasses) changes - change (mediawiki...MultimediaViewer)
Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175155
Change subject: Update for OOUI OptionWidget (and subclasses) changes
..
Update for OOUI OptionWidget (and subclasses) changes
OptionWidget constructor now accepts a 'data' config option instead of
a separate 'data' parameter.
See I7ee78b6d.
Change-Id: Ie54e9db788cbe846cd2d173498c7fe17bafc126e
---
M resources/mmv/ui/mmv.ui.download.pane.js
M resources/mmv/ui/mmv.ui.reuse.dialog.js
M resources/mmv/ui/mmv.ui.reuse.dialog.less
M resources/mmv/ui/mmv.ui.reuse.embed.js
M resources/mmv/ui/mmv.ui.utils.js
5 files changed, 23 insertions(+), 20 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/55/175155/1
diff --git a/resources/mmv/ui/mmv.ui.download.pane.js
b/resources/mmv/ui/mmv.ui.download.pane.js
index 66919a7..7d635d1 100644
--- a/resources/mmv/ui/mmv.ui.download.pane.js
+++ b/resources/mmv/ui/mmv.ui.download.pane.js
@@ -148,17 +148,19 @@
attributionSwitch = new oo.ui.ButtonSelectWidget( {
classes: [ 'mw-mmv-download-attr-select' ]
} ),
- plainOption = new oo.ui.ButtonOptionWidget( 'plain', {
+ plainOption = new oo.ui.ButtonOptionWidget( {
+ data: 'plain',
label: mw.message(
'multimediaviewer-attr-plain' ).text()
} ),
- htmlOption = new oo.ui.ButtonOptionWidget( 'html', {
+ htmlOption = new oo.ui.ButtonOptionWidget( {
+ data: 'html',
label: mw.message( 'multimediaviewer-attr-html'
).text()
} );
attributionSwitch.addItems( [
- plainOption,
- htmlOption
- ] );
+ plainOption,
+ htmlOption
+ ] );
attributionSwitch.selectItem( plainOption );
diff --git a/resources/mmv/ui/mmv.ui.reuse.dialog.js
b/resources/mmv/ui/mmv.ui.reuse.dialog.js
index 1b4ce4e..a257693 100644
--- a/resources/mmv/ui/mmv.ui.reuse.dialog.js
+++ b/resources/mmv/ui/mmv.ui.reuse.dialog.js
@@ -54,7 +54,8 @@
// FIXME this should happen outside the dialog and the tabs, but we
need to improve
DP.initTabs = function () {
function makeTab( type ) {
- return new oo.ui.MenuOptionWidget( type, {
+ return new oo.ui.MenuOptionWidget( {
+ data: type,
label: mw.message( 'multimediaviewer-' + type +
'-tab' ).text()
} );
}
diff --git a/resources/mmv/ui/mmv.ui.reuse.dialog.less
b/resources/mmv/ui/mmv.ui.reuse.dialog.less
index 6dc1e99..2a06377 100644
--- a/resources/mmv/ui/mmv.ui.reuse.dialog.less
+++ b/resources/mmv/ui/mmv.ui.reuse.dialog.less
@@ -19,7 +19,7 @@
display: none;
}
- .oo-ui-optionWidget {
+ .oo-ui-optionWidget {
@tab-border-height: 3px;
@highlighted-tab-color: rgb(225, 243, 255);
@selected-tab-color: rgb(0, 113, 188);
diff --git a/resources/mmv/ui/mmv.ui.reuse.embed.js
b/resources/mmv/ui/mmv.ui.reuse.embed.js
index 824f4b7..75bddc8 100644
--- a/resources/mmv/ui/mmv.ui.reuse.embed.js
+++ b/resources/mmv/ui/mmv.ui.reuse.embed.js
@@ -158,12 +158,14 @@
classes: [ 'mw-mmv-embed-select' ]
} );
- wikitextButtonOption = new oo.ui.ButtonOptionWidget(
'wikitext', {
- label: mw.message( 'multimediaviewer-embed-wt'
).text()
- } );
- htmlButtonOption = new oo.ui.ButtonOptionWidget( 'html', {
- label: mw.message(
'multimediaviewer-embed-html' ).text()
- } );
+ wikitextButtonOption = new oo.ui.ButtonOptionWidget( {
+ data: 'wikitext',
+ label: mw.message( 'multimediaviewer-embed-wt' ).text()
+ } );
+ htmlButtonOption = new oo.ui.ButtonOptionWidget( {
+ data: 'html',
+ label: mw.message( 'multimediaviewer-embed-html'
).text()
+ } );
this.embedSwitch.addItems( [
wikitextButtonOption,
diff --git a/resources/mmv/ui/mmv.ui.utils.js b/resources/mmv/ui/mmv.ui.utils.js
index 492689f..9d03900 100644
--- a/resources/mmv/ui/mmv.ui.utils.js
+++ b/resources/mmv/ui/mmv.ui.utils.js
@@ -50,17 +50,15 @@
for ( i = 0; i < options.length; i++ ) {
[MediaWiki-commits] [Gerrit] Add a getMenu() getter to ComboBoxWidget - change (oojs/ui)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175154
Change subject: Add a getMenu() getter to ComboBoxWidget
..
Add a getMenu() getter to ComboBoxWidget
Change-Id: Iac778dd7d077c054dd71aa3fe929747a30b11448
---
M src/widgets/ComboBoxWidget.js
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/54/175154/1
diff --git a/src/widgets/ComboBoxWidget.js b/src/widgets/ComboBoxWidget.js
index 863e3b2..87985b9 100644
--- a/src/widgets/ComboBoxWidget.js
+++ b/src/widgets/ComboBoxWidget.js
@@ -58,6 +58,14 @@
/* Methods */
/**
+ * Get the combobox's menu.
+ * @returns {OO.ui.TextInputMenuSelectWidget} Menu widget
+ */
+OO.ui.ComboBoxWidget.prototype.getMenu = function () {
+ return this.menu;
+};
+
+/**
* Handle input change events.
*
* @param {string} value New value
--
To view, visit https://gerrit.wikimedia.org/r/175154
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iac778dd7d077c054dd71aa3fe929747a30b11448
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add hiera lookup tool - change (operations/puppet)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175153
Change subject: Add hiera lookup tool
..
Add hiera lookup tool
Add a command-line script for performing Hiera lookups given a particular host.
Usage: hiera_lookup --fqdn=FQDN [--hostname=NAME] [--realm=REALM] [--site=SITE]
If hostname, realm or site are not provided, they will be derived from the FQDN.
Example: hiera_lookup --fqdn=mw1020.eqiad.wmnet
Change-Id: I23c70d8c80a82ee71ccca5fd284756238d5ce302
---
A hiera_lookup
1 file changed, 49 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/53/175153/1
diff --git a/hiera_lookup b/hiera_lookup
new file mode 100755
index 000..edf5d4f
--- /dev/null
+++ b/hiera_lookup
@@ -0,0 +1,49 @@
+#!/usr/bin/env ruby
+# -*- coding: utf-8 -*-
+# hiera_lookup: hiera lookup tool
+
+usage = <<-end
+hiera_lookup: hiera lookup tool
+Usage: hiera_lookup --fqdn=FQDN [--hostname=NAME] [--realm=REALM] [--site=SITE]
+
+If hostname, realm or site are not provided, they will be derived from the
FQDN.
+
+Example: hiera_lookup --fqdn=mw1020.eqiad.wmnet
+end
+
+begin
+ require 'rubygems'
+rescue LoadError
+ nil
+end
+
+require 'hiera'
+require 'hiera/backend'
+
+abort(usage) if ARGV.include?('-h') || ARGV.include?('--help')
+
+$DIR = File.expand_path('..', __FILE__)
+$LOAD_PATH << File.join($DIR, 'modules/wmflib/lib')
+cfg = File.join($DIR, 'modules/puppetmaster/files/production.hiera.yaml')
+
+module Hiera
+ module Backend
+class << self
+ alias_method :old_datadir, :datadir
+ def datadir(backend, scope)
+old_datadir(backend, scope).gsub(/^.*(?=\/hieradata)/, $DIR)
+ end
+end
+ end
+end
+
+scope = Hash[ARGV.map { |kv| "::#{kv.tr('-:', '')}".split('=') }]
+
+abort(usage << "\nError: --fqdn=FQDN is required.") unless scope['::fqdn']
+
+scope['::hostname'] ||= scope['::fqdn'][/^[^.]+/]
+scope['::realm'] ||= scope['::fqdn'].include?('labs') ? 'labs' : 'production'
+scope['::site'] ||= scope['::realm'] == 'labs' ? 'eqiad' :
scope['::fqdn'].split('.')[-2]
+
+hiera = Hiera.new(:config => cfg)
+puts hiera.lookup('mainrole', nil, scope, nil, :priority)
--
To view, visit https://gerrit.wikimedia.org/r/175153
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I23c70d8c80a82ee71ccca5fd284756238d5ce302
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ori.livneh
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update Edit schema again - change (mediawiki...WikimediaEvents)
jenkins-bot has submitted this change and it was merged. Change subject: Update Edit schema again .. Update Edit schema again We'd left in an enum for an integer property. Oops :( Change-Id: I3b35377a907d94359792f775b890ab0b4148377f --- M WikimediaEvents.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Krinkle: Looks good to me, approved jenkins-bot: Verified diff --git a/WikimediaEvents.php b/WikimediaEvents.php index 8ecedf8..267eaa9 100644 --- a/WikimediaEvents.php +++ b/WikimediaEvents.php @@ -51,7 +51,7 @@ 'schema.Edit' => array( 'class' => 'ResourceLoaderSchemaModule', 'schema' => 'Edit', - 'revision' => 10590995, + 'revision' => 10604157, ), 'ext.wikimediaEvents.ve' => array( 'scripts' => 'ext.wikimediaEvents.ve.js', -- To view, visit https://gerrit.wikimedia.org/r/175151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3b35377a907d94359792f775b890ab0b4148377f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaEvents Gerrit-Branch: master Gerrit-Owner: Catrope Gerrit-Reviewer: Krinkle 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 Prateek as an author - change (mediawiki...AccountInfo)
jenkins-bot has submitted this change and it was merged. Change subject: Add Prateek as an author .. Add Prateek as an author Change-Id: If1b9a25542d5e6372a7752df34c4e1733dd0fa0d --- M AccountInfo.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Legoktm: Looks good to me, approved jenkins-bot: Verified diff --git a/AccountInfo.php b/AccountInfo.php index c6a87d9..35f3799 100644 --- a/AccountInfo.php +++ b/AccountInfo.php @@ -15,7 +15,7 @@ $wgExtensionCredits['other'][] = array( 'path' => __FILE__, 'name' => 'AccountInfo', - 'author' => array( 'Kunal Mehta', 'Benjamin Lees' ), + 'author' => array( 'Kunal Mehta', 'Benjamin Lees', 'Prateek Saxena' ), 'url' => 'https://www.mediawiki.org/wiki/Extension:AccountInfo', 'descriptionmsg' => 'accountinfo-desc', 'version' => '0.2.0', -- To view, visit https://gerrit.wikimedia.org/r/175148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: If1b9a25542d5e6372a7752df34c4e1733dd0fa0d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AccountInfo Gerrit-Branch: master Gerrit-Owner: Legoktm Gerrit-Reviewer: Legoktm 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 Edit schema again - change (mediawiki...WikimediaEvents)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/175151 Change subject: Update Edit schema again .. Update Edit schema again We'd left in an enum for an integer property. Oops :( Change-Id: I3b35377a907d94359792f775b890ab0b4148377f --- M WikimediaEvents.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/WikimediaEvents refs/changes/51/175151/1 diff --git a/WikimediaEvents.php b/WikimediaEvents.php index 8ecedf8..267eaa9 100644 --- a/WikimediaEvents.php +++ b/WikimediaEvents.php @@ -51,7 +51,7 @@ 'schema.Edit' => array( 'class' => 'ResourceLoaderSchemaModule', 'schema' => 'Edit', - 'revision' => 10590995, + 'revision' => 10604157, ), 'ext.wikimediaEvents.ve' => array( 'scripts' => 'ext.wikimediaEvents.ve.js', -- To view, visit https://gerrit.wikimedia.org/r/175151 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b35377a907d94359792f775b890ab0b4148377f Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/WikimediaEvents Gerrit-Branch: master Gerrit-Owner: Catrope ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Reverting change I10c2cbfdfa5c6d74b98d7c45e1c060911a7f20b4 - change (mediawiki...MobileFrontend)
Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175150
Change subject: Reverting change I10c2cbfdfa5c6d74b98d7c45e1c060911a7f20b4
..
Reverting change I10c2cbfdfa5c6d74b98d7c45e1c060911a7f20b4
This change caused bug 73255. Still need to figure out how to
fix bug 69092 (which is somewhat less important).
Bug: 73255
Bug: 69092
Change-Id: I20a1b26d5f5b9979d969f9c11b32fd13f2e642fd
---
M javascripts/externals/micro.autosize.js
1 file changed, 2 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/50/175150/1
diff --git a/javascripts/externals/micro.autosize.js
b/javascripts/externals/micro.autosize.js
index 55570f5..f8778a3 100644
--- a/javascripts/externals/micro.autosize.js
+++ b/javascripts/externals/micro.autosize.js
@@ -7,20 +7,14 @@
var $window = $(window);
function resize() {
-var $el = $(this), scrollTop, maxHeight;
+var $el = $(this), scrollTop;
if ($el.prop('scrollHeight')) {
scrollTop = $window.scrollTop();
- height = $el.prop('scrollHeight');
- maxHeight = $( window ).height() - 2 - $el.offset().top;
- // prevent textarea growing bigger than the window.
- if (height > maxHeight) {
-height = maxHeight;
- }
$el.
css('height', 'auto').
// can't reuse prop('scrollHeight') because we need the current value
-css('height', (height + 2) + 'px');
+css('height', ($el.prop('scrollHeight') + 2) + 'px');
$window.scrollTop(scrollTop);
}
}
--
To view, visit https://gerrit.wikimedia.org/r/175150
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20a1b26d5f5b9979d969f9c11b32fd13f2e642fd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Add focus method to BookletLayout - change (oojs/ui)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175149
Change subject: [WIP] Add focus method to BookletLayout
..
[WIP] Add focus method to BookletLayout
Needs testing, needs commit summary, needs VE-MW change to call it
Change-Id: I60377cb5bf0b104ee80e555ca18a8edfe7c0889e
---
M src/layouts/BookletLayout.js
1 file changed, 27 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/49/175149/1
diff --git a/src/layouts/BookletLayout.js b/src/layouts/BookletLayout.js
index e0c29b6..04180d3 100644
--- a/src/layouts/BookletLayout.js
+++ b/src/layouts/BookletLayout.js
@@ -120,19 +120,34 @@
* @param {OO.ui.PanelLayout|null} page The page panel that is now the current
panel
*/
OO.ui.BookletLayout.prototype.onStackLayoutSet = function ( page ) {
- var $input, layout = this;
+ var layout = this;
if ( page ) {
page.scrollElementIntoView( { complete: function () {
if ( layout.autoFocus ) {
- // Set focus to the first input if nothing on
the page is focused yet
- if ( !page.$element.find( ':focus' ).length ) {
- $input = page.$element.find(
':input:first' );
- if ( $input.length ) {
- $input[0].focus();
- }
- }
+ layout.focus();
}
} } );
+ }
+};
+
+/**
+ * Focus the first input in the current page.
+ *
+ * If no page is selected, the first selectable page will be selected.
+ * If the focus is already in an element on the current page, nothing will
happen.
+ */
+OO.ui.BookletLayout.prototype.focus = function () {
+ var $input, page = this.stackLayout.getCurrentItem();
+ if ( !page ) {
+ this.selectFirstSelectablePage();
+ page = this.stackLayout.getCurrentItem();
+ }
+ // Only change the focus if is not already in the current page
+ if ( !page.$element.find( ':focus' ).length ) {
+ $input = page.$element.find( ':input:first' );
+ if ( $input.length ) {
+ $input[0].focus();
+ }
}
};
@@ -310,7 +325,7 @@
if ( this.outlined && items.length ) {
this.outlineSelectWidget.addItems( items, index );
- this.updateOutlineSelectWidget();
+ this.selectFirstSelectablePage();
}
this.stackLayout.addItems( pages, index );
this.emit( 'add', pages, index );
@@ -339,7 +354,7 @@
}
if ( this.outlined && items.length ) {
this.outlineSelectWidget.removeItems( items );
- this.updateOutlineSelectWidget();
+ this.selectFirstSelectablePage();
}
this.stackLayout.removeItems( pages );
this.emit( 'remove', pages );
@@ -412,12 +427,11 @@
};
/**
- * Call this after adding or removing items from the OutlineSelectWidget.
+ * Select the first selectable page.
*
* @chainable
*/
-OO.ui.BookletLayout.prototype.updateOutlineSelectWidget = function () {
- // Auto-select first item when nothing is selected anymore
+OO.ui.BookletLayout.prototype.selectFirstSelectablePage = function () {
if ( !this.outlineSelectWidget.getSelectedItem() ) {
this.outlineSelectWidget.selectItem(
this.outlineSelectWidget.getFirstSelectableItem() );
}
--
To view, visit https://gerrit.wikimedia.org/r/175149
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I60377cb5bf0b104ee80e555ca18a8edfe7c0889e
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add Prateek as an author - change (mediawiki...AccountInfo)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/175148 Change subject: Add Prateek as an author .. Add Prateek as an author Change-Id: If1b9a25542d5e6372a7752df34c4e1733dd0fa0d --- M AccountInfo.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/AccountInfo refs/changes/48/175148/1 diff --git a/AccountInfo.php b/AccountInfo.php index c6a87d9..35f3799 100644 --- a/AccountInfo.php +++ b/AccountInfo.php @@ -15,7 +15,7 @@ $wgExtensionCredits['other'][] = array( 'path' => __FILE__, 'name' => 'AccountInfo', - 'author' => array( 'Kunal Mehta', 'Benjamin Lees' ), + 'author' => array( 'Kunal Mehta', 'Benjamin Lees', 'Prateek Saxena' ), 'url' => 'https://www.mediawiki.org/wiki/Extension:AccountInfo', 'descriptionmsg' => 'accountinfo-desc', 'version' => '0.2.0', -- To view, visit https://gerrit.wikimedia.org/r/175148 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If1b9a25542d5e6372a7752df34c4e1733dd0fa0d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/AccountInfo Gerrit-Branch: master Gerrit-Owner: Legoktm ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WIP] Set ready delay to animation duration in VE WindowManager - change (VisualEditor/VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175147
Change subject: [WIP] Set ready delay to animation duration in VE WindowManager
..
[WIP] Set ready delay to animation duration in VE WindowManager
Needs things in oojs-ui
Change-Id: I8d0cf1e1775e894632310580b30cfb4f100fd488
---
M src/ui/ve.ui.WindowManager.js
1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/47/175147/1
diff --git a/src/ui/ve.ui.WindowManager.js b/src/ui/ve.ui.WindowManager.js
index 1b06bdd..e8616fd 100644
--- a/src/ui/ve.ui.WindowManager.js
+++ b/src/ui/ve.ui.WindowManager.js
@@ -39,3 +39,11 @@
ve.ui.WindowManager.prototype.getOverlay = function () {
return this.overlay;
};
+
+/**
+ * @inheritdoc
+ */
+ve.ui.WindowManager.prototype.getReadyDelay = function () {
+ // HACK: Really this should be measured by OOjs UI so it can vary by
theme
+ return 250;
+};
--
To view, visit https://gerrit.wikimedia.org/r/175147
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8d0cf1e1775e894632310580b30cfb4f100fd488
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Start the window opening transition before ready, not after - change (oojs/ui)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175146
Change subject: Start the window opening transition before ready, not after
..
Start the window opening transition before ready, not after
Otherwise two bad things happen:
* A non-zero getReadyDelay() value freezes the window
in the scale(0.5) state
* While the ready process runs, elements inside the window
are not yet in their final position
Change-Id: I82bbc1989e5feac4c525cb4509a902fcf713a636
---
M src/themes/apex/windows.less
M src/themes/mediawiki/windows.less
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/46/175146/1
diff --git a/src/themes/apex/windows.less b/src/themes/apex/windows.less
index 4dab86f..3abd27e 100644
--- a/src/themes/apex/windows.less
+++ b/src/themes/apex/windows.less
@@ -321,7 +321,7 @@
opacity: 1;
}
- &.oo-ui-window-ready {
+ &.oo-ui-window-setup {
> .oo-ui-window-frame {
.oo-ui-transform(scale(1));
}
diff --git a/src/themes/mediawiki/windows.less
b/src/themes/mediawiki/windows.less
index f45216e..7cb6936 100644
--- a/src/themes/mediawiki/windows.less
+++ b/src/themes/mediawiki/windows.less
@@ -314,7 +314,7 @@
opacity: 1;
}
- &.oo-ui-window-ready {
+ &.oo-ui-window-setup {
> .oo-ui-window-frame {
.oo-ui-transform(scale(1));
}
--
To view, visit https://gerrit.wikimedia.org/r/175146
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I82bbc1989e5feac4c525cb4509a902fcf713a636
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use recursiveTagParse() instead of parse() - change (mediawiki...SemanticForms)
Foxtrott has submitted this change and it was merged.
Change subject: Use recursiveTagParse() instead of parse()
..
Use recursiveTagParse() instead of parse()
Bug: 66202
Change-Id: Ie4783a8d57db3edf38c406a698d2cfc98fbc95c7
---
M includes/SF_FormUtils.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Foxtrott: Verified; Looks good to me, approved
diff --git a/includes/SF_FormUtils.php b/includes/SF_FormUtils.php
index 5a5a2a1..7dd8bc7 100644
--- a/includes/SF_FormUtils.php
+++ b/includes/SF_FormUtils.php
@@ -422,11 +422,9 @@
$form_def
);
- $title = is_object( $parser->getTitle() ) ? $parser->getTitle()
: new Title();
-
// parse wiki-text
- $output = $parser->parse( $form_def, $title,
$parser->getOptions() );
- $form_def = $stripState->unstripGeneral( $output->getText() );
+ $form_def = $stripState->unstripGeneral(
$parser->recursiveTagParse( $form_def ) );
+ $output = $parser->getOutput();
if ( $output->getCacheTime() == -1 ) {
$form_article = Article::newFromID( $form_id );
--
To view, visit https://gerrit.wikimedia.org/r/175145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie4783a8d57db3edf38c406a698d2cfc98fbc95c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Foxtrott
Gerrit-Reviewer: Foxtrott
Gerrit-Reviewer: Yaron Koren
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding basic profiler sampling support and restored the --pr... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Adding basic profiler sampling support and restored the
--profiler script option
..
Adding basic profiler sampling support and restored the --profiler script option
* Also enforce that the profiler is normally off in CLI mode
Change-Id: I35faedff818af2ad459b544c9ad50e77b54b378e
---
M StartProfiler.sample
M includes/profiler/Profiler.php
M maintenance/Maintenance.php
3 files changed, 48 insertions(+), 9 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/StartProfiler.sample b/StartProfiler.sample
index b72d5d5..d20c0e1 100644
--- a/StartProfiler.sample
+++ b/StartProfiler.sample
@@ -22,8 +22,12 @@
* maintenance/archives/patch-profiling.sql to your database.
*
* For a rudimentary sampling profiler:
- * if ( !mt_rand( 0, 100 ) ) {
- * $wgProfiler['class'] = 'ProfilerStandard';
- * $wgProfiler['output'] = array( 'db' );
- * }
+ * $wgProfiler['class'] = 'ProfilerStandard';
+ * $wgProfiler['output'] = array( 'db' );
+ * $wgProfiler['sampling'] = 50; // one every 50 requests
+ * This will use ProfilerStub for non-sampled cases.
+ *
+ * For performance, the profiler is always disabled for CLI scripts
+ * as they could be long running and the data would accumulate. Use
+ * the --profiler parameter of maintenance scripts to override this.
*/
diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index f2bdc84..2b3b616 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -72,10 +72,10 @@
if ( self::$__instance === null ) {
global $wgProfiler;
if ( is_array( $wgProfiler ) ) {
- if ( !isset( $wgProfiler['class'] ) ) {
+ $class = isset( $wgProfiler['class'] ) ?
$wgProfiler['class'] : 'ProfilerStub';
+ $factor = isset( $wgProfiler['sampling'] ) ?
$wgProfiler['sampling'] : 1;
+ if ( PHP_SAPI === 'cli' || mt_rand( 0, $factor
- 1 ) != 0 ) {
$class = 'ProfilerStub';
- } else {
- $class = $wgProfiler['class'];
}
self::$__instance = new $class( $wgProfiler );
} else {
@@ -83,6 +83,21 @@
}
}
return self::$__instance;
+ }
+
+ /**
+* Replace the current profiler with $profiler if no non-stub profiler
is set
+*
+* @param Profiler $profiler
+* @throws MWException
+* @since 1.25
+*/
+ final public static function replaceStubInstance( Profiler $profiler ) {
+ if ( self::$__instance && !( self::$__instance instanceof
ProfilerStub ) ) {
+ throw new MWException( 'Could not replace non-stub
profiler instance.' );
+ } else {
+ self::$__instance = $profiler;
+ }
}
/**
@@ -144,8 +159,7 @@
* @since 1.25
*/
public function logData() {
- $output = isset( $this->params['output'] ) ?
- $this->params['output'] : null;
+ $output = isset( $this->params['output'] ) ?
$this->params['output'] : null;
if ( !$output || $this->isStub() ) {
// return early when no output classes defined or we're
a stub
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 3f8f6e8..1d558d2 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -446,6 +446,7 @@
$this->addOption( 'server', "The protocol and server name to
use in URLs, e.g. " .
"http://en.wikipedia.org. This is sometimes necessary
because " .
"server name detection may fail in command line
scripts.", false, true );
+ $this->addOption( 'profiler', 'Profiler output format (usually
"text")', false, true );
# Save generic options to display them separately in help
$this->mGenericParameters = $this->mParams;
@@ -593,6 +594,23 @@
}
if ( $limit != 'default' ) {
ini_set( 'memory_limit', $limit );
+ }
+ }
+
+ /**
+* Activate the profiler (assuming $wgProfiler is set)
+*/
+ protected function activateProfiler() {
+ global $wgProfiler;
+
+ $output = $this->getOption( 'profiler' );
+ if ( $output && is_array( $wgProfiler ) ) {
+ $class = $wgProfiler['class'];
+ $profiler = new $class(
[MediaWiki-commits] [Gerrit] Use recursiveTagParse() instead of parse() - change (mediawiki...SemanticForms)
Foxtrott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175145
Change subject: Use recursiveTagParse() instead of parse()
..
Use recursiveTagParse() instead of parse()
Bug: 66202
Change-Id: Ie4783a8d57db3edf38c406a698d2cfc98fbc95c7
---
M includes/SF_FormUtils.php
1 file changed, 2 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/45/175145/1
diff --git a/includes/SF_FormUtils.php b/includes/SF_FormUtils.php
index 5a5a2a1..7dd8bc7 100644
--- a/includes/SF_FormUtils.php
+++ b/includes/SF_FormUtils.php
@@ -422,11 +422,9 @@
$form_def
);
- $title = is_object( $parser->getTitle() ) ? $parser->getTitle()
: new Title();
-
// parse wiki-text
- $output = $parser->parse( $form_def, $title,
$parser->getOptions() );
- $form_def = $stripState->unstripGeneral( $output->getText() );
+ $form_def = $stripState->unstripGeneral(
$parser->recursiveTagParse( $form_def ) );
+ $output = $parser->getOutput();
if ( $output->getCacheTime() == -1 ) {
$form_article = Article::newFromID( $form_id );
--
To view, visit https://gerrit.wikimedia.org/r/175145
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie4783a8d57db3edf38c406a698d2cfc98fbc95c7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Foxtrott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] mediawiki: Configure 'error' and 'exception' log groups - change (integration/jenkins)
jenkins-bot has submitted this change and it was merged.
Change subject: mediawiki: Configure 'error' and 'exception' log groups
..
mediawiki: Configure 'error' and 'exception' log groups
Also add $wgShowSQLErrors = true;
Bug: 48002
Change-Id: Ia420b2e458808629a31f88c5b54242ec7b0823de
---
M mediawiki/conf.d/00_dev_settings.php
M mediawiki/conf.d/00_set_debug_log.php
2 files changed, 6 insertions(+), 3 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
Hashar: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/mediawiki/conf.d/00_dev_settings.php
b/mediawiki/conf.d/00_dev_settings.php
index 7caad03..6d7c7cb 100644
--- a/mediawiki/conf.d/00_dev_settings.php
+++ b/mediawiki/conf.d/00_dev_settings.php
@@ -11,4 +11,5 @@
$wgDevelopmentWarnings = true;
$wgShowDBErrorBacktrace = true;
$wgShowExceptionDetails = true;
+$wgShowSQLErrors = true;
$wgDebugRawPage = true; // bug 47960
diff --git a/mediawiki/conf.d/00_set_debug_log.php
b/mediawiki/conf.d/00_set_debug_log.php
index db7dce5..43c6731 100644
--- a/mediawiki/conf.d/00_set_debug_log.php
+++ b/mediawiki/conf.d/00_set_debug_log.php
@@ -19,13 +19,15 @@
$wmgJobWorkspace = $IP;
}
+// Debugging: Logging
$wmgMwLogDir = "$wmgJobWorkspace/log";
-
-$wgDBerrorLog = "$wmgMwLogDir/mw-dberror.log";
-$wgRateLimitLog = "$wmgMwLogDir/mw-ratelimit.log";
if ( $wgCommandLineMode ) {
$wgDebugLogFile = "$wmgMwLogDir/mw-debug-cli.log";
} else {
$wgDebugLogFile = "$wmgMwLogDir/mw-debug-www.log";
}
+$wgDBerrorLog = "$wmgMwLogDir/mw-dberror.log";
+$wgRateLimitLog = "$wmgMwLogDir/mw-ratelimit.log";
+$wgDebugLogGroups['exception'] = "$wmgMwLogDir/mw-exception.log";
+$wgDebugLogGroups['error'] = "$wmgMwLogDir/mw-error.log";
--
To view, visit https://gerrit.wikimedia.org/r/174810
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia420b2e458808629a31f88c5b54242ec7b0823de
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins
Gerrit-Branch: master
Gerrit-Owner: Krinkle
Gerrit-Reviewer: Hashar
Gerrit-Reviewer: Krinkle
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: $targetPageExists undefined - change (mediawiki...SemanticForms)
Foxtrott has submitted this change and it was merged.
Change subject: Fix notice: $targetPageExists undefined
..
Fix notice: $targetPageExists undefined
Change-Id: I708a20d6fd5f105725685893b574c3eb4e44faa7
---
M includes/SF_Utils.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Foxtrott: Verified; Looks good to me, approved
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 41f254b..482daa9 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -1000,10 +1000,13 @@
if ( $inTargetName != '' ) {
$targetTitle = Title::newFromText( $inTargetName );
$targetPageExists = ( $targetTitle != '' &&
$targetTitle->exists() );
+ } else {
+ $targetPageExists = false;
}
+
if ( !$inEditExistingTarget && $targetPageExists ) {
return Linker::link( $targetTitle );
- }
+ }
$formSpecialPage = SpecialPageFactory::getPage(
$specialPageName );
if ( strpos( $inFormName, '/' ) == true ) {
--
To view, visit https://gerrit.wikimedia.org/r/175143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I708a20d6fd5f105725685893b574c3eb4e44faa7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Foxtrott
Gerrit-Reviewer: Foxtrott
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bugzilla: switch svc_name to old-bugzilla - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175144
Change subject: bugzilla: switch svc_name to old-bugzilla
..
bugzilla: switch svc_name to old-bugzilla
switch Bugzilla's svc_name config, used
in Apache config template, over to
old-bugzilla, for after the phab migration
untested, also needs changes in BZ admin UI
to go with it
Change-Id: I3e7c3513fa94b11ec7979b785a5d6039f5dc3c0f
---
M modules/bugzilla/manifests/init.pp
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/44/175144/1
diff --git a/modules/bugzilla/manifests/init.pp
b/modules/bugzilla/manifests/init.pp
index af05425..e08cdbe 100644
--- a/modules/bugzilla/manifests/init.pp
+++ b/modules/bugzilla/manifests/init.pp
@@ -50,7 +50,7 @@
# basic apache site and certs
class {'bugzilla::apache':
-svc_name=> 'bugzilla.wikimedia.org',
+svc_name=> 'old-bugzilla.wikimedia.org',
attach_svc_name => 'bug-attachment.wikimedia.org',
docroot => '/srv/org/wikimedia/bugzilla/',
}
--
To view, visit https://gerrit.wikimedia.org/r/175144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3e7c3513fa94b11ec7979b785a5d6039f5dc3c0f
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix notice: $targetPageExists undefined - change (mediawiki...SemanticForms)
Foxtrott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175143
Change subject: Fix notice: $targetPageExists undefined
..
Fix notice: $targetPageExists undefined
Change-Id: I708a20d6fd5f105725685893b574c3eb4e44faa7
---
M includes/SF_Utils.php
1 file changed, 4 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/SemanticForms
refs/changes/43/175143/1
diff --git a/includes/SF_Utils.php b/includes/SF_Utils.php
index 41f254b..482daa9 100644
--- a/includes/SF_Utils.php
+++ b/includes/SF_Utils.php
@@ -1000,10 +1000,13 @@
if ( $inTargetName != '' ) {
$targetTitle = Title::newFromText( $inTargetName );
$targetPageExists = ( $targetTitle != '' &&
$targetTitle->exists() );
+ } else {
+ $targetPageExists = false;
}
+
if ( !$inEditExistingTarget && $targetPageExists ) {
return Linker::link( $targetTitle );
- }
+ }
$formSpecialPage = SpecialPageFactory::getPage(
$specialPageName );
if ( strpos( $inFormName, '/' ) == true ) {
--
To view, visit https://gerrit.wikimedia.org/r/175143
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I708a20d6fd5f105725685893b574c3eb4e44faa7
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/SemanticForms
Gerrit-Branch: master
Gerrit-Owner: Foxtrott
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...DonationInterface)
jenkins-bot has submitted this change and it was merged. Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I7495521a06ef6e300558d381e957e810096fcda8 --- M gateway_common/i18n/interface/cs.json M gateway_common/i18n/interface/de.json M gateway_common/i18n/interface/fi.json M gateway_common/i18n/interface/fr.json M gateway_common/i18n/interface/he.json M gateway_common/i18n/interface/ja.json M gateway_common/i18n/interface/mk.json M gateway_common/i18n/interface/nl.json M gateway_common/i18n/interface/pl.json M gateway_common/i18n/interface/pt.json M gateway_common/i18n/interface/qqq.json M gateway_common/i18n/interface/uk.json M gateway_common/i18n/interface/vi.json M gateway_common/i18n/interface/zh-hans.json M gateway_common/i18n/interface/zh-hant.json 15 files changed, 43 insertions(+), 53 deletions(-) Approvals: Katie Horn: Looks good to me, approved jenkins-bot: Verified diff --git a/gateway_common/i18n/interface/cs.json b/gateway_common/i18n/interface/cs.json index bbc62da..eae6ce1 100644 --- a/gateway_common/i18n/interface/cs.json +++ b/gateway_common/i18n/interface/cs.json @@ -215,7 +215,6 @@ "donate_interface-otherways-alt": "Možné jsou jiné způsoby, jak přispět, včetně šeků.", "donate_interface-otherways-short": "Jiné způsoby, jak přispět", "donate_interface-paypal": "Máte účet na PayPal? Přispějte přes PayPal.", - "donate_interface-credit-storage-processing": "Údaje o vaší kreditní kartě neuchováváme a na veškeré osobní údaje se vztahují naše pravidla ochrany soukromí dárců.", "donate_interface-token-mismatch": "Platnost vašeho sezení vypršela. Zkuste, prosím, formulář vyplnit ještě jednou a znovu jej odeslat.", "donate_interface-cc-form-header-personal": "Údaje o platbě", "donate_interface-cc-form-header-payment": "Údaje o platbě", @@ -373,7 +372,7 @@ "donate_interface-email-unsub-warning": "Tímto se odhlásíte z příjmu e-mailů, které vám jako dárci posílala Wikimedia Foundation. I nadále můžete dostávat další e-maily na tuto e-mailovou adresu, pokud je přiřazena k účtu na některém z našich projektů. Pokud máte jakékoli otázky, napište na mailto:donati...@wikimedia.org\";>donati...@wikimedia.org.", "donate_interface-faqs": "Často kladené otázky", "donate_interface-tax-info": "Informace o nároku na odpočet daně", - "donate_interface-informationsharing": "Vaším darováním sdělujete informace nadaci Wikimedia, neziskové organizaci provozující Wikipedii a další projekty Wikimedia, a jejím partnerům, v souladu s pravidly o ochraně soukromí dárců. Tyto informace nikomu neprodáme, ani s nimy nebudeme nijak obchodovat. Více si o tom můžete přečíst v pravidlech ochrany soukromí dárců.", + "donate_interface-informationsharing": "Tímto darováním souhlasíte s poskytnutím osobních údajů nadaci Wikimedia, neziskové organizaci provozující Wikipedii a další projekty Wikimedia, a jejím partnerům, v souladu s pravidly dárcovství. Nadace Wikimedia a její partneři sídlí ve Spojených státech a dalších zemích, jejichž zákony na ochranu osobních údajů se nemusí shodovat s těmi ve vaší zemi. Tyto údaje nikomu neprodáme, ani s nimi nebudeme nijak obchodovat. Více si o tom můžete přečíst v našich pravidlech dárcovství.", "donate_interface-currency-change": "Změnit?", "donate_interface-bank_transfer_message": "Upozorňujeme, že na vašem výpise bude jako příjemce tohoto daru uveden „Global Collect“. Global Collect je pověřen přijímáním a zpracováním plateb jménem Wikimedia Foundation. Nezapomeňte v bankovním převodu uvést zde poskytnuté referenční číslo, a pokud máte jakékoli dotazy či obavy, neváhejte nám poslat e-mail na donati...@wikimedia.org.", "donate_interface-globalcollect-proxy": "Povšimněte si prosím, že ve vašem výpisu bude jako příjemce tohoto daru uveden „Global Collect“, který je oprávněn přijímat a zpracovávat platby pro Wikimedia Foundation.", @@ -382,7 +381,6 @@ "donate_interface-taxded-msg-int": "Wikimedia Foundation je nezisková organizace založená ve Spojených státech v souladu s paragrafem 501(c)(3) amerického daňového zákona, v důsledku čeho mohou být dary od osob sídlících ve Spojených státech využívat daňové odečitatelnosti. Dary od osob sídlících mimo Spojené státy nemusí mít na daňovou odečitatelnost ve Spojených státech či jinde nárok; v takovém případě by měli dárci vyhledat pomoc místního daňového poradce. Je důležité upozornit, že Wikimedia nevyhledává příspěvky od osob sídlících v jakékoli jurisdikci, která zakazuje či omezuje výběr příspěvků mezinárodním dobročinným organizacím, jakou je Wikimedia, nebo na příspěvky takovým mezinárodním dobročinným organizacím uvaluje darovací daň.", "donate_interface-taxded-msg-us": "Wikimedia Foundation je nezisková organizace zal
[MediaWiki-commits] [Gerrit] Localisation updates from https://translatewiki.net. - change (mediawiki...DonationInterface)
Katie Horn has uploaded a new change for review. https://gerrit.wikimedia.org/r/175142 Change subject: Localisation updates from https://translatewiki.net. .. Localisation updates from https://translatewiki.net. Change-Id: I7495521a06ef6e300558d381e957e810096fcda8 --- M gateway_common/i18n/interface/cs.json M gateway_common/i18n/interface/de.json M gateway_common/i18n/interface/fi.json M gateway_common/i18n/interface/fr.json M gateway_common/i18n/interface/he.json M gateway_common/i18n/interface/ja.json M gateway_common/i18n/interface/mk.json M gateway_common/i18n/interface/nl.json M gateway_common/i18n/interface/pl.json M gateway_common/i18n/interface/pt.json M gateway_common/i18n/interface/qqq.json M gateway_common/i18n/interface/uk.json M gateway_common/i18n/interface/vi.json M gateway_common/i18n/interface/zh-hans.json M gateway_common/i18n/interface/zh-hant.json 15 files changed, 43 insertions(+), 53 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/42/175142/1 diff --git a/gateway_common/i18n/interface/cs.json b/gateway_common/i18n/interface/cs.json index bbc62da..eae6ce1 100644 --- a/gateway_common/i18n/interface/cs.json +++ b/gateway_common/i18n/interface/cs.json @@ -215,7 +215,6 @@ "donate_interface-otherways-alt": "Možné jsou jiné způsoby, jak přispět, včetně šeků.", "donate_interface-otherways-short": "Jiné způsoby, jak přispět", "donate_interface-paypal": "Máte účet na PayPal? Přispějte přes PayPal.", - "donate_interface-credit-storage-processing": "Údaje o vaší kreditní kartě neuchováváme a na veškeré osobní údaje se vztahují naše pravidla ochrany soukromí dárců.", "donate_interface-token-mismatch": "Platnost vašeho sezení vypršela. Zkuste, prosím, formulář vyplnit ještě jednou a znovu jej odeslat.", "donate_interface-cc-form-header-personal": "Údaje o platbě", "donate_interface-cc-form-header-payment": "Údaje o platbě", @@ -373,7 +372,7 @@ "donate_interface-email-unsub-warning": "Tímto se odhlásíte z příjmu e-mailů, které vám jako dárci posílala Wikimedia Foundation. I nadále můžete dostávat další e-maily na tuto e-mailovou adresu, pokud je přiřazena k účtu na některém z našich projektů. Pokud máte jakékoli otázky, napište na mailto:donati...@wikimedia.org\";>donati...@wikimedia.org.", "donate_interface-faqs": "Často kladené otázky", "donate_interface-tax-info": "Informace o nároku na odpočet daně", - "donate_interface-informationsharing": "Vaším darováním sdělujete informace nadaci Wikimedia, neziskové organizaci provozující Wikipedii a další projekty Wikimedia, a jejím partnerům, v souladu s pravidly o ochraně soukromí dárců. Tyto informace nikomu neprodáme, ani s nimy nebudeme nijak obchodovat. Více si o tom můžete přečíst v pravidlech ochrany soukromí dárců.", + "donate_interface-informationsharing": "Tímto darováním souhlasíte s poskytnutím osobních údajů nadaci Wikimedia, neziskové organizaci provozující Wikipedii a další projekty Wikimedia, a jejím partnerům, v souladu s pravidly dárcovství. Nadace Wikimedia a její partneři sídlí ve Spojených státech a dalších zemích, jejichž zákony na ochranu osobních údajů se nemusí shodovat s těmi ve vaší zemi. Tyto údaje nikomu neprodáme, ani s nimi nebudeme nijak obchodovat. Více si o tom můžete přečíst v našich pravidlech dárcovství.", "donate_interface-currency-change": "Změnit?", "donate_interface-bank_transfer_message": "Upozorňujeme, že na vašem výpise bude jako příjemce tohoto daru uveden „Global Collect“. Global Collect je pověřen přijímáním a zpracováním plateb jménem Wikimedia Foundation. Nezapomeňte v bankovním převodu uvést zde poskytnuté referenční číslo, a pokud máte jakékoli dotazy či obavy, neváhejte nám poslat e-mail na donati...@wikimedia.org.", "donate_interface-globalcollect-proxy": "Povšimněte si prosím, že ve vašem výpisu bude jako příjemce tohoto daru uveden „Global Collect“, který je oprávněn přijímat a zpracovávat platby pro Wikimedia Foundation.", @@ -382,7 +381,6 @@ "donate_interface-taxded-msg-int": "Wikimedia Foundation je nezisková organizace založená ve Spojených státech v souladu s paragrafem 501(c)(3) amerického daňového zákona, v důsledku čeho mohou být dary od osob sídlících ve Spojených státech využívat daňové odečitatelnosti. Dary od osob sídlících mimo Spojené státy nemusí mít na daňovou odečitatelnost ve Spojených státech či jinde nárok; v takovém případě by měli dárci vyhledat pomoc místního daňového poradce. Je důležité upozornit, že Wikimedia nevyhledává příspěvky od osob sídlících v jakékoli jurisdikci, která zakazuje či omezuje výběr příspěvků mezinárodním dobročinným organizacím, jakou je Wikimedia, nebo na příspěvky takovým mezinárodním dobročinným organizacím uvaluje darovací daň.", "donate_interface-t
[MediaWiki-commits] [Gerrit] Bump cassandra module to d6182892c5f - change (operations/puppet)
Andrew Bogott has submitted this change and it was merged. Change subject: Bump cassandra module to d6182892c5f .. Bump cassandra module to d6182892c5f This merges the fixes from https://gerrit.wikimedia.org/r/#/c/175001/. Change-Id: I3c10a30034ba5cacdae2962b97af2d320b60f4e2 --- M modules/cassandra 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/modules/cassandra b/modules/cassandra index 86786f7..d618289 16 --- a/modules/cassandra +++ b/modules/cassandra -Subproject commit 86786f792252b21fdfcc08d321d254c8758f868a +Subproject commit d6182892c5f71081306e4a616d012ed8687fb20b -- To view, visit https://gerrit.wikimedia.org/r/175141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I3c10a30034ba5cacdae2962b97af2d320b60f4e2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: GWicke Gerrit-Reviewer: Andrew Bogott Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump cassandra module to d6182892c5f - change (operations/puppet)
GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/175141 Change subject: Bump cassandra module to d6182892c5f .. Bump cassandra module to d6182892c5f This merges the fixes from https://gerrit.wikimedia.org/r/#/c/175001/. Change-Id: I3c10a30034ba5cacdae2962b97af2d320b60f4e2 --- M modules/cassandra 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/41/175141/1 diff --git a/modules/cassandra b/modules/cassandra index 86786f7..d618289 16 --- a/modules/cassandra +++ b/modules/cassandra -Subproject commit 86786f792252b21fdfcc08d321d254c8758f868a +Subproject commit d6182892c5f71081306e4a616d012ed8687fb20b -- To view, visit https://gerrit.wikimedia.org/r/175141 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3c10a30034ba5cacdae2962b97af2d320b60f4e2 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: GWicke ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix two bugs in cassandra module defaults - change (operations...cassandra)
Andrew Bogott has submitted this change and it was merged.
Change subject: Fix two bugs in cassandra module defaults
..
Fix two bugs in cassandra module defaults
- Use $::ipaddress for the default seeds
- Don't try to pass an empty array to pick, as that will explode without
proving any helpful error messages
Change-Id: I65b45dc319f15308f7eff6c8148f3466d5f3173b
---
M manifests/defaults.pp
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
Yuvipanda: Looks good to me, approved
GWicke: Looks good to me, but someone else must approve
diff --git a/manifests/defaults.pp b/manifests/defaults.pp
index 6e0c14e..14e6f65 100644
--- a/manifests/defaults.pp
+++ b/manifests/defaults.pp
@@ -1,5 +1,5 @@
class cassandra::defaults {
-$seeds= pick($::cassandra_seeds,
[$ipaddress])
+$seeds= pick($::cassandra_seeds,
[$::ipaddress])
$cluster_name = pick($::cassandra_cluster_name,
'Test Cluster')
$num_tokens = pick($::cassandra_num_tokens,
256)
$authenticator= pick($::cassandra_authenticator,
true)
@@ -44,7 +44,11 @@
}
$jmx_port = pick($::cassandra_jmx_port,
7199)
-$additional_jvm_opts = pick($::cassandra_additional_jvm_opts,
[])
+# Since the default here is an empty array we can't use stdlib's pick().
+$additional_jvm_opts = $::cassandra_additional_jvm_opts ? {
+undef => [],
+default => $::cassandra_additional_jvm_opts,
+}
$dc = pick($::cassandra_dc,
'dc1')
$rack = pick($::cassandra_rack,
'rack1')
--
To view, visit https://gerrit.wikimedia.org/r/175001
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I65b45dc319f15308f7eff6c8148f3466d5f3173b
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet/cassandra
Gerrit-Branch: master
Gerrit-Owner: GWicke
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: GWicke
Gerrit-Reviewer: Ori.livneh
Gerrit-Reviewer: Ottomata
Gerrit-Reviewer: RobH
Gerrit-Reviewer: Yuvipanda
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Adding basic profiler sampling support and restored the --pr... - change (mediawiki/core)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175140
Change subject: Adding basic profiler sampling support and restored the
--profiler script option
..
Adding basic profiler sampling support and restored the --profiler script option
* Also enforce that the profiler is normally off in CLI mode
Change-Id: I35faedff818af2ad459b544c9ad50e77b54b378e
---
M StartProfiler.sample
M includes/profiler/Profiler.php
M maintenance/Maintenance.php
3 files changed, 48 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/40/175140/1
diff --git a/StartProfiler.sample b/StartProfiler.sample
index b72d5d5..51c24fb 100644
--- a/StartProfiler.sample
+++ b/StartProfiler.sample
@@ -22,8 +22,12 @@
* maintenance/archives/patch-profiling.sql to your database.
*
* For a rudimentary sampling profiler:
- * if ( !mt_rand( 0, 100 ) ) {
- * $wgProfiler['class'] = 'ProfilerStandard';
- * $wgProfiler['output'] = array( 'db' );
- * }
+ * $wgProfiler['class'] = 'ProfilerStandard';
+ * $wgProfiler['output'] = array( 'db' );
+ * $wgProfiler['sampling'] = 50; // one every 50 requests
+ * This will use ProfilerStub for non-sampled cases.
+ *
+ * For performance, the profiler is always disable for CLI scripts
+ * as they could be long running and the data would accumulate. Use
+ * the --profiler parameter of maintenance script to override this.
*/
diff --git a/includes/profiler/Profiler.php b/includes/profiler/Profiler.php
index f2bdc84..2b3b616 100644
--- a/includes/profiler/Profiler.php
+++ b/includes/profiler/Profiler.php
@@ -72,10 +72,10 @@
if ( self::$__instance === null ) {
global $wgProfiler;
if ( is_array( $wgProfiler ) ) {
- if ( !isset( $wgProfiler['class'] ) ) {
+ $class = isset( $wgProfiler['class'] ) ?
$wgProfiler['class'] : 'ProfilerStub';
+ $factor = isset( $wgProfiler['sampling'] ) ?
$wgProfiler['sampling'] : 1;
+ if ( PHP_SAPI === 'cli' || mt_rand( 0, $factor
- 1 ) != 0 ) {
$class = 'ProfilerStub';
- } else {
- $class = $wgProfiler['class'];
}
self::$__instance = new $class( $wgProfiler );
} else {
@@ -83,6 +83,21 @@
}
}
return self::$__instance;
+ }
+
+ /**
+* Replace the current profiler with $profiler if no non-stub profiler
is set
+*
+* @param Profiler $profiler
+* @throws MWException
+* @since 1.25
+*/
+ final public static function replaceStubInstance( Profiler $profiler ) {
+ if ( self::$__instance && !( self::$__instance instanceof
ProfilerStub ) ) {
+ throw new MWException( 'Could not replace non-stub
profiler instance.' );
+ } else {
+ self::$__instance = $profiler;
+ }
}
/**
@@ -144,8 +159,7 @@
* @since 1.25
*/
public function logData() {
- $output = isset( $this->params['output'] ) ?
- $this->params['output'] : null;
+ $output = isset( $this->params['output'] ) ?
$this->params['output'] : null;
if ( !$output || $this->isStub() ) {
// return early when no output classes defined or we're
a stub
diff --git a/maintenance/Maintenance.php b/maintenance/Maintenance.php
index 3f8f6e8..36214a2 100644
--- a/maintenance/Maintenance.php
+++ b/maintenance/Maintenance.php
@@ -446,6 +446,7 @@
$this->addOption( 'server', "The protocol and server name to
use in URLs, e.g. " .
"http://en.wikipedia.org. This is sometimes necessary
because " .
"server name detection may fail in command line
scripts.", false, true );
+ $this->addOption( 'profiler', 'Profiler output format (usually
"text")', false, true );
# Save generic options to display them separately in help
$this->mGenericParameters = $this->mParams;
@@ -593,6 +594,23 @@
}
if ( $limit != 'default' ) {
ini_set( 'memory_limit', $limit );
+ }
+ }
+
+ /**
+* Set the profiler for debugging (assuming $wgProfiler is set)
+*/
+ protected function setDebugProfiler() {
+ global $wgProfiler;
+
+ $output = $this->getOption( 'profiler' );
+ if ( $output && is_array( $wgProfiler ) ) {
+ $class = $wgProfiler['c
[MediaWiki-commits] [Gerrit] Remove animation to speed up denser plots - change (analytics/dashiki)
Nuria has submitted this change and it was merged.
Change subject: Remove animation to speed up denser plots
..
Remove animation to speed up denser plots
Change-Id: I0d8e86d7eff193ce58c1836871841bb4b5ce297b
---
M src/components/visualizers/vega-timeseries/bindings.js
M src/components/visualizers/vega-timeseries/vega-timeseries.js
2 files changed, 13 insertions(+), 9 deletions(-)
Approvals:
Nuria: Verified; Looks good to me, approved
diff --git a/src/components/visualizers/vega-timeseries/bindings.js
b/src/components/visualizers/vega-timeseries/bindings.js
index 8f627ab..fbc5983 100644
--- a/src/components/visualizers/vega-timeseries/bindings.js
+++ b/src/components/visualizers/vega-timeseries/bindings.js
@@ -32,12 +32,14 @@
var unwrap = ko.unwrap(valueAccessor());
// override defaults with any changed values
-return setOrDefault(unwrap, {
+var withDefaults = setOrDefault(unwrap, {
data: [],
width: 'auto',
height: 'auto',
parentSelector: '.parent-of-resizable',
-updateDuration: 300,
+updateOptions: {
+duration: 300
+},
padding: {
top: 30,
right: 108,
@@ -47,6 +49,12 @@
strokeWidth: 2,
colorScale: undefined
});
+
+// don't animate if there's a ton of data
+if (withDefaults.data.length >= 1000) {
+withDefaults.updateOptions = null;
+}
+return withDefaults;
}
function processAutosize(value, element) {
@@ -233,9 +241,7 @@
element.view
.height(dimensions.height)
.width(dimensions.width)
-.update({
-duration: value.updateDuration
-});
+.update(value.updateOptions);
}
}
});
@@ -267,9 +273,7 @@
if (element.view) {
var parsed = vega.parse.data(vegaData(value.data)).load;
-element.view.data(parsed).update({
-duration: value.updateDuration
-});
+element.view.data(parsed).update(value.updateOptions);
updateColor();
} else {
vega.parse.spec(vegaDefinition(value), function (graph) {
diff --git a/src/components/visualizers/vega-timeseries/vega-timeseries.js
b/src/components/visualizers/vega-timeseries/vega-timeseries.js
index 2978b01..d99ea8e 100644
--- a/src/components/visualizers/vega-timeseries/vega-timeseries.js
+++ b/src/components/visualizers/vega-timeseries/vega-timeseries.js
@@ -14,7 +14,7 @@
width : 'auto',
height : 'auto',
parentSelector : '.parent-of-resizable',
-updateDuration : 300,
+updateOptions : {duration: 300},
padding : {top: 30, right: 40, bottom: 30, left: 35},
strokeWidth : 2
colorScale : undefined (pass a ko.observable to monitor color)
--
To view, visit https://gerrit.wikimedia.org/r/175137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0d8e86d7eff193ce58c1836871841bb4b5ce297b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric
Gerrit-Reviewer: Nuria
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (8f8896196f) - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (8f8896196f)
..
Update OOjs UI to v0.1.0-pre (8f8896196f)
New changes:
56587a8 [BREAKING CHANGE] Rename InputWidget#sanitizeValue → #cleanUpValue
4253739 Implement radio button widgets
Change-Id: If10927a4e595de9b6d0ad45182470e84f335683c
---
M resources/lib/oojs-ui/oojs-ui-apex.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-apex.svg.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
M resources/lib/oojs-ui/oojs-ui.js
7 files changed, 243 insertions(+), 19 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css
b/resources/lib/oojs-ui/oojs-ui-apex.css
index eb46d19..0b168c2 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (23565e7519)
+ * OOjs UI v0.1.0-pre (8f8896196f)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:18:30Z
+ * Date: 2014-11-21T22:32:38Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
@@ -970,6 +970,9 @@
border-bottom-right-radius: 0.3em;
border-top-right-radius: 0.3em;
}
+.oo-ui-radioSelectWidget {
+ padding: 0.75em 0 0.5em 0;
+}
.oo-ui-buttonOptionWidget {
display: inline-block;
padding: 0;
@@ -997,6 +1000,24 @@
.oo-ui-buttonOptionWidget.oo-ui-optionWidget-highlighted {
background-color: transparent;
}
+.oo-ui-radioOptionWidget {
+ cursor: default;
+ padding: 0;
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget .oo-ui-radioInputWidget,
+.oo-ui-radioOptionWidget .oo-ui-labelElement-label {
+ display: inline-block;
+ vertical-align: middle;
+}
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-selected,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-pressed,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-highlighted {
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget > .oo-ui-labelElement-label {
+ padding: 0 0.5em;
+}
.oo-ui-labelWidget {
display: inline-block;
padding: 0.5em 0;
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js
b/resources/lib/oojs-ui/oojs-ui-apex.js
index 9da52ac..150c0f2 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (23565e7519)
+ * OOjs UI v0.1.0-pre (8f8896196f)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:18:20Z
+ * Date: 2014-11-21T22:32:28Z
*/
/* Instantiation */
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
index d677c6c..2ccec13 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (23565e7519)
+ * OOjs UI v0.1.0-pre (8f8896196f)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:18:30Z
+ * Date: 2014-11-21T22:32:38Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
@@ -970,6 +970,9 @@
border-bottom-right-radius: 0.3em;
border-top-right-radius: 0.3em;
}
+.oo-ui-radioSelectWidget {
+ padding: 0.75em 0 0.5em 0;
+}
.oo-ui-buttonOptionWidget {
display: inline-block;
padding: 0;
@@ -997,6 +1000,24 @@
.oo-ui-buttonOptionWidget.oo-ui-optionWidget-highlighted {
background-color: transparent;
}
+.oo-ui-radioOptionWidget {
+ cursor: default;
+ padding: 0;
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget .oo-ui-radioInputWidget,
+.oo-ui-radioOptionWidget .oo-ui-labelElement-label {
+ display: inline-block;
+ vertical-align: middle;
+}
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-selected,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-pressed,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-highlighted {
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget > .oo-ui-labelElement-label {
+ padding: 0 0.5em;
+}
.oo-ui-labelWidget {
display: inline-block;
padding: 0.5em 0;
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
index 81bd5dd..4d14376 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
+++ b/resources/lib/oojs-ui/oojs-ui-mediawiki.c
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (8f8896196f) - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (8f8896196f)
..
Update OOjs UI to v0.1.0-pre (8f8896196f)
New changes:
56587a8 [BREAKING CHANGE] Rename InputWidget#sanitizeValue → #cleanUpValue
4253739 Implement radio button widgets
Local changes:
LinkTargetInputWidget: Update for #sanitizeValue → #cleanUpValue OOUI change
Bug: 73156
Change-Id: If10927a4e595de9b6d0ad45182470e84f335683c
---
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-apex.svg.css
M lib/oojs-ui/oojs-ui-apex.svg.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css
M lib/oojs-ui/oojs-ui.js
M src/ui/widgets/ve.ui.LinkTargetInputWidget.js
12 files changed, 336 insertions(+), 28 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, but someone else must approve
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css
index 1ccb25a..02116d0 100644
--- a/lib/oojs-ui/oojs-ui-apex.css
+++ b/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (23565e7519)
+ * OOjs UI v0.1.0-pre (8f8896196f)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:15:41Z
+ * Date: 2014-11-21T22:32:01Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
@@ -970,6 +970,9 @@
border-bottom-right-radius: 0.3em;
border-top-right-radius: 0.3em;
}
+.oo-ui-radioSelectWidget {
+ padding: 0.75em 0 0.5em 0;
+}
.oo-ui-buttonOptionWidget {
display: inline-block;
padding: 0;
@@ -997,6 +1000,24 @@
.oo-ui-buttonOptionWidget.oo-ui-optionWidget-highlighted {
background-color: transparent;
}
+.oo-ui-radioOptionWidget {
+ cursor: default;
+ padding: 0;
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget .oo-ui-radioInputWidget,
+.oo-ui-radioOptionWidget .oo-ui-labelElement-label {
+ display: inline-block;
+ vertical-align: middle;
+}
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-selected,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-pressed,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-highlighted {
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget > .oo-ui-labelElement-label {
+ padding: 0 0.5em;
+}
.oo-ui-labelWidget {
display: inline-block;
padding: 0.5em 0;
diff --git a/lib/oojs-ui/oojs-ui-apex.js b/lib/oojs-ui/oojs-ui-apex.js
index c851ac8..bff36f8 100644
--- a/lib/oojs-ui/oojs-ui-apex.js
+++ b/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (23565e7519)
+ * OOjs UI v0.1.0-pre (8f8896196f)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:15:30Z
+ * Date: 2014-11-21T22:31:51Z
*/
/* Instantiation */
diff --git a/lib/oojs-ui/oojs-ui-apex.rtl.css b/lib/oojs-ui/oojs-ui-apex.rtl.css
index e77b387..c9eab99 100644
--- a/lib/oojs-ui/oojs-ui-apex.rtl.css
+++ b/lib/oojs-ui/oojs-ui-apex.rtl.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (23565e7519)
+ * OOjs UI v0.1.0-pre (8f8896196f)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:15:41Z
+ * Date: 2014-11-21T22:32:01Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-right: -40%;
@@ -970,6 +970,9 @@
border-bottom-left-radius: 0.3em;
border-top-left-radius: 0.3em;
}
+.oo-ui-radioSelectWidget {
+ padding: 0.75em 0 0.5em 0;
+}
.oo-ui-buttonOptionWidget {
display: inline-block;
padding: 0;
@@ -997,6 +1000,24 @@
.oo-ui-buttonOptionWidget.oo-ui-optionWidget-highlighted {
background-color: transparent;
}
+.oo-ui-radioOptionWidget {
+ cursor: default;
+ padding: 0;
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget .oo-ui-radioInputWidget,
+.oo-ui-radioOptionWidget .oo-ui-labelElement-label {
+ display: inline-block;
+ vertical-align: middle;
+}
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-selected,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-pressed,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-highlighted {
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget > .oo-ui-labelElement-label {
+ padding: 0 0.5em;
+}
.oo-ui-labelWidget {
display: inline-block;
padding: 0.5em 0;
diff --git a/lib/oojs-ui/oojs-ui-apex.svg.css b/lib/
[MediaWiki-commits] [Gerrit] Release notes for aacdb664a10 - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Release notes for aacdb664a10 .. Release notes for aacdb664a10 Change-Id: Ib917a32794726d15dc3c40af24eaad710a0f1645 --- M RELEASE-NOTES-1.25 1 file changed, 3 insertions(+), 0 deletions(-) Approvals: Ori.livneh: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.25 b/RELEASE-NOTES-1.25 index 5aba823..2781b38 100644 --- a/RELEASE-NOTES-1.25 +++ b/RELEASE-NOTES-1.25 @@ -197,6 +197,9 @@ and getInternalLinkAttributes methods in Linker, and removed getExternalLinkAttributes method, which was deprecated in MediaWiki 1.18. * Removed Sites class, which was deprecated in 1.21 and replaced by SiteSQLStore. +* The mw.api.getToken() method now uses action=query?meta=tokens. This will now + fail for custom tokens registered only via the deprecated ApiTokensGetTokenTypes + hook. The ApiQueryTokensRegisterTypes hook should be used for this to work. == Compatibility == -- To view, visit https://gerrit.wikimedia.org/r/175130 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ib917a32794726d15dc3c40af24eaad710a0f1645 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Aaron Schulz Gerrit-Reviewer: Ori.livneh Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] bugzilla: delete bugzilla.wikiPedia.org - change (operations/puppet)
Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175139
Change subject: bugzilla: delete bugzilla.wikiPedia.org
..
bugzilla: delete bugzilla.wikiPedia.org
if you check DNS you will see this already
points to the Apache cluster, so the redirect
is handled there, which means this should not be
needed on zirconium at all
Change-Id: I6a686781c3c4df6a5c0aca03f07a4a13e94f2153
---
M modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
1 file changed, 0 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/39/175139/1
diff --git a/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
b/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
index bdafbf4..7f1fc34 100644
--- a/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
+++ b/modules/bugzilla/templates/apache/bugzilla.wikimedia.org.erb
@@ -35,15 +35,6 @@
RewriteRule (.*) https://<%= @svc_name %>%{REQUEST_URI}
-
-ServerAdmin webmas...@wikimedia.org
-ServerName bugzilla.wikipedia.org
-Redirect permanent / https://<%= @svc_name %>/
-RewriteEngine On
-RewriteCond %{HTTPS} off
-RewriteRule (.*) https://<%= @svc_name %>%{REQUEST_URI}
-
-
ServerAdmin webmas...@wikimedia.org
ServerName bugs.wikimedia.org
--
To view, visit https://gerrit.wikimedia.org/r/175139
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6a686781c3c4df6a5c0aca03f07a4a13e94f2153
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (8f8896196f) - change (mediawiki/core)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175138
Change subject: Update OOjs UI to v0.1.0-pre (8f8896196f)
..
Update OOjs UI to v0.1.0-pre (8f8896196f)
New changes:
56587a8 [BREAKING CHANGE] Rename InputWidget#sanitizeValue → #cleanUpValue
4253739 Implement radio button widgets
Change-Id: If10927a4e595de9b6d0ad45182470e84f335683c
---
M resources/lib/oojs-ui/oojs-ui-apex.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-apex.svg.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
M resources/lib/oojs-ui/oojs-ui.js
7 files changed, 243 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/38/175138/1
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css
b/resources/lib/oojs-ui/oojs-ui-apex.css
index eb46d19..0b168c2 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (23565e7519)
+ * OOjs UI v0.1.0-pre (8f8896196f)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:18:30Z
+ * Date: 2014-11-21T22:32:38Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
@@ -970,6 +970,9 @@
border-bottom-right-radius: 0.3em;
border-top-right-radius: 0.3em;
}
+.oo-ui-radioSelectWidget {
+ padding: 0.75em 0 0.5em 0;
+}
.oo-ui-buttonOptionWidget {
display: inline-block;
padding: 0;
@@ -997,6 +1000,24 @@
.oo-ui-buttonOptionWidget.oo-ui-optionWidget-highlighted {
background-color: transparent;
}
+.oo-ui-radioOptionWidget {
+ cursor: default;
+ padding: 0;
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget .oo-ui-radioInputWidget,
+.oo-ui-radioOptionWidget .oo-ui-labelElement-label {
+ display: inline-block;
+ vertical-align: middle;
+}
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-selected,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-pressed,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-highlighted {
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget > .oo-ui-labelElement-label {
+ padding: 0 0.5em;
+}
.oo-ui-labelWidget {
display: inline-block;
padding: 0.5em 0;
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.js
b/resources/lib/oojs-ui/oojs-ui-apex.js
index 9da52ac..150c0f2 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.js
+++ b/resources/lib/oojs-ui/oojs-ui-apex.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (23565e7519)
+ * OOjs UI v0.1.0-pre (8f8896196f)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:18:20Z
+ * Date: 2014-11-21T22:32:28Z
*/
/* Instantiation */
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
index d677c6c..2ccec13 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.svg.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.svg.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (23565e7519)
+ * OOjs UI v0.1.0-pre (8f8896196f)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T22:18:30Z
+ * Date: 2014-11-21T22:32:38Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
@@ -970,6 +970,9 @@
border-bottom-right-radius: 0.3em;
border-top-right-radius: 0.3em;
}
+.oo-ui-radioSelectWidget {
+ padding: 0.75em 0 0.5em 0;
+}
.oo-ui-buttonOptionWidget {
display: inline-block;
padding: 0;
@@ -997,6 +1000,24 @@
.oo-ui-buttonOptionWidget.oo-ui-optionWidget-highlighted {
background-color: transparent;
}
+.oo-ui-radioOptionWidget {
+ cursor: default;
+ padding: 0;
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget .oo-ui-radioInputWidget,
+.oo-ui-radioOptionWidget .oo-ui-labelElement-label {
+ display: inline-block;
+ vertical-align: middle;
+}
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-selected,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-pressed,
+.oo-ui-radioOptionWidget.oo-ui-optionWidget-highlighted {
+ background-color: transparent;
+}
+.oo-ui-radioOptionWidget > .oo-ui-labelElement-label {
+ padding: 0 0.5em;
+}
.oo-ui-labelWidget {
display: inline-block;
padding: 0.5em 0;
diff --git a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
b/resources/lib/oojs-ui/oojs-ui-mediawiki.css
index 81bd5dd..4d14376 100644
--- a/resources/lib/oojs-ui/oojs-ui-mediawiki.css
+++ b/resources
[MediaWiki-commits] [Gerrit] [BREAKING CHANGE] Rename InputWidget#sanitizeValue → #cleanU... - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: [BREAKING CHANGE] Rename InputWidget#sanitizeValue →
#cleanUpValue
..
[BREAKING CHANGE] Rename InputWidget#sanitizeValue → #cleanUpValue
To avoid any possible theoretical confusion with HTML sanitization.
Bug: 73156
Change-Id: I3a7b29bf8a5098c36702b7bba3bcc1378acefbb8
---
M php/widgets/InputWidget.php
M src/widgets/InputWidget.js
2 files changed, 9 insertions(+), 9 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
diff --git a/php/widgets/InputWidget.php b/php/widgets/InputWidget.php
index 9834651..bd83222 100644
--- a/php/widgets/InputWidget.php
+++ b/php/widgets/InputWidget.php
@@ -87,20 +87,20 @@
* @chainable
*/
public function setValue( $value ) {
- $this->value = $this->sanitizeValue( $value );
+ $this->value = $this->cleanUpValue( $value );
$this->input->setValue( $this->value );
return $this;
}
/**
-* Sanitize incoming value.
+* Clean up incoming value.
*
* Ensures value is a string, and converts null to empty string.
*
* @param string $value Original value
-* @return string Sanitized value
+* @return string Cleaned up value
*/
- protected function sanitizeValue( $value ) {
+ protected function cleanUpValue( $value ) {
if ( $value === null ) {
return '';
} else {
diff --git a/src/widgets/InputWidget.js b/src/widgets/InputWidget.js
index 0af965c..c0fa123 100644
--- a/src/widgets/InputWidget.js
+++ b/src/widgets/InputWidget.js
@@ -110,12 +110,12 @@
* @chainable
*/
OO.ui.InputWidget.prototype.setValue = function ( value ) {
- value = this.sanitizeValue( value );
+ value = this.cleanUpValue( value );
if ( this.value !== value ) {
this.value = value;
this.emit( 'change', this.value );
}
- // Update the DOM if it has changed. Note that with sanitizeValue, it
+ // Update the DOM if it has changed. Note that with cleanUpValue, it
// is possible for the DOM value to change without this.value changing.
if ( this.$input.val() !== this.value ) {
this.$input.val( this.value );
@@ -124,15 +124,15 @@
};
/**
- * Sanitize incoming value.
+ * Clean up incoming value.
*
* Ensures value is a string, and converts undefined and null to empty string.
*
* @private
* @param {string} value Original value
- * @return {string} Sanitized value
+ * @return {string} Cleaned up value
*/
-OO.ui.InputWidget.prototype.sanitizeValue = function ( value ) {
+OO.ui.InputWidget.prototype.cleanUpValue = function ( value ) {
if ( value === undefined || value === null ) {
return '';
} else if ( this.inputFilter ) {
--
To view, visit https://gerrit.wikimedia.org/r/174815
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3a7b29bf8a5098c36702b7bba3bcc1378acefbb8
Gerrit-PatchSet: 2
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński
Gerrit-Reviewer: Jforrester
Gerrit-Reviewer: Legoktm
Gerrit-Reviewer: Trevor Parscal
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove animation to speed up denser plots - change (analytics/dashiki)
Milimetric has uploaded a new change for review.
https://gerrit.wikimedia.org/r/175137
Change subject: Remove animation to speed up denser plots
..
Remove animation to speed up denser plots
Change-Id: I0d8e86d7eff193ce58c1836871841bb4b5ce297b
---
M src/components/visualizers/vega-timeseries/bindings.js
M src/components/visualizers/vega-timeseries/vega-timeseries.js
2 files changed, 13 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/analytics/dashiki
refs/changes/37/175137/1
diff --git a/src/components/visualizers/vega-timeseries/bindings.js
b/src/components/visualizers/vega-timeseries/bindings.js
index 8f627ab..fbc5983 100644
--- a/src/components/visualizers/vega-timeseries/bindings.js
+++ b/src/components/visualizers/vega-timeseries/bindings.js
@@ -32,12 +32,14 @@
var unwrap = ko.unwrap(valueAccessor());
// override defaults with any changed values
-return setOrDefault(unwrap, {
+var withDefaults = setOrDefault(unwrap, {
data: [],
width: 'auto',
height: 'auto',
parentSelector: '.parent-of-resizable',
-updateDuration: 300,
+updateOptions: {
+duration: 300
+},
padding: {
top: 30,
right: 108,
@@ -47,6 +49,12 @@
strokeWidth: 2,
colorScale: undefined
});
+
+// don't animate if there's a ton of data
+if (withDefaults.data.length >= 1000) {
+withDefaults.updateOptions = null;
+}
+return withDefaults;
}
function processAutosize(value, element) {
@@ -233,9 +241,7 @@
element.view
.height(dimensions.height)
.width(dimensions.width)
-.update({
-duration: value.updateDuration
-});
+.update(value.updateOptions);
}
}
});
@@ -267,9 +273,7 @@
if (element.view) {
var parsed = vega.parse.data(vegaData(value.data)).load;
-element.view.data(parsed).update({
-duration: value.updateDuration
-});
+element.view.data(parsed).update(value.updateOptions);
updateColor();
} else {
vega.parse.spec(vegaDefinition(value), function (graph) {
diff --git a/src/components/visualizers/vega-timeseries/vega-timeseries.js
b/src/components/visualizers/vega-timeseries/vega-timeseries.js
index 2978b01..d99ea8e 100644
--- a/src/components/visualizers/vega-timeseries/vega-timeseries.js
+++ b/src/components/visualizers/vega-timeseries/vega-timeseries.js
@@ -14,7 +14,7 @@
width : 'auto',
height : 'auto',
parentSelector : '.parent-of-resizable',
-updateDuration : 300,
+updateOptions : {duration: 300},
padding : {top: 30, right: 40, bottom: 30, left: 35},
strokeWidth : 2
colorScale : undefined (pass a ko.observable to monitor color)
--
To view, visit https://gerrit.wikimedia.org/r/175137
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0d8e86d7eff193ce58c1836871841bb4b5ce297b
Gerrit-PatchSet: 1
Gerrit-Project: analytics/dashiki
Gerrit-Branch: master
Gerrit-Owner: Milimetric
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Switching from php5 to php and removing unneeded variable in... - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Switching from php5 to php and removing unneeded variable in
Makefile
..
Switching from php5 to php and removing unneeded variable in Makefile
There's no reason this should be specific to PHP version 5, plus
'php5' is not always registered as an alias to php. For example,
I'm running PHP 5.4.24, but 'php5' does nothing in my environment.
Removing MW_MF_INSTALL_PATH. We already have MW_INSTALL_PATH and
extensions are always in the extension dir, so I don't think we
need to create a separate variable for this.
Change-Id: I863ced57532cc4c41afdadc1e8aaa2e3eb605455
---
M Makefile
1 file changed, 1 insertion(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Makefile b/Makefile
index 2ee18c6..d8bc57f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,4 @@
MW_INSTALL_PATH ?= /vagrant/mediawiki/
-MW_MF_INSTALL_PATH ?= /vagrant/mediawiki/extensions/MobileFrontend
MEDIAWIKI_LOAD_URL ?= http://localhost:8080/w/load.php
# From https://gist.github.com/prwhite/8168133
@@ -82,7 +81,7 @@
@dev-scripts/phplint.sh
phpunit: ## Run the PHPUnit test suite
- cd ${MW_INSTALL_PATH}/tests/phpunit && php5 phpunit.php
${MW_MF_INSTALL_PATH}/tests/phpunit --group=MobileFrontend
+ cd ${MW_INSTALL_PATH}/tests/phpunit && php phpunit.php
${MW_INSTALL_PATH}/extensions/MobileFrontend/tests/phpunit
--group=MobileFrontend
qunit: ## Run the QUnit test suite
@dev-scripts/qunit.sh
--
To view, visit https://gerrit.wikimedia.org/r/175032
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I863ced57532cc4c41afdadc1e8aaa2e3eb605455
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Kaldari
Gerrit-Reviewer: Awjrichards
Gerrit-Reviewer: Krinkle
Gerrit-Reviewer: MaxSem
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 OOjs UI to v0.1.0-pre (23565e7519) - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (23565e7519)
..
Update OOjs UI to v0.1.0-pre (23565e7519)
New changes:
0557719 Use README.md as doxygen main page
290f8a9 Remove accidental double try-catch from 76800b47
e7039d0 Revert "Revert "Show the modal overlay as soon as openWindow is called""
61ac646 Fix lots of spelling mistakes and typos
5b381ae build: Create a 'typos' task to detect common typos
f21c8eb FieldLayout: Only use for InputWidgets
39e8522 Localisation updates from https://translatewiki.net.
16eb98d PHP: Reject malformed and potentially evil input when outputting HTML
Change-Id: Ie039a451cf03eaf21e16538cfca270b1d9b8f7f9
---
M resources/lib/oojs-ui/i18n/es.json
M resources/lib/oojs-ui/i18n/fr.json
M resources/lib/oojs-ui/i18n/om.json
M resources/lib/oojs-ui/oojs-ui-apex.css
M resources/lib/oojs-ui/oojs-ui-apex.js
M resources/lib/oojs-ui/oojs-ui-apex.svg.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.css
M resources/lib/oojs-ui/oojs-ui-mediawiki.js
M resources/lib/oojs-ui/oojs-ui-mediawiki.svg.css
M resources/lib/oojs-ui/oojs-ui.js
10 files changed, 108 insertions(+), 80 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/lib/oojs-ui/i18n/es.json
b/resources/lib/oojs-ui/i18n/es.json
index 82699a3..915791e 100644
--- a/resources/lib/oojs-ui/i18n/es.json
+++ b/resources/lib/oojs-ui/i18n/es.json
@@ -28,5 +28,6 @@
"ooui-dialog-message-reject": "Cancelar",
"ooui-dialog-process-error": "Algo salió mal",
"ooui-dialog-process-dismiss": "Descartar",
- "ooui-dialog-process-retry": "Intentar de nuevo"
+ "ooui-dialog-process-retry": "Intentar de nuevo",
+ "ooui-dialog-process-continue": "Continuar"
}
diff --git a/resources/lib/oojs-ui/i18n/fr.json
b/resources/lib/oojs-ui/i18n/fr.json
index def0346..9144cb0 100644
--- a/resources/lib/oojs-ui/i18n/fr.json
+++ b/resources/lib/oojs-ui/i18n/fr.json
@@ -26,7 +26,8 @@
"Urhixidur",
"Verdy p",
"Wyz",
- "SnowedEarth"
+ "SnowedEarth",
+ "Jdforrester"
]
},
"ooui-outline-control-move-down": "Faire descendre l’élément",
@@ -34,9 +35,11 @@
"ooui-outline-control-remove": "Supprimer l’élément",
"ooui-toolbar-more": "Plus",
"ooui-toolgroup-expand": "Plus",
+ "ooui-toolgroup-collapse": "Moins",
"ooui-dialog-message-accept": "OK",
"ooui-dialog-message-reject": "Annuler",
"ooui-dialog-process-error": "Quelque chose a mal tourné",
"ooui-dialog-process-dismiss": "Rejeter",
- "ooui-dialog-process-retry": "Réessayez"
+ "ooui-dialog-process-retry": "Réessayez",
+ "ooui-dialog-process-continue": "Continuer"
}
diff --git a/resources/lib/oojs-ui/i18n/om.json
b/resources/lib/oojs-ui/i18n/om.json
index c62782e..ecf9597 100644
--- a/resources/lib/oojs-ui/i18n/om.json
+++ b/resources/lib/oojs-ui/i18n/om.json
@@ -9,9 +9,12 @@
"ooui-outline-control-move-up": "Ol baasi",
"ooui-outline-control-remove": "Balleessi",
"ooui-toolbar-more": "Dabalata",
+ "ooui-toolgroup-expand": "Dabalata",
+ "ooui-toolgroup-collapse": "Xiqqaa",
"ooui-dialog-message-accept": "Tole",
"ooui-dialog-message-reject": "Dhiisi",
"ooui-dialog-process-error": "Dogoggorri wayii ummameera",
"ooui-dialog-process-dismiss": "Didi",
- "ooui-dialog-process-retry": "Itti deebi'ii yaali"
+ "ooui-dialog-process-retry": "Itti deebi'ii yaali",
+ "ooui-dialog-process-continue": "Itti fufi"
}
diff --git a/resources/lib/oojs-ui/oojs-ui-apex.css
b/resources/lib/oojs-ui/oojs-ui-apex.css
index 6af125f..eb46d19 100644
--- a/resources/lib/oojs-ui/oojs-ui-apex.css
+++ b/resources/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (d4cfcce969)
+ * OOjs UI v0.1.0-pre (23565e7519)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T00:12:46Z
+ * Date: 2014-11-21T22:18:30Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
@@ -2025,7 +2025,7 @@
height: 0;
overflow: hidden;
}
-.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup {
+.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load {
width: auto;
height: auto;
top: 0;
@@ -2042,10 +2042,14 @@
overflow: hidden;
max-width: 100%;
max-height: 100%;
+ visibility: visible;
}
.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup >
.oo-ui-window-frame > iframe {
width: 100%;
height: 100%;
+}
+.oo-ui-windowManager-modal > .
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (23565e7519) - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (23565e7519)
..
Update OOjs UI to v0.1.0-pre (23565e7519)
New changes:
0557719 Use README.md as doxygen main page
290f8a9 Remove accidental double try-catch from 76800b47
e7039d0 Revert "Revert "Show the modal overlay as soon as openWindow is called""
61ac646 Fix lots of spelling mistakes and typos
5b381ae build: Create a 'typos' task to detect common typos
f21c8eb FieldLayout: Only use for InputWidgets
39e8522 Localisation updates from https://translatewiki.net.
16eb98d PHP: Reject malformed and potentially evil input when outputting HTML
Change-Id: Ie039a451cf03eaf21e16538cfca270b1d9b8f7f9
---
M lib/oojs-ui/i18n/es.json
M lib/oojs-ui/i18n/fr.json
M lib/oojs-ui/i18n/om.json
M lib/oojs-ui/oojs-ui-apex.css
M lib/oojs-ui/oojs-ui-apex.js
M lib/oojs-ui/oojs-ui-apex.rtl.css
M lib/oojs-ui/oojs-ui-apex.svg.css
M lib/oojs-ui/oojs-ui-apex.svg.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.css
M lib/oojs-ui/oojs-ui-mediawiki.js
M lib/oojs-ui/oojs-ui-mediawiki.rtl.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.css
M lib/oojs-ui/oojs-ui-mediawiki.svg.rtl.css
M lib/oojs-ui/oojs-ui.js
14 files changed, 140 insertions(+), 96 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/oojs-ui/i18n/es.json b/lib/oojs-ui/i18n/es.json
index 82699a3..915791e 100644
--- a/lib/oojs-ui/i18n/es.json
+++ b/lib/oojs-ui/i18n/es.json
@@ -28,5 +28,6 @@
"ooui-dialog-message-reject": "Cancelar",
"ooui-dialog-process-error": "Algo salió mal",
"ooui-dialog-process-dismiss": "Descartar",
- "ooui-dialog-process-retry": "Intentar de nuevo"
+ "ooui-dialog-process-retry": "Intentar de nuevo",
+ "ooui-dialog-process-continue": "Continuar"
}
diff --git a/lib/oojs-ui/i18n/fr.json b/lib/oojs-ui/i18n/fr.json
index def0346..9144cb0 100644
--- a/lib/oojs-ui/i18n/fr.json
+++ b/lib/oojs-ui/i18n/fr.json
@@ -26,7 +26,8 @@
"Urhixidur",
"Verdy p",
"Wyz",
- "SnowedEarth"
+ "SnowedEarth",
+ "Jdforrester"
]
},
"ooui-outline-control-move-down": "Faire descendre l’élément",
@@ -34,9 +35,11 @@
"ooui-outline-control-remove": "Supprimer l’élément",
"ooui-toolbar-more": "Plus",
"ooui-toolgroup-expand": "Plus",
+ "ooui-toolgroup-collapse": "Moins",
"ooui-dialog-message-accept": "OK",
"ooui-dialog-message-reject": "Annuler",
"ooui-dialog-process-error": "Quelque chose a mal tourné",
"ooui-dialog-process-dismiss": "Rejeter",
- "ooui-dialog-process-retry": "Réessayez"
+ "ooui-dialog-process-retry": "Réessayez",
+ "ooui-dialog-process-continue": "Continuer"
}
diff --git a/lib/oojs-ui/i18n/om.json b/lib/oojs-ui/i18n/om.json
index c62782e..ecf9597 100644
--- a/lib/oojs-ui/i18n/om.json
+++ b/lib/oojs-ui/i18n/om.json
@@ -9,9 +9,12 @@
"ooui-outline-control-move-up": "Ol baasi",
"ooui-outline-control-remove": "Balleessi",
"ooui-toolbar-more": "Dabalata",
+ "ooui-toolgroup-expand": "Dabalata",
+ "ooui-toolgroup-collapse": "Xiqqaa",
"ooui-dialog-message-accept": "Tole",
"ooui-dialog-message-reject": "Dhiisi",
"ooui-dialog-process-error": "Dogoggorri wayii ummameera",
"ooui-dialog-process-dismiss": "Didi",
- "ooui-dialog-process-retry": "Itti deebi'ii yaali"
+ "ooui-dialog-process-retry": "Itti deebi'ii yaali",
+ "ooui-dialog-process-continue": "Itti fufi"
}
diff --git a/lib/oojs-ui/oojs-ui-apex.css b/lib/oojs-ui/oojs-ui-apex.css
index 8a4952e..1ccb25a 100644
--- a/lib/oojs-ui/oojs-ui-apex.css
+++ b/lib/oojs-ui/oojs-ui-apex.css
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (d4cfcce969)
+ * OOjs UI v0.1.0-pre (23565e7519)
* https://www.mediawiki.org/wiki/OOjs_UI
*
* Copyright 2011–2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: 2014-11-21T00:12:03Z
+ * Date: 2014-11-21T22:15:41Z
*/
.oo-ui-progressBarWidget-slide-frames from {
margin-left: -40%;
@@ -2025,7 +2025,7 @@
height: 0;
overflow: hidden;
}
-.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup {
+.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-load {
width: auto;
height: auto;
top: 0;
@@ -2042,10 +2042,14 @@
overflow: hidden;
max-width: 100%;
max-height: 100%;
+ visibility: visible;
}
.oo-ui-windowManager-modal > .oo-ui-dialog.oo-ui-window-setup >
.oo-ui-window-frame > iframe {
width: 100%;
height: 100%;
+}
+.oo-ui-windowManager-modal > .oo-ui-dialog > .oo-ui-window-frame {
+ visibility: hidden;
}
.oo-ui-windowManager-fullscreen > .oo
