[MediaWiki-commits] [Gerrit] Prune invalid roles from vagrant-managed.pp - change (mediawiki/vagrant)
jenkins-bot has submitted this change and it was merged.
Change subject: Prune invalid roles from vagrant-managed.pp
..
Prune invalid roles from vagrant-managed.pp
When vagrant is invoked, check if vagrant-managed.pp references nonexistent
roles. If so, rebuild the file.
Change-Id: I6426e95f9070bc0900143cb340cfe366555a2226
---
M lib/mediawiki-vagrant/helpers.rb
1 file changed, 6 insertions(+), 0 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/mediawiki-vagrant/helpers.rb b/lib/mediawiki-vagrant/helpers.rb
index 6e25b18..143f062 100644
--- a/lib/mediawiki-vagrant/helpers.rb
+++ b/lib/mediawiki-vagrant/helpers.rb
@@ -55,3 +55,9 @@
}.join("\n")
}
end
+
+# Prune references to retired roles from vagrant-managed.pp
+valid_roles = roles_enabled & roles_available
+if roles_enabled.length > valid_roles.length
+update_roles(valid_roles)
+end
--
To view, visit https://gerrit.wikimedia.org/r/113520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6426e95f9070bc0900143cb340cfe366555a2226
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
Gerrit-Reviewer: Mattflaschen
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] WIP: Store the page_id in the logging table for deletions. - change (mediawiki/core)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113525
Change subject: WIP: Store the page_id in the logging table for deletions.
..
WIP: Store the page_id in the logging table for deletions.
Bug: 26122
Change-Id: I1c7f3a84f10df05d6b37dccbad4c8232edf51580
---
M includes/WikiPage.php
1 file changed, 10 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/25/113525/1
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index bcd0f69..a271255 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -2777,22 +2777,29 @@
$dbw->delete( 'revision', array( 'rev_page' => $id ),
__METHOD__ );
}
- $this->doDeleteUpdates( $id, $content );
-
// Log the deletion, if the page was suppressed, log it at
Oversight instead
$logtype = $suppress ? 'suppress' : 'delete';
+ // Insert the log first, since doDeleteUpdates will clear the
article ID,
+ // but don't publish immediately. Publishing can go out over
the network
+ // (e.g. UDP), which unlike the insert can not be rolled back.
+ //
+ // Wait until after the (optional) commit just in case the
transaction
+ // rolls back in doDeleteUpdates.
$logEntry = new ManualLogEntry( $logtype, 'delete' );
$logEntry->setPerformer( $user );
$logEntry->setTarget( $this->mTitle );
$logEntry->setComment( $reason );
$logid = $logEntry->insert();
- $logEntry->publish( $logid );
+
+ $this->doDeleteUpdates( $id, $content );
if ( $commit ) {
$dbw->commit( __METHOD__ );
}
+ $logEntry->publish( $logid );
+
wfRunHooks( 'ArticleDeleteComplete', array( &$this, &$user,
$reason, $id, $content, $logEntry ) );
$status->value = $logid;
return $status;
--
To view, visit https://gerrit.wikimedia.org/r/113525
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1c7f3a84f10df05d6b37dccbad4c8232edf51580
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] remove deprecated %n and %l format specifiers; version 0.7 - change (mediawiki...EventLogging)
jenkins-bot has submitted this change and it was merged.
Change subject: remove deprecated %n and %l format specifiers; version 0.7
..
remove deprecated %n and %l format specifiers; version 0.7
* '%l' and '%n' were deprecated in I07c6c7856. Remove them.
* Bump version to 0.7.
* Also fix silly test failure.
* Some unrelated linting.
Change-Id: I1a6336c00f07d91249e56f0c53ff55a2a585cb2c
---
M EventLogging.php
M server/eventlogging/__init__.py
M server/eventlogging/parse.py
M server/eventlogging/streams.py
M server/setup.py
M server/tests/fixtures.py
M server/tests/test_parser.py
7 files changed, 25 insertions(+), 33 deletions(-)
Approvals:
Ori.livneh: Looks good to me, approved
jenkins-bot: Verified
diff --git a/EventLogging.php b/EventLogging.php
index e5e0f12..0a73521 100644
--- a/EventLogging.php
+++ b/EventLogging.php
@@ -9,7 +9,7 @@
*
* @author Ori Livneh
* @license GPL v2 or later
- * @version 0.6
+ * @version 0.7
*/
// Credits
@@ -23,7 +23,7 @@
'S Page',
'Matthew Flaschen',
),
- 'version' => '0.6',
+ 'version' => '0.7',
'url' => 'https://www.mediawiki.org/wiki/Extension:EventLogging',
'descriptionmsg' => 'eventlogging-desc'
);
diff --git a/server/eventlogging/__init__.py b/server/eventlogging/__init__.py
index 5de88c1..90ac75c 100644
--- a/server/eventlogging/__init__.py
+++ b/server/eventlogging/__init__.py
@@ -32,4 +32,4 @@
# :exc:`jsonschema.SchemaError`.
from jsonschema import ValidationError, SchemaError
-__version__ = '0.5'
+__version__ = '0.7'
diff --git a/server/eventlogging/parse.py b/server/eventlogging/parse.py
index 41cc4f6..9c0f83a 100644
--- a/server/eventlogging/parse.py
+++ b/server/eventlogging/parse.py
@@ -17,11 +17,7 @@
++=+
| %h | Client IP |
++-+
- | %j | JSON object |
- ++-+
- | %l | Hostname of origin* |
- ++-+
- | %n | Sequence ID*|
+ | %j | JSON event object |
++-+
| %q | Query-string-encoded JSON |
++-+
@@ -35,8 +31,6 @@
++-+
'..' is the desired property name for the capturing group.
-
- *: Deprecated; use "%{..}x"-style format specifiers instead.
"""
from __future__ import division, unicode_literals
diff --git a/server/eventlogging/streams.py b/server/eventlogging/streams.py
index 3ed94f7..c1a9eed 100644
--- a/server/eventlogging/streams.py
+++ b/server/eventlogging/streams.py
@@ -16,7 +16,7 @@
import zmq
-from .compat import items, urisplit
+from .compat import items
__all__ = ('iter_json', 'iter_unicode', 'make_canonical', 'pub_socket',
@@ -40,30 +40,30 @@
def pub_socket(endpoint):
"""Get a pre-configured ØMQ publisher."""
context = zmq.Context.instance()
-socket = context.socket(zmq.PUB)
+sock = context.socket(zmq.PUB)
if hasattr(zmq, 'HWM'):
-socket.hwm = ZMQ_HIGH_WATER_MARK
-socket.linger = ZMQ_LINGER
-socket.sndbuf = SOCKET_BUFFER_SIZE
+sock.hwm = ZMQ_HIGH_WATER_MARK
+sock.linger = ZMQ_LINGER
+sock.sndbuf = SOCKET_BUFFER_SIZE
canonical_endpoint = make_canonical(endpoint, host='*')
-socket.bind(canonical_endpoint)
-return socket
+sock.bind(canonical_endpoint)
+return sock
def sub_socket(endpoint, identity='', subscribe=''):
"""Get a pre-configured ØMQ subscriber."""
context = zmq.Context.instance()
-socket = context.socket(zmq.SUB)
+sock = context.socket(zmq.SUB)
if hasattr(zmq, 'HWM'):
-socket.hwm = ZMQ_HIGH_WATER_MARK
-socket.linger = ZMQ_LINGER
-socket.rcvbuf = SOCKET_BUFFER_SIZE
-if identity and hasattr(socket, 'identity'):
-socket.identity = identity.encode('utf-8')
+sock.hwm = ZMQ_HIGH_WATER_MARK
+sock.linger = ZMQ_LINGER
+sock.rcvbuf = SOCKET_BUFFER_SIZE
+if identity and hasattr(sock, 'identity'):
+sock.identity = identity.encode('utf-8')
canonical_endpoint = make_canonical(endpoint)
-socket.connect(canonical_endpoint)
-socket.subscribe = subscribe.encode('utf-8')
-return socket
+sock.connect(canonical_endpoint)
+sock.subscribe = subscribe.encode('utf-8')
+return sock
def udp_socket(hostname, port):
diff --git a/server/setup.py b/server/setup.py
index 7cfe5c3..ed6f6fb 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -19,7 +19,7 @@
setup(
name='eventlogging',
-version='0.6',
+version='0.7',
license='GPL',
author='Ori Livneh',
author_email='o...@wikimedia.org',
diff --git a/server/tests/fixtures.py b/server/tests/fixtures.py
index 1fb9a5c..160d872 100644
--- a/server/tests/fixtures.py
[MediaWiki-commits] [Gerrit] remove deprecated %n and %l format specifiers - change (mediawiki...EventLogging)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113524
Change subject: remove deprecated %n and %l format specifiers
..
remove deprecated %n and %l format specifiers
* '%l' and '%n' were deprecated in I07c6c7856.
* Also fix silly test failure.
Change-Id: I1a6336c00f07d91249e56f0c53ff55a2a585cb2c
---
M EventLogging.php
M server/eventlogging/__init__.py
M server/eventlogging/parse.py
M server/eventlogging/streams.py
M server/setup.py
M server/tests/fixtures.py
M server/tests/test_parser.py
7 files changed, 25 insertions(+), 33 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/EventLogging
refs/changes/24/113524/1
diff --git a/EventLogging.php b/EventLogging.php
index e5e0f12..0a73521 100644
--- a/EventLogging.php
+++ b/EventLogging.php
@@ -9,7 +9,7 @@
*
* @author Ori Livneh
* @license GPL v2 or later
- * @version 0.6
+ * @version 0.7
*/
// Credits
@@ -23,7 +23,7 @@
'S Page',
'Matthew Flaschen',
),
- 'version' => '0.6',
+ 'version' => '0.7',
'url' => 'https://www.mediawiki.org/wiki/Extension:EventLogging',
'descriptionmsg' => 'eventlogging-desc'
);
diff --git a/server/eventlogging/__init__.py b/server/eventlogging/__init__.py
index 5de88c1..90ac75c 100644
--- a/server/eventlogging/__init__.py
+++ b/server/eventlogging/__init__.py
@@ -32,4 +32,4 @@
# :exc:`jsonschema.SchemaError`.
from jsonschema import ValidationError, SchemaError
-__version__ = '0.5'
+__version__ = '0.7'
diff --git a/server/eventlogging/parse.py b/server/eventlogging/parse.py
index 41cc4f6..9c0f83a 100644
--- a/server/eventlogging/parse.py
+++ b/server/eventlogging/parse.py
@@ -17,11 +17,7 @@
++=+
| %h | Client IP |
++-+
- | %j | JSON object |
- ++-+
- | %l | Hostname of origin* |
- ++-+
- | %n | Sequence ID*|
+ | %j | JSON event object |
++-+
| %q | Query-string-encoded JSON |
++-+
@@ -35,8 +31,6 @@
++-+
'..' is the desired property name for the capturing group.
-
- *: Deprecated; use "%{..}x"-style format specifiers instead.
"""
from __future__ import division, unicode_literals
diff --git a/server/eventlogging/streams.py b/server/eventlogging/streams.py
index 3ed94f7..c1a9eed 100644
--- a/server/eventlogging/streams.py
+++ b/server/eventlogging/streams.py
@@ -16,7 +16,7 @@
import zmq
-from .compat import items, urisplit
+from .compat import items
__all__ = ('iter_json', 'iter_unicode', 'make_canonical', 'pub_socket',
@@ -40,30 +40,30 @@
def pub_socket(endpoint):
"""Get a pre-configured ØMQ publisher."""
context = zmq.Context.instance()
-socket = context.socket(zmq.PUB)
+sock = context.socket(zmq.PUB)
if hasattr(zmq, 'HWM'):
-socket.hwm = ZMQ_HIGH_WATER_MARK
-socket.linger = ZMQ_LINGER
-socket.sndbuf = SOCKET_BUFFER_SIZE
+sock.hwm = ZMQ_HIGH_WATER_MARK
+sock.linger = ZMQ_LINGER
+sock.sndbuf = SOCKET_BUFFER_SIZE
canonical_endpoint = make_canonical(endpoint, host='*')
-socket.bind(canonical_endpoint)
-return socket
+sock.bind(canonical_endpoint)
+return sock
def sub_socket(endpoint, identity='', subscribe=''):
"""Get a pre-configured ØMQ subscriber."""
context = zmq.Context.instance()
-socket = context.socket(zmq.SUB)
+sock = context.socket(zmq.SUB)
if hasattr(zmq, 'HWM'):
-socket.hwm = ZMQ_HIGH_WATER_MARK
-socket.linger = ZMQ_LINGER
-socket.rcvbuf = SOCKET_BUFFER_SIZE
-if identity and hasattr(socket, 'identity'):
-socket.identity = identity.encode('utf-8')
+sock.hwm = ZMQ_HIGH_WATER_MARK
+sock.linger = ZMQ_LINGER
+sock.rcvbuf = SOCKET_BUFFER_SIZE
+if identity and hasattr(sock, 'identity'):
+sock.identity = identity.encode('utf-8')
canonical_endpoint = make_canonical(endpoint)
-socket.connect(canonical_endpoint)
-socket.subscribe = subscribe.encode('utf-8')
-return socket
+sock.connect(canonical_endpoint)
+sock.subscribe = subscribe.encode('utf-8')
+return sock
def udp_socket(hostname, port):
diff --git a/server/setup.py b/server/setup.py
index 7cfe5c3..ed6f6fb 100644
--- a/server/setup.py
+++ b/server/setup.py
@@ -19,7 +19,7 @@
setup(
name='eventlogging',
-version='0.6',
+version='0.7',
license='GPL',
author='Ori Livneh',
author_email='o...@wikimedia.org',
diff --git a/server/tests/fixtures.py b/server/tests/fixtures.py
index 1fb9a5c..160d872 100644
--- a/server/tests/fixtures.py
+++ b/server/tests/fixtures.p
[MediaWiki-commits] [Gerrit] Implement way to get the ID of a deleted page from deletion ... - change (mediawiki/core)
leucosticte has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113523
Change subject: Implement way to get the ID of a deleted page from deletion
logs. WikiPage::doDeleteArticleReal will tell ManualLogEntry::insert() what the
page_id is, so it can be stored in log_page; then ApiQueryLogEvents will
provide that data.
..
Implement way to get the ID of a deleted page from deletion logs.
WikiPage::doDeleteArticleReal will tell ManualLogEntry::insert()
what the page_id is, so it can be stored in log_page; then
ApiQueryLogEvents will provide that data.
Bug: 26122
Change-Id: I4724684287ed9abde9f504425c931b4b38dea5e2
---
M includes/WikiPage.php
M includes/api/ApiQueryLogEvents.php
M includes/logging/LogEntry.php
3 files changed, 18 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/23/113523/1
diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index bcd0f69..920199a 100644
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -2786,7 +2786,7 @@
$logEntry->setPerformer( $user );
$logEntry->setTarget( $this->mTitle );
$logEntry->setComment( $reason );
- $logid = $logEntry->insert();
+ $logid = $logEntry->insert( null, $id );
$logEntry->publish( $logid );
if ( $commit ) {
diff --git a/includes/api/ApiQueryLogEvents.php
b/includes/api/ApiQueryLogEvents.php
index 1578775..b7246a3 100644
--- a/includes/api/ApiQueryLogEvents.php
+++ b/includes/api/ApiQueryLogEvents.php
@@ -81,6 +81,9 @@
) );
$this->addFieldsIf( array( 'log_id', 'page_id' ),
$this->fld_ids );
+ $this->addFieldsIf( array( 'log_page' ), $this->fld_ids
+ && ( !$fld_action || $fld_action === 'delete' )
+ && ( !$fld_type || $fld_type === 'delete' ) );
$this->addFieldsIf( array( 'log_user', 'log_user_text',
'user_name' ), $this->fld_user );
$this->addFieldsIf( 'log_user', $this->fld_userid );
$this->addFieldsIf(
@@ -328,8 +331,15 @@
if ( $this->fld_title ) {
ApiQueryBase::addTitleInfo( $vals,
$title );
}
+ $vals['pageid'] = 0;
if ( $this->fld_ids ) {
- $vals['pageid'] = intval( $row->page_id
);
+ if ( intval( $row->page_id ) ) {
+ $vals['pageid'] = intval(
$row->page_id );
+ } else {
+ if ( intval( $row->log_page ) )
{
+ $vals['pageid'] =
intval( $row->log_page );
+ }
+ }
}
if ( $this->fld_details && $row->log_params !==
'' ) {
self::addLogParams(
diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php
index 71b4fc2..5477b7f 100644
--- a/includes/logging/LogEntry.php
+++ b/includes/logging/LogEntry.php
@@ -475,7 +475,7 @@
* @return int ID of the log entry
* @throws MWException
*/
- public function insert( IDatabase $dbw = null ) {
+ public function insert( IDatabase $dbw = null, $pageId = null ) {
global $wgContLang;
$dbw = $dbw ?: wfGetDB( DB_MASTER );
@@ -491,7 +491,10 @@
# Truncate for whole multibyte characters.
$comment = $wgContLang->truncate( $comment, 255 );
- $data = array(
+ if ( $pageId === null ) {
+$pageId = $this->getTarget()->getArticleID();
+}
+$data = array(
'log_id' => $id,
'log_type' => $this->getType(),
'log_action' => $this->getSubtype(),
@@ -500,7 +503,7 @@
'log_user_text' => $this->getPerformer()->getName(),
'log_namespace' => $this->getTarget()->getNamespace(),
'log_title' => $this->getTarget()->getDBkey(),
- 'log_page' => $this->getTarget()->getArticleID(),
+ 'log_page' => $pageId,
'log_comment' => $comment,
'log_params' => serialize(
(array)$this->getParameters() ),
);
--
To view, visit https://gerrit.wikimedia.org/r/113523
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4724684287ed9abde9f504425c931b4b38
[MediaWiki-commits] [Gerrit] s1 assign db1034 - change (operations/puppet)
Springle has submitted this change and it was merged.
Change subject: s1 assign db1034
..
s1 assign db1034
Change-Id: I40fc28545901a51bd7f462ab4801c5fe69ef577b
---
M manifests/site.pp
1 file changed, 2 insertions(+), 8 deletions(-)
Approvals:
Springle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/site.pp b/manifests/site.pp
index 913f800..9f01bbb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -555,13 +555,13 @@
}
# eqiad dbs
-node /^db10(37|43|49|50|51|52|55|56)\.eqiad\.wmnet/ {
+node /^db10(34|37|43|49|50|51|52|55|56)\.eqiad\.wmnet/ {
if $::hostname =~ /^db10(56)/ {
$ganglia_aggregator = true
include mha::manager
}
-if $::hostname =~ /^db10(37|49|50|51|52|55|56)/ {
+if $::hostname =~ /^db10(34|37|49|50|51|52|55|56)/ {
class { role::coredb::s1 : innodb_file_per_table => true, mariadb =>
true }
} elsif $::hostname =~ /^db10(43)/ {
class { role::coredb::s1 : mariadb => true }
@@ -735,12 +735,6 @@
mysql_wmf,
mysql_wmf::datadirs,
mysql_wmf::mysqluser
-}
-
-# out of action
-# db1034 RT 6783
-node /^db10(34)\.eqiad\.wmnet/ {
-include standard
}
node "dobson.wikimedia.org" {
--
To view, visit https://gerrit.wikimedia.org/r/113522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I40fc28545901a51bd7f462ab4801c5fe69ef577b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
Gerrit-Reviewer: Springle
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] s1 assign db1034 - change (operations/puppet)
Springle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113522
Change subject: s1 assign db1034
..
s1 assign db1034
Change-Id: I40fc28545901a51bd7f462ab4801c5fe69ef577b
---
M manifests/site.pp
1 file changed, 2 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/22/113522/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 913f800..9f01bbb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -555,13 +555,13 @@
}
# eqiad dbs
-node /^db10(37|43|49|50|51|52|55|56)\.eqiad\.wmnet/ {
+node /^db10(34|37|43|49|50|51|52|55|56)\.eqiad\.wmnet/ {
if $::hostname =~ /^db10(56)/ {
$ganglia_aggregator = true
include mha::manager
}
-if $::hostname =~ /^db10(37|49|50|51|52|55|56)/ {
+if $::hostname =~ /^db10(34|37|49|50|51|52|55|56)/ {
class { role::coredb::s1 : innodb_file_per_table => true, mariadb =>
true }
} elsif $::hostname =~ /^db10(43)/ {
class { role::coredb::s1 : mariadb => true }
@@ -735,12 +735,6 @@
mysql_wmf,
mysql_wmf::datadirs,
mysql_wmf::mysqluser
-}
-
-# out of action
-# db1034 RT 6783
-node /^db10(34)\.eqiad\.wmnet/ {
-include standard
}
node "dobson.wikimedia.org" {
--
To view, visit https://gerrit.wikimedia.org/r/113522
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I40fc28545901a51bd7f462ab4801c5fe69ef577b
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Springle
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make 'remote_debug' PHP settings the default; retire role - change (mediawiki/vagrant)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113521
Change subject: Make 'remote_debug' PHP settings the default; retire role
..
Make 'remote_debug' PHP settings the default; retire role
Retire 'remote_debug' by moving its configuration options to the PHP module.
Change-Id: Icaf8cd9ce7d2d26965e1c2c230f5d0aa5a0df28c
---
D puppet/manifests/roles/remote_debug.pp
M puppet/modules/php/manifests/init.pp
2 files changed, 15 insertions(+), 31 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/21/113521/1
diff --git a/puppet/manifests/roles/remote_debug.pp
b/puppet/manifests/roles/remote_debug.pp
deleted file mode 100644
index efea363..000
--- a/puppet/manifests/roles/remote_debug.pp
+++ /dev/null
@@ -1,29 +0,0 @@
-# == Class: role::remote_debug
-# This class enables support for remote debugging of PHP code using
-# Xdebug. Remote debugging allows you to interactively walk through your
-# code as executes. Remote debugging is most useful when used in
-# conjunction with a PHP IDE such as PhpStorm or Emacs (with Geben).
-# The IDE is installed on your machine, not the Vagrant VM.
-#
-# -- To use, enable this role from shell:
-#vagrant enable-role remote_debug
-# -- In your IDE, enable "Start Listening for PHP Debug Connections"
-# -- For Firefox, install
-#https://addons.mozilla.org/en-US/firefox/addon/the-easiest-xdebug
-#and click "Enable Debug" icon in the Add-on bar
-# -- Set breakpoints
-# -- Navigate to 127.0.0.1:8080/...
-#
-# See
https://www.mediawiki.org/wiki/MediaWiki-Vagrant/Advanced_usage#MediaWiki_debugging_using_Xdebug_and_an_IDE_in_your_host
-# for more information.
-class role::remote_debug {
-include php
-
-php::ini { 'remote_debug':
-settings => {
-'xdebug.remote_connect_back' => 1,
-'xdebug.remote_enable' => 1,
-},
-require => Package['php5-xdebug'],
-}
-}
diff --git a/puppet/modules/php/manifests/init.pp
b/puppet/modules/php/manifests/init.pp
index 45054b5..88671f6 100644
--- a/puppet/modules/php/manifests/init.pp
+++ b/puppet/modules/php/manifests/init.pp
@@ -24,11 +24,24 @@
ensure => present,
}
-php::ini { 'debug output':
+php::ini { 'debug_output':
settings => {
display_errors => true,
display_startup_errors => true,
error_reporting=> -1,
-}
+},
+}
+
+# Enables support for remote debugging of PHP code using Xdebug.
+# This allows you to interactively walk through your code as
+# executes. Remote debugging is most useful when used in conjunction
+# with a PHP IDE such as PhpStorm or Emacs (with Geben).
+# See
+# for more information.
+php::ini { 'remote_debug':
+settings => {
+'xdebug.remote_connect_back' => 1,
+'xdebug.remote_enable' => 1,
+},
}
}
--
To view, visit https://gerrit.wikimedia.org/r/113521
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icaf8cd9ce7d2d26965e1c2c230f5d0aa5a0df28c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
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] Prune invalid roles from vagrant-managed.pp - change (mediawiki/vagrant)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113520
Change subject: Prune invalid roles from vagrant-managed.pp
..
Prune invalid roles from vagrant-managed.pp
When vagrant is invoked, check if vagrant-managed.pp references nonexistent
roles. If so, rebuild the file.
Change-Id: I6426e95f9070bc0900143cb340cfe366555a2226
---
M lib/mediawiki-vagrant/helpers.rb
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/20/113520/1
diff --git a/lib/mediawiki-vagrant/helpers.rb b/lib/mediawiki-vagrant/helpers.rb
index 6e25b18..143f062 100644
--- a/lib/mediawiki-vagrant/helpers.rb
+++ b/lib/mediawiki-vagrant/helpers.rb
@@ -55,3 +55,9 @@
}.join("\n")
}
end
+
+# Prune references to retired roles from vagrant-managed.pp
+valid_roles = roles_enabled & roles_available
+if roles_enabled.length > valid_roles.length
+update_roles(valid_roles)
+end
--
To view, visit https://gerrit.wikimedia.org/r/113520
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6426e95f9070bc0900143cb340cfe366555a2226
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
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] Upgrade XDebug, always enable, switch from apt to PECL - change (mediawiki/vagrant)
Mattflaschen has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113519
Change subject: Upgrade XDebug, always enable, switch from apt to PECL
..
Upgrade XDebug, always enable, switch from apt to PECL
* Upgrade XDebug from 2.1.0 to 2.2.3. Fixes at least one bug with
bogus CLASSNAME entries showing instead of object members in some
cases.
* Always enable XDebug
* Use the PECL package. It's suggested prominently at
http://xdebug.org/docs/install and is more up to date than Ubuntu's
package.
Change-Id: Id564d627f8a4f26731223f3fd9181a3fabd5a54f
---
M puppet/manifests/roles/remote_debug.pp
M puppet/modules/php/manifests/init.pp
2 files changed, 25 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/vagrant
refs/changes/19/113519/1
diff --git a/puppet/manifests/roles/remote_debug.pp
b/puppet/manifests/roles/remote_debug.pp
index efea363..e9b3e85 100644
--- a/puppet/manifests/roles/remote_debug.pp
+++ b/puppet/manifests/roles/remote_debug.pp
@@ -5,8 +5,12 @@
# conjunction with a PHP IDE such as PhpStorm or Emacs (with Geben).
# The IDE is installed on your machine, not the Vagrant VM.
#
-# -- To use, enable this role from shell:
-#vagrant enable-role remote_debug
+#
+# This was formerly off by default, but is now enabled on all
+# MediaWiki-Vagrant installations.
+#
+# To use:
+#
# -- In your IDE, enable "Start Listening for PHP Debug Connections"
# -- For Firefox, install
#https://addons.mozilla.org/en-US/firefox/addon/the-easiest-xdebug
@@ -17,13 +21,28 @@
# See
https://www.mediawiki.org/wiki/MediaWiki-Vagrant/Advanced_usage#MediaWiki_debugging_using_Xdebug_and_an_IDE_in_your_host
# for more information.
class role::remote_debug {
-include php
+$xdebug_extension_path = '/usr/lib/php5/20090626/xdebug.so'
+
+exec { 'install xdebug':
+command => 'pecl install xdebug',
+require => Package['php-pear'],
+creates => $xdebug_extension_path,
+}
+
+# Remove apt package so it doesn't clash with PECL package
+package { [
+'php5-xdebug',
+]:
+
+ensure => purged,
+}
php::ini { 'remote_debug':
settings => {
+'zend_extension' => $xdebug_extension_path,
'xdebug.remote_connect_back' => 1,
'xdebug.remote_enable' => 1,
},
-require => Package['php5-xdebug'],
+require => Exec['install xdebug'],
}
}
diff --git a/puppet/modules/php/manifests/init.pp
b/puppet/modules/php/manifests/init.pp
index 45054b5..ff7d897 100644
--- a/puppet/modules/php/manifests/init.pp
+++ b/puppet/modules/php/manifests/init.pp
@@ -8,6 +8,8 @@
include ::apache
include ::apache::mods::php5
+include role::remote_debug
+
package { [
'php5',
'php-apc',
@@ -19,7 +21,6 @@
'php5-intl',
'php5-mcrypt',
'php5-mysql',
-'php5-xdebug'
]:
ensure => present,
}
--
To view, visit https://gerrit.wikimedia.org/r/113519
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id564d627f8a4f26731223f3fd9181a3fabd5a54f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Mattflaschen
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Handle HTTPS for Zero traffic - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Handle HTTPS for Zero traffic
..
Handle HTTPS for Zero traffic
* Now all mobile traffic, including HTTPS, will be analyzed for zero
* X-Forwarded-For is analyzed more-correctly for proxy/SSL situations
Change-Id: I2e431638e45cd54cb738a3ebf2b788b8587e5776
---
M templates/varnish/mobile-frontend.inc.vcl.erb
M templates/varnish/zero.inc.vcl.erb
2 files changed, 205 insertions(+), 190 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index 1f82c4d..993fdad 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -18,20 +18,23 @@
*/
unset req.http.Range;
- if (!req.http.X-Forwarded-Proto) {
- /* This call will always set the following req.http values:
- X-Subdomain = M or ZERO
- This value is only set if the carrier has been successfully
detected
- X-CS = "502-13"
- */
- call tag_carrier;
-
- /* Assemble X-Analytics header */
- if (req.http.X-CS) {
- set req.http.X-Analytics = "zero=" + req.http.X-CS;
+ // Only do tag_carrier logic on first start, and only for (m|zero).wp
+ if (req.restarts == 0) {
+ // Always set X-Subdomain
+ if (req.http.host ~ "^([a-zA-Z0-9-]+\.)?zero\.") {
+ set req.http.X-Subdomain = "ZERO";
+ } else {
+ set req.http.X-Subdomain = "M";
}
- } else {
- set req.http.X-Subdomain = "M";
+
+ if (req.http.host ~ "^([a-zA-Z0-9-]+\.)?(m|zero)\.wikipedia\.")
{
+ call tag_carrier;
+ }
+ }
+
+ /* Assemble X-Analytics header */
+ if (req.http.X-CS) {
+ set req.http.X-Analytics = "zero=" + req.http.X-CS;
}
/* Rewrite m.mediawiki.org to mediawiki.org etc */
diff --git a/templates/varnish/zero.inc.vcl.erb
b/templates/varnish/zero.inc.vcl.erb
index 404daaa..c93506c 100644
--- a/templates/varnish/zero.inc.vcl.erb
+++ b/templates/varnish/zero.inc.vcl.erb
@@ -9,197 +9,209 @@
}
sub tag_carrier {
- // Note that currently, tag_carrier is *only* called when the request
is not
- // via HTTPS (check for X-Forwarded-Proto at the top of vcl_recv in
mobile-frontend.vcl).
+ // This is what things look like on entry in four basic scenarios
+ // ("both" here means something MITM-proxied the SSL connection, like
OperaMini,
+ // but was kind enough to set an XFF header on the way)
+ // (the leading "..." in XFF is that sometimes there are other local
+ // proxies on 127.0.0.1 or whatever, according to some OperaMini
docs...)
- set req.http.X-Forwarded-By = netmapper.map("proxies", "" + client.ip);
- // netmapper returns an empty string when not found, not NULL,
- // need to normalize before using implicit bool cast
+ /*
+ *v> | client.ip | XFF| XFP
+ * direct| client| (...,)? client |
+ * ssl | ssl | (...,)? client, ssl| https
+ * proxy | proxy | (...,)? client, proxy |
+ * both | ssl | (...,)? client, proxy, ssl | https
+ */
+
+ // first, strip the SSL entry from XFF if applicable
+ if (req.http.X-Forwarded-Proto) {
+ set req.http.XFF-NoSSL = regsub(req.http.X-Forwarded-For,
",[^,]+$", ""); // strips final entry
+ } else {
+ set req.http.XFF-NoSSL = req.http.X-Forwarded-For;
+ }
+
+
/*
+ *v> | XFF-NoSSL | map("proxies") input from regsub
below
+ * direct/ssl | (...,)? client| client
+ * proxy/both | (...,)? client, proxy | proxy
+
*/
+
+ // now get the trusted proxy into XFB, if any - the regsub grabs the
final entry in the list
+ set req.http.X-Forwarded-By = netmapper.map("proxies",
regsub(req.http.XFF-NoSSL, "^([^,]+, ?)+", ""));
+
+ // normalize to boolean again...
if (req.http.X-Forwarded-By == "") {
unset req.http.X-Forwarded-By;
}
- if (!req.http.X-Forwarded-By) {
- // direct request or unknown proxy
- set req.http.X-CS2 = netmapper.map("zero", "" + client.ip);
- } else if (req.restarts == 0) {
-
[MediaWiki-commits] [Gerrit] Add X-CS response for all requests that came from Zero network - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: Add X-CS response for all requests that came from Zero network
..
Add X-CS response for all requests that came from Zero network
All mobile responses need to have the X-CS set if it came from a zero network.
This allows apps to detect when we switch from zero to non-zero and back,
or when the user switches from one network to another and both are zero
(multi-sim phones).
The client should constantly check each response for this header, and if it
changes,
re-request the partner's message info.
Change-Id: If3dd1115148c3ea0a0e4bdf79c11343d0d21ac44
---
M templates/varnish/mobile-frontend.inc.vcl.erb
1 file changed, 13 insertions(+), 1 deletion(-)
Approvals:
BBlack: Verified; Looks good to me, approved
diff --git a/templates/varnish/mobile-frontend.inc.vcl.erb
b/templates/varnish/mobile-frontend.inc.vcl.erb
index f8111bd..1f82c4d 100644
--- a/templates/varnish/mobile-frontend.inc.vcl.erb
+++ b/templates/varnish/mobile-frontend.inc.vcl.erb
@@ -135,7 +135,19 @@
sub vcl_deliver {
# unset resp.http.Enable-ESI;
- unset resp.http.X-CS;
+
+ // All mobile responses need to have the X-CS set if it came from a
zero network.
+ // This allows apps to detect when we switch from zero to non-zero and
back,
+ // or when the user switches from one network to another and both are
zero (multi-sim phones).
+ // The client should constantly check each response for this header,
and if it changes,
+ // re-request the partner's message info.
+ // This value is only based on Varnish's zero detection, not the
backend processing of any sort
+ // We are in vcl_deliver, so changing it here would not affect the
cached object
+ if (req.http.X-CS) {
+ set resp.http.X-CS = req.http.X-CS;
+ } else {
+ unset resp.http.X-CS;
+ }
if (resp.http.X-Analytics) {
# do nothing, MediaWiki has handled X-Analytics
--
To view, visit https://gerrit.wikimedia.org/r/112805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If3dd1115148c3ea0a0e4bdf79c11343d0d21ac44
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yurik
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: Dr0ptp4kt
Gerrit-Reviewer: Faidon Liambotis
Gerrit-Reviewer: Yurik
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Decode html entities before comparing strings in #ifeq: and ... - change (mediawiki...ParserFunctions)
Brian Wolff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113518
Change subject: Decode html entities before comparing strings in #ifeq: and
#switch
..
Decode html entities before comparing strings in #ifeq: and #switch
This makes foo's equal to foo's. This is particularly important
since {{PAGENAME}} and friends html encode certain characters.
This change should be communicated to users before it hits wikis.
I don't think anyone is relying on the current behaviour, but
you never know.
Bug: 35628
Change-Id: I0035ac541d22491fcf15f55f2589aaab394ed0ed
---
M ParserFunctions_body.php
1 file changed, 20 insertions(+), 5 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ParserFunctions
refs/changes/18/113518/1
diff --git a/ParserFunctions_body.php b/ParserFunctions_body.php
index 3567cc5..970729e 100644
--- a/ParserFunctions_body.php
+++ b/ParserFunctions_body.php
@@ -147,8 +147,8 @@
* @return string
*/
public static function ifeqObj( $parser, $frame, $args ) {
- $left = isset( $args[0] ) ? trim( $frame->expand( $args[0] ) )
: '';
- $right = isset( $args[1] ) ? trim( $frame->expand( $args[1] ) )
: '';
+ $left = isset( $args[0] ) ? self::decodeTrimExpand( $args[0],
$frame ) : '';
+ $right = isset( $args[1] ) ? self::decodeTrimExpand( $args[1],
$frame ) : '';
if ( $left == $right ) {
return isset( $args[2] ) ? trim( $frame->expand(
$args[2] ) ) : '';
} else {
@@ -201,7 +201,7 @@
if ( count( $args ) == 0 ) {
return '';
}
- $primary = trim( $frame->expand( array_shift( $args ) ) );
+ $primary = self::decodeTrimExpand( array_shift( $args ), $frame
);
$found = $defaultFound = false;
$default = null;
$lastItemHadNoEquals = false;
@@ -219,7 +219,7 @@
# Multiple input match
return trim( $frame->expand( $valueNode
) );
} else {
- $test = trim( $frame->expand( $nameNode
) );
+ $test = self::decodeTrimExpand(
$nameNode, $frame );
if ( $test == $primary ) {
# Found a match, return now
return trim( $frame->expand(
$valueNode ) );
@@ -231,8 +231,10 @@
# Multiple input, single output
# If the value matches, set a flag and continue
$lastItemHadNoEquals = true;
- $test = trim( $frame->expand( $valueNode ) );
+ $test = self::decodeTrimExpand( $valueNode,
$frame );
if ( $test == $primary ) {
+ // Don't want to decode entities, if
potentially output.
+ $test = trim( $frame->expand(
$valueNode ) );
$found = true;
} elseif ( $mwDefault->matchStartAndRemove(
$test ) ) {
$defaultFound = true;
@@ -844,4 +846,17 @@
wfProfileOut( __METHOD__ );
return $result;
}
+
+ /**
+* Take a PPNode (-ish thing), expand it, remove entities, and trim.
+*
+* For use when doing string comparisions, where user expects entities
+* to be equal for what they stand for (e.g. comparisions with
{{PAGENAME}})
+*
+* @param $obj PPNode|string Thing to expand
+* @param $frame PPFrame
+*/
+ private static function decodeTrimExpand( $obj, $frame ) {
+ return trim( Sanitizer::decodeCharReferences( $frame->expand(
$obj ) ) );
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/113518
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0035ac541d22491fcf15f55f2589aaab394ed0ed
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ParserFunctions
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Note OOjs and OOjs-UI presence in the RELEASE-NOTES - change (mediawiki/core)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/113517 Change subject: Note OOjs and OOjs-UI presence in the RELEASE-NOTES .. Note OOjs and OOjs-UI presence in the RELEASE-NOTES Change-Id: I377304a70d19b87f35ea52ab2950f52fa1e72471 --- M RELEASE-NOTES-1.23 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/17/113517/1 diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index f07fbbb..12451aa 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -229,6 +229,7 @@ * Thumbnails that keep failing to render in thumb.php will be rate-limited againt further render attempts for 1 hour. $wgAttemptFailureEpoch can be altered to reset all rate-limited thumbnails at once. +* (bug 56572) Builds of the OOjs and OOjs UI libraries are now available. Removed classes * FakeMemCachedClient (deprecated in 1.18) -- To view, visit https://gerrit.wikimedia.org/r/113517 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I377304a70d19b87f35ea52ab2950f52fa1e72471 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core 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] Syncronize VisualEditor: 8826999..bbba650 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 8826999..bbba650 .. Syncronize VisualEditor: 8826999..bbba650 Change-Id: Id5bbe582bd293ed162fec22923892b5122033c5e --- 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 8826999..bbba650 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 88269996b3770dfc34bce542f36068268ed031a2 +Subproject commit bbba650002d2f0d8433742e7d26a2786e66061a6 -- To view, visit https://gerrit.wikimedia.org/r/113516 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id5bbe582bd293ed162fec22923892b5122033c5e 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: 8826999..bbba650 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/113516 Change subject: Syncronize VisualEditor: 8826999..bbba650 .. Syncronize VisualEditor: 8826999..bbba650 Change-Id: Id5bbe582bd293ed162fec22923892b5122033c5e --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/16/113516/1 diff --git a/VisualEditor b/VisualEditor index 8826999..bbba650 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 88269996b3770dfc34bce542f36068268ed031a2 +Subproject commit bbba650002d2f0d8433742e7d26a2786e66061a6 -- To view, visit https://gerrit.wikimedia.org/r/113516 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id5bbe582bd293ed162fec22923892b5122033c5e 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] Syncronize VisualEditor: 7a32674..8826999 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 7a32674..8826999 .. Syncronize VisualEditor: 7a32674..8826999 Change-Id: I74b4474239be644bb18d538778932e360d2b6dbb --- 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 7a32674..8826999 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 7a3267467aa2e614a20bb634d6944d7bc293f3bd +Subproject commit 88269996b3770dfc34bce542f36068268ed031a2 -- To view, visit https://gerrit.wikimedia.org/r/113515 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I74b4474239be644bb18d538778932e360d2b6dbb 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: 7a32674..8826999 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/113515 Change subject: Syncronize VisualEditor: 7a32674..8826999 .. Syncronize VisualEditor: 7a32674..8826999 Change-Id: I74b4474239be644bb18d538778932e360d2b6dbb --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/15/113515/1 diff --git a/VisualEditor b/VisualEditor index 7a32674..8826999 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 7a3267467aa2e614a20bb634d6944d7bc293f3bd +Subproject commit 88269996b3770dfc34bce542f36068268ed031a2 -- To view, visit https://gerrit.wikimedia.org/r/113515 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I74b4474239be644bb18d538778932e360d2b6dbb 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] Only display image info if that exists - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Only display image info if that exists
..
Only display image info if that exists
When a new search is performed in the MWMediaSearchWidget,
image thumbnail details are extracted from the API's imageinfo.
In some cases, this parameter does not exist. MWMediaResultWidget
relies on that parameter to get image details like 'src' and
width/height. Without it the search fails.
This fix makes sure that the thumbnail result is only displayed
if there are 'imageinfo' details at all. Otherwise, the image
result is ignored.
Bug: 61392
Change-Id: I5261059bb42d3a57441514eafaa0bffa3a3c3ba4
---
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
1 file changed, 14 insertions(+), 9 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
index 5590ff6..64d0479 100755
--- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
@@ -187,15 +187,20 @@
}
for ( page in pages ) {
- title = new mw.Title( pages[page].title ).getMainText();
- if ( !( title in this.titles ) ) {
- this.titles[title] = true;
- items.push(
- new ve.ui.MWMediaResultWidget(
- pages[page],
- { '$': this.$, 'size': this.size }
- )
- );
+ // Verify that imageinfo exists
+ // In case it does not, skip the image to avoid errors in
+ // ve.ui.MWMediaResultWidget
+ if ( pages[page].imageinfo && pages[page].imageinfo.length > 0
) {
+ title = new mw.Title( pages[page].title ).getMainText();
+ if ( !( title in this.titles ) ) {
+ this.titles[title] = true;
+ items.push(
+ new ve.ui.MWMediaResultWidget(
+ pages[page],
+ { '$': this.$, 'size':
this.size }
+ )
+ );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/113478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5261059bb42d3a57441514eafaa0bffa3a3c3ba4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
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: 4c2d4c1..7a32674 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/113513 Change subject: Syncronize VisualEditor: 4c2d4c1..7a32674 .. Syncronize VisualEditor: 4c2d4c1..7a32674 Change-Id: Ifadf523a00c6313bdf997e9278a782bddb7b8e7f --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/13/113513/1 diff --git a/VisualEditor b/VisualEditor index 4c2d4c1..7a32674 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4c2d4c14ea13faf4868e90a10cef2c2a5289b2a9 +Subproject commit 7a3267467aa2e614a20bb634d6944d7bc293f3bd -- To view, visit https://gerrit.wikimedia.org/r/113513 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ifadf523a00c6313bdf997e9278a782bddb7b8e7f 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] Syncronize VisualEditor: 4c2d4c1..7a32674 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 4c2d4c1..7a32674 .. Syncronize VisualEditor: 4c2d4c1..7a32674 Change-Id: Ifadf523a00c6313bdf997e9278a782bddb7b8e7f --- 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 4c2d4c1..7a32674 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 4c2d4c14ea13faf4868e90a10cef2c2a5289b2a9 +Subproject commit 7a3267467aa2e614a20bb634d6944d7bc293f3bd -- To view, visit https://gerrit.wikimedia.org/r/113513 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifadf523a00c6313bdf997e9278a782bddb7b8e7f 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 scripts to generate update builds of OOjs and OOjs UI - change (mediawiki/core)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113514
Change subject: Add scripts to generate update builds of OOjs and OOjs UI
..
Add scripts to generate update builds of OOjs and OOjs UI
Change-Id: Ib2e156cbd56dda3d32953d75bafca608eda974ad
---
A resources/oojs-ui/update-oojs-ui.sh
A resources/oojs/update-oojs.sh
2 files changed, 186 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/14/113514/1
diff --git a/resources/oojs-ui/update-oojs-ui.sh
b/resources/oojs-ui/update-oojs-ui.sh
new file mode 100755
index 000..66536bb
--- /dev/null
+++ b/resources/oojs-ui/update-oojs-ui.sh
@@ -0,0 +1,93 @@
+#!/usr/bin/env bash
+
+# FIXME this script is duplicated from update-oojs.sh - factor this out
+
+# This script generates a commit that updates the oojs-ui distribution
+# ./bin/update-oojs-ui.sh path/to/repo/for/oojs-ui
+
+function oojsuihash() {
+ grep "OOjs UI v" resources/oojs-ui/oojs-ui.js \
+ | head -n 1 \
+ | grep -Eo '\([a-z0-9]+\)' \
+ | sed 's/^(//' \
+ | sed 's/)$//'
+}
+
+function oojsuitag() {
+ grep "OOjs UI v" resources/oojs-ui/oojs-ui.js \
+ | head -n 1 \
+ | grep -Eo '\bv[0-9a-z.-]+\b'
+}
+
+function oojsuiversion() {
+ grep "OOjs UI v" resources/oojs-ui/oojs-ui.js \
+ | head -n 1 \
+ | grep -Eo '\bv[0-9a-z.-]+\b.*$'
+}
+
+# cd to the VisualEditor directory
+cd $(cd $(dirname $0)/../..; pwd)
+
+if [ "x$1" == "x" ]
+then
+ echo >&2 "Usage: update-oojs-ui.sh path/to/repo/for/oojs-ui"
+ exit 1
+fi
+
+# Undo any changes in the oojs-ui directory
+git reset resources/oojs-ui/
+git checkout resources/oojs-ui/
+# Get the old oojs-ui version
+OLDVERSION=$(oojsuihash)
+if [ "x$OLDVERSION" == "x" ]
+then
+ TAG=$(oojsuitag)
+fi
+
+# cd to the oojs-ui directory
+cd $1 || exit 1
+if [ "x$OLDVERSION" == "x" ]
+then
+ # Try the tag
+ OLDVERSION=$(git rev-parse $TAG)
+ if [ $? != 0 ]
+ then
+ echo Could not find OOjs UI version
+ cd -
+ exit 1
+ fi
+fi
+if [ "$(git rev-parse $OLDVERSION)" == "$(git rev-parse HEAD)" ]
+then
+ echo "No changes (already at $OLDVERSION)"
+ cd -
+ exit 0
+fi
+# Build the distribution
+grunt
+# Get the list of changes
+NEWCHANGES=$(git log $OLDVERSION.. --oneline --no-merges --reverse
--color=never)
+NEWCHANGESDISPLAY=$(git log $OLDVERSION.. --oneline --no-merges --reverse
--color=always)
+# cd back to the VisualEditor directory
+cd -
+
+# Copy files from dist/ to resources/oojs-ui
+cp -a $1/dist/{oojs-ui.js,oojs-ui.svg.css,images,i18n} resources/oojs-ui/
+# Figure out what the new version is
+NEWVERSION=$(oojsuiversion)
+# Generate commit summary
+COMMITMSG=$(cat <&2 <&2 "Usage: update-oojs.sh path/to/repo/for/oojs"
+ exit 1
+fi
+
+# Undo any changes in the oojs directory
+git reset resources/oojs/
+git checkout resources/oojs/
+# Get the old oojs version
+OLDVERSION=$(oojshash)
+if [ "x$OLDVERSION" == "x" ]
+then
+ TAG=$(oojstag)
+fi
+
+# cd to the oojs directory
+cd $1 || exit 1
+if [ "x$OLDVERSION" == "x" ]
+then
+ # Try the tag
+ OLDVERSION=$(git rev-parse $TAG)
+ if [ $? != 0 ]
+ then
+ echo Could not find OOjs version
+ cd -
+ exit 1
+ fi
+fi
+if [ "$(git rev-parse $OLDVERSION)" == "$(git rev-parse HEAD)" ]
+then
+ echo "No changes (already at $OLDVERSION)"
+ cd -
+ exit 0
+fi
+# Build the distribution
+grunt
+# Get the list of changes
+NEWCHANGES=$(git log $OLDVERSION.. --oneline --no-merges --reverse
--color=never)
+NEWCHANGESDISPLAY=$(git log $OLDVERSION.. --oneline --no-merges --reverse
--color=always)
+# cd back to the VisualEditor directory
+cd -
+
+# Copy files from dist/ to resources/oojs/
+cp -a $1/dist/* resources/oojs/
+# Figure out what the new version is
+NEWVERSION=$(oojsversion)
+# Generate commit summary
+COMMITMSG=$(cat <&2
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: cebb0ad..4c2d4c1 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: cebb0ad..4c2d4c1 .. Syncronize VisualEditor: cebb0ad..4c2d4c1 Change-Id: I2ab5e2967719e2a28e68a2797ece5938fd17baff --- 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 cebb0ad..4c2d4c1 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit cebb0ad9da23d9dfcf741d7239ec7344cc35ae3a +Subproject commit 4c2d4c14ea13faf4868e90a10cef2c2a5289b2a9 -- To view, visit https://gerrit.wikimedia.org/r/113512 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2ab5e2967719e2a28e68a2797ece5938fd17baff 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] Update VE core submodule to master (50ef8e8) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (50ef8e8) .. Update VE core submodule to master (50ef8e8) New changes: 71145fe Move commands into static getter so they can be overridden. Change-Id: I47f0f1fc13c69c0c46ea54e2a1db5a48e1cacbe3 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 8b545f4..50ef8e8 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 8b545f4f88bf0ec926224592720ea3f213269747 +Subproject commit 50ef8e89260745526523e36ed82612fa07b61531 -- To view, visit https://gerrit.wikimedia.org/r/113510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47f0f1fc13c69c0c46ea54e2a1db5a48e1cacbe3 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope 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: cebb0ad..4c2d4c1 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/113512 Change subject: Syncronize VisualEditor: cebb0ad..4c2d4c1 .. Syncronize VisualEditor: cebb0ad..4c2d4c1 Change-Id: I2ab5e2967719e2a28e68a2797ece5938fd17baff --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/12/113512/1 diff --git a/VisualEditor b/VisualEditor index cebb0ad..4c2d4c1 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit cebb0ad9da23d9dfcf741d7239ec7344cc35ae3a +Subproject commit 4c2d4c14ea13faf4868e90a10cef2c2a5289b2a9 -- To view, visit https://gerrit.wikimedia.org/r/113512 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ab5e2967719e2a28e68a2797ece5938fd17baff 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 (64650c6) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (64650c6)
..
Update VE core submodule to master (64650c6)
Switch to using FieldLayout for laying out forms.
New changes:
64650c6 Update OOjs UI to v0.1.0-pre (424b40373e)
Change-Id: I757aecf3485673f54aa9e7f38e88c079dda4451d
---
M modules/ve-mw/i18n/en.json
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
M modules/ve-mw/ui/dialogs/ve.ui.MWSaveDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
M modules/ve-mw/ui/styles/ve.ui.MWWidget.css
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
10 files changed, 120 insertions(+), 89 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/i18n/en.json b/modules/ve-mw/i18n/en.json
index 865b4e9..6c902f6 100644
--- a/modules/ve-mw/i18n/en.json
+++ b/modules/ve-mw/i18n/en.json
@@ -78,9 +78,9 @@
"visualeditor-dialog-meta-settings-redirect-placeholder": "Target page for
redirection",
"visualeditor-dialog-meta-settings-redirect-staticlabel": "Prevent this
redirect being updated when target page is moved.",
"visualeditor-dialog-meta-settings-section": "Page settings",
-"visualeditor-dialog-meta-settings-toc-default": "Show if needed",
-"visualeditor-dialog-meta-settings-toc-disable": "Never show",
-"visualeditor-dialog-meta-settings-toc-force": "Always show",
+"visualeditor-dialog-meta-settings-toc-default": "If needed",
+"visualeditor-dialog-meta-settings-toc-disable": "Never",
+"visualeditor-dialog-meta-settings-toc-force": "Always",
"visualeditor-dialog-meta-settings-toc-label": "Show the Table of
Contents",
"visualeditor-dialog-meta-title": "Options",
"visualeditor-dialog-reference-insert-button": "Insert reference",
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index b5f51fd..11fa3a1 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -224,7 +224,7 @@
'icon': 'parameter'
} );
- this.sizeErrorLabel = new OO.ui.InputLabelWidget( {
+ this.sizeErrorLabel = new OO.ui.LabelWidget( {
'$': this.$,
'label': ve.msg(
'visualeditor-dialog-media-size-originalsize-error' )
} );
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
index 8d9fc7b..c46dddb 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceDialog.js
@@ -238,9 +238,9 @@
} );
// TODO: Use a drop-down or something, and populate with existing
groups instead of free-text
this.referenceGroupInput = new OO.ui.TextInputWidget( { '$': this.$ } );
- this.referenceGroupLabel = new OO.ui.InputLabelWidget( {
+ this.referenceGroupField = new OO.ui.FieldLayout(
this.referenceGroupInput, {
'$': this.$,
- 'input': this.referenceGroupInput,
+ 'align': 'top',
'label': ve.msg(
'visualeditor-dialog-reference-options-group-label' )
} );
this.search = new ve.ui.MWReferenceSearchWidget(
@@ -269,7 +269,7 @@
// Initialization
this.panels.addItems( [ this.editPanel, this.searchPanel ] );
this.editPanel.$element.append( this.contentFieldset.$element,
this.optionsFieldset.$element );
- this.optionsFieldset.$element.append(
this.referenceGroupLabel.$element, this.referenceGroupInput.$element );
+ this.optionsFieldset.addItems( [ this.referenceGroupField ] );
this.searchPanel.$element.append( this.search.$element );
this.$body.append( this.panels.$element );
this.$foot.append(
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
index 0c65652..0850278 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWReferenceListDialog.js
@@ -53,9 +53,9 @@
} );
this.groupInput = new OO.ui.TextInputWidget( { '$': this.$ } );
- this.groupLabel = new OO.ui.InputLabelWidget( {
+ this.groupField = new OO.ui.FieldLayout( this.groupInput, {
'$': this.$,
- 'input': this.groupInput,
+ 'align': 'top',
'label': ve.msg(
'visualeditor-dialog-reference-options-group-label' )
} );
@@ -69,7 +69,7 @@
this.applyButton.connect( this, { 'click': [ 'close', { 'action':
'apply' } ] } );
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (8b545f4) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update VE core submodule to master (8b545f4)
..
Update VE core submodule to master (8b545f4)
Also update use of OO.ui.PageLayout to work with changes in OOUI.
See: I58a279dd949a867a4698a791103d5a6f2bd4b67f
New changes:
8b545f4 Update OOjs UI to v0.1.0-pre (3a9a4c1da8)
Change-Id: Ib5063db055a63082d08b2858bffb9f854d76c01b
---
M lib/ve
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
M modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
M modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
M modules/ve-mw/ui/pages/ve.ui.MWSettingsPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplateParameterPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTemplatePlaceholderPage.js
M modules/ve-mw/ui/pages/ve.ui.MWTransclusionContentPage.js
M modules/ve-mw/ui/styles/ve.ui.MWDialog.css
10 files changed, 119 insertions(+), 70 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ve b/lib/ve
index 72788ab..8b545f4 16
--- a/lib/ve
+++ b/lib/ve
-Subproject commit 72788ab0670bdc4343baa75f907b1a689bddecec
+Subproject commit 8b545f4f88bf0ec926224592720ea3f213269747
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
index 032f400..b5f51fd 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaEditDialog.js
@@ -129,21 +129,17 @@
'outlined': true
} );
- this.generalSettingsPage = new OO.ui.PageLayout( 'general', {
- '$': this.$,
- 'label': ve.msg( 'visualeditor-dialog-media-page-general' ),
- 'icon': 'parameter'
- } );
-
- this.advancedSettingsPage = new OO.ui.PageLayout( 'advanced', {
- '$': this.$,
- 'label': ve.msg( 'visualeditor-dialog-media-page-advanced' ),
- 'icon': 'parameter'
- } );
-
+ this.generalSettingsPage = new OO.ui.PageLayout( 'general', { '$':
this.$ } );
+ this.advancedSettingsPage = new OO.ui.PageLayout( 'advanced', { '$':
this.$ } );
this.bookletLayout.addPages( [
this.generalSettingsPage, this.advancedSettingsPage
] );
+ this.generalSettingsPage.getOutlineItem()
+ .setIcon( 'parameter' )
+ .setLabel( ve.msg( 'visualeditor-dialog-media-page-general' ) );
+ this.advancedSettingsPage.getOutlineItem()
+ .setIcon( 'parameter' )
+ .setLabel( ve.msg( 'visualeditor-dialog-media-page-advanced' )
);
// Define fieldsets for image settings
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
index 4e1848e..aa2d6bd 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWCategoriesPage.js
@@ -21,10 +21,7 @@
*/
ve.ui.MWCategoriesPage = function VeUiMWCategoriesPage( surface, name, config
) {
// Configuration initialization
- config = ve.extendObject( {
- 'icon': 'tag',
- 'label': ve.msg( 'visualeditor-dialog-meta-categories-section' )
- }, config );
+ config = config || {};
// Parent constructor
OO.ui.PageLayout.call( this, name, config );
@@ -85,6 +82,20 @@
/* Methods */
/**
+ * @inheritdoc
+ */
+ve.ui.MWCategoriesPage.prototype.setOutlineItem = function ( outlineItem ) {
+ // Parent method
+ OO.ui.PageLayout.prototype.setOutlineItem.call( this, outlineItem );
+
+ if ( this.outlineItem ) {
+ this.outlineItem
+ .setIcon( 'tag' )
+ .setLabel( ve.msg(
'visualeditor-dialog-meta-categories-section' ) );
+ }
+};
+
+/**
* Handle category default sort change events.
*
* @param {string} value Default sort value
diff --git a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
index c3b1af7..1c026f4 100644
--- a/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
+++ b/modules/ve-mw/ui/pages/ve.ui.MWLanguagesPage.js
@@ -18,12 +18,6 @@
* @param {Object} [config] Configuration options
*/
ve.ui.MWLanguagesPage = function VeUiMWLanguagesPage( name, config ) {
- // Configuration initialization
- config = ve.extendObject( {
- 'icon': 'language',
- 'label': ve.msg( 'visualeditor-dialog-meta-languages-section' )
- }, config );
-
// Parent constructor
OO.ui.PageLayout.call( this, name, config );
@@ -50,6 +44,20 @@
/* Methods */
+/**
+ * @inheritdoc
+ */
+ve.ui.MWLanguagesPage.prototype.setOutlineItem = function ( outlineItem ) {
+ // Parent method
+ OO.ui.PageLayout.prototype.setOutlineItem.call( this, outlineItem );
+
+ if ( this.outli
[MediaWiki-commits] [Gerrit] Update VE core submodule to 72788ab0670bdc4343baa75f907b1a68... - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to 72788ab0670bdc4343baa75f907b1a689bddecec .. Update VE core submodule to 72788ab0670bdc4343baa75f907b1a689bddecec New changes: fd9babf Localisation updates from https://translatewiki.net. edd0561 Only allow pointer events on shields inside generated content nodes d475984 Actually hide the size label when not in use 2d04297 Update OOjs UI to v0.1.0-pre (7d3223b8f4) cca13e0 Update OOjs to v1.0.7-pre (9c04f3e917) 72788ab Localisation updates from https://translatewiki.net. Change-Id: Ida75926ed2303c410a52141d1c1bb6a99b3e78f7 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 43787a8..72788ab 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 43787a8a7145b7028e199df223c139c00a2be2da +Subproject commit 72788ab0670bdc4343baa75f907b1a689bddecec -- To view, visit https://gerrit.wikimedia.org/r/113504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ida75926ed2303c410a52141d1c1bb6a99b3e78f7 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Catrope 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] update DonationInterface submodule - change (mediawiki/core)
Adamw has submitted this change and it was merged. Change subject: update DonationInterface submodule .. update DonationInterface submodule Change-Id: I64a6d86cd6e71857b6740cee710868c1d6991991 --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Adamw: Verified; Looks good to me, approved diff --git a/extensions/DonationInterface b/extensions/DonationInterface index dc7e26d..9a1a784 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit dc7e26daf8aa7662907da3a31aee60bbd890bdc9 +Subproject commit 9a1a78494d07169135244bafb323e99e4a28446a -- To view, visit https://gerrit.wikimedia.org/r/113511 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I64a6d86cd6e71857b6740cee710868c1d6991991 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_22 Gerrit-Owner: Adamw Gerrit-Reviewer: Adamw ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update DonationInterface submodule - change (mediawiki/core)
Adamw has uploaded a new change for review. https://gerrit.wikimedia.org/r/113511 Change subject: update DonationInterface submodule .. update DonationInterface submodule Change-Id: I64a6d86cd6e71857b6740cee710868c1d6991991 --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/11/113511/1 diff --git a/extensions/DonationInterface b/extensions/DonationInterface index dc7e26d..9a1a784 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit dc7e26daf8aa7662907da3a31aee60bbd890bdc9 +Subproject commit 9a1a78494d07169135244bafb323e99e4a28446a -- To view, visit https://gerrit.wikimedia.org/r/113511 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I64a6d86cd6e71857b6740cee710868c1d6991991 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_22 Gerrit-Owner: Adamw ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] omg Czech also wrongly coded - change (mediawiki...DonationInterface)
Mwalker has submitted this change and it was merged.
Change subject: omg Czech also wrongly coded
..
omg Czech also wrongly coded
Change-Id: I20081d1fc66bc6f743546abedc6e756ff077f25f
---
M globalcollect_gateway/globalcollect.adapter.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Mwalker: Looks good to me, approved
jenkins-bot: Verified
diff --git a/globalcollect_gateway/globalcollect.adapter.php
b/globalcollect_gateway/globalcollect.adapter.php
index ac5b659..876bf75 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1828,7 +1828,7 @@
function getAvailableLanguages(){
$languages = array(
'ar', //Arabic
- 'cz', //Czech
+ 'cs', //Czech
'da', //Danish
'nl', //Dutch
'en', //English
--
To view, visit https://gerrit.wikimedia.org/r/113509
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I20081d1fc66bc6f743546abedc6e756ff077f25f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Adamw
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Mwalker
Gerrit-Reviewer: Ssmith
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 VE core submodule to master (50ef8e8) - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/113510 Change subject: Update VE core submodule to master (50ef8e8) .. Update VE core submodule to master (50ef8e8) New changes: 71145fe Move commands into static getter so they can be overridden. Change-Id: I47f0f1fc13c69c0c46ea54e2a1db5a48e1cacbe3 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/10/113510/1 diff --git a/lib/ve b/lib/ve index 8b545f4..50ef8e8 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 8b545f4f88bf0ec926224592720ea3f213269747 +Subproject commit 50ef8e89260745526523e36ed82612fa07b61531 -- To view, visit https://gerrit.wikimedia.org/r/113510 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I47f0f1fc13c69c0c46ea54e2a1db5a48e1cacbe3 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] Update OOjs UI to v0.1.0-pre (424b40373e) - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (424b40373e)
..
Update OOjs UI to v0.1.0-pre (424b40373e)
554683c Allow whitespace labels
3a9a4c1 Invert dependencies for OutlineItemWidget and PageLayout
51f7972 Fix occurrences of @mixin to be @mixins
424b403 FieldLayout, styling improvements and standardization
Change-Id: Iee8653d41c85d8f3a927e9a32587cdc3f42e0412
---
M resources/oojs-ui/oojs-ui.js
M resources/oojs-ui/oojs-ui.svg.css
2 files changed, 332 insertions(+), 198 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/oojs-ui/oojs-ui.js b/resources/oojs-ui/oojs-ui.js
index 7412270..63ecf98 100644
--- a/resources/oojs-ui/oojs-ui.js
+++ b/resources/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (7d3223b8f4)
+ * OOjs UI v0.1.0-pre (424b40373e)
* 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: Thu Feb 13 2014 18:36:08 GMT-0800 (PST)
+ * Date: Fri Feb 14 2014 17:57:32 GMT-0800 (PST)
*/
( function () {
@@ -179,7 +179,7 @@
this.elementGroup = null;
// Initialization
- if ( Array.isArray( config.classes ) ) {
+ if ( $.isArray( config.classes ) ) {
this.$element.addClass( config.classes.join( ' ' ) );
}
if ( config.$content ) {
@@ -1628,7 +1628,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
@@ -1658,7 +1658,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
@@ -1824,8 +1824,12 @@
*
* @constructor
* @param {jQuery} $clippable Nodes to clip, assigned to #$clippable
+ * @param {Object} [config] Configuration options
*/
-OO.ui.ClippableElement = function OoUiClippableElement( $clippable ) {
+OO.ui.ClippableElement = function OoUiClippableElement( $clippable, config ) {
+ // Configuration initialization
+ config = config || {};
+
// Properties
this.$clippable = $clippable;
this.clipping = false;
@@ -2012,7 +2016,7 @@
var i, len, flag,
classPrefix = 'oo-ui-flaggableElement-';
- if ( Array.isArray( flags ) ) {
+ if ( $.isArray( flags ) ) {
for ( i = 0, len = flags.length; i < len; i++ ) {
flag = flags[i];
// Set
@@ -2021,7 +2025,7 @@
}
} else if ( OO.isPlainObject( flags ) ) {
for ( flag in flags ) {
- if ( flags[flags] ) {
+ if ( flags[flag] ) {
// Set
this.flags[flag] = true;
this.$element.addClass( classPrefix + flag );
@@ -2085,7 +2089,7 @@
item = items[i];
// Check if item exists then remove it first, effectively
"moving" it
- currentIndex = this.items.indexOf( item );
+ currentIndex = $.inArray( item, this.items );
if ( currentIndex >= 0 ) {
this.removeItems( [ item ] );
// Adjust index to compensate for removal
@@ -2136,7 +2140,7 @@
// Remove specific items
for ( i = 0, len = items.length; i < len; i++ ) {
item = items[i];
- index = this.items.indexOf( item );
+ index = $.inArray( item, this.items );
if ( index !== -1 ) {
if ( this.aggregate ) {
item.disconnect( this );
@@ -2419,6 +2423,9 @@
/**
* Set the label.
*
+ * An empty string will result in the label being hidden. A string containing
only whitespace will
+ * be converted to a single
+ *
* @method
* @param {jQuery|string|Function|null} label Label nodes; text; a function
that retuns nodes or
* text; or null for no label
@@ -2428,8 +2435,13 @@
var empty = false;
this.label = label = OO.ui.resolveMsg( label ) || null;
- if ( typeof label === 'string' && label.trim() ) {
- this.$label.text( label );
+ if ( typeof label === 'string' && label.length ) {
+ if ( label.match( /^\s*$/ ) ) {
+ // Convert whitespace only string to a single
non-breaking space
+ this.$label.html( ' ' );
+ } else {
+ this.$label.text( label );
+ }
} else if ( label instanceof jQuery ) {
this.$label.empty().append( label );
} else {
@@ -2847,20 +28
[MediaWiki-commits] [Gerrit] omg Czech also wrongly coded - change (mediawiki...DonationInterface)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113509
Change subject: omg Czech also wrongly coded
..
omg Czech also wrongly coded
Change-Id: I20081d1fc66bc6f743546abedc6e756ff077f25f
---
M globalcollect_gateway/globalcollect.adapter.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface
refs/changes/09/113509/1
diff --git a/globalcollect_gateway/globalcollect.adapter.php
b/globalcollect_gateway/globalcollect.adapter.php
index ac5b659..876bf75 100644
--- a/globalcollect_gateway/globalcollect.adapter.php
+++ b/globalcollect_gateway/globalcollect.adapter.php
@@ -1828,7 +1828,7 @@
function getAvailableLanguages(){
$languages = array(
'ar', //Arabic
- 'cz', //Czech
+ 'cs', //Czech
'da', //Danish
'nl', //Dutch
'en', //English
--
To view, visit https://gerrit.wikimedia.org/r/113509
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I20081d1fc66bc6f743546abedc6e756ff077f25f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/DonationInterface
Gerrit-Branch: master
Gerrit-Owner: Adamw
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update OOjs to v1.0.7-pre (9c04f3e917) - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs to v1.0.7-pre (9c04f3e917)
..
Update OOjs to v1.0.7-pre (9c04f3e917)
c723873 package.json: Set npm dependencies at fixed versions
d27e989 Set up node-jscs, pass it, and configure in local Gruntfile
e284c5f Update build notice and licence file for 2014
81d0f4a Tag v1.0.7
7b20b8a package.json: Update devDependencies
6c47d42 Implement generateDocs.sh script
9c04f3e core: Add a 'super' property to inheriting classes
Change-Id: I4c9d0bceed00ed290ac2454b54abe2e53a46857c
---
M resources/oojs/oojs.js
1 file changed, 25 insertions(+), 21 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/oojs/oojs.js b/resources/oojs/oojs.js
index 706f589..70cb221 100644
--- a/resources/oojs/oojs.js
+++ b/resources/oojs/oojs.js
@@ -1,12 +1,12 @@
/*!
- * OOjs v1.0.6
+ * OOjs v1.0.7-pre (9c04f3e917)
* https://www.mediawiki.org/wiki/OOjs
*
- * Copyright 2011-2013 OOjs Team and other contributors.
+ * Copyright 2011-2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: Tue Dec 10 2013 22:43:42 GMT+0100 (CET)
+ * Date: Fri Feb 14 2014 17:51:43 GMT-0800 (PST)
*/
( function ( global ) {
@@ -22,7 +22,6 @@
toString = oo.toString;
/* Class Methods */
-
/**
* Assert whether a value is a plain object or not.
@@ -64,23 +63,27 @@
* multiple constructors consider storing an instance of the other
constructor in a
* property instead, or perhaps use a mixin (see oo.mixinClass).
*
- * function Foo() {}
- * Foo.prototype.jump = function () {};
+ * function Thing() {}
+ * Thing.prototype.exists = function () {};
*
- * function FooBar() {}
- * oo.inheritClass( FooBar, Foo );
- * FooBar.prop.feet = 2;
- * FooBar.prototype.walk = function () {};
+ * function Person() {
+ * this.constructor.super.apply( this, arguments );
+ * }
+ * oo.inheritClass( Person, Thing );
+ * Person.static.defaultEyeCount = 2;
+ * Person.prototype.walk = function () {};
*
- * function FooBarQuux() {}
- * OO.inheritClass( FooBarQuux, FooBar );
- * FooBarQuux.prototype.jump = function () {};
+ * function Jumper() {
+ * this.constructor.super.apply( this, arguments );
+ * }
+ * OO.inheritClass( Jumper, Person );
+ * Jumper.prototype.jump = function () {};
*
- * FooBarQuux.prop.feet === 2;
- * var fb = new FooBar();
- * fb.jump();
- * fb.walk();
- * fb instanceof Foo && fb instanceof FooBar && fb instanceof FooBarQuux;
+ * Jumper.static.defaultEyeCount === 2;
+ * var x = new Jumper();
+ * x.jump();
+ * x.walk();
+ * x instanceof Thing && x instanceof Person && x instanceof Jumper;
*
* @method
* @param {Function} targetFn
@@ -94,6 +97,7 @@
var targetConstructor = targetFn.prototype.constructor;
+ targetFn.super = originFn;
targetFn.prototype = Object.create( originFn.prototype, {
// Restore constructor property of targetFn
constructor: {
@@ -502,9 +506,9 @@
}
// Add binding
bindings.push( {
- 'callback': callback,
- 'args': args,
- 'context': context
+ callback: callback,
+ args: args,
+ context: context
} );
return this;
};
--
To view, visit https://gerrit.wikimedia.org/r/113507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4c9d0bceed00ed290ac2454b54abe2e53a46857c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jforrester
Gerrit-Reviewer: Catrope
Gerrit-Reviewer: Jack Phoenix
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move commands into static getter so they can be overridden. - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Move commands into static getter so they can be overridden.
..
Move commands into static getter so they can be overridden.
Also key groups by name. This makes it easiers for overriding classes
to add extra keyboard shortcuts (e.g. MediaWiki specific shortcuts).
Change-Id: I4d84df7b5992e83b2ac296865a64f301fe5b2e22
---
M modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
M modules/ve/ui/styles/ve.ui.Dialog.css
2 files changed, 61 insertions(+), 50 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
b/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
index 93f4a69..bb4582a 100644
--- a/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
+++ b/modules/ve/ui/dialogs/ve.ui.CommandHelpDialog.js
@@ -45,58 +45,12 @@
// Parent method
ve.ui.Dialog.prototype.initialize.call( this );
- var i, iLen, j, jLen, shortcut, commands,
- $list,
- commandGroups = [
- {
- 'title': 'visualeditor-shortcuts-text-style',
- 'commands': [
- { 'name': 'bold', 'msg':
'visualeditor-annotationbutton-bold-tooltip' },
- { 'name': 'italic', 'msg':
'visualeditor-annotationbutton-italic-tooltip' },
- { 'name': 'link', 'msg':
'visualeditor-annotationbutton-link-tooltip' },
- { 'name': 'subscript', 'msg':
'visualeditor-annotationbutton-subscript-tooltip' },
- { 'name': 'superscript', 'msg':
'visualeditor-annotationbutton-superscript-tooltip' },
- { 'name': 'underline', 'msg':
'visualeditor-annotationbutton-underline-tooltip' },
- { 'name': 'clear', 'msg':
'visualeditor-clearbutton-tooltip' }
- ]
- },
- {
- 'title': 'visualeditor-shortcuts-formatting',
- 'commands': [
- { 'name': 'paragraph', 'msg':
'visualeditor-formatdropdown-format-paragraph' },
- { 'shortcut': 'CTRL+(1-6)', 'msg':
'visualeditor-formatdropdown-format-heading-label' },
- { 'name': 'preformatted', 'msg':
'visualeditor-formatdropdown-format-preformatted' },
- { 'name': 'indent', 'msg':
'visualeditor-indentationbutton-indent-tooltip' },
- { 'name': 'outdent', 'msg':
'visualeditor-indentationbutton-outdent-tooltip' }
- ]
- },
- {
- 'title': 'visualeditor-shortcuts-history',
- 'commands': [
- { 'name': 'undo', 'msg':
'visualeditor-historybutton-undo-tooltip' },
- { 'name': 'redo', 'msg':
'visualeditor-historybutton-redo-tooltip' }
- ]
- },
- {
- 'title': 'visualeditor-shortcuts-clipboard',
- 'commands': [
- { 'shortcut': 'CTRL+X', 'msg':
'visualeditor-clipboard-cut' },
- { 'shortcut': 'CTRL+C', 'msg':
'visualeditor-clipboard-copy' },
- { 'shortcut': 'CTRL+V', 'msg':
'visualeditor-clipboard-paste' },
- { 'name': 'pasteSpecial', 'msg':
'visualeditor-clipboard-paste-special' }
- ]
- },
- {
- 'title': 'visualeditor-shortcuts-other',
- 'commands': [
- { 'name': 'commandHelp', 'msg':
'visualeditor-dialog-command-help-title' }
- ]
- },
- ],
+ var i, j, jLen, shortcut, commands, $list,
+ commandGroups = this.constructor.static.getCommandGroups(),
$container = this.$( '' ).addClass(
've-ui-commandHelpDialog-container' ),
triggers = this.surface.getTriggers();
- for ( i = 0, iLen = commandGroups.length; i < iLen; i++ ) {
+ for ( i in commandGroups ) {
commands = commandGroups[i].commands;
$list = this.$( '' ).addClass(
've-ui-commandHelpDialog-list' );
for ( j = 0, jLen = commands.length; j < jL
[MediaWiki-commits] [Gerrit] Use new history params callback stuff for history - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Use new history params callback stuff for history
..
Use new history params callback stuff for history
Change-Id: I60e3c16f6f0c1310077fa6a8791bbd380d959e72
---
M FlowActions.php
M includes/View/History/HistoryRecord.php
M includes/View/History/HistoryRenderer.php
3 files changed, 16 insertions(+), 35 deletions(-)
Approvals:
Bsitu: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FlowActions.php b/FlowActions.php
index e6597c1..b54c514 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -23,7 +23,7 @@
* * history: all history-related information:
* * i18n-message: the i18n message key for this change type
* * i18n-params: array of i18n parameters for the provided message (see
- * HistoryRecord::buildMessage phpdoc for more details)
+ * AbstractFormatter::processParam phpdoc for more details)
* * class: classname to be added to the list-item for this changetype
* * bundle: array with, again, all of the above information if multiple
types
* should be bundled (then the bundle i18n & class will be used to generate
diff --git a/includes/View/History/HistoryRecord.php
b/includes/View/History/HistoryRecord.php
index 4483173..95d7bf0 100644
--- a/includes/View/History/HistoryRecord.php
+++ b/includes/View/History/HistoryRecord.php
@@ -96,15 +96,12 @@
* to this method, be be passed along to the callback functions that
* generate the final message parameters, per message.
*
-* @param $callbackParam1[optional] Callback parameter
-* @param $callbackParam2[optional] Second callback parameter (this
method
-* can be overloaded, all params will be passed along)
* @return Message
*/
- public function getMessage( $callbackParam1 = null /*[,
$callbackParam2[, ...]] */ ) {
+ public function getMessageParams() {
$details = $this->getActionDetails( $this->getType() );
$params = isset( $details['i18n-params'] ) ?
$details['i18n-params'] : array();
- return $this->buildMessage( $details['i18n-message'], $params,
func_get_args() );
+ return array( $details['i18n-message'], $params );
}
/**
@@ -113,28 +110,5 @@
public function isBundled() {
$details = $this->getActionDetails( $this->getType() );
return isset( $details['bundle'] );
- }
-
- /**
-* Returns i18n message for $msg.
-*
-* Complex parameters can be injected in the i18n messages. Anything in
-* $params will be call_user_func'ed, with these given $arguments.
-* Those results will be used as message parameters.
-*
-* Note: return array( 'raw' => $value ) or array( 'num' => $value ) for
-* raw or numeric parameter input.
-*
-* @param string $msg i18n key
-* @param array[optional] $params Callbacks for parameters
-* @param array[optional] $arguments Arguments for the callbacks
-* @return Message
-*/
- protected function buildMessage( $msg, array $params = array(), array
$arguments = array() ) {
- foreach ( $params as &$param ) {
- $param = call_user_func_array( $param, $arguments );
- }
-
- return wfMessage( $msg, $params );
}
}
diff --git a/includes/View/History/HistoryRenderer.php
b/includes/View/History/HistoryRenderer.php
index 788f91b..a22c2ba 100644
--- a/includes/View/History/HistoryRenderer.php
+++ b/includes/View/History/HistoryRenderer.php
@@ -3,13 +3,14 @@
namespace Flow\View\History;
use Flow\Block\Block;
+use Flow\Formatter\AbstractFormatter;
use Flow\Templating;
use MWTimestamp;
/**
* HistoryRenderer will use Templating to render a given list of History.
*/
-class HistoryRenderer {
+class HistoryRenderer extends AbstractFormatter {
/**
* @var Templating
*/
@@ -226,15 +227,21 @@
}
}
- return $this->templating->render( 'flow:history-line.html.php',
array(
- 'class' => $record->getClass(),
- 'message' => $record->getMessage(
+ // build i18n message
+ list( $msg, $params ) = $record->getMessageParams();
+ foreach ( $params as &$param ) {
+ $param = $this->processParam(
// Arguments for the i18n messages' parameter
callbacks.
+ $param,
$record->getData(),
- $this->templating,
$this->block->getWorkflowId(),
$this->block->getName()
- ),
+ );
+
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (424b40373e) - change (mediawiki/core)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113508
Change subject: Update OOjs UI to v0.1.0-pre (424b40373e)
..
Update OOjs UI to v0.1.0-pre (424b40373e)
554683c Allow whitespace labels
3a9a4c1 Invert dependencies for OutlineItemWidget and PageLayout
51f7972 Fix occurrences of @mixin to be @mixins
424b403 FieldLayout, styling improvements and standardization
Change-Id: Iee8653d41c85d8f3a927e9a32587cdc3f42e0412
---
M resources/oojs-ui/oojs-ui.js
M resources/oojs-ui/oojs-ui.svg.css
2 files changed, 332 insertions(+), 198 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/08/113508/1
diff --git a/resources/oojs-ui/oojs-ui.js b/resources/oojs-ui/oojs-ui.js
index 7412270..63ecf98 100644
--- a/resources/oojs-ui/oojs-ui.js
+++ b/resources/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (7d3223b8f4)
+ * OOjs UI v0.1.0-pre (424b40373e)
* 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: Thu Feb 13 2014 18:36:08 GMT-0800 (PST)
+ * Date: Fri Feb 14 2014 17:57:32 GMT-0800 (PST)
*/
( function () {
@@ -179,7 +179,7 @@
this.elementGroup = null;
// Initialization
- if ( Array.isArray( config.classes ) ) {
+ if ( $.isArray( config.classes ) ) {
this.$element.addClass( config.classes.join( ' ' ) );
}
if ( config.$content ) {
@@ -1628,7 +1628,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
@@ -1658,7 +1658,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
@@ -1824,8 +1824,12 @@
*
* @constructor
* @param {jQuery} $clippable Nodes to clip, assigned to #$clippable
+ * @param {Object} [config] Configuration options
*/
-OO.ui.ClippableElement = function OoUiClippableElement( $clippable ) {
+OO.ui.ClippableElement = function OoUiClippableElement( $clippable, config ) {
+ // Configuration initialization
+ config = config || {};
+
// Properties
this.$clippable = $clippable;
this.clipping = false;
@@ -2012,7 +2016,7 @@
var i, len, flag,
classPrefix = 'oo-ui-flaggableElement-';
- if ( Array.isArray( flags ) ) {
+ if ( $.isArray( flags ) ) {
for ( i = 0, len = flags.length; i < len; i++ ) {
flag = flags[i];
// Set
@@ -2021,7 +2025,7 @@
}
} else if ( OO.isPlainObject( flags ) ) {
for ( flag in flags ) {
- if ( flags[flags] ) {
+ if ( flags[flag] ) {
// Set
this.flags[flag] = true;
this.$element.addClass( classPrefix + flag );
@@ -2085,7 +2089,7 @@
item = items[i];
// Check if item exists then remove it first, effectively
"moving" it
- currentIndex = this.items.indexOf( item );
+ currentIndex = $.inArray( item, this.items );
if ( currentIndex >= 0 ) {
this.removeItems( [ item ] );
// Adjust index to compensate for removal
@@ -2136,7 +2140,7 @@
// Remove specific items
for ( i = 0, len = items.length; i < len; i++ ) {
item = items[i];
- index = this.items.indexOf( item );
+ index = $.inArray( item, this.items );
if ( index !== -1 ) {
if ( this.aggregate ) {
item.disconnect( this );
@@ -2419,6 +2423,9 @@
/**
* Set the label.
*
+ * An empty string will result in the label being hidden. A string containing
only whitespace will
+ * be converted to a single
+ *
* @method
* @param {jQuery|string|Function|null} label Label nodes; text; a function
that retuns nodes or
* text; or null for no label
@@ -2428,8 +2435,13 @@
var empty = false;
this.label = label = OO.ui.resolveMsg( label ) || null;
- if ( typeof label === 'string' && label.trim() ) {
- this.$label.text( label );
+ if ( typeof label === 'string' && label.length ) {
+ if ( label.match( /^\s*$/ ) ) {
+ // Convert whitespace only string to a single
non-breaking space
+ this.$label.html( ' ' );
+ } else {
+ this.$label.text( label );
+ }
} else if ( label instanceof jQuery ) {
this.$label.empty().append
[MediaWiki-commits] [Gerrit] Update OOjs to v1.0.7-pre (9c04f3e917) - change (mediawiki/core)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113507
Change subject: Update OOjs to v1.0.7-pre (9c04f3e917)
..
Update OOjs to v1.0.7-pre (9c04f3e917)
c723873 package.json: Set npm dependencies at fixed versions
d27e989 Set up node-jscs, pass it, and configure in local Gruntfile
e284c5f Update build notice and licence file for 2014
81d0f4a Tag v1.0.7
7b20b8a package.json: Update devDependencies
6c47d42 Implement generateDocs.sh script
9c04f3e core: Add a 'super' property to inheriting classes
Change-Id: I4c9d0bceed00ed290ac2454b54abe2e53a46857c
---
M resources/oojs/oojs.js
1 file changed, 25 insertions(+), 21 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/07/113507/1
diff --git a/resources/oojs/oojs.js b/resources/oojs/oojs.js
index 706f589..70cb221 100644
--- a/resources/oojs/oojs.js
+++ b/resources/oojs/oojs.js
@@ -1,12 +1,12 @@
/*!
- * OOjs v1.0.6
+ * OOjs v1.0.7-pre (9c04f3e917)
* https://www.mediawiki.org/wiki/OOjs
*
- * Copyright 2011-2013 OOjs Team and other contributors.
+ * Copyright 2011-2014 OOjs Team and other contributors.
* Released under the MIT license
* http://oojs.mit-license.org
*
- * Date: Tue Dec 10 2013 22:43:42 GMT+0100 (CET)
+ * Date: Fri Feb 14 2014 17:51:43 GMT-0800 (PST)
*/
( function ( global ) {
@@ -22,7 +22,6 @@
toString = oo.toString;
/* Class Methods */
-
/**
* Assert whether a value is a plain object or not.
@@ -64,23 +63,27 @@
* multiple constructors consider storing an instance of the other
constructor in a
* property instead, or perhaps use a mixin (see oo.mixinClass).
*
- * function Foo() {}
- * Foo.prototype.jump = function () {};
+ * function Thing() {}
+ * Thing.prototype.exists = function () {};
*
- * function FooBar() {}
- * oo.inheritClass( FooBar, Foo );
- * FooBar.prop.feet = 2;
- * FooBar.prototype.walk = function () {};
+ * function Person() {
+ * this.constructor.super.apply( this, arguments );
+ * }
+ * oo.inheritClass( Person, Thing );
+ * Person.static.defaultEyeCount = 2;
+ * Person.prototype.walk = function () {};
*
- * function FooBarQuux() {}
- * OO.inheritClass( FooBarQuux, FooBar );
- * FooBarQuux.prototype.jump = function () {};
+ * function Jumper() {
+ * this.constructor.super.apply( this, arguments );
+ * }
+ * OO.inheritClass( Jumper, Person );
+ * Jumper.prototype.jump = function () {};
*
- * FooBarQuux.prop.feet === 2;
- * var fb = new FooBar();
- * fb.jump();
- * fb.walk();
- * fb instanceof Foo && fb instanceof FooBar && fb instanceof FooBarQuux;
+ * Jumper.static.defaultEyeCount === 2;
+ * var x = new Jumper();
+ * x.jump();
+ * x.walk();
+ * x instanceof Thing && x instanceof Person && x instanceof Jumper;
*
* @method
* @param {Function} targetFn
@@ -94,6 +97,7 @@
var targetConstructor = targetFn.prototype.constructor;
+ targetFn.super = originFn;
targetFn.prototype = Object.create( originFn.prototype, {
// Restore constructor property of targetFn
constructor: {
@@ -502,9 +506,9 @@
}
// Add binding
bindings.push( {
- 'callback': callback,
- 'args': args,
- 'context': context
+ callback: callback,
+ args: args,
+ context: context
} );
return this;
};
--
To view, visit https://gerrit.wikimedia.org/r/113507
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4c9d0bceed00ed290ac2454b54abe2e53a46857c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
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] Use new history params callback stuff for history - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113506
Change subject: Use new history params callback stuff for history
..
Use new history params callback stuff for history
Change-Id: I60e3c16f6f0c1310077fa6a8791bbd380d959e72
---
M FlowActions.php
M includes/View/History/HistoryRecord.php
M includes/View/History/HistoryRenderer.php
3 files changed, 16 insertions(+), 35 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/06/113506/1
diff --git a/FlowActions.php b/FlowActions.php
index e6597c1..b54c514 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -23,7 +23,7 @@
* * history: all history-related information:
* * i18n-message: the i18n message key for this change type
* * i18n-params: array of i18n parameters for the provided message (see
- * HistoryRecord::buildMessage phpdoc for more details)
+ * AbstractFormatter::processParam phpdoc for more details)
* * class: classname to be added to the list-item for this changetype
* * bundle: array with, again, all of the above information if multiple
types
* should be bundled (then the bundle i18n & class will be used to generate
diff --git a/includes/View/History/HistoryRecord.php
b/includes/View/History/HistoryRecord.php
index 4483173..95d7bf0 100644
--- a/includes/View/History/HistoryRecord.php
+++ b/includes/View/History/HistoryRecord.php
@@ -96,15 +96,12 @@
* to this method, be be passed along to the callback functions that
* generate the final message parameters, per message.
*
-* @param $callbackParam1[optional] Callback parameter
-* @param $callbackParam2[optional] Second callback parameter (this
method
-* can be overloaded, all params will be passed along)
* @return Message
*/
- public function getMessage( $callbackParam1 = null /*[,
$callbackParam2[, ...]] */ ) {
+ public function getMessageParams() {
$details = $this->getActionDetails( $this->getType() );
$params = isset( $details['i18n-params'] ) ?
$details['i18n-params'] : array();
- return $this->buildMessage( $details['i18n-message'], $params,
func_get_args() );
+ return array( $details['i18n-message'], $params );
}
/**
@@ -113,28 +110,5 @@
public function isBundled() {
$details = $this->getActionDetails( $this->getType() );
return isset( $details['bundle'] );
- }
-
- /**
-* Returns i18n message for $msg.
-*
-* Complex parameters can be injected in the i18n messages. Anything in
-* $params will be call_user_func'ed, with these given $arguments.
-* Those results will be used as message parameters.
-*
-* Note: return array( 'raw' => $value ) or array( 'num' => $value ) for
-* raw or numeric parameter input.
-*
-* @param string $msg i18n key
-* @param array[optional] $params Callbacks for parameters
-* @param array[optional] $arguments Arguments for the callbacks
-* @return Message
-*/
- protected function buildMessage( $msg, array $params = array(), array
$arguments = array() ) {
- foreach ( $params as &$param ) {
- $param = call_user_func_array( $param, $arguments );
- }
-
- return wfMessage( $msg, $params );
}
}
diff --git a/includes/View/History/HistoryRenderer.php
b/includes/View/History/HistoryRenderer.php
index 788f91b..a22c2ba 100644
--- a/includes/View/History/HistoryRenderer.php
+++ b/includes/View/History/HistoryRenderer.php
@@ -3,13 +3,14 @@
namespace Flow\View\History;
use Flow\Block\Block;
+use Flow\Formatter\AbstractFormatter;
use Flow\Templating;
use MWTimestamp;
/**
* HistoryRenderer will use Templating to render a given list of History.
*/
-class HistoryRenderer {
+class HistoryRenderer extends AbstractFormatter {
/**
* @var Templating
*/
@@ -226,15 +227,21 @@
}
}
- return $this->templating->render( 'flow:history-line.html.php',
array(
- 'class' => $record->getClass(),
- 'message' => $record->getMessage(
+ // build i18n message
+ list( $msg, $params ) = $record->getMessageParams();
+ foreach ( $params as &$param ) {
+ $param = $this->processParam(
// Arguments for the i18n messages' parameter
callbacks.
+ $param,
$record->getData(),
- $this->templating,
$this->block->getWorkflowId(),
$this->block->getNam
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (424b40373e) - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (424b40373e)
..
Update OOjs UI to v0.1.0-pre (424b40373e)
Also account for InputLabelWidget -> LabelWidget rename.
New changes:
51f7972 Fix occurrences of @mixin to be @mixins
424b403 FieldLayout, styling improvements and standardization
Change-Id: Ib544f68fe1e20e1fbe9dddc6cc501fdfa3de5852
---
M lib/oojs-ui/oojs-ui.js
M lib/oojs-ui/oojs-ui.svg.css
M modules/ve/ui/widgets/ve.ui.LanguageInputWidget.js
M modules/ve/ui/widgets/ve.ui.MediaSizeWidget.js
4 files changed, 271 insertions(+), 109 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js
index 5fc82ec..b6a8f76 100644
--- a/lib/oojs-ui/oojs-ui.js
+++ b/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (3a9a4c1da8)
+ * OOjs UI v0.1.0-pre (424b40373e)
* 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: Fri Feb 14 2014 17:31:21 GMT-0800 (PST)
+ * Date: Fri Feb 14 2014 17:41:30 GMT-0800 (PST)
*/
( function () {
@@ -179,7 +179,7 @@
this.elementGroup = null;
// Initialization
- if ( Array.isArray( config.classes ) ) {
+ if ( $.isArray( config.classes ) ) {
this.$element.addClass( config.classes.join( ' ' ) );
}
if ( config.$content ) {
@@ -1628,7 +1628,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
@@ -1658,7 +1658,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
@@ -1824,8 +1824,12 @@
*
* @constructor
* @param {jQuery} $clippable Nodes to clip, assigned to #$clippable
+ * @param {Object} [config] Configuration options
*/
-OO.ui.ClippableElement = function OoUiClippableElement( $clippable ) {
+OO.ui.ClippableElement = function OoUiClippableElement( $clippable, config ) {
+ // Configuration initialization
+ config = config || {};
+
// Properties
this.$clippable = $clippable;
this.clipping = false;
@@ -2012,7 +2016,7 @@
var i, len, flag,
classPrefix = 'oo-ui-flaggableElement-';
- if ( Array.isArray( flags ) ) {
+ if ( $.isArray( flags ) ) {
for ( i = 0, len = flags.length; i < len; i++ ) {
flag = flags[i];
// Set
@@ -2085,7 +2089,7 @@
item = items[i];
// Check if item exists then remove it first, effectively
"moving" it
- currentIndex = this.items.indexOf( item );
+ currentIndex = $.inArray( item, this.items );
if ( currentIndex >= 0 ) {
this.removeItems( [ item ] );
// Adjust index to compensate for removal
@@ -2136,7 +2140,7 @@
// Remove specific items
for ( i = 0, len = items.length; i < len; i++ ) {
item = items[i];
- index = this.items.indexOf( item );
+ index = $.inArray( item, this.items );
if ( index !== -1 ) {
if ( this.aggregate ) {
item.disconnect( this );
@@ -2855,20 +2859,20 @@
*
* @constructor
* @param {OO.Factory} toolFactory Factory for creating tools
- * @param {Object} [options] Configuration options
+ * @param {Object} [config] Configuration options
* @cfg {boolean} [actions] Add an actions section opposite to the tools
* @cfg {boolean} [shadow] Add a shadow below the toolbar
*/
-OO.ui.Toolbar = function OoUiToolbar( toolFactory, options ) {
+OO.ui.Toolbar = function OoUiToolbar( toolFactory, config ) {
// Configuration initialization
- options = options || {};
+ config = config || {};
// Parent constructor
- OO.ui.Element.call( this, options );
+ OO.ui.Element.call( this, config );
// Mixin constructors
OO.EventEmitter.call( this );
- OO.ui.GroupElement.call( this, this.$( '' ) );
+ OO.ui.GroupElement.call( this, this.$( '' ), config );
// Properties
this.toolFactory = toolFactory;
@@ -2886,12 +2890,12 @@
// Initialization
this.$group.addClass( 'oo-ui-toolbar-tools' );
this.$bar.addClass( 'oo-ui-toolbar-bar' ).append( this.$group );
- if ( options.actions ) {
+ if ( config.actions ) {
this.$actions.addClass( 'oo-ui-toolbar-actions' );
this.$bar.append( this.$actions );
}
this.$bar.append( '' );
- if ( option
[MediaWiki-commits] [Gerrit] update DonationInterface submodule - change (mediawiki/core)
Adamw has uploaded a new change for review. https://gerrit.wikimedia.org/r/113505 Change subject: update DonationInterface submodule .. update DonationInterface submodule Change-Id: Id26ccf46d3f6fec92186562194748f69e5bb7a1d --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/05/113505/1 diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 0c4228d..dc7e26d 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit 0c4228da91ad8a0abd6a5d8833e8858213fa2036 +Subproject commit dc7e26daf8aa7662907da3a31aee60bbd890bdc9 -- To view, visit https://gerrit.wikimedia.org/r/113505 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id26ccf46d3f6fec92186562194748f69e5bb7a1d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_22 Gerrit-Owner: Adamw ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] update DonationInterface submodule - change (mediawiki/core)
Adamw has submitted this change and it was merged. Change subject: update DonationInterface submodule .. update DonationInterface submodule Change-Id: Id26ccf46d3f6fec92186562194748f69e5bb7a1d --- M extensions/DonationInterface 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Adamw: Verified; Looks good to me, approved diff --git a/extensions/DonationInterface b/extensions/DonationInterface index 0c4228d..dc7e26d 16 --- a/extensions/DonationInterface +++ b/extensions/DonationInterface -Subproject commit 0c4228da91ad8a0abd6a5d8833e8858213fa2036 +Subproject commit dc7e26daf8aa7662907da3a31aee60bbd890bdc9 -- To view, visit https://gerrit.wikimedia.org/r/113505 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id26ccf46d3f6fec92186562194748f69e5bb7a1d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: fundraising/REL1_22 Gerrit-Owner: Adamw Gerrit-Reviewer: Adamw ___ 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 72788ab0670bdc4343baa75f907b1a68... - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/113504 Change subject: Update VE core submodule to 72788ab0670bdc4343baa75f907b1a689bddecec .. Update VE core submodule to 72788ab0670bdc4343baa75f907b1a689bddecec New changes: fd9babf Localisation updates from https://translatewiki.net. edd0561 Only allow pointer events on shields inside generated content nodes d475984 Actually hide the size label when not in use 2d04297 Update OOjs UI to v0.1.0-pre (7d3223b8f4) cca13e0 Update OOjs to v1.0.7-pre (9c04f3e917) 72788ab Localisation updates from https://translatewiki.net. Change-Id: Ida75926ed2303c410a52141d1c1bb6a99b3e78f7 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/04/113504/1 diff --git a/lib/ve b/lib/ve index 43787a8..72788ab 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 43787a8a7145b7028e199df223c139c00a2be2da +Subproject commit 72788ab0670bdc4343baa75f907b1a689bddecec -- To view, visit https://gerrit.wikimedia.org/r/113504 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ida75926ed2303c410a52141d1c1bb6a99b3e78f7 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] Update OOjs UI to v0.1.0-pre (424b40373e) - change (VisualEditor/VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113503
Change subject: Update OOjs UI to v0.1.0-pre (424b40373e)
..
Update OOjs UI to v0.1.0-pre (424b40373e)
New changes:
51f7972 Fix occurrences of @mixin to be @mixins
424b403 FieldLayout, styling improvements and standardization
Change-Id: Ic99b1b149c2b79e72254270291b604d96c096599
---
M lib/oojs-ui/oojs-ui.js
M lib/oojs-ui/oojs-ui.svg.css
2 files changed, 266 insertions(+), 104 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/03/113503/1
diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js
index 5fc82ec..49257cd 100644
--- a/lib/oojs-ui/oojs-ui.js
+++ b/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (3a9a4c1da8)
+ * OOjs UI v0.1.0-pre (424b40373e)
* 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: Fri Feb 14 2014 17:31:21 GMT-0800 (PST)
+ * Date: Fri Feb 14 2014 17:34:54 GMT-0800 (PST)
*/
( function () {
@@ -179,7 +179,7 @@
this.elementGroup = null;
// Initialization
- if ( Array.isArray( config.classes ) ) {
+ if ( $.isArray( config.classes ) ) {
this.$element.addClass( config.classes.join( ' ' ) );
}
if ( config.$content ) {
@@ -1628,7 +1628,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
@@ -1658,7 +1658,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
@@ -1824,8 +1824,12 @@
*
* @constructor
* @param {jQuery} $clippable Nodes to clip, assigned to #$clippable
+ * @param {Object} [config] Configuration options
*/
-OO.ui.ClippableElement = function OoUiClippableElement( $clippable ) {
+OO.ui.ClippableElement = function OoUiClippableElement( $clippable, config ) {
+ // Configuration initialization
+ config = config || {};
+
// Properties
this.$clippable = $clippable;
this.clipping = false;
@@ -2012,7 +2016,7 @@
var i, len, flag,
classPrefix = 'oo-ui-flaggableElement-';
- if ( Array.isArray( flags ) ) {
+ if ( $.isArray( flags ) ) {
for ( i = 0, len = flags.length; i < len; i++ ) {
flag = flags[i];
// Set
@@ -2085,7 +2089,7 @@
item = items[i];
// Check if item exists then remove it first, effectively
"moving" it
- currentIndex = this.items.indexOf( item );
+ currentIndex = $.inArray( item, this.items );
if ( currentIndex >= 0 ) {
this.removeItems( [ item ] );
// Adjust index to compensate for removal
@@ -2136,7 +2140,7 @@
// Remove specific items
for ( i = 0, len = items.length; i < len; i++ ) {
item = items[i];
- index = this.items.indexOf( item );
+ index = $.inArray( item, this.items );
if ( index !== -1 ) {
if ( this.aggregate ) {
item.disconnect( this );
@@ -2855,20 +2859,20 @@
*
* @constructor
* @param {OO.Factory} toolFactory Factory for creating tools
- * @param {Object} [options] Configuration options
+ * @param {Object} [config] Configuration options
* @cfg {boolean} [actions] Add an actions section opposite to the tools
* @cfg {boolean} [shadow] Add a shadow below the toolbar
*/
-OO.ui.Toolbar = function OoUiToolbar( toolFactory, options ) {
+OO.ui.Toolbar = function OoUiToolbar( toolFactory, config ) {
// Configuration initialization
- options = options || {};
+ config = config || {};
// Parent constructor
- OO.ui.Element.call( this, options );
+ OO.ui.Element.call( this, config );
// Mixin constructors
OO.EventEmitter.call( this );
- OO.ui.GroupElement.call( this, this.$( '' ) );
+ OO.ui.GroupElement.call( this, this.$( '' ), config );
// Properties
this.toolFactory = toolFactory;
@@ -2886,12 +2890,12 @@
// Initialization
this.$group.addClass( 'oo-ui-toolbar-tools' );
this.$bar.addClass( 'oo-ui-toolbar-bar' ).append( this.$group );
- if ( options.actions ) {
+ if ( config.actions ) {
this.$actions.addClass( 'oo-ui-toolbar-actions' );
this.$bar.append( this.$actions );
}
this.$bar.append( '' );
- if ( options.shadow ) {
+ if ( config.shadow ) {
this.$bar.append( '' );
}
this.$e
[MediaWiki-commits] [Gerrit] Update OOjs UI to v0.1.0-pre (3a9a4c1da8) - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Update OOjs UI to v0.1.0-pre (3a9a4c1da8)
..
Update OOjs UI to v0.1.0-pre (3a9a4c1da8)
New changes:
554683c Allow whitespace labels
3a9a4c1 Invert dependencies for OutlineItemWidget and PageLayout
Change-Id: I4337257afcce7e8d69381cb5472ad11f2951848a
---
M lib/oojs-ui/oojs-ui.js
M lib/oojs-ui/oojs-ui.svg.css
2 files changed, 70 insertions(+), 98 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/oojs-ui/oojs-ui.js b/lib/oojs-ui/oojs-ui.js
index 7412270..5fc82ec 100644
--- a/lib/oojs-ui/oojs-ui.js
+++ b/lib/oojs-ui/oojs-ui.js
@@ -1,12 +1,12 @@
/*!
- * OOjs UI v0.1.0-pre (7d3223b8f4)
+ * OOjs UI v0.1.0-pre (3a9a4c1da8)
* 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: Thu Feb 13 2014 18:36:08 GMT-0800 (PST)
+ * Date: Fri Feb 14 2014 17:31:21 GMT-0800 (PST)
*/
( function () {
@@ -2021,7 +2021,7 @@
}
} else if ( OO.isPlainObject( flags ) ) {
for ( flag in flags ) {
- if ( flags[flags] ) {
+ if ( flags[flag] ) {
// Set
this.flags[flag] = true;
this.$element.addClass( classPrefix + flag );
@@ -2419,6 +2419,9 @@
/**
* Set the label.
*
+ * An empty string will result in the label being hidden. A string containing
only whitespace will
+ * be converted to a single
+ *
* @method
* @param {jQuery|string|Function|null} label Label nodes; text; a function
that retuns nodes or
* text; or null for no label
@@ -2428,8 +2431,13 @@
var empty = false;
this.label = label = OO.ui.resolveMsg( label ) || null;
- if ( typeof label === 'string' && label.trim() ) {
- this.$label.text( label );
+ if ( typeof label === 'string' && label.length ) {
+ if ( label.match( /^\s*$/ ) ) {
+ // Convert whitespace only string to a single
non-breaking space
+ this.$label.html( ' ' );
+ } else {
+ this.$label.text( label );
+ }
} else if ( label instanceof jQuery ) {
this.$label.empty().append( label );
} else {
@@ -3868,7 +3876,7 @@
* @chainable
*/
OO.ui.BookletLayout.prototype.addPages = function ( pages, index ) {
- var i, len, name, page,
+ var i, len, name, page, item,
items = [],
remove = [];
@@ -3881,7 +3889,9 @@
}
this.pages[page.getName()] = page;
if ( this.outlined ) {
- items.push( new OO.ui.BookletOutlineItemWidget( name,
page, { '$': this.$ } ) );
+ item = new OO.ui.OutlineItemWidget( name, page, { '$':
this.$ } );
+ page.setOutlineItem( item );
+ items.push( item );
}
}
if ( remove.length ) {
@@ -3915,6 +3925,7 @@
delete this.pages[name];
if ( this.outlined ) {
items.push( this.outlineWidget.getItemFromData( name )
);
+ page.setOutlineItem( null );
}
}
if ( this.outlined && items.length ) {
@@ -3935,12 +3946,16 @@
* @chainable
*/
OO.ui.BookletLayout.prototype.clearPages = function () {
- var pages = this.stackLayout.getItems();
+ var i, len,
+ pages = this.stackLayout.getItems();
this.pages = {};
this.currentPageName = null;
if ( this.outlined ) {
this.outlineWidget.clearItems();
+ for ( i = 0, len = pages.length; i < len; i++ ) {
+ pages[i].setOutlineItem( null );
+ }
}
this.stackLayout.clearItems();
@@ -4032,12 +4047,7 @@
* @constructor
* @param {string} name Unique symbolic name of page
* @param {Object} [config] Configuration options
- * @param {string} [icon=''] Symbolic name of icon to display in outline
- * @param {string} [indicator=''] Symbolic name of indicator to display in
outline
- * @param {string} [indicatorTitle=''] Description of indicator meaning to
display in outline
- * @param {string} [label=''] Label to display in outline
- * @param {number} [level=0] Indentation level of item in outline
- * @param {boolean} [movable=false] Page should be movable using outline
controls
+ * @param {string} [outlineItem] Outline item widget
*/
OO.ui.PageLayout = function OoUiPageLayout( name, config ) {
// Configuration initialization
@@ -4048,12 +4058,7 @@
// Properties
this.name = name;
- this.icon = config.ico
[MediaWiki-commits] [Gerrit] Revert "further damage the theme in a search for real estate" - change (wikimedia...drupal)
Ssmith has submitted this change and it was merged.
Change subject: Revert "further damage the theme in a search for real estate"
..
Revert "further damage the theme in a search for real estate"
This didn't work--the content div line-wraps below the sidebar when its
natural width is wider than the available space.
This reverts commit 300f51331d5b190db0e51ed0636c327b268a869b.
Change-Id: Ief062753b4a4e274a7d18a01b9d1199a251c4826
---
M themes/bartik/css/layout.css
1 file changed, 7 insertions(+), 0 deletions(-)
Approvals:
Ssmith: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/themes/bartik/css/layout.css b/themes/bartik/css/layout.css
index 160004c..b561f4c 100644
--- a/themes/bartik/css/layout.css
+++ b/themes/bartik/css/layout.css
@@ -17,6 +17,9 @@
#triptych,
#footer-columns,
#footer {
+ width: 960px;
+ margin-left: auto;
+ margin-right: auto;
}
#header div.section {
position: relative;
@@ -52,10 +55,13 @@
position: relative;
}
.one-sidebar #content {
+ width: 720px;
}
.two-sidebars #content {
+ width: 480px;
}
.no-sidebars #content {
+ width: 960px;
float: none;
}
#sidebar-first,
@@ -89,5 +95,6 @@
width: 220px;
}
#footer {
+ width: 940px;
min-width: 920px;
}
--
To view, visit https://gerrit.wikimedia.org/r/113499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ief062753b4a4e274a7d18a01b9d1199a251c4826
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/drupal
Gerrit-Branch: master
Gerrit-Owner: Adamw
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] correct iso code for Polish language - change (mediawiki...DonationInterface)
Ssmith has submitted this change and it was merged. Change subject: correct iso code for Polish language .. correct iso code for Polish language Change-Id: I79c0b7c327fc00c8aecea67868e448183c858cb6 --- M globalcollect_gateway/globalcollect.adapter.php 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Ssmith: Verified; Looks good to me, approved jenkins-bot: Verified diff --git a/globalcollect_gateway/globalcollect.adapter.php b/globalcollect_gateway/globalcollect.adapter.php index 0b26bfa..ac5b659 100644 --- a/globalcollect_gateway/globalcollect.adapter.php +++ b/globalcollect_gateway/globalcollect.adapter.php @@ -1843,7 +1843,7 @@ 'ja', //Japanese 'ko', //Korean 'no', //Norwegian - 'po', //Polish + 'pl', //Polish 'pt', //Portuguese 'ro', //Romanian 'sl', //Slovene -- To view, visit https://gerrit.wikimedia.org/r/113502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I79c0b7c327fc00c8aecea67868e448183c858cb6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Adamw Gerrit-Reviewer: Katie Horn Gerrit-Reviewer: Mwalker Gerrit-Reviewer: Ssmith Gerrit-Reviewer: jenkins-bot <> ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] FieldLayout, styling improvements and standardization - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: FieldLayout, styling improvements and standardization
..
FieldLayout, styling improvements and standardization
FieldLayout
- Added FieldLayout which provides label and layout features to a widget
- Made Fieldset support adding FieldLayout items
- Removed CheckboxWidget (not needed now, just place a checkbox in a
FieldLayout and set 'align' to 'inline'
- Updated demo to use FieldLayout
- Moved input cleverness of InputLabelWidget to FieldLayout, and renamed
it to LabelWidget
Styling improvements
- Made ButtonGroup and ButtonSelect widgets never wrap
- Made Fieldsets use IconedElement mixin instead of rolling its own icon
support
Standardization
- Added support for passing 'items' config option to most widgets that
mixin GroupElement (not all should have this, so it's not done at the
top level)
- Updated all uses of mixins to include final config argument allowing
config options to be added to mixin classes without updating all callers
- Added config option to clippable element for future use
- Renamed 'options' to 'config' in Toolbar
Change-Id: I87e1bdf5ccb67ce58022926c4faede0c70a1f4a4
---
M build/modules.json
M demos/widgets.js
M src/OO.ui.Element.js
M src/OO.ui.ToolFactory.js
M src/OO.ui.ToolGroup.js
M src/OO.ui.Toolbar.js
M src/elements/OO.ui.ClippableElement.js
M src/elements/OO.ui.FlaggableElement.js
M src/elements/OO.ui.GroupElement.js
A src/layouts/OO.ui.FieldLayout.js
M src/layouts/OO.ui.FieldsetLayout.js
M src/layouts/OO.ui.StackLayout.js
M src/styles/OO.ui.Layout.css
M src/styles/OO.ui.Widget.css
M src/toolgroups/OO.ui.PopupToolGroup.js
M src/widgets/OO.ui.ButtonGroupWidget.js
D src/widgets/OO.ui.CheckboxWidget.js
D src/widgets/OO.ui.InputLabelWidget.js
M src/widgets/OO.ui.InputWidget.js
A src/widgets/OO.ui.LabelWidget.js
M src/widgets/OO.ui.MenuWidget.js
M src/widgets/OO.ui.SelectWidget.js
22 files changed, 492 insertions(+), 334 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/build/modules.json b/build/modules.json
index 0cae465..d77e9ef 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -24,6 +24,7 @@
"src/OO.ui.ToolFactory.js",
"src/OO.ui.ToolGroup.js",
"src/layouts/OO.ui.FieldsetLayout.js",
+ "src/layouts/OO.ui.FieldLayout.js",
"src/layouts/OO.ui.GridLayout.js",
"src/layouts/OO.ui.BookletLayout.js",
"src/layouts/OO.ui.PanelLayout.js",
@@ -40,8 +41,7 @@
"src/widgets/OO.ui.ButtonWidget.js",
"src/widgets/OO.ui.InputWidget.js",
"src/widgets/OO.ui.CheckboxInputWidget.js",
- "src/widgets/OO.ui.CheckboxWidget.js",
- "src/widgets/OO.ui.InputLabelWidget.js",
+ "src/widgets/OO.ui.LabelWidget.js",
"src/widgets/OO.ui.LookupInputWidget.js",
"src/widgets/OO.ui.OptionWidget.js",
"src/widgets/OO.ui.SelectWidget.js",
diff --git a/demos/widgets.js b/demos/widgets.js
index fe4a21e..69b4bb1 100644
--- a/demos/widgets.js
+++ b/demos/widgets.js
@@ -1,237 +1,234 @@
$( function () {
- var i, name, len, item, items, fieldset,
+ var name, fieldset,
$demo = $( '.oo-ui-demo' ),
sections = {
'Widgets': [
- {
- 'label': 'ButtonWidget',
- 'widget': new OO.ui.ButtonWidget( {
'label': 'Normal' } )
- },
- {
- 'widget': new OO.ui.ButtonWidget( {
+ new OO.ui.FieldLayout(
+ new OO.ui.ButtonWidget( { 'label':
'Normal' } ),
+ { 'label': 'ButtonWidget (normal)' }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.ButtonWidget( {
'label': 'Primary',
'flags': [ 'primary' ]
- } )
- },
- {
- 'widget': new OO.ui.ButtonWidget( {
+ } ),
+ { 'label': 'ButtonWidget (primary)' }
+ ),
+ new OO.ui.FieldLayout(
+ new OO.ui.ButtonWidget( {
'label': 'C
[MediaWiki-commits] [Gerrit] correct iso code for Polish language - change (mediawiki...DonationInterface)
Adamw has uploaded a new change for review. https://gerrit.wikimedia.org/r/113502 Change subject: correct iso code for Polish language .. correct iso code for Polish language Change-Id: I79c0b7c327fc00c8aecea67868e448183c858cb6 --- M globalcollect_gateway/globalcollect.adapter.php 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/DonationInterface refs/changes/02/113502/1 diff --git a/globalcollect_gateway/globalcollect.adapter.php b/globalcollect_gateway/globalcollect.adapter.php index 0b26bfa..ac5b659 100644 --- a/globalcollect_gateway/globalcollect.adapter.php +++ b/globalcollect_gateway/globalcollect.adapter.php @@ -1843,7 +1843,7 @@ 'ja', //Japanese 'ko', //Korean 'no', //Norwegian - 'po', //Polish + 'pl', //Polish 'pt', //Portuguese 'ro', //Romanian 'sl', //Slovene -- To view, visit https://gerrit.wikimedia.org/r/113502 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79c0b7c327fc00c8aecea67868e448183c858cb6 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/DonationInterface Gerrit-Branch: master Gerrit-Owner: Adamw ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Set pemissive CORS headers in production - change (mediawiki...deploy)
GWicke has uploaded a new change for review. https://gerrit.wikimedia.org/r/113501 Change subject: Set pemissive CORS headers in production .. Set pemissive CORS headers in production Change-Id: I6649bede04c7bcc18eb81ee31f044b4ba4d976a2 --- M conf/wmf/localsettings.js 1 file changed, 3 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy refs/changes/01/113501/1 diff --git a/conf/wmf/localsettings.js b/conf/wmf/localsettings.js index 9729ab1..97ca09d 100644 --- a/conf/wmf/localsettings.js +++ b/conf/wmf/localsettings.js @@ -34,4 +34,7 @@ // Use the API backends directly without hitting the text varnishes. // API requests are not cacheable anyway. parsoidConfig.defaultAPIProxyURI = 'http://10.2.2.22'; + +// Allow cors as we are only running on non-sensitive domains +parsoidConfig.allowCORS = '*'; }; -- To view, visit https://gerrit.wikimedia.org/r/113501 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6649bede04c7bcc18eb81ee31f044b4ba4d976a2 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/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] Tweak documentation for Title::getLocalUrl - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Tweak documentation for Title::getLocalUrl .. Tweak documentation for Title::getLocalUrl Because I was confused by the docs when I tried to use it. https://gerrit.wikimedia.org/r/#/c/109945/1/specials/SpecialTranslationStash.php Change-Id: Ic19704c6a57b633bb5ef1c8a06db9a562e67c6c9 --- M includes/Title.php 1 file changed, 15 insertions(+), 25 deletions(-) Approvals: Brian Wolff: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Title.php b/includes/Title.php index ab79d6d..2862685 100644 --- a/includes/Title.php +++ b/includes/Title.php @@ -1,6 +1,6 @@ https://gerrit.wikimedia.org/r/64 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ic19704c6a57b633bb5ef1c8a06db9a562e67c6c9 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Nemo bis Gerrit-Reviewer: Brian Wolff Gerrit-Reviewer: Nemo bis Gerrit-Reviewer: Nikerabbit 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 Musées de la Haute-Saône to wgCopyUploadsDomains - change (operations/mediawiki-config)
Jean-Frédéric has uploaded a new change for review. https://gerrit.wikimedia.org/r/113500 Change subject: Add Musées de la Haute-Saône to wgCopyUploadsDomains .. Add Musées de la Haute-Saône to wgCopyUploadsDomains This patch adds *.tounoki.org, a secondary web-server used by the Musées de la Haute-Saône (France), to $wgCopyUploadsDomains so as to enable mass collection uploads on Wikimedia Commons using the GlamWikiToolset. Bug: 61378 Change-Id: I749f5fbc61609c0ea26ec4f991af842b4f244b95 --- M wmf-config/InitialiseSettings.php 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/00/113500/1 diff --git a/wmf-config/InitialiseSettings.php b/wmf-config/InitialiseSettings.php index dd2e4f4..91a786c 100644 --- a/wmf-config/InitialiseSettings.php +++ b/wmf-config/InitialiseSettings.php @@ -10354,7 +10354,8 @@ '*.raa.se', // Swedish National Heritage Board '*.rbge.org.uk', // Royal Botanic Garden Edinburgh '*.rijksmuseum.nl', // Rijksmuseum - '*.llgc.org.uk', // National Library of Wales + '*.llgc.org.uk', // National Library of Wales + '*.tounoki.org', // Musées de la Haute-Saône ), ), -- To view, visit https://gerrit.wikimedia.org/r/113500 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I749f5fbc61609c0ea26ec4f991af842b4f244b95 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Jean-Frédéric ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "further damage the theme in a search for real estate" - change (wikimedia...drupal)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113499
Change subject: Revert "further damage the theme in a search for real estate"
..
Revert "further damage the theme in a search for real estate"
This didn't work--the content div line-wraps below the sidebar when its
natural width is wider than the available space.
This reverts commit 300f51331d5b190db0e51ed0636c327b268a869b.
Change-Id: Ief062753b4a4e274a7d18a01b9d1199a251c4826
---
M themes/bartik/css/layout.css
1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/drupal
refs/changes/99/113499/1
diff --git a/themes/bartik/css/layout.css b/themes/bartik/css/layout.css
index 160004c..b561f4c 100644
--- a/themes/bartik/css/layout.css
+++ b/themes/bartik/css/layout.css
@@ -17,6 +17,9 @@
#triptych,
#footer-columns,
#footer {
+ width: 960px;
+ margin-left: auto;
+ margin-right: auto;
}
#header div.section {
position: relative;
@@ -52,10 +55,13 @@
position: relative;
}
.one-sidebar #content {
+ width: 720px;
}
.two-sidebars #content {
+ width: 480px;
}
.no-sidebars #content {
+ width: 960px;
float: none;
}
#sidebar-first,
@@ -89,5 +95,6 @@
width: 220px;
}
#footer {
+ width: 940px;
min-width: 920px;
}
--
To view, visit https://gerrit.wikimedia.org/r/113499
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ief062753b4a4e274a7d18a01b9d1199a251c4826
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/drupal
Gerrit-Branch: master
Gerrit-Owner: Adamw
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove padding around banners that slipped in. - change (mediawiki...ZeroRatedMobileAccess)
Dr0ptp4kt has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113498
Change subject: Remove padding around banners that slipped in.
..
Remove padding around banners that slipped in.
Change-Id: Ide179d7989cc81b50b7487a3f48e996058c5f4af
---
M modules/banner.css
1 file changed, 4 insertions(+), 0 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ZeroRatedMobileAccess
refs/changes/98/113498/1
diff --git a/modules/banner.css b/modules/banner.css
index e3cf345..e65b953 100644
--- a/modules/banner.css
+++ b/modules/banner.css
@@ -2,6 +2,10 @@
moved from beta_common.css in
Change-Id: Ia25126d950ee87cbc76f2e91d679cdd27405ee51
*/
+#mw-mf-page-center {
+padding: 0;
+}
+
.mw-mf-banner {
position: relative;
width: 100%;
--
To view, visit https://gerrit.wikimedia.org/r/113498
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ide179d7989cc81b50b7487a3f48e996058c5f4af
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ZeroRatedMobileAccess
Gerrit-Branch: master
Gerrit-Owner: Dr0ptp4kt
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Handle empty lines gracefully - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Handle empty lines gracefully
..
Handle empty lines gracefully
Partially revert Id87a90474, restoring the code that handles empty lines and
lines containing only a comment.
Change-Id: I7e014f29e9feeb271fd2fcc31be18704ceb4e02c
---
M multiversion/MWWikiversions.php
1 file changed, 8 insertions(+), 1 deletion(-)
Approvals:
Reedy: Looks good to me, approved
jenkins-bot: Verified
diff --git a/multiversion/MWWikiversions.php b/multiversion/MWWikiversions.php
index 6ddce6f..f53579a 100644
--- a/multiversion/MWWikiversions.php
+++ b/multiversion/MWWikiversions.php
@@ -38,8 +38,15 @@
* @return Array|null (dbname, version, extended version, comment)
*/
public static function rowFromLine( $line, $lineNo ) {
+ $len = strcspn( $line, '#' );
+ if ( $len === 0 ) {
+ return null; // comment line or empty line
+ }
+ $row = substr( $line, 0, $len );
+ $comment = trim( substr( $line, $len + 1 ) ); // exclude the '#'
+
// Get the column values for this row...
- $items = explode( ' ', trim( $line ) ); // cleanup w/s
+ $items = explode( ' ', trim( $row ) ); // cleanup w/s
if ( count( $items ) >= 2 ) {
list( $dbName, $version ) = $items;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/113497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7e014f29e9feeb271fd2fcc31be18704ceb4e02c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Ori.livneh
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] Handle empty lines gracefully - change (operations/mediawiki-config)
Ori.livneh has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113497
Change subject: Handle empty lines gracefully
..
Handle empty lines gracefully
Partially revert Id87a90474, restoring the code that handles empty lines and
lines containing only a comment.
Change-Id: I7e014f29e9feeb271fd2fcc31be18704ceb4e02c
---
M multiversion/MWWikiversions.php
1 file changed, 8 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/97/113497/1
diff --git a/multiversion/MWWikiversions.php b/multiversion/MWWikiversions.php
index 6ddce6f..f53579a 100644
--- a/multiversion/MWWikiversions.php
+++ b/multiversion/MWWikiversions.php
@@ -38,8 +38,15 @@
* @return Array|null (dbname, version, extended version, comment)
*/
public static function rowFromLine( $line, $lineNo ) {
+ $len = strcspn( $line, '#' );
+ if ( $len === 0 ) {
+ return null; // comment line or empty line
+ }
+ $row = substr( $line, 0, $len );
+ $comment = trim( substr( $line, $len + 1 ) ); // exclude the '#'
+
// Get the column values for this row...
- $items = explode( ' ', trim( $line ) ); // cleanup w/s
+ $items = explode( ' ', trim( $row ) ); // cleanup w/s
if ( count( $items ) >= 2 ) {
list( $dbName, $version ) = $items;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/113497
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7e014f29e9feeb271fd2fcc31be18704ceb4e02c
Gerrit-PatchSet: 1
Gerrit-Project: operations/mediawiki-config
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] Story 1628: Fix some of the mobile VE toolbar styles - change (mediawiki...MobileFrontend)
Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113496
Change subject: Story 1628: Fix some of the mobile VE toolbar styles
..
Story 1628: Fix some of the mobile VE toolbar styles
This doesn't fix everything, but fixes the major glaring styling
problems. For the rest of it, we're going to wait until Trevor
implements skin support in the MW build of OO-ui.
Change-Id: I72f689d58133dad783ccf80e8e4758195f3bd28f
---
M less/modules/editor/VisualEditorOverlay.less
1 file changed, 20 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/96/113496/1
diff --git a/less/modules/editor/VisualEditorOverlay.less
b/less/modules/editor/VisualEditorOverlay.less
index b5a283c..da78c10 100644
--- a/less/modules/editor/VisualEditorOverlay.less
+++ b/less/modules/editor/VisualEditorOverlay.less
@@ -62,6 +62,26 @@
.overlay-header-container {
.overlay-header > .toolbar {
padding: 0;
+
+ // FIXME: Remove most of these resets once oo-ui
supports skinning
+ // and no longer loads Vector-like styles by default in
MediaWiki.
+ .oo-ui-toolbar-bar {
+ background-image: none;
+ border-bottom: none;
+
+ .oo-ui-toolGroup {
+ margin: 0;
+ border: none;
+ }
+
+ .oo-ui-tool {
+ height: 3em; /* default is too tall */
+ }
+
+ .oo-ui-toolbar-shadow {
+ display: none;
+ }
+ }
}
.oo-ui-tool {
--
To view, visit https://gerrit.wikimedia.org/r/113496
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I72f689d58133dad783ccf80e8e4758195f3bd28f
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] update drupal submodule - change (wikimedia...crm)
Adamw has submitted this change and it was merged. Change subject: update drupal submodule .. update drupal submodule Change-Id: I8bfc370d182eaa4051df146b25ba06079558dbd6 --- M drupal 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Adamw: Verified; Looks good to me, approved diff --git a/drupal b/drupal index debfcf6..300f513 16 --- a/drupal +++ b/drupal -Subproject commit debfcf69ad07aabf6774f6aeb9c63d189c37f690 +Subproject commit 300f51331d5b190db0e51ed0636c327b268a869b -- To view, visit https://gerrit.wikimedia.org/r/113495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I8bfc370d182eaa4051df146b25ba06079558dbd6 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Adamw Gerrit-Reviewer: Adamw 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 drupal submodule - change (wikimedia...crm)
Adamw has uploaded a new change for review. https://gerrit.wikimedia.org/r/113495 Change subject: update drupal submodule .. update drupal submodule Change-Id: I8bfc370d182eaa4051df146b25ba06079558dbd6 --- M drupal 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm refs/changes/95/113495/1 diff --git a/drupal b/drupal index debfcf6..300f513 16 --- a/drupal +++ b/drupal -Subproject commit debfcf69ad07aabf6774f6aeb9c63d189c37f690 +Subproject commit 300f51331d5b190db0e51ed0636c327b268a869b -- To view, visit https://gerrit.wikimedia.org/r/113495 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bfc370d182eaa4051df146b25ba06079558dbd6 Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/fundraising/crm Gerrit-Branch: master Gerrit-Owner: Adamw ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix variable - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix variable
..
Fix variable
Change-Id: I0b584935cbf7987a22aed4c4c1e83f7828cef02b
---
M includes/Block/Header.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index 3f831b8..a81d12f 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -226,7 +226,7 @@
}
}
- return $found;
+ return $history;
}
public function getName() {
--
To view, visit https://gerrit.wikimedia.org/r/113494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b584935cbf7987a22aed4c4c1e83f7828cef02b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
Gerrit-Reviewer: Matthias Mullie
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Fix variable" - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Revert "Fix variable"
..
Revert "Fix variable"
This reverts commit ceefaadae1dc4c6412d5601090583619b5706d66.
Change-Id: I655b7ec791b443ed805cbe973be19db080824317
---
M includes/Block/Header.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index a81d12f..3f831b8 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -226,7 +226,7 @@
}
}
- return $history;
+ return $found;
}
public function getName() {
--
To view, visit https://gerrit.wikimedia.org/r/113493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I655b7ec791b443ed805cbe973be19db080824317
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
Gerrit-Reviewer: Matthias Mullie
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 unused third/fourth parameters for wikiversions - change (operations/mediawiki-config)
Ori.livneh has submitted this change and it was merged.
Change subject: Remove unused third/fourth parameters for wikiversions
..
Remove unused third/fourth parameters for wikiversions
This patch makes multiversion scripts only parse the first two space-separated
fields in wikiversions.dat. The third field (external version) and fourth
"field" (an optional comment, preceded by '#') are discarded. To ease
migration, the structure of CDB files is preserved, with the external version
field hard-coded to the empty string.
Change-Id: Id87a90474ffc1fce6eed58c228fc91fcd36e5dbb
---
M multiversion/MWWikiversions.php
M multiversion/activeMWVersions.php
M multiversion/refreshWikiversionsCDB
M multiversion/switchAllMediaWikis.php
4 files changed, 11 insertions(+), 32 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/multiversion/MWWikiversions.php b/multiversion/MWWikiversions.php
index 2e9ac2b..6ddce6f 100644
--- a/multiversion/MWWikiversions.php
+++ b/multiversion/MWWikiversions.php
@@ -38,26 +38,15 @@
* @return Array|null (dbname, version, extended version, comment)
*/
public static function rowFromLine( $line, $lineNo ) {
- // Strip comments and ignore comment lines...
- $len = strcspn( $line, '#' );
- if ( $len === 0 ) {
- return null; // comment line or empty line
- }
- $row = substr( $line, 0, $len );
- $comment = trim( substr( $line, $len + 1 ) ); // exclude the '#'
-
// Get the column values for this row...
- $items = explode( ' ', trim( $row ) ); // cleanup w/s
- if ( count( $items ) === 3 ) {
- list( $dbName, $version, $extVersion ) = $items;
- } elseif ( count( $items ) === 2 ) {
+ $items = explode( ' ', trim( $line ) ); // cleanup w/s
+ if ( count( $items ) >= 2 ) {
list( $dbName, $version ) = $items;
- $extVersion = '*'; // none
} else {
throw new Exception( "Invalid row on line $lineNo
('$line').\n" );
}
- return array( $dbName, $version, $extVersion, $comment );
+ return array( $dbName, $version );
}
/**
@@ -65,12 +54,8 @@
* @return string Line for wikiversions.dat
*/
public static function lineFromRow( array $row ) {
- list( $dbName, $version, $extVersion, $comment ) = $row;
- $line = "$dbName $version $extVersion";
- if ( $comment !== '' ) {
- $line .= " #$comment";
- }
- return $line;
+ list( $dbName, $version ) = $row;
+ return "$dbName $version";
}
/**
diff --git a/multiversion/activeMWVersions.php
b/multiversion/activeMWVersions.php
index 67efc59..9f1497c 100644
--- a/multiversion/activeMWVersions.php
+++ b/multiversion/activeMWVersions.php
@@ -42,10 +42,7 @@
$result = $activeVersions = array();
foreach ( $versionRows as $row ) {
- list( $dbName, $version, $extVersion, $comment ) = $row;
- if ( $extVersion !== '*' && in_array( '--extended', $options )
) {
- $version .= "-$extVersion";
- }
+ list( $dbName, $version ) = $row;
if ( !isset( $activeVersions[$version] ) ) { // already listed?
$activeVersions[$version] = 1;
diff --git a/multiversion/refreshWikiversionsCDB
b/multiversion/refreshWikiversionsCDB
index 7500fc6..30b73b2 100755
--- a/multiversion/refreshWikiversionsCDB
+++ b/multiversion/refreshWikiversionsCDB
@@ -27,7 +27,7 @@
$rows = MWWikiversions::readWikiVersionsFile( $srcPath );
// Sanity check version directories...
foreach ( $rows as $row ) {
- list( $dbName, $version, $extVersion, $comment ) = $row;
+ list( $dbName, $version ) = $row;
$versionDir = MULTIVER_COMMON_HOME . '/' . $version;
if ( !is_dir( $versionDir ) ) {
print "Invalid version dir '$versionDir' for wiki
'$dbName'.\n";
@@ -58,12 +58,9 @@
exit( 1 );
}
foreach ( $rows as $row ) {
- list( $dbName, $version, $extVersion, $comment ) = $row;
- if ( $extVersion === '*' ) {
- $extVersion = ''; // "*" means "none"
- }
+ list( $dbName, $version ) = $row;
$db->set( "ver:$dbName", $version );
- $db->set( "ext:$dbName", $extVersion );
+ $db->set( "ext:$dbName", '' );
}
$db->close();
diff --git a/multiversion/switchAllMediaWikis.php
b/mult
[MediaWiki-commits] [Gerrit] Fix variable - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113494
Change subject: Fix variable
..
Fix variable
Change-Id: I0b584935cbf7987a22aed4c4c1e83f7828cef02b
---
M includes/Block/Header.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/94/113494/1
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index 3f831b8..a81d12f 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -226,7 +226,7 @@
}
}
- return $found;
+ return $history;
}
public function getName() {
--
To view, visit https://gerrit.wikimedia.org/r/113494
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0b584935cbf7987a22aed4c4c1e83f7828cef02b
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use Collection instead of manually fetching from storage - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113492
Change subject: Use Collection instead of manually fetching from storage
..
Use Collection instead of manually fetching from storage
Change-Id: Ibeae21f7e18c63d64ea66580b0b1e7dfcb379264
---
M includes/Formatter/AbstractFormatter.php
1 file changed, 1 insertion(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/92/113492/1
diff --git a/includes/Formatter/AbstractFormatter.php
b/includes/Formatter/AbstractFormatter.php
index 499a9fb..6754097 100644
--- a/includes/Formatter/AbstractFormatter.php
+++ b/includes/Formatter/AbstractFormatter.php
@@ -437,10 +437,7 @@
if ( $revision->isFirstRevision() ) {
return '';
}
- $previousRevision = Container::get( 'storage' )->get(
- get_class( $revision ),
- $revision->getPrevRevisionId()
- );
+ $previousRevision =
$revision->getCollection()->getPrevRevision( $revision );
if ( !$previousRevision ) {
// wfDebugLog( __CLASS__, __FUNCTION__ . ':
Something something' );
return '';
--
To view, visit https://gerrit.wikimedia.org/r/113492
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibeae21f7e18c63d64ea66580b0b1e7dfcb379264
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Revert "Fix variable" - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113493
Change subject: Revert "Fix variable"
..
Revert "Fix variable"
This reverts commit ceefaadae1dc4c6412d5601090583619b5706d66.
Change-Id: I655b7ec791b443ed805cbe973be19db080824317
---
M includes/Block/Header.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/93/113493/1
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index a81d12f..3f831b8 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -226,7 +226,7 @@
}
}
- return $history;
+ return $found;
}
public function getName() {
--
To view, visit https://gerrit.wikimedia.org/r/113493
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I655b7ec791b443ed805cbe973be19db080824317
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix occurrences of @mixin to be @mixins - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix occurrences of @mixin to be @mixins
..
Fix occurrences of @mixin to be @mixins
Change-Id: I7ec39921e54b79a0f08a55826627c110f8f83817
---
M src/OO.ui.Layout.js
M src/OO.ui.Widget.js
M src/widgets/OO.ui.ButtonGroupWidget.js
M src/widgets/OO.ui.SelectWidget.js
4 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/OO.ui.Layout.js b/src/OO.ui.Layout.js
index 2b97fcb..bb2a735 100644
--- a/src/OO.ui.Layout.js
+++ b/src/OO.ui.Layout.js
@@ -4,7 +4,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
diff --git a/src/OO.ui.Widget.js b/src/OO.ui.Widget.js
index 8ed052c..6a39210 100644
--- a/src/OO.ui.Widget.js
+++ b/src/OO.ui.Widget.js
@@ -4,7 +4,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
diff --git a/src/widgets/OO.ui.ButtonGroupWidget.js
b/src/widgets/OO.ui.ButtonGroupWidget.js
index 9cc2831..40faf65 100644
--- a/src/widgets/OO.ui.ButtonGroupWidget.js
+++ b/src/widgets/OO.ui.ButtonGroupWidget.js
@@ -3,7 +3,7 @@
*
* @class
* @extends OO.ui.Widget
- * @mixin OO.ui.GroupElement
+ * @mixins OO.ui.GroupElement
*
* @constructor
* @param {Object} [config] Configuration options
diff --git a/src/widgets/OO.ui.SelectWidget.js
b/src/widgets/OO.ui.SelectWidget.js
index 9c15e9c..5bae115 100644
--- a/src/widgets/OO.ui.SelectWidget.js
+++ b/src/widgets/OO.ui.SelectWidget.js
@@ -4,7 +4,7 @@
* @class
* @abstract
* @extends OO.ui.Widget
- * @mixin OO.ui.GroupElement
+ * @mixins OO.ui.GroupElement
*
* @constructor
* @param {Object} [config] Configuration options
--
To view, visit https://gerrit.wikimedia.org/r/113485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I7ec39921e54b79a0f08a55826627c110f8f83817
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Catrope
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] Add missing use statement - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged. Change subject: Add missing use statement .. Add missing use statement Change-Id: I33b2170858e6e4f36ef237194da9736c0067181a --- M includes/Formatter/AbstractFormatter.php 1 file changed, 1 insertion(+), 0 deletions(-) Approvals: EBernhardson: Looks good to me, approved jenkins-bot: Verified diff --git a/includes/Formatter/AbstractFormatter.php b/includes/Formatter/AbstractFormatter.php index 499a9fb..b737495 100644 --- a/includes/Formatter/AbstractFormatter.php +++ b/includes/Formatter/AbstractFormatter.php @@ -10,6 +10,7 @@ use Flow\Model\Workflow; use Flow\Exception\DataModelException; use Flow\Model\UUID; +use Flow\RevisionActionPermissions; use Flow\Templating; use Flow\UrlGenerator; use Language; -- To view, visit https://gerrit.wikimedia.org/r/113491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I33b2170858e6e4f36ef237194da9736c0067181a Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/Flow Gerrit-Branch: master Gerrit-Owner: EBernhardson Gerrit-Reviewer: EBernhardson 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 missing use statement - change (mediawiki...Flow)
EBernhardson has uploaded a new change for review. https://gerrit.wikimedia.org/r/113491 Change subject: Add missing use statement .. Add missing use statement Change-Id: I33b2170858e6e4f36ef237194da9736c0067181a --- M includes/Formatter/AbstractFormatter.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow refs/changes/91/113491/1 diff --git a/includes/Formatter/AbstractFormatter.php b/includes/Formatter/AbstractFormatter.php index 499a9fb..b737495 100644 --- a/includes/Formatter/AbstractFormatter.php +++ b/includes/Formatter/AbstractFormatter.php @@ -10,6 +10,7 @@ use Flow\Model\Workflow; use Flow\Exception\DataModelException; use Flow\Model\UUID; +use Flow\RevisionActionPermissions; use Flow\Templating; use Flow\UrlGenerator; use Language; -- To view, visit https://gerrit.wikimedia.org/r/113491 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I33b2170858e6e4f36ef237194da9736c0067181a 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] Fix variable - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix variable
..
Fix variable
Change-Id: I21af8ab38f638ad2ba0c1724f068659f2769e5a9
---
M includes/Block/Header.php
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index 3f831b8..a81d12f 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -226,7 +226,7 @@
}
}
- return $found;
+ return $history;
}
public function getName() {
--
To view, visit https://gerrit.wikimedia.org/r/113490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I21af8ab38f638ad2ba0c1724f068659f2769e5a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
Gerrit-Reviewer: Matthias Mullie
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Url encode page title for add subtitles link. - change (mediawiki...TimedMediaHandler)
Brian Wolff has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113489
Change subject: Url encode page title for add subtitles link.
..
Url encode page title for add subtitles link.
Was breaking on pages with '&' in title.
Bug: 61336
Change-Id: I683acc29693d0deea579d39152e974158f9bc21c
---
M resources/mw.MediaWikiPlayerSupport.js
1 file changed, 4 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TimedMediaHandler
refs/changes/89/113489/1
diff --git a/resources/mw.MediaWikiPlayerSupport.js
b/resources/mw.MediaWikiPlayerSupport.js
index c901462..baab3fd 100644
--- a/resources/mw.MediaWikiPlayerSupport.js
+++ b/resources/mw.MediaWikiPlayerSupport.js
@@ -293,10 +293,12 @@
// add text link already present
return ;
}
-
+
+ var pageTitle = 'TimedText:' +
+ decodeURIComponent(
embedPlayer.apiTitleKey ).replace(/^File:|^Image:/, '');
var addTextPage = mw.getApiProviderURL(
apiProvider )
.replace( 'api.php', 'index.php') +
-
'?title=TimedText:' + unescape( embedPlayer.apiTitleKey
).replace(/^File:|^Image:/, '');
+
'?title=' + encodeURIComponent( pageTitle );
var $li = $.getLineItem( mw.msg(
'mwe-timedtext-upload-timed-text'), 'script', function() {
window.location = addTextPage;
--
To view, visit https://gerrit.wikimedia.org/r/113489
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I683acc29693d0deea579d39152e974158f9bc21c
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: Brian Wolff
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 variable - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113490
Change subject: Fix variable
..
Fix variable
Change-Id: I21af8ab38f638ad2ba0c1724f068659f2769e5a9
---
M includes/Block/Header.php
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/90/113490/1
diff --git a/includes/Block/Header.php b/includes/Block/Header.php
index 3f831b8..a81d12f 100644
--- a/includes/Block/Header.php
+++ b/includes/Block/Header.php
@@ -226,7 +226,7 @@
}
}
- return $found;
+ return $history;
}
public function getName() {
--
To view, visit https://gerrit.wikimedia.org/r/113490
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21af8ab38f638ad2ba0c1724f068659f2769e5a9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Deprecate wgSkipSkin in favor of wgSkipSkins - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Deprecate wgSkipSkin in favor of wgSkipSkins .. Deprecate wgSkipSkin in favor of wgSkipSkins Per comments at https://gerrit.wikimedia.org/r/#/c/110162/5/includes/DefaultSettings.php Change-Id: I47e891464c9955e2ea8c655c8e2e19cb09f55baa --- M RELEASE-NOTES-1.23 M includes/DefaultSettings.php 2 files changed, 4 insertions(+), 0 deletions(-) Approvals: Anomie: Looks good to me, approved jenkins-bot: Verified diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23 index b16276b..f07fbbb 100644 --- a/RELEASE-NOTES-1.23 +++ b/RELEASE-NOTES-1.23 @@ -34,6 +34,8 @@ * The 'max threads' setting was removed from $wgDBservers. * Support for AdminSettings.php has been completely removed. All configuration belongs in LocalSettings.php. +* $wgSkipSkin, which has been replaceable by $wgSkipSkins since 2005 (r9249), is + now formally deprecated. === New features in 1.23 === * ResourceLoader can utilize the Web Storage API to cache modules client-side. diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php index dd76a04..34bb191 100644 --- a/includes/DefaultSettings.php +++ b/includes/DefaultSettings.php @@ -2908,6 +2908,8 @@ * Specify the name of a skin that should not be presented in the list of * available skins. Use for blacklisting a skin which you do not want to * remove from the .../skins/ directory + * + * @deprecated since 1.23; use $wgSkipSkins instead */ $wgSkipSkin = ''; -- To view, visit https://gerrit.wikimedia.org/r/113341 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I47e891464c9955e2ea8c655c8e2e19cb09f55baa Gerrit-PatchSet: 2 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: TTO Gerrit-Reviewer: Anomie Gerrit-Reviewer: TTO 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 crasher - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix crasher
..
Fix crasher
* Introduced in 4d1f0abc7403a33f0aa4e6c0ee616f2b7b030a09. Tokens are
still being shared. Requires further work.
* Some other cleanup while investigating.
Bug: 61298
Change-Id: Iebd2e14bc12d6caddfbac98fea65da0fb8725fab
---
M lib/ext.core.Sanitizer.js
M lib/ext.core.TemplateHandler.js
M lib/mediawiki.TokenTransformManager.js
3 files changed, 20 insertions(+), 15 deletions(-)
Approvals:
GWicke: Looks good to me, approved
jenkins-bot: Verified
diff --git a/lib/ext.core.Sanitizer.js b/lib/ext.core.Sanitizer.js
index 7b436dc..df72edb 100644
--- a/lib/ext.core.Sanitizer.js
+++ b/lib/ext.core.Sanitizer.js
@@ -732,6 +732,10 @@
// XXX: Likely better done in AttributeTransformManager when
processing is
// complete
if (attribs && attribs.length > 0) {
+ // FIXME: There's still some token sharing going on and
templates
+ // contained in templates end up getting attributes
stripped.
+ // This is #61298.
+ token = token.clone();
// is this an htmlpre?
var p = token.getAttribute( "property" );
@@ -932,6 +936,12 @@
k === "content" &&
/(?:^|\s)mw:.+?(?=$|\s)/.test(Util.lookup(attrs, 'property'));
};
+// RDFa and microdata properties allow URLs, URIs and/or CURIs.
+var microData = JSUtils.arrayToSet([
+ 'rel', 'rev', 'about', 'property', 'resource', 'datatype', 'typeof', //
RDFa
+ 'itemid', 'itemprop', 'itemref', 'itemscope', 'itemtype' // HTML5
microdata
+]);
+
Sanitizer.prototype.sanitizeTagAttrs = function(token, attrs) {
var tag = token.name;
var allowRdfa = this.constants.globalConfig.allowRdfaAttrs;
@@ -990,11 +1000,7 @@
// RDFa and microdata properties allow URLs, URIs and/or CURIs.
// Check them for sanity
- if (k === 'rel' || k === 'rev' ||
- k === 'about' || k === 'property' || k === 'resource'
|| // RDFa
- k === 'datatype' || k === 'typeof' ||
// RDFa
- k === 'itemid' || k === 'itemprop' || k === 'itemref'
|| // HTML5 microdata
- k === 'itemscope' || k === 'itemtype' ) {
// HTML5 microdata
+ if ( microData.has( k ) ) {
// Paranoia. Allow "simple" values but suppress
javascript
if (v.match(evilUriRE)) {
@@ -1032,7 +1038,7 @@
}
// SSS FIXME: We are right now adding shadow information for all
sanitized
- // attributes. This is being doing for minimizing dirty diffs for the
first
+ // attributes. This is being done to minimize dirty diffs for the first
// cut. It can be reasonably argued that we can permanently delete
dangerous
// and unacceptable attributes in the interest of safety/security and
the
// resultant dirty diffs should be acceptable. But, this is something
to do
diff --git a/lib/ext.core.TemplateHandler.js b/lib/ext.core.TemplateHandler.js
index 852b131..da9b2c8 100644
--- a/lib/ext.core.TemplateHandler.js
+++ b/lib/ext.core.TemplateHandler.js
@@ -437,11 +437,11 @@
} else {
newCB = cb;
}
- this.parserFunctions[target](state.token, this.manager.frame,
newCB, pfAttribs);
+ this.parserFunctions[target](state.token, frame, newCB,
pfAttribs);
return;
}
- var checkRes = this.manager.frame.loopAndDepthCheck( target,
env.conf.parsoid.maxDepth );
+ var checkRes = frame.loopAndDepthCheck( target,
env.conf.parsoid.maxDepth );
if( checkRes ) {
// Loop detected or depth limit exceeded, abort!
res = [
@@ -912,10 +912,9 @@
*/
TemplateHandler.prototype.onTemplateArg = function (token, frame, cb) {
- // SSS FIXME: Are 'frame' and 'this.manager.frame' different?
- var args= this.manager.frame.args.named();
- var attribs = token.attribs;
- var newCB;
+ var args = frame.args.named(),
+ attribs = token.attribs,
+ newCB;
if (this.options.wrapTemplates) {
// This is a bare use of template arg syntax at the top level
diff --git a/lib/mediawiki.TokenTransformManager.js
b/lib/mediawiki.TokenTransformManager.js
index 5a1c05a..3ed163b 100644
--- a/lib/mediawiki.TokenTransformManager.js
+++ b/lib/mediawiki.TokenTransformManager.js
@@ -140,9 +140,9 @@
TokenTransformManager.prototype.addTransform = function ( transformation,
debug_name, rank, type, name ) {
var t = {
rank: rank,
- name: debug_name
+ name: d
[MediaWiki-commits] [Gerrit] further damage the theme in a search for real estate - change (wikimedia...drupal)
Ssmith has submitted this change and it was merged.
Change subject: further damage the theme in a search for real estate
..
further damage the theme in a search for real estate
Change-Id: I17630d1547c9614470802da8dced4c452da9ef0f
---
M themes/bartik/css/layout.css
1 file changed, 0 insertions(+), 7 deletions(-)
Approvals:
Ssmith: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/themes/bartik/css/layout.css b/themes/bartik/css/layout.css
index b561f4c..160004c 100644
--- a/themes/bartik/css/layout.css
+++ b/themes/bartik/css/layout.css
@@ -17,9 +17,6 @@
#triptych,
#footer-columns,
#footer {
- width: 960px;
- margin-left: auto;
- margin-right: auto;
}
#header div.section {
position: relative;
@@ -55,13 +52,10 @@
position: relative;
}
.one-sidebar #content {
- width: 720px;
}
.two-sidebars #content {
- width: 480px;
}
.no-sidebars #content {
- width: 960px;
float: none;
}
#sidebar-first,
@@ -95,6 +89,5 @@
width: 220px;
}
#footer {
- width: 940px;
min-width: 920px;
}
--
To view, visit https://gerrit.wikimedia.org/r/113483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I17630d1547c9614470802da8dced4c452da9ef0f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/drupal
Gerrit-Branch: master
Gerrit-Owner: Adamw
Gerrit-Reviewer: Katie Horn
Gerrit-Reviewer: Mwalker
Gerrit-Reviewer: Ssmith
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Consolidate history i18n parameters into AbstractFormatter - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Consolidate history i18n parameters into AbstractFormatter
..
Consolidate history i18n parameters into AbstractFormatter
Change-Id: I714830c8433b4960b80a579387a0cd78a728091e
---
M FlowActions.php
M includes/Formatter/AbstractFormatter.php
2 files changed, 155 insertions(+), 237 deletions(-)
Approvals:
Matthias Mullie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/FlowActions.php b/FlowActions.php
index 3fb1089..e6597c1 100644
--- a/FlowActions.php
+++ b/FlowActions.php
@@ -5,6 +5,7 @@
use Flow\Model\Header;
use Flow\Model\UUID;
use Flow\RevisionActionPermissions;
+use Flow\Exception\DataModelException;
use Flow\Log\Logger;
use Flow\Templating;
use Flow\Container;
@@ -39,12 +40,8 @@
'history' => array(
'i18n-message' => 'flow-rev-message-create-header',
'i18n-params' => array(
- function ( Header $revision, Templating
$templating, UUID $workflowId, $blockType ) {
- return Message::rawParam(
$templating->getUserLinks( $revision ) );
- },
- function ( Header $revision, Templating
$templating, UUID $workflowId, $blockType ) {
- return $templating->getUserText(
$revision );
- },
+ 'user-links',
+ 'user-text',
),
'class' => 'flow-history-create-header',
),
@@ -60,12 +57,8 @@
'history' => array(
'i18n-message' => 'flow-rev-message-edit-header',
'i18n-params' => array(
- function ( Header $revision, Templating
$templating, UUID $workflowId, $blockType ) {
- return Message::rawParam(
$templating->getUserLinks( $revision ) );
- },
- function ( Header $revision, Templating
$templating, UUID $workflowId, $blockType ) {
- return $templating->getUserText(
$revision );
- },
+ 'user-links',
+ 'user-text',
),
'class' => 'flow-history-edit-header',
),
@@ -81,36 +74,18 @@
'history' => array(
'i18n-message' => 'flow-rev-message-edit-title',
'i18n-params' => array(
- function ( PostRevision $revision, Templating
$templating, UUID $workflowId, $blockType ) {
- return Message::rawParam(
$templating->getUserLinks( $revision ) );
- },
- function ( PostRevision $revision, Templating
$templating, UUID $workflowId, $blockType ) {
- return $templating->getUserText(
$revision );
- },
- function ( PostRevision $revision, Templating
$templating, UUID $workflowId, $blockType ) {
- return
$templating->getUrlGenerator()->generateUrl( $revision->getPostId() );
- },
- function ( PostRevision $revision, Templating
$templating, UUID $workflowId, $blockType ) {
- // make sure topic title isn't parsed
- $content = $templating->getContent(
$revision, 'wikitext' );
- return array( 'raw' =>
htmlspecialchars( $content ) );
- },
- function ( PostRevision $revision, Templating
$templating, UUID $workflowId, $blockType ) {
- $previousId =
$revision->getPrevRevisionId();
- if ( $previousId ) {
- $previousRevision =
Container::get( 'storage' )->get( get_class( $revision ), $previousId );
- // make sure topic title isn't
parsed
- $content =
$templating->getContent( $previousRevision, 'wikitext' );
- return array( 'raw' =>
htmlspecialchars( $content ) );
- }
-
- return '';
- },
+ 'user-links',
+ 'user-text',
+ '
[MediaWiki-commits] [Gerrit] Split up ext.visualEditor.mwcore into smaller parts - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/113488 Change subject: Split up ext.visualEditor.mwcore into smaller parts .. Split up ext.visualEditor.mwcore into smaller parts Core retains core functionality, including text styling and architectural items like dialogs. The new modules are: * mwformatting * mwimages * mwlinks * mwmeta * mwreferences * mwtransclusions The new modules are loaded in ViewPageTarget (for desktop), except for mwlinks which is included from MWTarget (for desktop and mobile), per the needs of the Mobile team. Also, mwgallery was moved to desktop-only loading status. This does not split up ext.visualEditor.core yet, which is left as an exercise for the fool-hardy. Bug: 61075 Change-Id: I6374854eaa13af824c11078d2f7004dc8a211a30 --- M VisualEditor.php M modules/ve-mw/init/targets/ve.init.mw.ViewPageTarget.js M modules/ve-mw/init/ve.init.mw.Target.js 3 files changed, 271 insertions(+), 153 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/88/113488/1 diff --git a/VisualEditor.php b/VisualEditor.php index ad38e1b..0d651c7 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -522,118 +522,34 @@ 'scripts' => array( // dm 'modules/ve-mw/dm/nodes/ve.dm.MWEntityNode.js', - 'modules/ve-mw/dm/nodes/ve.dm.MWHeadingNode.js', - 'modules/ve-mw/dm/nodes/ve.dm.MWPreformattedNode.js', - 'modules/ve-mw/dm/nodes/ve.dm.MWImageNode.js', - 'modules/ve-mw/dm/nodes/ve.dm.MWInlineImageNode.js', - 'modules/ve-mw/dm/nodes/ve.dm.MWBlockImageNode.js', - 'modules/ve-mw/dm/nodes/ve.dm.MWImageCaptionNode.js', - 'modules/ve-mw/dm/nodes/ve.dm.MWNumberedExternalLinkNode.js', - 'modules/ve-mw/dm/nodes/ve.dm.MWTransclusionNode.js', - 'modules/ve-mw/dm/nodes/ve.dm.MWReferenceListNode.js', - 'modules/ve-mw/dm/nodes/ve.dm.MWReferenceNode.js', 'modules/ve-mw/dm/nodes/ve.dm.MWExtensionNode.js', - 'modules/ve-mw/dm/annotations/ve.dm.MWExternalLinkAnnotation.js', - 'modules/ve-mw/dm/annotations/ve.dm.MWInternalLinkAnnotation.js', 'modules/ve-mw/dm/annotations/ve.dm.MWNowikiAnnotation.js', 'modules/ve-mw/dm/metaitems/ve.dm.MWAlienMetaItem.js', - 'modules/ve-mw/dm/metaitems/ve.dm.MWCategoryMetaItem.js', - 'modules/ve-mw/dm/metaitems/ve.dm.MWDefaultSortMetaItem.js', - 'modules/ve-mw/dm/metaitems/ve.dm.MWLanguageMetaItem.js', - 'modules/ve-mw/dm/metaitems/ve.dm.MWNoEditSectionMetaItem.js', - 'modules/ve-mw/dm/metaitems/ve.dm.MWTransclusionMetaItem.js', - 'modules/ve-mw/dm/metaitems/ve.dm.MWRedirectMetaItem.js', - 'modules/ve-mw/dm/metaitems/ve.dm.MWStaticRedirectMetaItem.js', - 'modules/ve-mw/dm/metaitems/ve.dm.MWTOCDisableMetaItem.js', - 'modules/ve-mw/dm/metaitems/ve.dm.MWTOCForceMetaItem.js', - - 'modules/ve-mw/dm/models/ve.dm.MWTransclusionModel.js', - 'modules/ve-mw/dm/models/ve.dm.MWTransclusionPartModel.js', - 'modules/ve-mw/dm/models/ve.dm.MWTransclusionContentModel.js', - 'modules/ve-mw/dm/models/ve.dm.MWTemplateSpecModel.js', - 'modules/ve-mw/dm/models/ve.dm.MWTemplateModel.js', - 'modules/ve-mw/dm/models/ve.dm.MWTemplatePlaceholderModel.js', - 'modules/ve-mw/dm/models/ve.dm.MWTemplateParameterModel.js', // ce - 'modules/ve-mw/ce/ve.ce.MWResizableNode.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWEntityNode.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWHeadingNode.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWPreformattedNode.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWImageNode.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWInlineImageNode.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWBlockImageNode.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWImageCaptionNode.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWNumberedExternalLinkNode.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWTransclusionNode.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWReferenceListNode.js', - 'modules/ve-mw/ce/nodes/ve.ce.MWReferenceNode.js', 'modules/ve-mw/ce/nodes/ve.ce.MWE
[MediaWiki-commits] [Gerrit] Split VE-MW's ve.ce.Node.css file into per-node files - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113487
Change subject: Split VE-MW's ve.ce.Node.css file into per-node files
..
Split VE-MW's ve.ce.Node.css file into per-node files
Bug: 61075
Change-Id: I9bfa43e23c95a916ae082c33693f33492670445e
---
M VisualEditor.php
A modules/ve-mw/ce/styles/ve.ce.MWAlienExtensionNode.css
A modules/ve-mw/ce/styles/ve.ce.MWBlockImageNode.css
A modules/ve-mw/ce/styles/ve.ce.MWHieroNode.css
A modules/ve-mw/ce/styles/ve.ce.MWInlineImageNode.css
A modules/ve-mw/ce/styles/ve.ce.MWMathNode.css
A modules/ve-mw/ce/styles/ve.ce.MWNumberedExternalLinkNode.css
A modules/ve-mw/ce/styles/ve.ce.MWReferenceListNode.css
A modules/ve-mw/ce/styles/ve.ce.MWReferenceNode.css
A modules/ve-mw/ce/styles/ve.ce.MWTransclusionNode.css
D modules/ve-mw/ce/styles/ve.ce.Node.css
11 files changed, 177 insertions(+), 133 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/87/113487/1
diff --git a/VisualEditor.php b/VisualEditor.php
index b34cb26..ad38e1b 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -623,7 +623,16 @@
),
'styles' => array(
// ce
- 'modules/ve-mw/ce/styles/ve.ce.Node.css',
+
'modules/ve-mw/ce/styles/ve.ce.MWAlienExtensionNode.css',
+ 'modules/ve-mw/ce/styles/ve.ce.MWBlockImageNode.css',
+ 'modules/ve-mw/ce/styles/ve.ce.MWHieroNode.css',
+ 'modules/ve-mw/ce/styles/ve.ce.MWInlineImageNode.css',
+ 'modules/ve-mw/ce/styles/ve.ce.MWMathNode.css',
+
'modules/ve-mw/ce/styles/ve.ce.MWNumberedExternalLinkNode.css',
+ 'modules/ve-mw/ce/styles/ve.ce.MWReferenceListNode.css',
+ 'modules/ve-mw/ce/styles/ve.ce.MWReferenceNode.css',
+ 'modules/ve-mw/ce/styles/ve.ce.MWTransclusionNode.css',
+
// ui
'modules/ve-mw/ui/styles/ve.ui.MWWidget.css',
'modules/ve-mw/ui/styles/ve.ui.MWInspector.css',
diff --git a/modules/ve-mw/ce/styles/ve.ce.MWAlienExtensionNode.css
b/modules/ve-mw/ce/styles/ve.ce.MWAlienExtensionNode.css
new file mode 100644
index 000..b66591c
--- /dev/null
+++ b/modules/ve-mw/ce/styles/ve.ce.MWAlienExtensionNode.css
@@ -0,0 +1,10 @@
+/*!
+ * VisualEditor ContentEditable MediaWiki MWAlienExtensionNode styles.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+
+.ve-ce-mwAlienExtensionNode {
+ display: inline-block;
+}
diff --git a/modules/ve-mw/ce/styles/ve.ce.MWBlockImageNode.css
b/modules/ve-mw/ce/styles/ve.ce.MWBlockImageNode.css
new file mode 100644
index 000..0b8f059
--- /dev/null
+++ b/modules/ve-mw/ce/styles/ve.ce.MWBlockImageNode.css
@@ -0,0 +1,61 @@
+/*!
+ * VisualEditor ContentEditable MediaWiki MWBlockImageNode styles.
+ *
+ * @copyright 2011-2014 VisualEditor Team and others; see AUTHORS.txt
+ * @license The MIT License (MIT); see LICENSE.txt
+ */
+/*csslint regex-selectors:false, overqualified-elements:false */
+
+figure[typeof*='mw:Image'] {
+ margin: 0;
+}
+
+figure[typeof*='mw:Image'] a {
+ border: 0;
+}
+
+/* TODO: Merge with div.tright styles */
+/* Due to a weird cssjanus bug, noflip rules
+ are set as single-rules rather than for the
+ whole class */
+figure[typeof*='mw:Image'].mw-halign-right {
+ /* @noflip */
+ clear: right;
+ /* @noflip */
+ float: right;
+ /* @noflip */
+ margin: .5em 0 1.3em 1.4em;
+}
+
+figure[typeof*='mw:Image'].mw-halign-center {
+ margin-left: auto;
+ margin-right: auto;
+}
+
+/* TODO: Merge with div.tleft styles */
+/* Due to a weird cssjanus bug, noflip rules
+ are set as single-rules rather than for the
+ whole class */
+figure[typeof*='mw:Image'].mw-halign-left {
+ /* @noflip */
+ clear: left;
+ /* @noflip */
+ float: left;
+ /* @noflip */
+ margin: .5em 1.4em 1.3em 0;
+}
+
+/* TODO: Merge with div.thumbinner styles */
+figure[typeof='mw:Image/Thumb'], figure[typeof='mw:Image/Frame'] {
+ background-color: #f9f9f9;
+ border: 1px solid #cc;
+ padding: 3px !important;
+ overflow: hidden;
+ font-size: 94%;
+ text-align: center;
+}
+
+/* TODO: Merge with .thumbimage styles */
+figure[typeof*='mw:Image'] .ve-ce-mwBlockImageNode-thumbimage {
+ border: 1px solid #cc;
+}
diff --git a/modules/ve-mw/ce/styles/ve.ce.MWHieroNode.css
b/modules/ve-mw/ce/styles/ve.ce.MWHieroNode.css
new file mode 100644
index 000..b528c90
--- /dev/null
+++ b/modules/ve-mw/ce/styles/ve.ce.MWHieroNode.css
@@ -0,0 +1,12 @@
+/*!
+ * VisualEditor ContentEditable MediaWiki MWHieroNode styles.
+ *
+ * @copyright 2011-201
[MediaWiki-commits] [Gerrit] Update occurrences of @mixin to be @mixins - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113486
Change subject: Update occurrences of @mixin to be @mixins
..
Update occurrences of @mixin to be @mixins
Change-Id: I1e727d359bdc9a04cb8a4ef11080743d596ddca9
---
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/86/113486/1
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
index 45b33f0..da93535 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryWidget.js
@@ -11,7 +11,7 @@
* @class
* @abstract
* @extends OO.ui.Widget
- * @mixin OO.ui.GroupElement
+ * @mixins OO.ui.GroupElement
*
* @constructor
* @param {Object} [config] Configuration options
--
To view, visit https://gerrit.wikimedia.org/r/113486
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e727d359bdc9a04cb8a4ef11080743d596ddca9
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] Fix occurrences of @mixin to be @mixins - change (oojs/ui)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113485
Change subject: Fix occurrences of @mixin to be @mixins
..
Fix occurrences of @mixin to be @mixins
Change-Id: I7ec39921e54b79a0f08a55826627c110f8f83817
---
M src/OO.ui.Layout.js
M src/OO.ui.Widget.js
M src/widgets/OO.ui.ButtonGroupWidget.js
M src/widgets/OO.ui.SelectWidget.js
4 files changed, 4 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/85/113485/1
diff --git a/src/OO.ui.Layout.js b/src/OO.ui.Layout.js
index 2b97fcb..bb2a735 100644
--- a/src/OO.ui.Layout.js
+++ b/src/OO.ui.Layout.js
@@ -4,7 +4,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
diff --git a/src/OO.ui.Widget.js b/src/OO.ui.Widget.js
index 8ed052c..6a39210 100644
--- a/src/OO.ui.Widget.js
+++ b/src/OO.ui.Widget.js
@@ -4,7 +4,7 @@
* @class
* @abstract
* @extends OO.ui.Element
- * @mixin OO.EventEmitter
+ * @mixins OO.EventEmitter
*
* @constructor
* @param {Object} [config] Configuration options
diff --git a/src/widgets/OO.ui.ButtonGroupWidget.js
b/src/widgets/OO.ui.ButtonGroupWidget.js
index 9cc2831..40faf65 100644
--- a/src/widgets/OO.ui.ButtonGroupWidget.js
+++ b/src/widgets/OO.ui.ButtonGroupWidget.js
@@ -3,7 +3,7 @@
*
* @class
* @extends OO.ui.Widget
- * @mixin OO.ui.GroupElement
+ * @mixins OO.ui.GroupElement
*
* @constructor
* @param {Object} [config] Configuration options
diff --git a/src/widgets/OO.ui.SelectWidget.js
b/src/widgets/OO.ui.SelectWidget.js
index 9c15e9c..5bae115 100644
--- a/src/widgets/OO.ui.SelectWidget.js
+++ b/src/widgets/OO.ui.SelectWidget.js
@@ -4,7 +4,7 @@
* @class
* @abstract
* @extends OO.ui.Widget
- * @mixin OO.ui.GroupElement
+ * @mixins OO.ui.GroupElement
*
* @constructor
* @param {Object} [config] Configuration options
--
To view, visit https://gerrit.wikimedia.org/r/113485
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7ec39921e54b79a0f08a55826627c110f8f83817
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] Syncronize VisualEditor: f22668b..cebb0ad - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/113484 Change subject: Syncronize VisualEditor: f22668b..cebb0ad .. Syncronize VisualEditor: f22668b..cebb0ad Change-Id: I2285babe81ca303dcf78340175b96a3b3717fb60 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/84/113484/1 diff --git a/VisualEditor b/VisualEditor index f22668b..cebb0ad 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit f22668be67a8da7ea663f0af5010f2f6fa1967a2 +Subproject commit cebb0ad9da23d9dfcf741d7239ec7344cc35ae3a -- To view, visit https://gerrit.wikimedia.org/r/113484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2285babe81ca303dcf78340175b96a3b3717fb60 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: f22668b..cebb0ad - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: f22668b..cebb0ad .. Syncronize VisualEditor: f22668b..cebb0ad Change-Id: I2285babe81ca303dcf78340175b96a3b3717fb60 --- 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 f22668b..cebb0ad 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit f22668be67a8da7ea663f0af5010f2f6fa1967a2 +Subproject commit cebb0ad9da23d9dfcf741d7239ec7344cc35ae3a -- To view, visit https://gerrit.wikimedia.org/r/113484 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I2285babe81ca303dcf78340175b96a3b3717fb60 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] Bring down arrows in CategoryItemWidget back - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Bring down arrows in CategoryItemWidget back
..
Bring down arrows in CategoryItemWidget back
This escaped the icon -> indicator migration because it was rolling
its own class (!).
Now using IndicatedElement to render the indicator.
Also, cleaned up some incorrectly named CSS classes.
Change-Id: I7f3369f2ffd3c34f0d29c0a235d1a15ddd68d1e3
---
M modules/ve-mw/ui/styles/ve.ui.MWWidget.css
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
M modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
3 files changed, 21 insertions(+), 13 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/styles/ve.ui.MWWidget.css
b/modules/ve-mw/ui/styles/ve.ui.MWWidget.css
index 82487f9..1d942e0 100644
--- a/modules/ve-mw/ui/styles/ve.ui.MWWidget.css
+++ b/modules/ve-mw/ui/styles/ve.ui.MWWidget.css
@@ -47,6 +47,8 @@
overflow-wrap: break-word;
}
+/* ve.ui.MWCategoryInputWidget */
+
.ve-ui-mwCategoryInputWidget {
float: left;
}
@@ -58,7 +60,7 @@
float: left;
}
-.ve-ui-mwCategoryItemButton {
+.ve-ui-mwCategoryItemWidget-button {
position: relative;
padding: 0.5em 0.75em 0.5em 1.125em;
margin: 0.75em 0.75em 0 0;
@@ -93,23 +95,23 @@
background-image: linear-gradient(top, #ff 0%, #f0f0f0 100%);
}
-.ve-ui-mwCategoryItemButton:hover {
+.ve-ui-mwCategoryItemWidget-button:hover {
opacity: 1;
}
-.ve-ui-mwCategoryItemButton span {
+.ve-ui-mwCategoryItemWidget-label {
display: block;
padding-right: 1.5em;
color: #333;
}
-.ve-ui-mwCategoryItemButton:active {
+.ve-ui-mwCategoryItemWidget-button:active {
border-color: #ddd;
box-shadow: inset 0 1px 4px 0 rgba(0, 0, 0, 0.07);
color: black;
}
-.ve-ui-mwCategoryItemControl {
+.ve-ui-mwCategoryItemWidget.oo-ui-indicatedElement
.oo-ui-indicatedElement-indicator {
position: absolute;
right: 0;
top: 0.125em;
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
index 809afe9..292b79a 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js
@@ -11,6 +11,7 @@
* @class
* @abstract
* @extends OO.ui.Widget
+ * @mixins OO.ui.IndicatedElement
*
* @constructor
* @param {Object} [config] Configuration options
@@ -18,10 +19,13 @@
*/
ve.ui.MWCategoryItemWidget = function VeUiMWCategoryItemWidget( config ) {
// Config intialization
- config = config || {};
+ config = ve.extendObject( { 'indicator': 'down' }, config );
// Parent constructor
OO.ui.Widget.call( this, config );
+
+ // Mixin constructors
+ OO.ui.IndicatedElement.call( this, this.$( '' ), config );
// Properties
this.name = config.item.name;
@@ -30,7 +34,6 @@
this.metaItem = config.item.metaItem;
this.menuOpen = false;
this.$label = this.$( '' );
- this.$arrow = this.$( '' );
this.$categoryItem = this.$( '' );
// Events
@@ -40,11 +43,12 @@
} );
// Initialization
- this.$label.text( this.value );
- this.$arrow.addClass( 've-ui-mwCategoryItemControl oo-ui-icon-down' );
+ this.$label
+ .addClass( 've-ui-mwCategoryItemWidget-label' )
+ .text( this.value );
this.$categoryItem
- .addClass( 've-ui-mwCategoryItemButton' )
- .append( this.$label, this.$arrow, this.$( '' ).css(
'clear', 'both' ) );
+ .addClass( 've-ui-mwCategoryItemWidget-button' )
+ .append( this.$label, this.$indicator );
this.$element
.addClass( 've-ui-mwCategoryItemWidget' )
.append( this.$categoryItem );
@@ -54,6 +58,8 @@
OO.inheritClass( ve.ui.MWCategoryItemWidget, OO.ui.Widget );
+OO.mixinClass( ve.ui.MWCategoryItemWidget, OO.ui.IndicatedElement );
+
/* Events */
/**
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
index 2a92ed7..36746fe 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryPopupWidget.js
@@ -168,8 +168,8 @@
* @param {ve.ui.MWCategoryItemWidget} item Category item
*/
ve.ui.MWCategoryPopupWidget.prototype.setPopup = function ( item ) {
- var left = item.$arrow.offset().left + ( item.$arrow.width() / 2 ),
- top = item.$arrow.offset().top + item.$arrow.height(),
+ var left = item.$indicator.offset().left + ( item.$indicator.width() /
2 ),
+ top = item.$indicator.offset().top + item.$indicator.height(),
width = this.$menu.outerWidth( true ),
h
[MediaWiki-commits] [Gerrit] further damage the theme in a search for real estate - change (wikimedia...drupal)
Adamw has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113483
Change subject: further damage the theme in a search for real estate
..
further damage the theme in a search for real estate
Change-Id: I17630d1547c9614470802da8dced4c452da9ef0f
---
M themes/bartik/css/layout.css
1 file changed, 0 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/crm/drupal
refs/changes/83/113483/1
diff --git a/themes/bartik/css/layout.css b/themes/bartik/css/layout.css
index b561f4c..160004c 100644
--- a/themes/bartik/css/layout.css
+++ b/themes/bartik/css/layout.css
@@ -17,9 +17,6 @@
#triptych,
#footer-columns,
#footer {
- width: 960px;
- margin-left: auto;
- margin-right: auto;
}
#header div.section {
position: relative;
@@ -55,13 +52,10 @@
position: relative;
}
.one-sidebar #content {
- width: 720px;
}
.two-sidebars #content {
- width: 480px;
}
.no-sidebars #content {
- width: 960px;
float: none;
}
#sidebar-first,
@@ -95,6 +89,5 @@
width: 220px;
}
#footer {
- width: 940px;
min-width: 920px;
}
--
To view, visit https://gerrit.wikimedia.org/r/113483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I17630d1547c9614470802da8dced4c452da9ef0f
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/crm/drupal
Gerrit-Branch: master
Gerrit-Owner: Adamw
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Make elasticsearch ganglia monitor compatible with logstash - change (operations/puppet)
Ori.livneh has submitted this change and it was merged.
Change subject: Make elasticsearch ganglia monitor compatible with logstash
..
Make elasticsearch ganglia monitor compatible with logstash
The ganglia monitor for elasticsearch assumed that all clusters being
monitored would have search clients using stats groups to categorize
search traffic sources. This is not the case for the kibana frontend
being used with the logstash cluster. The lack of a 'groups' component
in the indices stats was causing the module to crash on initialization.
Bug: 61384
Change-Id: Ie56d3a5b55d628e783b09c7e1064e6d95fd63a48
---
M modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
1 file changed, 12 insertions(+), 10 deletions(-)
Approvals:
Ori.livneh: Verified; Looks good to me, approved
diff --git a/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
b/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
index 85f7518..90c04d5 100644
--- a/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
+++ b/modules/elasticsearch/files/ganglia/elasticsearch_monitoring.py
@@ -508,16 +508,18 @@
'url': url,
'path_transformer': noop_path_transformer,
}
-for group in load(url)['_all']['total']['search']['groups']:
-group_index_stats = dict()
-for stat_name, stat in index_stats.iteritems():
-stat_name = stat_name % {'group': group.replace(' ', '_')}
-stat_name = deunicode(stat_name)
-path = deunicode(stat['path'] % {'group': group})
-group_index_stats[stat_name] = merge(stat, {'path': path})
-Desc_Skel['call_back'] = partial(
-get_stat, index_stats_result, group_index_stats)
-init(group_index_stats)
+stat_groups = load(url)
+if 'groups' in stat_groups['_all']['total']['search']:
+for group in stat_groups['_all']['total']['search']['groups']:
+group_index_stats = dict()
+for stat_name, stat in index_stats.iteritems():
+stat_name = stat_name % {'group': group.replace(' ', '_')}
+stat_name = deunicode(stat_name)
+path = deunicode(stat['path'] % {'group': group})
+group_index_stats[stat_name] = merge(stat, {'path': path})
+Desc_Skel['call_back'] = partial(
+get_stat, index_stats_result, group_index_stats)
+init(group_index_stats)
return descriptors
--
To view, visit https://gerrit.wikimedia.org/r/113471
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie56d3a5b55d628e783b09c7e1064e6d95fd63a48
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: BryanDavis
Gerrit-Reviewer: BryanDavis
Gerrit-Reviewer: Manybubbles
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] Fix crasher - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113482
Change subject: Fix crasher
..
Fix crasher
* Introduced in 4d1f0abc7403a33f0aa4e6c0ee616f2b7b030a09. Tokens are
still being shared. Requires further work.
* Some other cleanup while investigating.
Bug: 61298
Change-Id: Iebd2e14bc12d6caddfbac98fea65da0fb8725fab
---
M lib/ext.core.Sanitizer.js
M lib/ext.core.TemplateHandler.js
M lib/mediawiki.TokenTransformManager.js
3 files changed, 20 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid
refs/changes/82/113482/1
diff --git a/lib/ext.core.Sanitizer.js b/lib/ext.core.Sanitizer.js
index 7b436dc..85f1b5d 100644
--- a/lib/ext.core.Sanitizer.js
+++ b/lib/ext.core.Sanitizer.js
@@ -732,6 +732,10 @@
// XXX: Likely better done in AttributeTransformManager when
processing is
// complete
if (attribs && attribs.length > 0) {
+ // FIXME: there's still some token sharing going on and
templates
+ // contained in templates end up getting attributes
stipped
+ // this is #61298
+ token = token.clone();
// is this an htmlpre?
var p = token.getAttribute( "property" );
@@ -764,6 +768,7 @@
// EndTagTk, drop attributes
token.attribs = [];
}
+
}
}
@@ -932,6 +937,12 @@
k === "content" &&
/(?:^|\s)mw:.+?(?=$|\s)/.test(Util.lookup(attrs, 'property'));
};
+// RDFa and microdata properties allow URLs, URIs and/or CURIs.
+var mircoData = JSUtils.arrayToSet([
+ 'rel', 'rev', 'about', 'property', 'resource', 'datatype', 'typeof', //
RDFa
+ 'itemid', 'itemprop', 'itemref', 'itemscope', 'itemtype' // HTML5
microdata
+]);
+
Sanitizer.prototype.sanitizeTagAttrs = function(token, attrs) {
var tag = token.name;
var allowRdfa = this.constants.globalConfig.allowRdfaAttrs;
@@ -990,11 +1001,7 @@
// RDFa and microdata properties allow URLs, URIs and/or CURIs.
// Check them for sanity
- if (k === 'rel' || k === 'rev' ||
- k === 'about' || k === 'property' || k === 'resource'
|| // RDFa
- k === 'datatype' || k === 'typeof' ||
// RDFa
- k === 'itemid' || k === 'itemprop' || k === 'itemref'
|| // HTML5 microdata
- k === 'itemscope' || k === 'itemtype' ) {
// HTML5 microdata
+ if ( mircoData.has( k ) ) {
// Paranoia. Allow "simple" values but suppress
javascript
if (v.match(evilUriRE)) {
@@ -1032,7 +1039,7 @@
}
// SSS FIXME: We are right now adding shadow information for all
sanitized
- // attributes. This is being doing for minimizing dirty diffs for the
first
+ // attributes. This is being done to minimize dirty diffs for the first
// cut. It can be reasonably argued that we can permanently delete
dangerous
// and unacceptable attributes in the interest of safety/security and
the
// resultant dirty diffs should be acceptable. But, this is something
to do
diff --git a/lib/ext.core.TemplateHandler.js b/lib/ext.core.TemplateHandler.js
index 852b131..a137be7 100644
--- a/lib/ext.core.TemplateHandler.js
+++ b/lib/ext.core.TemplateHandler.js
@@ -437,7 +437,7 @@
} else {
newCB = cb;
}
- this.parserFunctions[target](state.token, this.manager.frame,
newCB, pfAttribs);
+ this.parserFunctions[target](state.token, frame, newCB,
pfAttribs);
return;
}
@@ -912,10 +912,9 @@
*/
TemplateHandler.prototype.onTemplateArg = function (token, frame, cb) {
- // SSS FIXME: Are 'frame' and 'this.manager.frame' different?
- var args= this.manager.frame.args.named();
- var attribs = token.attribs;
- var newCB;
+ var args = frame.args.named(),
+ attribs = token.attribs,
+ newCB;
if (this.options.wrapTemplates) {
// This is a bare use of template arg syntax at the top level
diff --git a/lib/mediawiki.TokenTransformManager.js
b/lib/mediawiki.TokenTransformManager.js
index 5a1c05a..3ed163b 100644
--- a/lib/mediawiki.TokenTransformManager.js
+++ b/lib/mediawiki.TokenTransformManager.js
@@ -140,9 +140,9 @@
TokenTransformManager.prototype.addTransform = function ( transformation,
debug_name, rank, type, name ) {
var t = {
rank: rank,
- name: debug_name
+ name: debug_name,
+ transform: transformation
[MediaWiki-commits] [Gerrit] Update the DB output hash if outdated according to texvc - change (mediawiki...Math)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113481
Change subject: Update the DB output hash if outdated according to texvc
..
Update the DB output hash if outdated according to texvc
* Otherwise all future hits will check the wrong file
(which may not exist), recreate the png, and store over the
proper file (even if it was already there). Update the DB to
point to the right hash instead.
bug: 60997
Change-Id: Ib833ad32ff1e4506e9b8ab2cc1b72516cb072cd5
(cherry picked from commit 078347b35e10cfdc54c400c4752fd4d6d8fb021b)
---
M MathTexvc.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/81/113481/1
diff --git a/MathTexvc.php b/MathTexvc.php
index 89eb94d..f958b81 100644
--- a/MathTexvc.php
+++ b/MathTexvc.php
@@ -193,7 +193,11 @@
}
if ( !$errmsg ) {
- $this->setHash( substr( $contents, 1, 32 ) );
+ $newHash = substr( $contents, 1, 32 );
+ if ( $this->hash !== $newHash ) {
+ $this->recall = false; // DB needs update in
writeCache() (bug 60997)
+ }
+ $this->setHash( $newHash );
}
wfRunHooks( 'MathAfterTexvc', array( &$this, &$errmsg ) );
--
To view, visit https://gerrit.wikimedia.org/r/113481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib833ad32ff1e4506e9b8ab2cc1b72516cb072cd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: wmf/1.23wmf13
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update the DB output hash if outdated according to texvc - change (mediawiki...Math)
jenkins-bot has submitted this change and it was merged.
Change subject: Update the DB output hash if outdated according to texvc
..
Update the DB output hash if outdated according to texvc
* Otherwise all future hits will check the wrong file
(which may not exist), recreate the png, and store over the
proper file (even if it was already there). Update the DB to
point to the right hash instead.
bug: 60997
Change-Id: Ib833ad32ff1e4506e9b8ab2cc1b72516cb072cd5
(cherry picked from commit 078347b35e10cfdc54c400c4752fd4d6d8fb021b)
---
M MathTexvc.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MathTexvc.php b/MathTexvc.php
index 89eb94d..f958b81 100644
--- a/MathTexvc.php
+++ b/MathTexvc.php
@@ -193,7 +193,11 @@
}
if ( !$errmsg ) {
- $this->setHash( substr( $contents, 1, 32 ) );
+ $newHash = substr( $contents, 1, 32 );
+ if ( $this->hash !== $newHash ) {
+ $this->recall = false; // DB needs update in
writeCache() (bug 60997)
+ }
+ $this->setHash( $newHash );
}
wfRunHooks( 'MathAfterTexvc', array( &$this, &$errmsg ) );
--
To view, visit https://gerrit.wikimedia.org/r/113481
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib833ad32ff1e4506e9b8ab2cc1b72516cb072cd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: wmf/1.23wmf13
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Aaron Schulz
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 the DB output hash if outdated according to texvc - change (mediawiki...Math)
jenkins-bot has submitted this change and it was merged.
Change subject: Update the DB output hash if outdated according to texvc
..
Update the DB output hash if outdated according to texvc
* Otherwise all future hits will check the wrong file
(which may not exist), recreate the png, and store over the
proper file (even if it was already there). Update the DB to
point to the right hash instead.
bug: 60997
Change-Id: Ib833ad32ff1e4506e9b8ab2cc1b72516cb072cd5
---
M MathTexvc.php
1 file changed, 5 insertions(+), 1 deletion(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MathTexvc.php b/MathTexvc.php
index 89eb94d..f958b81 100644
--- a/MathTexvc.php
+++ b/MathTexvc.php
@@ -193,7 +193,11 @@
}
if ( !$errmsg ) {
- $this->setHash( substr( $contents, 1, 32 ) );
+ $newHash = substr( $contents, 1, 32 );
+ if ( $this->hash !== $newHash ) {
+ $this->recall = false; // DB needs update in
writeCache() (bug 60997)
+ }
+ $this->setHash( $newHash );
}
wfRunHooks( 'MathAfterTexvc', array( &$this, &$errmsg ) );
--
To view, visit https://gerrit.wikimedia.org/r/113480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib833ad32ff1e4506e9b8ab2cc1b72516cb072cd5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
Gerrit-Reviewer: Chad
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 the DB output hash if outdated according to texvc - change (mediawiki...Math)
Aaron Schulz has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113480
Change subject: Update the DB output hash if outdated according to texvc
..
Update the DB output hash if outdated according to texvc
* Otherwise all future hits will check the wrong file
(which may not exist), recreate the png, and store over the
proper file (even if it was already there). Update the DB to
point to the right hash instead.
Change-Id: Ib833ad32ff1e4506e9b8ab2cc1b72516cb072cd5
---
M MathTexvc.php
1 file changed, 5 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Math
refs/changes/80/113480/1
diff --git a/MathTexvc.php b/MathTexvc.php
index 89eb94d..f958b81 100644
--- a/MathTexvc.php
+++ b/MathTexvc.php
@@ -193,7 +193,11 @@
}
if ( !$errmsg ) {
- $this->setHash( substr( $contents, 1, 32 ) );
+ $newHash = substr( $contents, 1, 32 );
+ if ( $this->hash !== $newHash ) {
+ $this->recall = false; // DB needs update in
writeCache() (bug 60997)
+ }
+ $this->setHash( $newHash );
}
wfRunHooks( 'MathAfterTexvc', array( &$this, &$errmsg ) );
--
To view, visit https://gerrit.wikimedia.org/r/113480
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib833ad32ff1e4506e9b8ab2cc1b72516cb072cd5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Math
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move traffic back to ulsfo, reverts fa5fa2e8 - change (operations/dns)
BBlack has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113479
Change subject: Move traffic back to ulsfo, reverts fa5fa2e8
..
Move traffic back to ulsfo, reverts fa5fa2e8
Change-Id: I0581809fa542d8c2121899d8871c3e998a40e6e9
---
M config-geo
1 file changed, 6 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/dns
refs/changes/79/113479/1
diff --git a/config-geo b/config-geo
index 09ae189..cdeada0 100644
--- a/config-geo
+++ b/config-geo
@@ -217,7 +217,7 @@
dcmap => {
eqiad => bits-lb.eqiad.wikimedia.org.
esams => bits-lb.esams.wikimedia.org.
- ulsfo => bits-lb.eqiad.wikimedia.org.
+ ulsfo => bits-lb.ulsfo.wikimedia.org.
}
}
upload => {
@@ -225,7 +225,7 @@
dcmap => {
eqiad => upload-lb.eqiad.wikimedia.org.
esams => upload-lb.esams.wikimedia.org.
- ulsfo => upload-lb.eqiad.wikimedia.org.
+ ulsfo => upload-lb.ulsfo.wikimedia.org.
}
}
geoiplookup => {
@@ -233,7 +233,7 @@
dcmap => {
eqiad => geoiplookup-lb.eqiad.wikimedia.org.
esams => geoiplookup-lb.esams.wikimedia.org.
- ulsfo => geoiplookup-lb.eqiad.wikimedia.org.
+ ulsfo => geoiplookup-lb.ulsfo.wikimedia.org.
}
}
donate => {
@@ -241,7 +241,7 @@
dcmap => {
eqiad => donate-lb.eqiad.wikimedia.org.
esams => donate-lb.esams.wikimedia.org.
- ulsfo => donate-lb.eqiad.wikimedia.org.
+ ulsfo => donate-lb.ulsfo.wikimedia.org.
}
}
text-lb => {
@@ -249,7 +249,7 @@
dcmap => {
eqiad => text-lb.eqiad.wikimedia.org.
esams => text-lb.esams.wikimedia.org.
- ulsfo => text-lb.eqiad.wikimedia.org.
+ ulsfo => text-lb.ulsfo.wikimedia.org.
}
}
mobile-lb => {
@@ -257,7 +257,7 @@
dcmap => {
eqiad => mobile-lb.eqiad.wikimedia.org.
esams => mobile-lb.esams.wikimedia.org.
- ulsfo => mobile-lb.eqiad.wikimedia.org.
+ ulsfo => mobile-lb.ulsfo.wikimedia.org.
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/113479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0581809fa542d8c2121899d8871c3e998a40e6e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move traffic back to ulsfo, reverts fa5fa2e8 - change (operations/dns)
BBlack has submitted this change and it was merged.
Change subject: Move traffic back to ulsfo, reverts fa5fa2e8
..
Move traffic back to ulsfo, reverts fa5fa2e8
Change-Id: I0581809fa542d8c2121899d8871c3e998a40e6e9
---
M config-geo
1 file changed, 6 insertions(+), 6 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/config-geo b/config-geo
index 09ae189..cdeada0 100644
--- a/config-geo
+++ b/config-geo
@@ -217,7 +217,7 @@
dcmap => {
eqiad => bits-lb.eqiad.wikimedia.org.
esams => bits-lb.esams.wikimedia.org.
- ulsfo => bits-lb.eqiad.wikimedia.org.
+ ulsfo => bits-lb.ulsfo.wikimedia.org.
}
}
upload => {
@@ -225,7 +225,7 @@
dcmap => {
eqiad => upload-lb.eqiad.wikimedia.org.
esams => upload-lb.esams.wikimedia.org.
- ulsfo => upload-lb.eqiad.wikimedia.org.
+ ulsfo => upload-lb.ulsfo.wikimedia.org.
}
}
geoiplookup => {
@@ -233,7 +233,7 @@
dcmap => {
eqiad => geoiplookup-lb.eqiad.wikimedia.org.
esams => geoiplookup-lb.esams.wikimedia.org.
- ulsfo => geoiplookup-lb.eqiad.wikimedia.org.
+ ulsfo => geoiplookup-lb.ulsfo.wikimedia.org.
}
}
donate => {
@@ -241,7 +241,7 @@
dcmap => {
eqiad => donate-lb.eqiad.wikimedia.org.
esams => donate-lb.esams.wikimedia.org.
- ulsfo => donate-lb.eqiad.wikimedia.org.
+ ulsfo => donate-lb.ulsfo.wikimedia.org.
}
}
text-lb => {
@@ -249,7 +249,7 @@
dcmap => {
eqiad => text-lb.eqiad.wikimedia.org.
esams => text-lb.esams.wikimedia.org.
- ulsfo => text-lb.eqiad.wikimedia.org.
+ ulsfo => text-lb.ulsfo.wikimedia.org.
}
}
mobile-lb => {
@@ -257,7 +257,7 @@
dcmap => {
eqiad => mobile-lb.eqiad.wikimedia.org.
esams => mobile-lb.esams.wikimedia.org.
- ulsfo => mobile-lb.eqiad.wikimedia.org.
+ ulsfo => mobile-lb.ulsfo.wikimedia.org.
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/113479
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0581809fa542d8c2121899d8871c3e998a40e6e9
Gerrit-PatchSet: 1
Gerrit-Project: operations/dns
Gerrit-Branch: master
Gerrit-Owner: BBlack
Gerrit-Reviewer: BBlack
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Invert dependencies for OutlineItemWidget and PageLayout - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: Invert dependencies for OutlineItemWidget and PageLayout
..
Invert dependencies for OutlineItemWidget and PageLayout
Problem:
* Properties for OutlineItemWidget were being set at instantiation in
the page and then copied over though getters, making it a one-way trip
and a lot of messy maintenance when adding new features
* BookletOutlineItemWidget was superfluous since it only copied page
properties and didn't even keep a reference to the page
* OutlineItemWidget movability property was not settable
* OutlineItemWidget was not flaggable, so additional styling was
difficult or impossible
Solution:
* Add missing movability setter to OutlineItemWidget
* Mix FlaggableWidget into OutlineItemWidget
* Remove BookletOutlineItemWidget
* Add some basic flag styles to OutlineItemWidget
* Remove OutlineItemWidget property shuffling in PageLayout
* Add methods to set, get and clear an OutlineItemWidget to PageLayout
* Adjust BookletLayout to set and clear OutlineItemWidget on PageLayout
* Fix bug in FlaggableElement which caused setting with object not to
work
Change-Id: I58a279dd949a867a4698a791103d5a6f2bd4b67f
---
M build/modules.json
M src/elements/OO.ui.FlaggableElement.js
M src/layouts/OO.ui.BookletLayout.js
M src/layouts/OO.ui.PageLayout.js
M src/styles/OO.ui.Widget.css
D src/widgets/OO.ui.BookletOutlineItemWidget.js
M src/widgets/OO.ui.OptionWidget.js
M src/widgets/OO.ui.OutlineItemWidget.js
8 files changed, 56 insertions(+), 93 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/build/modules.json b/build/modules.json
index fd6f84d..0cae465 100644
--- a/build/modules.json
+++ b/build/modules.json
@@ -51,7 +51,6 @@
"src/widgets/OO.ui.OutlineWidget.js",
"src/widgets/OO.ui.OutlineControlsWidget.js",
"src/widgets/OO.ui.OutlineItemWidget.js",
- "src/widgets/OO.ui.BookletOutlineItemWidget.js",
"src/widgets/OO.ui.ButtonOptionWidget.js",
"src/widgets/OO.ui.ButtonSelectWidget.js",
"src/widgets/OO.ui.PopupWidget.js",
diff --git a/src/elements/OO.ui.FlaggableElement.js
b/src/elements/OO.ui.FlaggableElement.js
index ee8fe58..8adb731 100644
--- a/src/elements/OO.ui.FlaggableElement.js
+++ b/src/elements/OO.ui.FlaggableElement.js
@@ -63,7 +63,7 @@
}
} else if ( OO.isPlainObject( flags ) ) {
for ( flag in flags ) {
- if ( flags[flags] ) {
+ if ( flags[flag] ) {
// Set
this.flags[flag] = true;
this.$element.addClass( classPrefix + flag );
diff --git a/src/layouts/OO.ui.BookletLayout.js
b/src/layouts/OO.ui.BookletLayout.js
index 75e36e8..2421502 100644
--- a/src/layouts/OO.ui.BookletLayout.js
+++ b/src/layouts/OO.ui.BookletLayout.js
@@ -220,7 +220,7 @@
* @chainable
*/
OO.ui.BookletLayout.prototype.addPages = function ( pages, index ) {
- var i, len, name, page,
+ var i, len, name, page, item,
items = [],
remove = [];
@@ -233,7 +233,9 @@
}
this.pages[page.getName()] = page;
if ( this.outlined ) {
- items.push( new OO.ui.BookletOutlineItemWidget( name,
page, { '$': this.$ } ) );
+ item = new OO.ui.OutlineItemWidget( name, page, { '$':
this.$ } );
+ page.setOutlineItem( item );
+ items.push( item );
}
}
if ( remove.length ) {
@@ -267,6 +269,7 @@
delete this.pages[name];
if ( this.outlined ) {
items.push( this.outlineWidget.getItemFromData( name )
);
+ page.setOutlineItem( null );
}
}
if ( this.outlined && items.length ) {
@@ -287,12 +290,16 @@
* @chainable
*/
OO.ui.BookletLayout.prototype.clearPages = function () {
- var pages = this.stackLayout.getItems();
+ var i, len,
+ pages = this.stackLayout.getItems();
this.pages = {};
this.currentPageName = null;
if ( this.outlined ) {
this.outlineWidget.clearItems();
+ for ( i = 0, len = pages.length; i < len; i++ ) {
+ pages[i].setOutlineItem( null );
+ }
}
this.stackLayout.clearItems();
diff --git a/src/layouts/OO.ui.PageLayout.js b/src/layouts/OO.ui.PageLayout.js
index 9fa9d16..23f3d6a 100644
--- a/src/layouts/OO.ui.PageLayout.js
+++ b/src/layouts/OO.ui.PageLayout.js
@@ -7,12 +7,7 @@
* @constructor
* @param {string} name Unique symbolic name of page
* @param {Object} [co
[MediaWiki-commits] [Gerrit] Only display image info if that exists - change (mediawiki...VisualEditor)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113478
Change subject: Only display image info if that exists
..
Only display image info if that exists
When a new search is performed in the MWMediaSearchWidget,
image thumbnail details are extracted from the API's imageinfo.
In some cases, this parameter does not exist. MWMediaResultWidget
relies on that parameter to get image details like 'src' and
width/height. Without it the search fails.
This fix makes sure that the thumbnail result is only displayed
if there are 'imageinfo' details at all. Otherwise, the image
result is ignored.
Bug: 61392
Change-Id: I5261059bb42d3a57441514eafaa0bffa3a3c3ba4
---
M modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
1 file changed, 14 insertions(+), 9 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/78/113478/1
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
index 5590ff6..64d0479 100755
--- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaSearchWidget.js
@@ -187,15 +187,20 @@
}
for ( page in pages ) {
- title = new mw.Title( pages[page].title ).getMainText();
- if ( !( title in this.titles ) ) {
- this.titles[title] = true;
- items.push(
- new ve.ui.MWMediaResultWidget(
- pages[page],
- { '$': this.$, 'size': this.size }
- )
- );
+ // Verify that imageinfo exists
+ // In case it does not, skip the image to avoid errors in
+ // ve.ui.MWMediaResultWidget
+ if ( pages[page].imageinfo && pages[page].imageinfo.length > 0
) {
+ title = new mw.Title( pages[page].title ).getMainText();
+ if ( !( title in this.titles ) ) {
+ this.titles[title] = true;
+ items.push(
+ new ve.ui.MWMediaResultWidget(
+ pages[page],
+ { '$': this.$, 'size':
this.size }
+ )
+ );
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/113478
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5261059bb42d3a57441514eafaa0bffa3a3c3ba4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bring down arrows in CategoryItemWidget back - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review. https://gerrit.wikimedia.org/r/113477 Change subject: Bring down arrows in CategoryItemWidget back .. Bring down arrows in CategoryItemWidget back This escaped the icon -> indicator migration because it was rolling its own class (!). Updated the class name and left a FIXME to make this use IndicatedElement properly. Change-Id: I7f3369f2ffd3c34f0d29c0a235d1a15ddd68d1e3 --- M modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js 1 file changed, 2 insertions(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/77/113477/1 diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js index 809afe9..b0f6677 100644 --- a/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js +++ b/modules/ve-mw/ui/widgets/ve.ui.MWCategoryItemWidget.js @@ -41,7 +41,8 @@ // Initialization this.$label.text( this.value ); - this.$arrow.addClass( 've-ui-mwCategoryItemControl oo-ui-icon-down' ); + // FIXME make this an IndicatedElement + this.$arrow.addClass( 've-ui-mwCategoryItemControl oo-ui-indicator-down' ); this.$categoryItem .addClass( 've-ui-mwCategoryItemButton' ) .append( this.$label, this.$arrow, this.$( '' ).css( 'clear', 'both' ) ); -- To view, visit https://gerrit.wikimedia.org/r/113477 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7f3369f2ffd3c34f0d29c0a235d1a15ddd68d1e3 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] Update VectorBeta to remove max-width - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged. Change subject: Update VectorBeta to remove max-width .. Update VectorBeta to remove max-width Change-Id: I71b01c08bdac38245f256a4464be89115bea73a8 --- M extensions/VectorBeta 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Kaldari: Looks good to me, approved jenkins-bot: Verified diff --git a/extensions/VectorBeta b/extensions/VectorBeta index 62d76b1..f9bbf79 16 --- a/extensions/VectorBeta +++ b/extensions/VectorBeta -Subproject commit 62d76b1c93bca1fee28a2baa99fb37a11b1c28af +Subproject commit f9bbf7919dec8a8d4d01dd0de229ab39e7b0e26d -- To view, visit https://gerrit.wikimedia.org/r/113476 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I71b01c08bdac38245f256a4464be89115bea73a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.23wmf13 Gerrit-Owner: Kaldari Gerrit-Reviewer: Kaldari 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 VectorBeta to remove max-width - change (mediawiki/core)
Kaldari has uploaded a new change for review. https://gerrit.wikimedia.org/r/113476 Change subject: Update VectorBeta to remove max-width .. Update VectorBeta to remove max-width Change-Id: I71b01c08bdac38245f256a4464be89115bea73a8 --- M extensions/VectorBeta 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/76/113476/1 diff --git a/extensions/VectorBeta b/extensions/VectorBeta index 62d76b1..f9bbf79 16 --- a/extensions/VectorBeta +++ b/extensions/VectorBeta -Subproject commit 62d76b1c93bca1fee28a2baa99fb37a11b1c28af +Subproject commit f9bbf7919dec8a8d4d01dd0de229ab39e7b0e26d -- To view, visit https://gerrit.wikimedia.org/r/113476 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I71b01c08bdac38245f256a4464be89115bea73a8 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: wmf/1.23wmf13 Gerrit-Owner: Kaldari ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Remove !important styles for .content img - change (mediawiki...MobileFrontend)
JGonera has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113475
Change subject: Remove !important styles for .content img
..
Remove !important styles for .content img
Fixes shields and phantom overlays in mobile VE.
These rules were moved from #content img in 8d0e4aa7. They do not seem
to affect Special:Uploads or Special:UserProfile in any way.
Unfortunately, I don't know what Nicole Sullivan says because of
[citation needed]. There are no other comments specifying what exactly
they were for, so it seems like a good idea to remove them and bring
them back somewhere else if necessary.
Bug: 60841
Change-Id: I2157134db93c9cf87bcca76135a34201ca8fe3c5
---
M less/common/common.less
1 file changed, 0 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MobileFrontend
refs/changes/75/113475/1
diff --git a/less/common/common.less b/less/common/common.less
index 57ef303..3d048fc 100644
--- a/less/common/common.less
+++ b/less/common/common.less
@@ -274,14 +274,6 @@
}
}
- // Includes images on the profile and uploads special pages
- img {
- // FIXME [Inline Styles]: Important ensures we can overwrite
any inline styles
- // It's a leaf node so Nicole Sullivan says its okay
- max-width: 100% !important;
- height: auto !important;
- }
-
ul {
list-style: square inside;
}
--
To view, visit https://gerrit.wikimedia.org/r/113475
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2157134db93c9cf87bcca76135a34201ca8fe3c5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: JGonera
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing the max-width for now per Erik - change (mediawiki...VectorBeta)
jenkins-bot has submitted this change and it was merged.
Change subject: Removing the max-width for now per Erik
..
Removing the max-width for now per Erik
Since we're about to move a bunch of the VectorBeta changes to
Vector, it would be good to make sure that people don't think we're
going to apply the max-width (since that was contentious). Erik
suggested that we go ahead and remove it from VectorBeta as well,
although we can add it back later if we decide we want to
experiement with it more.
Change-Id: Ic1c37b736c3315ab68b8dff77e6a74ece79b5d68
---
M less/screen-beta.less
1 file changed, 0 insertions(+), 12 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/less/screen-beta.less b/less/screen-beta.less
index 56b7106..ec623a5 100644
--- a/less/screen-beta.less
+++ b/less/screen-beta.less
@@ -1,15 +1,3 @@
-.action-view {
- #bodyContent {
- max-width: 715px;
- }
-
- &.ns-special {
- #bodyContent {
- max-width: none;
- }
- }
-}
-
/* Content */
div#content {
line-height: @content-line-height;
--
To view, visit https://gerrit.wikimedia.org/r/113474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic1c37b736c3315ab68b8dff77e6a74ece79b5d68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: wmf/1.23wmf13
Gerrit-Owner: Kaldari
Gerrit-Reviewer: Kaldari
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Removing the max-width for now per Erik - change (mediawiki...VectorBeta)
Kaldari has uploaded a new change for review.
https://gerrit.wikimedia.org/r/113474
Change subject: Removing the max-width for now per Erik
..
Removing the max-width for now per Erik
Since we're about to move a bunch of the VectorBeta changes to
Vector, it would be good to make sure that people don't think we're
going to apply the max-width (since that was contentious). Erik
suggested that we go ahead and remove it from VectorBeta as well,
although we can add it back later if we decide we want to
experiement with it more.
Change-Id: Ic1c37b736c3315ab68b8dff77e6a74ece79b5d68
---
M less/screen-beta.less
1 file changed, 0 insertions(+), 12 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VectorBeta
refs/changes/74/113474/1
diff --git a/less/screen-beta.less b/less/screen-beta.less
index 56b7106..ec623a5 100644
--- a/less/screen-beta.less
+++ b/less/screen-beta.less
@@ -1,15 +1,3 @@
-.action-view {
- #bodyContent {
- max-width: 715px;
- }
-
- &.ns-special {
- #bodyContent {
- max-width: none;
- }
- }
-}
-
/* Content */
div#content {
line-height: @content-line-height;
--
To view, visit https://gerrit.wikimedia.org/r/113474
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1c37b736c3315ab68b8dff77e6a74ece79b5d68
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VectorBeta
Gerrit-Branch: wmf/1.23wmf13
Gerrit-Owner: Kaldari
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
