[MediaWiki-commits] [Gerrit] WIP: Move phpcs in ContentTranslation to composer - change (integration/config)
Amire80 has uploaded a new change for review. https://gerrit.wikimedia.org/r/194340 Change subject: WIP: Move phpcs in ContentTranslation to composer .. WIP: Move phpcs in ContentTranslation to composer Bug: T90943 Change-Id: Ib7c2b34c9706954ace474f8358a13de566e1e294 --- M zuul/layout.yaml 1 file changed, 2 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/40/194340/1 diff --git a/zuul/layout.yaml b/zuul/layout.yaml index 890a42a..65c305b 100644 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -465,8 +465,6 @@ - name: mwext-cldr-phpcs-HEAD voting: true - - name: mwext-ContentTranslation-phpcs-HEAD -voting: true - name: mwext-Interwiki-phpcs-HEAD voting: true - name: mwext-MobileFrontend-phpcs-HEAD @@ -3040,7 +3038,8 @@ - name: mediawiki/extensions/ContentTranslation check: - - mwext-ContentTranslation-phpcs-HEAD + - mwext-ContentTranslation-composer-hhvm + - mwext-ContentTranslation-composer-zend - mwext-ContentTranslation-jslint - mwext-ContentTranslation-lint - mwext-ContentTranslation-ruby1.9.3lint -- To view, visit https://gerrit.wikimedia.org/r/194340 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib7c2b34c9706954ace474f8358a13de566e1e294 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Beta: CX: Add wgContentTranslationCampaigns - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Beta: CX: Add wgContentTranslationCampaigns
..
Beta: CX: Add wgContentTranslationCampaigns
This is used to set CX campaigns.
Change-Id: I5c6169c4f1ee15e0bf3075174585b44f47e40124
---
M wmf-config/CommonSettings-labs.php
M wmf-config/InitialiseSettings-labs.php
2 files changed, 5 insertions(+), 0 deletions(-)
Approvals:
Anomie: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wmf-config/CommonSettings-labs.php
b/wmf-config/CommonSettings-labs.php
index 850d38e..73f93c4 100644
--- a/wmf-config/CommonSettings-labs.php
+++ b/wmf-config/CommonSettings-labs.php
@@ -99,6 +99,7 @@
// $wmgParsoidURL from production is not accessible from Beta, so use
public URL
$wgContentTranslationParsoid['url'] =
'http://parsoid-lb.eqiad.wikimedia.org';
$wgContentTranslationTranslateInTarget = false;
+ $wgContentTranslationCampaigns = $wmgContentTranslationCampaigns;
}
if ( $wmgUseCentralNotice ) {
diff --git a/wmf-config/InitialiseSettings-labs.php
b/wmf-config/InitialiseSettings-labs.php
index 5285d35..46dad1a 100644
--- a/wmf-config/InitialiseSettings-labs.php
+++ b/wmf-config/InitialiseSettings-labs.php
@@ -411,6 +411,10 @@
'default' = 'Main',
),
+ 'wmgContentTranslationCampaigns' = array(
+ 'default' = array( 'newarticle' ),
+ ),
+
'wmgUseNavigationTiming' = array(
'default' = true,
),
--
To view, visit https://gerrit.wikimedia.org/r/194265
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5c6169c4f1ee15e0bf3075174585b44f47e40124
Gerrit-PatchSet: 5
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: KartikMistry kartik.mis...@gmail.com
Gerrit-Reviewer: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add missing dependency - change (mediawiki...VisualEditor)
Matthias Mullie has uploaded a new change for review. https://gerrit.wikimedia.org/r/194343 Change subject: Add missing dependency .. Add missing dependency ve.init.mw.Platform.js uses $.uls Change-Id: I0b3d8c2b25694e29c86b91d7df7875f1be24fb2d --- M VisualEditor.php 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/43/194343/1 diff --git a/VisualEditor.php b/VisualEditor.php index 5c44a1e..08b4efe 100644 --- a/VisualEditor.php +++ b/VisualEditor.php @@ -314,6 +314,7 @@ 'moment', 'ext.visualEditor.base', 'ext.visualEditor.track', + 'jquery.uls.data', ), 'targets' = array( 'desktop', 'mobile' ), ), -- To view, visit https://gerrit.wikimedia.org/r/194343 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0b3d8c2b25694e29c86b91d7df7875f1be24fb2d Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Handle optional parameters correctly in table selection - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review. https://gerrit.wikimedia.org/r/194351 Change subject: Handle optional parameters correctly in table selection .. Handle optional parameters correctly in table selection If toCol/Row were undefined, then startCol/Row weren't set. Change-Id: Ie61c198c4d47126fa6df82b9c2e1812f413e75cd --- M src/dm/ve.dm.TableSelection.js 1 file changed, 5 insertions(+), 2 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor refs/changes/51/194351/1 diff --git a/src/dm/ve.dm.TableSelection.js b/src/dm/ve.dm.TableSelection.js index ab9b3a7..3392f58 100644 --- a/src/dm/ve.dm.TableSelection.js +++ b/src/dm/ve.dm.TableSelection.js @@ -23,10 +23,13 @@ this.tableRange = tableRange; this.tableNode = null; + toCol = toCol === undefined ? fromCol : toCol; + toRow = toRow === undefined ? fromRow : toRow; + this.fromCol = fromCol; this.fromRow = fromRow; - this.toCol = toCol === undefined ? this.fromCol : toCol; - this.toRow = toRow === undefined ? this.fromRow : toRow; + this.toCol = toCol; + this.toRow = toRow; this.startCol = fromCol toCol ? fromCol : toCol; this.startRow = fromRow toRow ? fromRow : toRow; this.endCol = fromCol toCol ? toCol : fromCol; -- To view, visit https://gerrit.wikimedia.org/r/194351 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie61c198c4d47126fa6df82b9c2e1812f413e75cd Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix up selection if we cursor into or next to a table node - change (VisualEditor/VisualEditor)
Esanders has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194352
Change subject: Fix up selection if we cursor into or next to a table node
..
Fix up selection if we cursor into or next to a table node
Use same code as we use for focusable nodes but check for tables
which are also ce=false.
Simplify focusable node checking code to just search by class.
Bug: T73560
Change-Id: I778af05f6b1e4a46e50f832bbcaa05bde7230cb0
---
M src/ce/nodes/ve.ce.TableNode.js
M src/ce/ve.ce.Surface.js
2 files changed, 18 insertions(+), 17 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/52/194352/1
diff --git a/src/ce/nodes/ve.ce.TableNode.js b/src/ce/nodes/ve.ce.TableNode.js
index e110f20..2114b8a 100644
--- a/src/ce/nodes/ve.ce.TableNode.js
+++ b/src/ce/nodes/ve.ce.TableNode.js
@@ -300,7 +300,7 @@
) ||
(
selection instanceof ve.dm.TableSelection
- selection.tableRange.equals(
this.getModel().getOuterRange() )
+ selection.tableRange.equalsSelection(
this.getModel().getOuterRange() )
);
if ( active ) {
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 350d01c..004c50c 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1210,7 +1210,7 @@
*/
ve.ce.Surface.prototype.afterDocumentKeyDown = function ( e ) {
var direction, focusableNode, startOffset, endOffset, offsetDiff,
- range, fixupCursorForUnicorn,
+ range, fixupCursorForUnicorn, matrix,
surface = this,
isArrow = (
e.keyCode === OO.ui.Keys.UP ||
@@ -1237,7 +1237,7 @@
* @returns {ve.ce.Node|null} node, or null if not in a focusable node
*/
function getSurroundingFocusableNode( node, offset, direction ) {
- var focusNode, $ceNode, focusableNode;
+ var focusNode;
if ( node.nodeType === Node.TEXT_NODE ) {
focusNode = node;
} else if ( direction 0 offset node.childNodes.length ) {
@@ -1247,19 +1247,7 @@
} else {
focusNode = node;
}
- $ceNode = $( focusNode ).closest(
- '[contenteditable], .ve-ce-branchNode'
- );
- if ( $ceNode.prop( 'contenteditable' ) !== 'false' ) {
- return null;
- }
- focusableNode = $ceNode.closest(
- '.ve-ce-branchNode, .ve-ce-leafNode'
- ).data( 'view' );
- if ( !focusableNode || !focusableNode.isFocusable() ) {
- return null;
- }
- return focusableNode;
+ return $( focusNode ).closest( '.ve-ce-focusableNode,
.ve-ce-tableNode' ).data( 'view' ) || null;
}
/**
@@ -1350,7 +1338,20 @@
range = range.flip();
}
}
- this.model.setLinearSelection( range );
+ if ( focusableNode instanceof ve.ce.TableNode ) {
+ if ( direction 0 ) {
+ this.model.setSelection( new
ve.dm.TableSelection(
+ this.model.documentModel,
range, 0, 0
+ ) );
+ } else {
+ matrix =
focusableNode.getModel().getMatrix();
+ this.model.setSelection( new
ve.dm.TableSelection(
+ this.model.documentModel,
range, matrix.getColCount() - 1, matrix.getRowCount() - 1
+ ) );
+ }
+ } else {
+ this.model.setLinearSelection( range );
+ }
if ( e.keyCode === OO.ui.Keys.LEFT ) {
this.cursorDirectionality = direction 0 ?
'rtl' : 'ltr';
} else if ( e.keyCode === OO.ui.Keys.RIGHT ) {
--
To view, visit https://gerrit.wikimedia.org/r/194352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I778af05f6b1e4a46e50f832bbcaa05bde7230cb0
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] added mc2135 - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: added mc2135
..
added mc2135
Change-Id: I4e4265e004d91c54964ce13f9189cee7547685b3
---
M modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
1 file changed, 5 insertions(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Verified; Looks good to me, approved
diff --git a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
index 59843af..5f9d2b0 100644
--- a/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
+++ b/modules/install-server/files/dhcpd/linux-host-entries.ttyS1-115200
@@ -4391,6 +4391,11 @@
fixed-address mw2134.codfw.wmnet;
}
+host mw2135 {
+ hardware ethernet B0:83:FE:DE:FA:62;
+ fixed-address mw2135.codfw.wmnet;
+}
+
host nembus {
hardware ethernet 90:B1:1C:00:AB:0D;
fixed-address nembus.wikimedia.org;
--
To view, visit https://gerrit.wikimedia.org/r/193864
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4e4265e004d91c54964ce13f9189cee7547685b3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Papaul ptshiba...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] role::deployment: add codfw deployment master (still tin) - change (operations/puppet)
Giuseppe Lavagetto has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194341
Change subject: role::deployment: add codfw deployment master (still tin)
..
role::deployment: add codfw deployment master (still tin)
Change-Id: I79b005a762a5851a5bcfb24c715416cf3ac3ec97
---
M manifests/role/deployment.pp
1 file changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/41/194341/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 573c9db..31e8759 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -217,6 +217,7 @@
'parent_dir' = '/srv/deployment',
'servers'= {
'eqiad' = $deployment_server,
+'codfw' = $deployment_server,
},
'redis' = {
'host' = $deployment_server,
--
To view, visit https://gerrit.wikimedia.org/r/194341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I79b005a762a5851a5bcfb24c715416cf3ac3ec97
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] codfw: assign IPs to mediawiki appservers in row b - change (operations/dns)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: codfw: assign IPs to mediawiki appservers in row b
..
codfw: assign IPs to mediawiki appservers in row b
Change-Id: Iaf2a5997a755d641348dd433e52b69c8da897ce0
---
M templates/10.in-addr.arpa
M templates/wmnet
2 files changed, 138 insertions(+), 0 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/templates/10.in-addr.arpa b/templates/10.in-addr.arpa
index 5a9b217..700e34f 100644
--- a/templates/10.in-addr.arpa
+++ b/templates/10.in-addr.arpa
@@ -2606,6 +2606,74 @@
50 1H IN PTR wtp2008.codfw.wmnet.
51 1H IN PTR wtp2009.codfw.wmnet.
52 1H IN PTR wtp2010.codfw.wmnet.
+53 1H IN PTR mw2080.codfw.wmnet.
+54 1H IN PTR mw2081.codfw.wmnet.
+55 1H IN PTR mw2082.codfw.wmnet.
+56 1H IN PTR mw2083.codfw.wmnet.
+57 1H IN PTR mw2084.codfw.wmnet.
+58 1H IN PTR mw2085.codfw.wmnet.
+59 1H IN PTR mw2086.codfw.wmnet.
+60 1H IN PTR mw2087.codfw.wmnet.
+61 1H IN PTR mw2088.codfw.wmnet.
+62 1H IN PTR mw2089.codfw.wmnet.
+63 1H IN PTR mw2090.codfw.wmnet.
+64 1H IN PTR mw2091.codfw.wmnet.
+65 1H IN PTR mw2092.codfw.wmnet.
+66 1H IN PTR mw2093.codfw.wmnet.
+67 1H IN PTR mw2094.codfw.wmnet.
+68 1H IN PTR mw2095.codfw.wmnet.
+69 1H IN PTR mw2096.codfw.wmnet.
+70 1H IN PTR mw2097.codfw.wmnet.
+71 1H IN PTR mw2098.codfw.wmnet.
+72 1H IN PTR mw2099.codfw.wmnet.
+73 1H IN PTR mw2100.codfw.wmnet.
+74 1H IN PTR mw2101.codfw.wmnet.
+75 1H IN PTR mw2102.codfw.wmnet.
+76 1H IN PTR mw2103.codfw.wmnet.
+77 1H IN PTR mw2104.codfw.wmnet.
+78 1H IN PTR mw2105.codfw.wmnet.
+79 1H IN PTR mw2106.codfw.wmnet.
+80 1H IN PTR mw2107.codfw.wmnet.
+81 1H IN PTR mw2108.codfw.wmnet.
+82 1H IN PTR mw2109.codfw.wmnet.
+83 1H IN PTR mw2110.codfw.wmnet.
+84 1H IN PTR mw2111.codfw.wmnet.
+85 1H IN PTR mw2112.codfw.wmnet.
+86 1H IN PTR mw2113.codfw.wmnet.
+87 1H IN PTR mw2114.codfw.wmnet.
+88 1H IN PTR mw2115.codfw.wmnet.
+89 1H IN PTR mw2116.codfw.wmnet.
+90 1H IN PTR mw2117.codfw.wmnet.
+91 1H IN PTR mw2118.codfw.wmnet.
+92 1H IN PTR mw2119.codfw.wmnet.
+93 1H IN PTR mw2120.codfw.wmnet.
+94 1H IN PTR mw2121.codfw.wmnet.
+95 1H IN PTR mw2122.codfw.wmnet.
+96 1H IN PTR mw2123.codfw.wmnet.
+97 1H IN PTR mw2124.codfw.wmnet.
+98 1H IN PTR mw2125.codfw.wmnet.
+99 1H IN PTR mw2126.codfw.wmnet.
+100 1H IN PTR mw2127.codfw.wmnet.
+101 1H IN PTR mw2128.codfw.wmnet.
+102 1H IN PTR mw2129.codfw.wmnet.
+103 1H IN PTR mw2130.codfw.wmnet.
+104 1H IN PTR mw2131.codfw.wmnet.
+105 1H IN PTR mw2132.codfw.wmnet.
+106 1H IN PTR mw2133.codfw.wmnet.
+107 1H IN PTR mw2134.codfw.wmnet.
+108 1H IN PTR mw2135.codfw.wmnet.
+109 1H IN PTR mw2136.codfw.wmnet.
+110 1H IN PTR mw2137.codfw.wmnet.
+111 1H IN PTR mw2138.codfw.wmnet.
+112 1H IN PTR mw2139.codfw.wmnet.
+113 1H IN PTR mw2140.codfw.wmnet.
+114 1H IN PTR mw2141.codfw.wmnet.
+115 1H IN PTR mw2142.codfw.wmnet.
+116 1H IN PTR mw2143.codfw.wmnet.
+117 1H IN PTR mw2144.codfw.wmnet.
+118 1H IN PTR mw2145.codfw.wmnet.
+119 1H IN PTR mw2146.codfw.wmnet.
+120 1H IN PTR mw2147.codfw.wmnet.
$ORIGIN 17.192.{{ zonename }}.
1 1H IN PTR vl2018-eth1.lvs2001.codfw.wmnet.
diff --git a/templates/wmnet b/templates/wmnet
index 044641b..330f7e5 100644
--- a/templates/wmnet
+++ b/templates/wmnet
@@ -2192,6 +2192,76 @@
mw2077 1H IN A10.192.0.116
mw2078 1H IN A10.192.0.117
mw2079 1H IN A10.192.0.118
+mw2080 1H IN A10.192.16.53
+mw2081 1H IN A10.192.16.54
+mw2082 1H IN A10.192.16.55
+mw2083 1H IN A10.192.16.56
+mw2084 1H IN A10.192.16.57
+mw2085 1H IN A10.192.16.58
+mw2086 1H IN A10.192.16.59
+mw2087 1H IN A10.192.16.60
+mw2088 1H IN A10.192.16.61
+mw2089 1H IN A10.192.16.62
+mw2090 1H IN A10.192.16.63
+mw2091 1H IN A10.192.16.64
+mw2092 1H IN A10.192.16.65
+mw2093 1H IN A10.192.16.66
+mw2094 1H IN A10.192.16.67
+mw2095 1H IN A10.192.16.68
+mw2096 1H IN A10.192.16.69
+mw2097 1H IN A10.192.16.70
+mw2098 1H IN A10.192.16.71
+mw2099 1H IN A10.192.16.72
+mw2100 1H IN A10.192.16.73
+mw2101 1H IN A10.192.16.74
+mw2102 1H IN A10.192.16.75
+mw2103 1H IN A10.192.16.76
+mw2104 1H IN A10.192.16.77
+mw2105 1H IN A10.192.16.78
+mw2106 1H IN A10.192.16.79
+mw2107 1H IN A10.192.16.80
+mw2108 1H IN A10.192.16.81
+mw2109 1H IN A10.192.16.82
+mw2110 1H IN A10.192.16.83
+mw2111 1H IN A
[MediaWiki-commits] [Gerrit] Change label from Language to Language code - change (mediawiki...Wikibase)
jenkins-bot has submitted this change and it was merged.
Change subject: Change label from Language to Language code
..
Change label from Language to Language code
To avoid confusion, it's more precise to use Language code. Also changed the
qqq.json accordingly.
Bug: T88691
Change-Id: If8d4dca24e4d9297842a60099a0a0b776046ac60
---
M repo/i18n/en.json
M repo/i18n/qqq.json
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Thiemo Mättig (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/repo/i18n/en.json b/repo/i18n/en.json
index c4f7f90..3112163 100644
--- a/repo/i18n/en.json
+++ b/repo/i18n/en.json
@@ -142,7 +142,7 @@
wikibase-gotolinkedpage-summary: Special:GoToLinkedPage is used to
find the page for an item on a connected site.br / The left field, \Site:\,
is where you enter the language and site code.br / For the right field,
\Item id:\, you must put in the item id you are looking for.,
special-itemdisambiguation: Item disambiguation,
wikibase-itemdisambiguation-lookup-fieldset: Search for items by
language and label,
- wikibase-itemdisambiguation-lookup-language: Language:,
+ wikibase-itemdisambiguation-lookup-language: Language code:,
wikibase-itemdisambiguation-lookup-label: Label:,
wikibase-itemdisambiguation-submit: Search,
wikibase-itemdisambiguation-nothing-found: Sorry, no item with that
label was found.,
@@ -206,7 +206,7 @@
wikibase-setsitelink-add-failed: The site link could not be saved.,
wikibase-setsitelink-remove-failed: The site link could not be
removed.,
wikibase-modifyentity-id: ID:,
- wikibase-modifyterm-language: Language:,
+ wikibase-modifyterm-language: Language code:,
special-mergeitems: Merge two items,
wikibase-mergeitems-intro: If you merge two items, all labels,
descriptions, aliases, sitelinks and statements will be moved from one item to
the other.,
wikibase-mergeitems-fromid: The id to merge from,
@@ -251,7 +251,7 @@
wikibase-entitieswithoutdescription-legend: Get list of entities
without description,
special-entitieswithoutlabel: Entities without label,
wikibase-entitieswithoutlabel-legend: Get list of entities without
label,
- wikibase-entitieswithoutlabel-label-language: Language:,
+ wikibase-entitieswithoutlabel-label-language: Language code:,
wikibase-entitieswithoutlabel-label-type: Type:,
wikibase-entitieswithoutlabel-label-alltypes: all,
wikibase-entitieswithoutlabel-submit: Find,
diff --git a/repo/i18n/qqq.json b/repo/i18n/qqq.json
index a2d404d..19c6d52 100644
--- a/repo/i18n/qqq.json
+++ b/repo/i18n/qqq.json
@@ -228,7 +228,7 @@
wikibase-setsitelink-add-failed: Error message when the site link
could not be saved.,
wikibase-setsitelink-remove-failed: Error message when the site link
could not be removed.,
wikibase-modifyentity-id: Label for the input field to select the ID
of the entity.\n{{Identical|ID}},
- wikibase-modifyterm-language: Label for the input field to select
the language the label should be set in.\n{{Identical|Language}},
+ wikibase-modifyterm-language: Label for the input field to select
the language code the label should be set in.\n{{Identical|Language}},
special-mergeitems: {{doc-special|MergeItems}},
wikibase-mergeitems-intro: A short text at the top of the page that
allows users to merge two items, explaining the form.\n\nFollowed by the
following input box labels:\n* {{msg-mw|Wikibase-mergeitems-fromid}}\n*
{{msg-mw|Wikibase-mergeitems-toid}},
wikibase-mergeitems-fromid: Label for the input field to select the
ID of the entity to merge from. See also:\n*
{{msg-mw|Wikibase-mergeitems-toid}},
@@ -273,7 +273,7 @@
wikibase-entitieswithoutdescription-legend: Legend of the form that
allow to change the language.,
special-entitieswithoutlabel:
{{doc-special|EntitiesWithoutLabel}}\nThis special page returns a list of
entities without label for a given language,
wikibase-entitieswithoutlabel-legend: Legend of the form that allow
to change the language.,
- wikibase-entitieswithoutlabel-label-language: Label for the input
field to change the language.\n{{Identical|Language}},
+ wikibase-entitieswithoutlabel-label-language: Label for the input
field to change the language code.\n{{Identical|Language}},
wikibase-entitieswithoutlabel-label-type: Label of the entity type
selector that allows to restrict the request to one type.\n{{Identical|Type}},
wikibase-entitieswithoutlabel-label-alltypes: Label of the entity
type selector entry that allows to output missing labels for all entity
types.\n{{Identical|All}},
wikibase-entitieswithoutlabel-submit: Label for the button that
activate the action.\n{{Identical|Find}},
--
To
[MediaWiki-commits] [Gerrit] Fix selectors for radio buttons - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix selectors for radio buttons
..
Fix selectors for radio buttons
Ids can change depending on configuration.
Bug: T90890
Change-Id: Icf0f970470be860e4362488acdbfe121696d
---
M tests/browser/features/support/pages/describe_page.rb
1 file changed, 3 insertions(+), 3 deletions(-)
Approvals:
MarkTraceur: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/browser/features/support/pages/describe_page.rb
b/tests/browser/features/support/pages/describe_page.rb
index 9778bcf..f42ca3c 100644
--- a/tests/browser/features/support/pages/describe_page.rb
+++ b/tests/browser/features/support/pages/describe_page.rb
@@ -36,9 +36,9 @@
a(:use_a_different_license, xpath:
//div[@id='mwe-upwiz-stepdiv-details']//form[@id='mwe-upwiz-detailsform0']//p[@class='mwe-more-options']/a)
- radio(:own_cc_zero_radio, id: license3_4)
- radio(:thirdparty_nasa_radio, id: license4_13)
- radio(:own_cc_by_sa_4_radio, id: license3_0)
+ radio(:own_cc_zero_radio, value: {{self|cc-zero}})
+ radio(:thirdparty_nasa_radio, value: {{PD-USGov-NASA}})
+ radio(:own_cc_by_sa_4_radio, value: {{self|cc-by-sa-4.0}})
radio(:own_work_radio, id: deedChooser2-ownwork)
radio(:thirdparty_radio, id: deedChooser2-thirdparty)
--
To view, visit https://gerrit.wikimedia.org/r/193144
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icf0f970470be860e4362488acdbfe121696d
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
Gerrit-Reviewer: Gergő Tisza gti...@wikimedia.org
Gerrit-Reviewer: MarkTraceur mtrac...@member.fsf.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WikiGrok] Add new suggestions to the actor campaign - change (operations/mediawiki-config)
Phuedx has uploaded a new change for review. https://gerrit.wikimedia.org/r/194354 Change subject: [WikiGrok] Add new suggestions to the actor campaign .. [WikiGrok] Add new suggestions to the actor campaign Add the voice actor and stage actor suggestions. Change-Id: I9aa0165480f5e799f7d0a0fb334336bf3a11a8cd --- M wmf-config/mobile.php 1 file changed, 16 insertions(+), 9 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/54/194354/1 diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php index 5e3d88d..147a770 100644 --- a/wmf-config/mobile.php +++ b/wmf-config/mobile.php @@ -122,15 +122,6 @@ 'ifNotAny' = array( 'P106'/* occupation */ = 'Q482980'/* author */ ), 'suggestions' = array( 'Q482980'/* author */ ), ), - // https://www.mediawiki.org/wiki/Extension:MobileFrontend/WikiGrok/Claim_suggestions#Types_of_actors - // After production testing is complete, split this campaign into 2 separate - // campaigns which exclude items that already have the respective claims made. - 'actor' = array( - 'type' = 'Simple', - 'property' = 'P106'/* occupation */, - 'ifAll' = array( 'P31'/* instance of */ = 'Q5'/* human */, 'P106'/* occupation */ = 'Q33999'/* actor */ ), - 'suggestions' = array( 'Q10798782'/* television actor */, 'Q10800557'/* film actor */ ), - ), // https://www.mediawiki.org/wiki/Extension:MobileFrontend/WikiGrok/Claim_suggestions#Album 'album' = array( 'type' = 'Simple', @@ -156,6 +147,22 @@ 'ifNotAny' = array( 'P364'/* original language of this work */ = 'Q1860'/* English */ ), 'suggestions' = array( 'Q1860'/* English */ ), ), + + // https://trello.com/c/XA608tCb/5-1-new-actor-campaign + 'actor2' = array( + 'type' = 'Simple', + 'property' = 'P31' /* instance of */, + 'ifAll' = array( + 'P31'/* instance of */ = 'Q5'/* human */, + 'P106'/* occupation */ = 'Q33999'/* actor */, + ), + 'suggestions' = array( + 'Q10798782' /* television actor */, + 'Q10800557' /* film actor */, + 'Q2405480' /* voice actor */, + 'Q2259451' /* stage actor */, + ), + ), ); } -- To view, visit https://gerrit.wikimedia.org/r/194354 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9aa0165480f5e799f7d0a0fb334336bf3a11a8cd Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Phuedx g...@samsmith.io ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] statistics: remove 2 UTF-8 characters - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: statistics: remove 2 UTF-8 characters .. statistics: remove 2 UTF-8 characters fixing one more invalid byte sequence in US-ASCII that only happens with ruby 1.9.x Bug:T91453 https://tickets.puppetlabs.com/browse/PUP-1031 Change-Id: I46112fcd51877ccd340e0141cfc8fd32a6d24c31 --- M manifests/role/statistics.pp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Dzahn: Verified; Looks good to me, approved diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp index 6d9952e..6d67ca0 100644 --- a/manifests/role/statistics.pp +++ b/manifests/role/statistics.pp @@ -94,7 +94,7 @@ # aggregating hourly pagecount-all-sites project count files into # daily per site csvs. -# Although it is in the “private” role, the dataset actually isn't +# Although it is in the private role, the dataset actually isn't # private. We just keep it here to spare adding a separate role. include statistics::aggregator -- To view, visit https://gerrit.wikimedia.org/r/194353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I46112fcd51877ccd340e0141cfc8fd32a6d24c31 Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] fix for missing image info when URLs have extra path extension - change (apps...wikipedia)
Bgerstle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194355
Change subject: fix for missing image info when URLs have extra path extension
..
fix for missing image info when URLs have extra path extension
Some images (e.g. svgs) have src URLs that have an extra path
extension. This caused imageinfo lookups to return empty results.
Fix:
- Modify `fileNameNoSizePrefix` to also strip extra path extensions
- Add unit tests to ensure previous and new functionality
(WMFImageURLParsingTests)
Add'l fixes:
- Uploader unknown being displayed while image info was being
retrieved
- Unit test target switched to application test target to prevent
issues with compiling subset of app sources
- Removed filePageURL property of MWKImage which was unused, and
unstable.
Bug: T90298
Change-Id: I00a20b837ce3275cc5ccd0217d7e759a07e52bad
---
M MediaWikiKit/MediaWikiKit/MWKImage.h
M MediaWikiKit/MediaWikiKit/MWKImage.m
M MediaWikiKit/MediaWikiKitTests/MWKImageInfo+MWKImageComparisonTests.m
M Wikipedia.xcodeproj/project.pbxproj
A WikipediaUnitTests/WMFImageURLParsingTests.m
M wikipedia/Networking/Fetchers/ArticleFetcher.m
M wikipedia/View Controllers/Image Gallery/WMFImageGalleryViewController.m
M wikipedia/mw-utils/WMFImageURLParsing.h
M wikipedia/mw-utils/WMFImageURLParsing.m
9 files changed, 146 insertions(+), 166 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/ios/wikipedia
refs/changes/55/194355/1
diff --git a/MediaWikiKit/MediaWikiKit/MWKImage.h
b/MediaWikiKit/MediaWikiKit/MWKImage.h
index 1bc2de1..0f6603b 100644
--- a/MediaWikiKit/MediaWikiKit/MWKImage.h
+++ b/MediaWikiKit/MediaWikiKit/MWKImage.h
@@ -32,13 +32,6 @@
@property (copy) NSNumber* width;
@property (copy) NSNumber* height;
-/**
- * A relative URL pointing at the file page associated with this image.
- * @discussion Typical format is: @c /wiki/File:Image_file_Name.
- * @see -[ArticleFetcher createImageRecordsForSection:]
- */
-@property (copy) NSString* filePageURL;
-
// Local storage status
@property (readonly) BOOL isCached;
diff --git a/MediaWikiKit/MediaWikiKit/MWKImage.m
b/MediaWikiKit/MediaWikiKit/MWKImage.m
index 2f37698..ca55ba8 100644
--- a/MediaWikiKit/MediaWikiKit/MWKImage.m
+++ b/MediaWikiKit/MediaWikiKit/MWKImage.m
@@ -11,13 +11,8 @@
#import MediaWikiKit.h
#import WMFImageURLParsing.h
-@interface MWKImage ()
-{
-NSString* _fileNameNoSizePrefix;
-}
-@end
-
@implementation MWKImage
+@synthesize fileNameNoSizePrefix = _fileNameNoSizePrefix;
- (instancetype)initWithArticle:(MWKArticle*)article sourceURL:(NSString*)url {
self = [super initWithSite:article.site];
@@ -45,7 +40,6 @@
_mimeType = [self optionalString:@mimeType dict:dict];
_width= [self optionalNumber:@width dict:dict];
_height = [self optionalNumber:@height dict:dict];
-_filePageURL = dict[@filePageURL];
}
return self;
}
@@ -116,9 +110,7 @@
if (self.height) {
dict[@height] = self.height;
}
-if (self.filePageURL) {
-dict[@filePageURL] = self.filePageURL;
-}
+
return [dict copy];
}
diff --git
a/MediaWikiKit/MediaWikiKitTests/MWKImageInfo+MWKImageComparisonTests.m
b/MediaWikiKit/MediaWikiKitTests/MWKImageInfo+MWKImageComparisonTests.m
index 6336fd1..6e0b64d 100644
--- a/MediaWikiKit/MediaWikiKitTests/MWKImageInfo+MWKImageComparisonTests.m
+++ b/MediaWikiKit/MediaWikiKitTests/MWKImageInfo+MWKImageComparisonTests.m
@@ -41,10 +41,7 @@
NSString* testFilename = @some-file name;
MWKImage* image= [self imageAssociatedWithFilename:testFilename];
MWKImageInfo* info = [self infoAssociatedWithFilename:testFilename];
-assertThat(image.infoAssociationValue,
- is(allOf(equalTo(info.imageAssociationValue),
-equalTo([info
valueForKeyPath:MWKImageAssociationKeyPath]),
-equalTo([image
valueForKeyPath:MWKImageAssociationKeyPath]), nil)));
+assertThat(image.infoAssociationValue,
is(equalTo(info.imageAssociationValue)));
XCTAssertTrue([info isAssociatedWithImage:image]);
XCTAssertTrue([image isAssociatedWithInfo:info]);
}
@@ -52,8 +49,7 @@
- (void)testDisassociation {
MWKImage* image= [self imageAssociatedWithFilename:@some-file name];
MWKImageInfo* info = [self infoAssociatedWithFilename:@other file name];
-assertThat([image valueForKeyPath:MWKImageAssociationKeyPath],
- isNot([info valueForKeyPath:MWKImageAssociationKeyPath]));
+assertThat([image infoAssociationValue], isNot(equalTo([info
imageAssociationValue])));
XCTAssertFalse([info isAssociatedWithImage:image]);
}
diff --git a/Wikipedia.xcodeproj/project.pbxproj
b/Wikipedia.xcodeproj/project.pbxproj
index ad9226e..fb4a150 100644
--- a/Wikipedia.xcodeproj/project.pbxproj
+++ b/Wikipedia.xcodeproj/project.pbxproj
@@ -47,9 +47,7 @@
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ec2bff5..32613d2 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: ec2bff5..32613d2 .. Syncronize VisualEditor: ec2bff5..32613d2 Change-Id: Iba8ee5da6fbf574d345e0f0c87b86f8accd29732 --- 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 ec2bff5..32613d2 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit ec2bff5535e50ad9a10fe1682e4ba0aa0c1e881e +Subproject commit 32613d204d77969042833406e8411e50830d69ff -- To view, visit https://gerrit.wikimedia.org/r/194361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iba8ee5da6fbf574d345e0f0c87b86f8accd29732 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: ec2bff5..32613d2 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/194361 Change subject: Syncronize VisualEditor: ec2bff5..32613d2 .. Syncronize VisualEditor: ec2bff5..32613d2 Change-Id: Iba8ee5da6fbf574d345e0f0c87b86f8accd29732 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/61/194361/1 diff --git a/VisualEditor b/VisualEditor index ec2bff5..32613d2 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit ec2bff5535e50ad9a10fe1682e4ba0aa0c1e881e +Subproject commit 32613d204d77969042833406e8411e50830d69ff -- To view, visit https://gerrit.wikimedia.org/r/194361 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba8ee5da6fbf574d345e0f0c87b86f8accd29732 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ 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 (7dcd5e8) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (7dcd5e8) .. Update VE core submodule to master (7dcd5e8) New changes: 61e1646 Resolve URLs in LinkContextItem 91d1814 Handle optional parameters correctly in table selection c2810ce Fix up selection if we cursor into or next to a table node 11f507a Don't call .addClass() in CE nodes' setup handlers Change-Id: Iad402ddab1ca8b736c79589e4724882a41eaa6e1 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index a65ad7c..7dcd5e8 16 --- a/lib/ve +++ b/lib/ve -Subproject commit a65ad7c55e8fc710aaf24fab36a0302ac1fc5b71 +Subproject commit 7dcd5e831381084809b984301404d5786125b85d -- To view, visit https://gerrit.wikimedia.org/r/194360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Iad402ddab1ca8b736c79589e4724882a41eaa6e1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix up selection if we cursor into or next to a table node - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix up selection if we cursor into or next to a table node
..
Fix up selection if we cursor into or next to a table node
Use same code as we use for focusable nodes but check for tables
which are also ce=false.
Simplify focusable node checking code to just search by class.
Bug: T73560
Change-Id: I778af05f6b1e4a46e50f832bbcaa05bde7230cb0
---
M src/ce/nodes/ve.ce.TableNode.js
M src/ce/ve.ce.Surface.js
2 files changed, 18 insertions(+), 17 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/nodes/ve.ce.TableNode.js b/src/ce/nodes/ve.ce.TableNode.js
index e110f20..2114b8a 100644
--- a/src/ce/nodes/ve.ce.TableNode.js
+++ b/src/ce/nodes/ve.ce.TableNode.js
@@ -300,7 +300,7 @@
) ||
(
selection instanceof ve.dm.TableSelection
- selection.tableRange.equals(
this.getModel().getOuterRange() )
+ selection.tableRange.equalsSelection(
this.getModel().getOuterRange() )
);
if ( active ) {
diff --git a/src/ce/ve.ce.Surface.js b/src/ce/ve.ce.Surface.js
index 350d01c..004c50c 100644
--- a/src/ce/ve.ce.Surface.js
+++ b/src/ce/ve.ce.Surface.js
@@ -1210,7 +1210,7 @@
*/
ve.ce.Surface.prototype.afterDocumentKeyDown = function ( e ) {
var direction, focusableNode, startOffset, endOffset, offsetDiff,
- range, fixupCursorForUnicorn,
+ range, fixupCursorForUnicorn, matrix,
surface = this,
isArrow = (
e.keyCode === OO.ui.Keys.UP ||
@@ -1237,7 +1237,7 @@
* @returns {ve.ce.Node|null} node, or null if not in a focusable node
*/
function getSurroundingFocusableNode( node, offset, direction ) {
- var focusNode, $ceNode, focusableNode;
+ var focusNode;
if ( node.nodeType === Node.TEXT_NODE ) {
focusNode = node;
} else if ( direction 0 offset node.childNodes.length ) {
@@ -1247,19 +1247,7 @@
} else {
focusNode = node;
}
- $ceNode = $( focusNode ).closest(
- '[contenteditable], .ve-ce-branchNode'
- );
- if ( $ceNode.prop( 'contenteditable' ) !== 'false' ) {
- return null;
- }
- focusableNode = $ceNode.closest(
- '.ve-ce-branchNode, .ve-ce-leafNode'
- ).data( 'view' );
- if ( !focusableNode || !focusableNode.isFocusable() ) {
- return null;
- }
- return focusableNode;
+ return $( focusNode ).closest( '.ve-ce-focusableNode,
.ve-ce-tableNode' ).data( 'view' ) || null;
}
/**
@@ -1350,7 +1338,20 @@
range = range.flip();
}
}
- this.model.setLinearSelection( range );
+ if ( focusableNode instanceof ve.ce.TableNode ) {
+ if ( direction 0 ) {
+ this.model.setSelection( new
ve.dm.TableSelection(
+ this.model.documentModel,
range, 0, 0
+ ) );
+ } else {
+ matrix =
focusableNode.getModel().getMatrix();
+ this.model.setSelection( new
ve.dm.TableSelection(
+ this.model.documentModel,
range, matrix.getColCount() - 1, matrix.getRowCount() - 1
+ ) );
+ }
+ } else {
+ this.model.setLinearSelection( range );
+ }
if ( e.keyCode === OO.ui.Keys.LEFT ) {
this.cursorDirectionality = direction 0 ?
'rtl' : 'ltr';
} else if ( e.keyCode === OO.ui.Keys.RIGHT ) {
--
To view, visit https://gerrit.wikimedia.org/r/194352
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I778af05f6b1e4a46e50f832bbcaa05bde7230cb0
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Browser test for flickr uploads - change (mediawiki...UploadWizard)
jenkins-bot has submitted this change and it was merged. Change subject: Browser test for flickr uploads .. Browser test for flickr uploads Bug: T86120 Change-Id: I47de4898c4fd3ed4786103e49c812c2a32689320 --- A tests/browser/features/flickr_upload.feature M tests/browser/features/step_definitions/upload_wizard_steps.rb M tests/browser/features/support/pages/describe_page.rb M tests/browser/features/support/pages/upload_page.rb 4 files changed, 116 insertions(+), 35 deletions(-) Approvals: MarkTraceur: Looks good to me, approved jenkins-bot: Verified diff --git a/tests/browser/features/flickr_upload.feature b/tests/browser/features/flickr_upload.feature new file mode 100644 index 000..ed2970f --- /dev/null +++ b/tests/browser/features/flickr_upload.feature @@ -0,0 +1,25 @@ +@login @chrome @firefox @commons.wikimedia.beta.wmflabs.org @test2.wikipedia.org +Feature: Flickr upload + + Scenario: Upload image from Flickr +Given I am logged in + And I am on the file upload step +When I click the Flickr import button + And I enter https://www.flickr.com/photos/fscholz/13540630105/ as the Flickr URL + And I click the Get from Flickr button + And click button Continue +Then upload number 1 should have the title Rheinturm + And upload number 1 should have the description Photos in Düsseldorf, Taken with a FED5B, Industar-61L 55mm F2.8 + And upload number 1 should have the date 2014-03-31 18:17:17 + + Scenario: Upload multiple images from Flickr at once +Given I am logged in + And I am on the file upload step +When I click the Flickr import button + And I enter https://www.flickr.com/photos/79472036@N07/with/13541023264/ as the Flickr URL + And I click the Get from Flickr button + And I click Flickr upload 0 + And I click Flickr upload 1 + And I click the Upload selected images button + And click button Continue +Then the Flickr uploads have the correct information diff --git a/tests/browser/features/step_definitions/upload_wizard_steps.rb b/tests/browser/features/step_definitions/upload_wizard_steps.rb index 8ff0cce..9d6a3f0 100644 --- a/tests/browser/features/step_definitions/upload_wizard_steps.rb +++ b/tests/browser/features/step_definitions/upload_wizard_steps.rb @@ -61,7 +61,8 @@ end When(/^click button Continue$/) do - on(UploadPage).continue_element.when_present(15).click + # Wait a while because this is sometimes waiting for the upload(s) to complete + on(UploadPage).continue_element.when_present(60).click end When(/^I click the Next button at the Describe page$/) do @@ -193,6 +194,62 @@ on(UsePage).upload_more_files_element.when_present(15).click end +When(/^I click Copy information to all uploads below$/) do + on(DescribePage).copy_expand_element.when_present(15).click +end + +When(/^I check Title$/) do + on(DescribePage).check_title_check +end + +When(/^I check Descriptions$/) do + on(DescribePage).check_description_check +end + +When(/^I check Date$/) do + on(DescribePage).check_date_check +end + +When(/^I check Categories$/) do + on(DescribePage).check_categories_check +end + +When(/^I click the Copy button$/) do + on(DescribePage) do |page| +page.copy_element.when_present(15).click +page.wait_for_ajax + end +end + +When(/^I uncheck all of the copy checkboxes$/) do + on(DescribePage).title_check_element.when_present(10).uncheck + on(DescribePage).description_check_element.when_present(10).uncheck + on(DescribePage).date_check_element.when_present(10).uncheck + on(DescribePage).categories_check_element.when_present(10).uncheck + on(DescribePage).other_check_element.when_present(10).uncheck +end + +When(/^I click the Flickr import button$/) do + on(UploadPage).flickr_button_element.when_present.click +end + +When(/^I enter (.+) as the Flickr URL$/) do |url| + on(UploadPage).flickr_url_element.when_present.value = url +end + +When(/^I click the Get from Flickr button$/) do + on(UploadPage).flickr_get_button_element.when_present.click +end + +When(/^I click Flickr upload (\d+)$/) do |index| + modifier = Selenium::WebDriver::Platform.os == :macosx ? :command : :control + on(UploadPage).flickr_upload(index).when_present.click(modifier) +end + +When(/^I click the Upload selected images button$/) do + on(UploadPage).flickr_select_button_element.when_present.click +end + Then(/^link to log in should appear$/) do on(UploadWizardPage).logged_in_element.should be_visible end @@ -259,33 +316,6 @@ end end -When(/^I click Copy information to all uploads below$/) do - on(DescribePage).copy_expand_element.when_present(15).click -end - -When(/^I check Title$/) do - on(DescribePage).check_title_check -end - -When(/^I check Descriptions$/) do - on(DescribePage).check_description_check -end - -When(/^I check Date$/) do - on(DescribePage).check_date_check -end - -When(/^I check
[MediaWiki-commits] [Gerrit] Resolve URLs in LinkContextItem - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Resolve URLs in LinkContextItem
..
Resolve URLs in LinkContextItem
this.model.getHref() is relative to the model DOM, not the view DOM,
so it needs to be remapped.
Because dm.Annotation objects don't have a reference to their
dm.Document for no particularly good reason, getting the HTML
document to resolve against is a bit involved.
Bug: T85622
Change-Id: Ifee722a7f606d2da1293a2bb32f9d9d9463947a0
---
M src/ui/contextitems/ve.ui.LinkContextItem.js
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ui/contextitems/ve.ui.LinkContextItem.js
b/src/ui/contextitems/ve.ui.LinkContextItem.js
index 39d98d2..f9d7b3f 100644
--- a/src/ui/contextitems/ve.ui.LinkContextItem.js
+++ b/src/ui/contextitems/ve.ui.LinkContextItem.js
@@ -52,11 +52,12 @@
* @inheritdoc
*/
ve.ui.LinkContextItem.prototype.renderBody = function () {
+ var htmlDoc =
this.context.getSurface().getModel().getDocument().getHtmlDocument();
this.$body.empty().append(
$( 'a' )
.text( this.getDescription() )
.attr( {
- href: this.model.getHref(),
+ href: ve.resolveUrl( this.model.getHref(),
htmlDoc ),
target: '_blank'
} )
);
--
To view, visit https://gerrit.wikimedia.org/r/194345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifee722a7f606d2da1293a2bb32f9d9d9463947a0
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 32613d2..0ea0691 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 32613d2..0ea0691 .. Syncronize VisualEditor: 32613d2..0ea0691 Change-Id: I5b97913d89386e65b3f2af485563fa7b9d3e0524 --- 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 32613d2..0ea0691 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 32613d204d77969042833406e8411e50830d69ff +Subproject commit 0ea0691ad781d47b04c1c7c112e7f3a26e24fdd6 -- To view, visit https://gerrit.wikimedia.org/r/194362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5b97913d89386e65b3f2af485563fa7b9d3e0524 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 32613d2..0ea0691 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/194362 Change subject: Syncronize VisualEditor: 32613d2..0ea0691 .. Syncronize VisualEditor: 32613d2..0ea0691 Change-Id: I5b97913d89386e65b3f2af485563fa7b9d3e0524 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/62/194362/1 diff --git a/VisualEditor b/VisualEditor index 32613d2..0ea0691 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 32613d204d77969042833406e8411e50830d69ff +Subproject commit 0ea0691ad781d47b04c1c7c112e7f3a26e24fdd6 -- To view, visit https://gerrit.wikimedia.org/r/194362 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5b97913d89386e65b3f2af485563fa7b9d3e0524 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] API: Properly handle limit and continuation for generator=pr... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: API: Properly handle limit and continuation for
generator=prefixsearch
..
API: Properly handle limit and continuation for generator=prefixsearch
The search engine is queried for limit+1 titles, so we know whether to
output a continuation value. Actually do this for generator mode,
instead of just returning the limit+1 titles.
Bug: T91503
Change-Id: Ib80c6d3fa9e8b52ae1f5c58fbe74c8e909329e59
---
M includes/api/ApiQueryPrefixSearch.php
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/api/ApiQueryPrefixSearch.php
b/includes/api/ApiQueryPrefixSearch.php
index 069e30b..7a31c48 100644
--- a/includes/api/ApiQueryPrefixSearch.php
+++ b/includes/api/ApiQueryPrefixSearch.php
@@ -48,6 +48,10 @@
$searcher = new TitlePrefixSearch;
$titles = $searcher-searchWithVariants( $search, $limit + 1,
$namespaces, $offset );
if ( $resultPageSet ) {
+ if ( count( $titles ) $limit ) {
+ $this-setContinueEnumParameter( 'offset',
$offset + $params['limit'] );
+ array_pop( $titles );
+ }
$resultPageSet-populateFromTitles( $titles );
foreach ( $titles as $index = $title ) {
$resultPageSet-setGeneratorData( $title,
array( 'index' = $index + $offset + 1 ) );
--
To view, visit https://gerrit.wikimedia.org/r/194330
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ib80c6d3fa9e8b52ae1f5c58fbe74c8e909329e59
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Anomie bjor...@wikimedia.org
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Correct jquery.uls dependencies - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Correct jquery.uls dependencies
..
Correct jquery.uls dependencies
ve.init.mw.Platform.js, ve.init.sa.Platform.js ve.ui.MWLanguagesPage.js
use $.uls, but nothing in the ext.visualEditor.core module does.
Change-Id: I0b3d8c2b25694e29c86b91d7df7875f1be24fb2d
---
M VisualEditor.php
M extension.json
2 files changed, 9 insertions(+), 5 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/VisualEditor.php b/VisualEditor.php
index 5c44a1e..3c7598c 100644
--- a/VisualEditor.php
+++ b/VisualEditor.php
@@ -314,6 +314,7 @@
'moment',
'ext.visualEditor.base',
'ext.visualEditor.track',
+ 'jquery.uls.data',
),
'targets' = array( 'desktop', 'mobile' ),
),
@@ -343,6 +344,7 @@
'dependencies' = array(
'ext.visualEditor.base',
'jquery.i18n',
+ 'jquery.uls.data',
),
),
@@ -668,7 +670,6 @@
'unicodejs',
'rangefix',
'papaparse',
- 'jquery.uls.data',
'ext.visualEditor.base',
),
'messages' = array(
@@ -1175,6 +1176,7 @@
'dependencies' = array(
'ext.visualEditor.mwcore',
'ext.visualEditor.mwlink',
+ 'jquery.uls.data',
),
'messages' = array(
'visualeditor-advancedsettings-tool',
diff --git a/extension.json b/extension.json
index 880436d..4a76843 100644
--- a/extension.json
+++ b/extension.json
@@ -396,7 +396,8 @@
user.tokens,
moment,
ext.visualEditor.base,
- ext.visualEditor.track
+ ext.visualEditor.track,
+ jquery.uls.data
],
targets: [
desktop,
@@ -427,7 +428,8 @@
],
dependencies: [
ext.visualEditor.base,
- jquery.i18n
+ jquery.i18n,
+ jquery.uls.data
]
},
ext.visualEditor.data: {
@@ -721,7 +723,6 @@
unicodejs,
rangefix,
papaparse,
- jquery.uls.data,
ext.visualEditor.base
],
messages: [
@@ -1200,7 +1201,8 @@
],
dependencies: [
ext.visualEditor.mwcore,
- ext.visualEditor.mwlink
+ ext.visualEditor.mwlink,
+ jquery.uls.data
],
messages: [
visualeditor-advancedsettings-tool,
--
To view, visit https://gerrit.wikimedia.org/r/194343
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b3d8c2b25694e29c86b91d7df7875f1be24fb2d
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Matthias Mullie mmul...@wikimedia.org
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 2739950..ec2bff5 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/194356 Change subject: Syncronize VisualEditor: 2739950..ec2bff5 .. Syncronize VisualEditor: 2739950..ec2bff5 Change-Id: I4a92be7706ee6497a3a8e7372ed63d528b810df5 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/56/194356/1 diff --git a/VisualEditor b/VisualEditor index 2739950..ec2bff5 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 273995058ece741e46e483bb9d35b7c1efefeebf +Subproject commit ec2bff5535e50ad9a10fe1682e4ba0aa0c1e881e -- To view, visit https://gerrit.wikimedia.org/r/194356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a92be7706ee6497a3a8e7372ed63d528b810df5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] python-jobs: Use remoteonly-zuul instead of remote-zuul - change (integration/config)
Krinkle has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194357
Change subject: python-jobs: Use remoteonly-zuul instead of remote-zuul
..
python-jobs: Use remoteonly-zuul instead of remote-zuul
There is no local replication in labs. It creates pointless errors:
ERROR: Reference path does not exist: /srv/ssd/gerrit/operations/puppet.git
It's not causing failures since remote-zuul falls back to a
regular clone from zuul.eqiad.wmnet – which is what remoteonly-zuul
does.
Change-Id: Icdf41729f8ab7abf60b3b20bda4adc6d8d08f237
---
M jjb/python-jobs.yaml
1 file changed, 5 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/57/194357/1
diff --git a/jjb/python-jobs.yaml b/jjb/python-jobs.yaml
index 563d72e..9ecbeee 100644
--- a/jjb/python-jobs.yaml
+++ b/jjb/python-jobs.yaml
@@ -8,7 +8,7 @@
- job-template:
name: '{name}-tox-{toxenv}'
node: contintLabsSlave UbuntuPrecise
-defaults: use-remote-zuul
+defaults: use-remoteonly-zuul
concurrent: true
triggers:
- zuul
@@ -28,7 +28,7 @@
- job-template:
name: '{name}-tox-{toxenv}-trusty'
node: contintLabsSlave UbuntuTrusty
-defaults: use-remote-zuul
+defaults: use-remoteonly-zuul
concurrent: true
triggers:
- zuul
@@ -44,7 +44,7 @@
- job-template:
name: '{name}-tox-doc-publish'
node: contintLabsSlave UbuntuPrecise
-defaults: use-remote-zuul
+defaults: use-remoteonly-zuul
triggers:
- zuul
builders:
@@ -60,7 +60,7 @@
- job-template:
name: '{name}-pep8'
node: hasContintPackages UbuntuPrecise
-defaults: use-remote-zuul
+defaults: use-remoteonly-zuul
concurrent: true
triggers:
- zuul
@@ -74,7 +74,7 @@
- job-template:
name: '{name}-pyflakes'
node: hasContintPackages UbuntuPrecise
-defaults: use-remote-zuul
+defaults: use-remoteonly-zuul
concurrent: true
triggers:
- zuul
--
To view, visit https://gerrit.wikimedia.org/r/194357
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Icdf41729f8ab7abf60b3b20bda4adc6d8d08f237
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Krinkle krinklem...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 2739950..ec2bff5 - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 2739950..ec2bff5 .. Syncronize VisualEditor: 2739950..ec2bff5 Change-Id: I4a92be7706ee6497a3a8e7372ed63d528b810df5 --- 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 2739950..ec2bff5 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 273995058ece741e46e483bb9d35b7c1efefeebf +Subproject commit ec2bff5535e50ad9a10fe1682e4ba0aa0c1e881e -- To view, visit https://gerrit.wikimedia.org/r/194356 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a92be7706ee6497a3a8e7372ed63d528b810df5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Resolve URLs in MWInternalLinkContextItem - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Resolve URLs in MWInternalLinkContextItem
..
Resolve URLs in MWInternalLinkContextItem
Exactly the same change as Ifee722a7f60.
Because we have such excellent code reuse, or something.
Bug: T85622
Change-Id: I18bd5d3923771b6ff149aa589bb2fa23beecf4f5
---
M modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js
1 file changed, 7 insertions(+), 6 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js
b/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js
index 59dcc8c..6b16cdb 100644
--- a/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js
+++ b/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js
@@ -46,12 +46,13 @@
* @inheritdoc
*/
ve.ui.MWInternalLinkContextItem.prototype.renderBody = function () {
- var $link = $( 'a' )
- .text( this.getDescription() )
- .attr( {
- href: this.model.getHref(),
- target: '_blank'
- } );
+ var htmlDoc =
this.context.getSurface().getModel().getDocument().getHtmlDocument(),
+ $link = $( 'a' )
+ .text( this.getDescription() )
+ .attr( {
+ href: ve.resolveUrl( this.model.getHref(),
htmlDoc ),
+ target: '_blank'
+ } );
this.$body.empty().append( $link );
// Style based on link cache information
--
To view, visit https://gerrit.wikimedia.org/r/194347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I18bd5d3923771b6ff149aa589bb2fa23beecf4f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] PopupWidget: Add keydown listener and hide popup on ESC - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: PopupWidget: Add keydown listener and hide popup on ESC
..
PopupWidget: Add keydown listener and hide popup on ESC
Bug: T87695
Change-Id: I60c5858d946ddf0dc83faa8b5a551bb55fa5f122
---
M src/widgets/PopupWidget.js
1 file changed, 39 insertions(+), 1 deletion(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/PopupWidget.js b/src/widgets/PopupWidget.js
index ccf3f70..feaad35 100644
--- a/src/widgets/PopupWidget.js
+++ b/src/widgets/PopupWidget.js
@@ -73,6 +73,7 @@
this.align = config.align || 'center';
this.closeButton = new OO.ui.ButtonWidget( { framed: false, icon:
'close' } );
this.onMouseDownHandler = this.onMouseDown.bind( this );
+ this.onDocumentKeyDownHandler = this.onDocumentKeyDown.bind( this );
// Events
this.closeButton.connect( this, { click: 'onCloseButtonClick' } );
@@ -120,7 +121,7 @@
* Handles mouse down events.
*
* @private
- * @param {jQuery.Event} e Mouse down event
+ * @param {MouseEvent} e Mouse down event
*/
OO.ui.PopupWidget.prototype.onMouseDown = function ( e ) {
if (
@@ -160,6 +161,41 @@
*/
OO.ui.PopupWidget.prototype.unbindMouseDownListener = function () {
this.getElementWindow().removeEventListener( 'mousedown',
this.onMouseDownHandler, true );
+};
+
+/**
+ * Handles key down events.
+ *
+ * @private
+ * @param {KeyboardEvent} e Key down event
+ */
+OO.ui.PopupWidget.prototype.onDocumentKeyDown = function ( e ) {
+ if (
+ e.which === OO.ui.Keys.ESCAPE
+ this.isVisible()
+ ) {
+ this.toggle( false );
+ e.preventDefault();
+ e.stopPropagation();
+ }
+};
+
+/**
+ * Bind key down listener.
+ *
+ * @private
+ */
+OO.ui.PopupWidget.prototype.bindKeyDownListener = function () {
+ this.getElementWindow().addEventListener( 'keydown',
this.onDocumentKeyDownHandler, true );
+};
+
+/**
+ * Unbind key down listener.
+ *
+ * @private
+ */
+OO.ui.PopupWidget.prototype.unbindKeyDownListener = function () {
+ this.getElementWindow().removeEventListener( 'keydown',
this.onDocumentKeyDownHandler, true );
};
/**
@@ -204,6 +240,7 @@
if ( show ) {
if ( this.autoClose ) {
this.bindMouseDownListener();
+ this.bindKeyDownListener();
}
this.updateDimensions();
this.toggleClipping( true );
@@ -211,6 +248,7 @@
this.toggleClipping( false );
if ( this.autoClose ) {
this.unbindMouseDownListener();
+ this.unbindKeyDownListener();
}
}
}
--
To view, visit https://gerrit.wikimedia.org/r/191027
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I60c5858d946ddf0dc83faa8b5a551bb55fa5f122
Gerrit-PatchSet: 4
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: Bartosz Dziewoński matma@gmail.com
Gerrit-Reviewer: Esanders esand...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: Prtksxna psax...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't use $dir - change (mediawiki...FeaturedFeeds)
jenkins-bot has submitted this change and it was merged. Change subject: Don't use $dir .. Don't use $dir Change-Id: I4f2cc1559ee70aa23ddac29db91e94355ab3a495 --- M FeaturedFeeds.php 1 file changed, 7 insertions(+), 9 deletions(-) Approvals: MaxSem: Looks good to me, approved jenkins-bot: Verified diff --git a/FeaturedFeeds.php b/FeaturedFeeds.php index 5beb854..ef20850 100644 --- a/FeaturedFeeds.php +++ b/FeaturedFeeds.php @@ -16,17 +16,15 @@ 'descriptionmsg' = 'ffeed-desc', ); -$dir = __DIR__; - -$wgAutoloadClasses['ApiFeaturedFeeds'] = $dir/ApiFeaturedFeeds.php; -$wgAutoloadClasses['FeaturedFeeds'] = $dir/FeaturedFeeds.body.php; -$wgAutoloadClasses['FeaturedFeedChannel'] = $dir/FeaturedFeeds.body.php; -$wgAutoloadClasses['FeaturedFeedItem'] = $dir/FeaturedFeeds.body.php; -$wgAutoloadClasses['SpecialFeedItem'] = $dir/SpecialFeedItem.php; +$wgAutoloadClasses['ApiFeaturedFeeds'] = __DIR__ . '/ApiFeaturedFeeds.php'; +$wgAutoloadClasses['FeaturedFeeds'] = __DIR__ . '/FeaturedFeeds.body.php'; +$wgAutoloadClasses['FeaturedFeedChannel'] = __DIR__ . '/FeaturedFeeds.body.php'; +$wgAutoloadClasses['FeaturedFeedItem'] = __DIR__ . '/FeaturedFeeds.body.php'; +$wgAutoloadClasses['SpecialFeedItem'] = __DIR__ . '/SpecialFeedItem.php'; $wgMessagesDirs['FeaturedFeeds'] = __DIR__ . '/i18n'; -$wgExtensionMessagesFiles['FeaturedFeeds'] = $dir/FeaturedFeeds.i18n.php; -$wgExtensionMessagesFiles['FeaturedFeedsAliases'] = $dir/FeaturedFeeds.alias.php; +$wgExtensionMessagesFiles['FeaturedFeeds'] = __DIR__ . '/FeaturedFeeds.i18n.php'; +$wgExtensionMessagesFiles['FeaturedFeedsAliases'] = __DIR__ . '/FeaturedFeeds.alias.php'; $wgSpecialPages['FeedItem'] = 'SpecialFeedItem'; -- To view, visit https://gerrit.wikimedia.org/r/194284 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4f2cc1559ee70aa23ddac29db91e94355ab3a495 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/FeaturedFeeds Gerrit-Branch: master Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't bomb out if a VM uses an image that glance doesn't kno... - change (mediawiki...OpenStackManager)
Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194358
Change subject: Don't bomb out if a VM uses an image that glance doesn't know
about.
..
Don't bomb out if a VM uses an image that glance doesn't know about.
Bug T89856
Change-Id: I54f52f08aa4cff42bd0a67ad77f7023acc8776db
---
M special/SpecialNovaInstance.php
1 file changed, 6 insertions(+), 2 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/OpenStackManager
refs/changes/58/194358/1
diff --git a/special/SpecialNovaInstance.php b/special/SpecialNovaInstance.php
index 1148ae5..10f9813 100644
--- a/special/SpecialNovaInstance.php
+++ b/special/SpecialNovaInstance.php
@@ -566,8 +566,12 @@
$imageName = $imageNameRet;
} else {
$image = $this-userNova-getImage( $imageId );
- $imageName = $image-getImageName();
- $wgMemc-set( $key, $imageName, 86400 );
+if ( $image ) {
+ $imageName = $image-getImageName();
+ $wgMemc-set( $key, $imageName, 86400 );
+ } else {
+ $imageName = (missing)
+ }
}
$this-pushResourceColumn( $instanceRow, $imageName );
$this-pushResourceColumn( $instanceRow,
$instance-getLaunchTime() );
--
To view, visit https://gerrit.wikimedia.org/r/194358
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I54f52f08aa4cff42bd0a67ad77f7023acc8776db
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/OpenStackManager
Gerrit-Branch: master
Gerrit-Owner: Andrew Bogott abog...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump src to 06c8cf33 for deploy - change (mediawiki...deploy)
Subramanya Sastry has uploaded a new change for review. https://gerrit.wikimedia.org/r/194359 Change subject: Bump src to 06c8cf33 for deploy .. Bump src to 06c8cf33 for deploy Change-Id: I5cbbb5fef2e20f54f702f05ad321d410f1dc6cf5 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid/deploy refs/changes/59/194359/1 diff --git a/src b/src index 08643f5..06c8cf3 16 --- a/src +++ b/src -Subproject commit 08643f53428b1d5a3c9e4fe30ef21e6a2861d942 +Subproject commit 06c8cf33378e3da67c9e2531233fd84d59be8c32 -- To view, visit https://gerrit.wikimedia.org/r/194359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5cbbb5fef2e20f54f702f05ad321d410f1dc6cf5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Handle optional parameters correctly in table selection - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Handle optional parameters correctly in table selection .. Handle optional parameters correctly in table selection If toCol/Row were undefined, then startCol/Row weren't set. Change-Id: Ie61c198c4d47126fa6df82b9c2e1812f413e75cd --- M src/dm/ve.dm.TableSelection.js 1 file changed, 5 insertions(+), 2 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/src/dm/ve.dm.TableSelection.js b/src/dm/ve.dm.TableSelection.js index ab9b3a7..3392f58 100644 --- a/src/dm/ve.dm.TableSelection.js +++ b/src/dm/ve.dm.TableSelection.js @@ -23,10 +23,13 @@ this.tableRange = tableRange; this.tableNode = null; + toCol = toCol === undefined ? fromCol : toCol; + toRow = toRow === undefined ? fromRow : toRow; + this.fromCol = fromCol; this.fromRow = fromRow; - this.toCol = toCol === undefined ? this.fromCol : toCol; - this.toRow = toRow === undefined ? this.fromRow : toRow; + this.toCol = toCol; + this.toRow = toRow; this.startCol = fromCol toCol ? fromCol : toCol; this.startRow = fromRow toRow ? fromRow : toRow; this.endCol = fromCol toCol ? toCol : fromCol; -- To view, visit https://gerrit.wikimedia.org/r/194351 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie61c198c4d47126fa6df82b9c2e1812f413e75cd Gerrit-PatchSet: 1 Gerrit-Project: VisualEditor/VisualEditor Gerrit-Branch: master Gerrit-Owner: Esanders esand...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] statistics: remove 2 UTF-8 characters - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/194353 Change subject: statistics: remove 2 UTF-8 characters .. statistics: remove 2 UTF-8 characters fixing one more invalid byte sequencein US-ASCII that only happens with ruby 1.9.x Bug:T91453 Change-Id: I46112fcd51877ccd340e0141cfc8fd32a6d24c31 --- M manifests/role/statistics.pp 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/53/194353/1 diff --git a/manifests/role/statistics.pp b/manifests/role/statistics.pp index 6d9952e..6d67ca0 100644 --- a/manifests/role/statistics.pp +++ b/manifests/role/statistics.pp @@ -94,7 +94,7 @@ # aggregating hourly pagecount-all-sites project count files into # daily per site csvs. -# Although it is in the “private” role, the dataset actually isn't +# Although it is in the private role, the dataset actually isn't # private. We just keep it here to spare adding a separate role. include statistics::aggregator -- To view, visit https://gerrit.wikimedia.org/r/194353 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I46112fcd51877ccd340e0141cfc8fd32a6d24c31 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use new Http profiling and drop custom profiling calls - change (mediawiki...Collection)
jenkins-bot has submitted this change and it was merged.
Change subject: Use new Http profiling and drop custom profiling calls
..
Use new Http profiling and drop custom profiling calls
Change-Id: I98f8ed4aa3811427ec2005c328a9db118534f642
---
M RenderingAPI.php
1 file changed, 2 insertions(+), 6 deletions(-)
Approvals:
MaxSem: Looks good to me, approved
jenkins-bot: Verified
diff --git a/RenderingAPI.php b/RenderingAPI.php
index ad55bfd..07a841f 100644
--- a/RenderingAPI.php
+++ b/RenderingAPI.php
@@ -232,7 +232,6 @@
protected function makeRequest( $command, array $params ) {
global $wgCollectionMWServeURL,
$wgCollectionMWServeCredentials, $wgCollectionFormatToServeURL,
$wgCollectionCommandToServeURL;
- wfProfileIn( __METHOD__ . -$command );
$serveURL = $wgCollectionMWServeURL;
if ( $this-writer ) {
if ( isset( $wgCollectionFormatToServeURL[
$this-writer ] ) ) {
@@ -251,14 +250,11 @@
// If $serveURL has a | in it, we need to use a proxy.
list( $proxy, $serveURL ) = array_pad( explode( '|', $serveURL,
2 ), -2, '' );
- $response = Http::post( $serveURL, array( 'postData' =
$params, 'proxy' = $proxy ) );
+ $response = Http::post( $serveURL, array( 'postData' =
$params, 'proxy' = $proxy ), __METHOD__ );
if ( $response === false ) {
wfDebugLog( 'collection', Request to $serveURL
resulted in error );
}
- $result = new CollectionAPIResult( $response );
- wfProfileOut( __METHOD__ . -$command );
-
- return $result;
+ return new CollectionAPIResult( $response );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/194272
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I98f8ed4aa3811427ec2005c328a9db118534f642
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Collection
Gerrit-Branch: master
Gerrit-Owner: Chad ch...@wikimedia.org
Gerrit-Reviewer: Cscott canan...@wikimedia.org
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Don't call .addClass() in CE nodes' setup handlers - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Don't call .addClass() in CE nodes' setup handlers
..
Don't call .addClass() in CE nodes' setup handlers
Adding CSS classes on setup causes nodes to first render without
the class, then rerender with the class. This is wasteful. Instead,
add classes in the constructor.
In LeafNode, BranchNode and FocusableNode we also set classes
on setup, because GeneratedContentNode does crazy things to this.$element
and it's important we don't lose these classes (a lot of code
checks for the presence of these classes).
In TableCellNode, we need to update classes when the style
attribute changes.
Change-Id: I2690751d16977b106831c94a0757b615985fa5d6
---
M src/ce/nodes/ve.ce.TableCaptionNode.js
M src/ce/nodes/ve.ce.TableCellNode.js
M src/ce/nodes/ve.ce.TableNode.js
M src/ce/ve.ce.BranchNode.js
M src/ce/ve.ce.FocusableNode.js
M src/ce/ve.ce.LeafNode.js
6 files changed, 52 insertions(+), 82 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/ce/nodes/ve.ce.TableCaptionNode.js
b/src/ce/nodes/ve.ce.TableCaptionNode.js
index 37b733e..1527d81 100644
--- a/src/ce/nodes/ve.ce.TableCaptionNode.js
+++ b/src/ce/nodes/ve.ce.TableCaptionNode.js
@@ -16,6 +16,11 @@
ve.ce.TableCaptionNode = function VeCeTableCaptionNode() {
// Parent constructor
ve.ce.TableCaptionNode.super.apply( this, arguments );
+
+ // DOM changes
+ this.$element
+ .addClass( 've-ce-tableCaptionNode' )
+ .prop( 'contentEditable', 'true' );
};
/* Inheritance */
@@ -27,21 +32,6 @@
ve.ce.TableCaptionNode.static.name = 'tableCaption';
ve.ce.TableCaptionNode.static.tagName = 'caption';
-
-/* Methods */
-
-/**
- * @inheritdoc
- */
-ve.ce.TableCaptionNode.prototype.onSetup = function () {
- // Parent method
- ve.ce.TableCaptionNode.super.prototype.onSetup.call( this );
-
- // DOM changes
- this.$element
- .addClass( 've-ce-tableCaptionNode' )
- .prop( 'contentEditable', 'true' );
-};
/* Registration */
diff --git a/src/ce/nodes/ve.ce.TableCellNode.js
b/src/ce/nodes/ve.ce.TableCellNode.js
index 25f38b1..f2980ce 100644
--- a/src/ce/nodes/ve.ce.TableCellNode.js
+++ b/src/ce/nodes/ve.ce.TableCellNode.js
@@ -17,6 +17,22 @@
// Parent constructor
ve.ce.TableCellNode.super.apply( this, arguments );
+ var rowspan = this.model.getRowspan(),
+ colspan = this.model.getColspan();
+
+ // DOM changes
+ this.$element
+ // The following classes can be used here:
+ // ve-ce-tableCellNode-data
+ // ve-ce-tableCellNode-header
+ .addClass( 've-ce-tableCellNode ve-ce-tableCellNode-' +
this.model.getAttribute( 'style' ) );
+ if ( rowspan 1 ) {
+ this.$element.attr( 'rowspan', rowspan );
+ }
+ if ( colspan 1 ) {
+ this.$element.attr( 'colspan', colspan );
+ }
+
// Events
this.model.connect( this, {
update: 'onUpdate',
@@ -33,46 +49,6 @@
ve.ce.TableCellNode.static.name = 'tableCell';
/* Methods */
-
-/**
- * @inheritdoc
- */
-ve.ce.TableCellNode.prototype.onSetup = function () {
- var rowspan = this.model.getRowspan(),
- colspan = this.model.getColspan();
-
- // Parent method
- ve.ce.TableCellNode.super.prototype.onSetup.call( this );
-
- // Exit if already setup or not attached
- if ( this.isSetup || !this.root ) {
- return;
- }
-
- // DOM changes
- this.$element
- // The following classes can be used here:
- // ve-ce-tableCellNode-data
- // ve-ce-tableCellNode-header
- .addClass( 've-ce-tableCellNode ve-ce-tableCellNode-' +
this.model.getAttribute( 'style' ) );
-
- if ( rowspan 1 ) {
- this.$element.attr( 'rowspan', rowspan );
- }
- if ( colspan 1 ) {
- this.$element.attr( 'colspan', colspan );
- }
-};
-
-/**
- * @inheritdoc
- */
-ve.ce.TableCellNode.prototype.onTeardown = function () {
- // Parent method
- ve.ce.TableCellNode.super.prototype.onTeardown.call( this );
-
- this.$element.removeClass( 've-ce-tableCellNode
ve-ce-tableCellNode-data ve-ce-tableCellNode-header' );
-};
/**
* Get the HTML tag name.
@@ -128,6 +104,9 @@
}
break;
case 'style':
+ this.$element
+ .removeClass( 've-ce-tableCellNode-' + from )
+ .addClass( 've-ce-tableCellNode-' + to );
this.updateTagName();
break;
}
diff --git a/src/ce/nodes/ve.ce.TableNode.js b/src/ce/nodes/ve.ce.TableNode.js
index
[MediaWiki-commits] [Gerrit] Update VE core submodule to master (7dcd5e8) - change (mediawiki...VisualEditor)
Jforrester has uploaded a new change for review. https://gerrit.wikimedia.org/r/194360 Change subject: Update VE core submodule to master (7dcd5e8) .. Update VE core submodule to master (7dcd5e8) New changes: 61e1646 Resolve URLs in LinkContextItem 91d1814 Handle optional parameters correctly in table selection c2810ce Fix up selection if we cursor into or next to a table node 11f507a Don't call .addClass() in CE nodes' setup handlers Change-Id: Iad402ddab1ca8b736c79589e4724882a41eaa6e1 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor refs/changes/60/194360/1 diff --git a/lib/ve b/lib/ve index a65ad7c..7dcd5e8 16 --- a/lib/ve +++ b/lib/ve -Subproject commit a65ad7c55e8fc710aaf24fab36a0302ac1fc5b71 +Subproject commit 7dcd5e831381084809b984301404d5786125b85d -- To view, visit https://gerrit.wikimedia.org/r/194360 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iad402ddab1ca8b736c79589e4724882a41eaa6e1 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Shorten long lines in PrefixSearch.php to make phpcs pass - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Shorten long lines in PrefixSearch.php to make phpcs pass
..
Shorten long lines in PrefixSearch.php to make phpcs pass
Change-Id: Ibf18835ff614e53887912b8e997a3230ed29dd68
---
M includes/PrefixSearch.php
1 file changed, 4 insertions(+), 1 deletion(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/PrefixSearch.php b/includes/PrefixSearch.php
index 2885679..55a4f49 100644
--- a/includes/PrefixSearch.php
+++ b/includes/PrefixSearch.php
@@ -155,7 +155,10 @@
}
}
$srchres = array();
- if ( Hooks::run( 'PrefixSearchBackend', array( $namespaces,
$search, $limit, $srchres, $offset ) ) ) {
+ if ( Hooks::run(
+ 'PrefixSearchBackend',
+ array( $namespaces, $search, $limit, $srchres, $offset
)
+ ) ) {
return $this-titles( $this-defaultSearchBackend(
$namespaces, $search, $limit, $offset ) );
}
return $this-strings( $this-handleResultFromHook( $srchres,
$namespaces, $search, $limit ) );
--
To view, visit https://gerrit.wikimedia.org/r/194189
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf18835ff614e53887912b8e997a3230ed29dd68
Gerrit-PatchSet: 4
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Amire80 amir.ahar...@mail.huji.ac.il
Gerrit-Reviewer: Krinkle krinklem...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DropdownInputWidget: Add description, example, and mark priv... - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: DropdownInputWidget: Add description, example, and mark private
method
..
DropdownInputWidget: Add description, example, and mark private method
Change-Id: I6376a7f22346b67b74d412a42addec84ea7970dd
---
M src/widgets/DropdownInputWidget.js
1 file changed, 19 insertions(+), 2 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/DropdownInputWidget.js
b/src/widgets/DropdownInputWidget.js
index 793d866..3ed83ed 100644
--- a/src/widgets/DropdownInputWidget.js
+++ b/src/widgets/DropdownInputWidget.js
@@ -1,6 +1,22 @@
/**
- * A OO.ui.DropdownWidget synchronized with a `input type=hidden` for form
submission. Intended to
- * be used within a OO.ui.FormLayout.
+ * DropdownInputWidget is a {@link OO.ui.DropdownWidget DropdownWidget}
intended to be used
+ * within a {@link OO.ui.FormLayout form}. The selected value is synchronized
with the value
+ * of a hidden HTML `input` tag. Please see the [OOjs UI documentation on
MediaWiki][1] for
+ * more information about input widgets.
+ *
+ * @example
+ * // Example: A DropdownInputWidget with three options
+ * var dropDown=new OO.ui.DropdownInputWidget( {
+ * label: 'Dropdown menu: Select a menu option',
+ * options: [
+ * { data: 'a', label: 'First' } ,
+ * { data: 'b', label: 'Second'} ,
+ * { data: 'c', label: 'Third' }
+ * ]
+ * } );
+ * $('body').append(dropDown.$element);
+ *
+ * [1]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Inputs
*
* @class
* @extends OO.ui.InputWidget
@@ -46,6 +62,7 @@
/**
* Handles menu select events.
*
+ * @private
* @param {OO.ui.MenuOptionWidget} item Selected menu item
*/
OO.ui.DropdownInputWidget.prototype.onMenuSelect = function ( item ) {
--
To view, visit https://gerrit.wikimedia.org/r/194363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I6376a7f22346b67b74d412a42addec84ea7970dd
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Kmenger kmen...@wikimedia.org
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] hhvm: convert 'ASCII art' to ASCII - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: hhvm: convert 'ASCII art' to ASCII .. hhvm: convert 'ASCII art' to ASCII In order to fix more invalid byte sequence in US-ASCII with ruby 1.9.x. https://tickets.puppetlabs.com/browse/PUP-1031 Bug:T91453 Change-Id: I267f42716320fcb7f4d3af479d301fa75fd729e7 --- M modules/hhvm/manifests/init.pp 1 file changed, 4 insertions(+), 4 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/hhvm/manifests/init.pp b/modules/hhvm/manifests/init.pp index 18c24c7..d62a5b7 100644 --- a/modules/hhvm/manifests/init.pp +++ b/modules/hhvm/manifests/init.pp @@ -6,8 +6,8 @@ # The layout of configuration files in /etc/hhvm is as follows: # # /etc/hhvm -# ├── php.ini # Settings for CLI mode -# └── fcgi.ini # Settings for FastCGI mode +# |__ php.ini # Settings for CLI mode +# |__ fcgi.ini # Settings for FastCGI mode # # The CLI configs are located in the paths HHVM automatically loads by # default. This makes it easy to invoke HHVM from the command line, @@ -25,8 +25,8 @@ # HHVM is also configured to write stack traces to the same directory. # # /var/log/hhvm -# ├── error.log -# └── stacktrace.NNN.log.MMDD, ... +# |__ error.log +# |__ stacktrace.NNN.log.MMDD, ... # # # === Parameters -- To view, visit https://gerrit.wikimedia.org/r/194365 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I267f42716320fcb7f4d3af479d301fa75fd729e7 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org Gerrit-Reviewer: Ori.livneh o...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] keyholder/eventlogging: replace UTF-8 chars - change (operations/puppet)
Dzahn has submitted this change and it was merged. Change subject: keyholder/eventlogging: replace UTF-8 chars .. keyholder/eventlogging: replace UTF-8 chars 2 more occurences of UTF-8 chars in *.pp files and then that's all. Replacing them because of T91453 ZeroMQ is a redirect to ØMQ on Wikipedia as well. :p Bug:T91453 Change-Id: I59e95c76520159bcfaac6a6d371f7e8d9b1ada6f --- M modules/eventlogging/manifests/init.pp M modules/keyholder/manifests/init.pp 2 files changed, 3 insertions(+), 3 deletions(-) Approvals: jenkins-bot: Verified Dzahn: Looks good to me, approved diff --git a/modules/eventlogging/manifests/init.pp b/modules/eventlogging/manifests/init.pp index f7b133f..4de008d 100644 --- a/modules/eventlogging/manifests/init.pp +++ b/modules/eventlogging/manifests/init.pp @@ -23,7 +23,7 @@ # incoming events (valid and invalid) to a StatsD host. # # These services communicate with one another using a publisher / -# subscriber model using ØMQ as the transport layer. Different +# subscriber model using ZeroMQ as the transport layer. Different # event-processing patterns can be implemented by freely composing # multiple instances of each type, running locally or distributed across # several hosts. diff --git a/modules/keyholder/manifests/init.pp b/modules/keyholder/manifests/init.pp index ecdf26d..3db511f 100644 --- a/modules/keyholder/manifests/init.pp +++ b/modules/keyholder/manifests/init.pp @@ -14,8 +14,8 @@ # The two services bind domain sockets at these addresses: # # /run/keyholder -# ├── agent.sock (0600) -# └── proxy.sock (0660) +# |__ agent.sock (0600) +# |__ proxy.sock (0660) # # Before the shared SSH agent can be used, it must be armed by a user # with access to the private key. This can be done by running: -- To view, visit https://gerrit.wikimedia.org/r/194369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I59e95c76520159bcfaac6a6d371f7e8d9b1ada6f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org Gerrit-Reviewer: Dzahn dz...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add a threshold to 'read more' calculation in media dialog info - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Add a threshold to 'read more' calculation in media dialog info
..
Add a threshold to 'read more' calculation in media dialog info
When calculating whether to show the 'read more' button on fields
that are configured 'descriptions', use a threshold to check if
the height is enough to be shown.
Bug: T87265
Change-Id: I0601e4fa92cb58903641a146500cf560bc029425
---
M modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
M modules/ve-mw/ui/widgets/ve.ui.MWMediaInfoFieldWidget.js
2 files changed, 30 insertions(+), 9 deletions(-)
Approvals:
Catrope: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
index 4bc24e4..11ba3fa 100644
--- a/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
+++ b/modules/ve-mw/ui/dialogs/ve.ui.MWMediaDialog.js
@@ -619,11 +619,9 @@
$info.outerWidth( Math.floor( windowWidth -
$thumbContainer.outerWidth( true ) - 15 ) );
}
- // Adjust height-limited fields
+ // Initialize fields
for ( field in fields ) {
- if ( fields[field].getType() === 'description' ) {
- fields[field].toggleReadMoreButton();
- }
+ fields[field].initialize();
}
// Let the scrollbar appear naturally if it should
this.mediaImageInfoPanel.$element.css( 'overflow', '' );
diff --git a/modules/ve-mw/ui/widgets/ve.ui.MWMediaInfoFieldWidget.js
b/modules/ve-mw/ui/widgets/ve.ui.MWMediaInfoFieldWidget.js
index ff0316e..6742faa 100644
--- a/modules/ve-mw/ui/widgets/ve.ui.MWMediaInfoFieldWidget.js
+++ b/modules/ve-mw/ui/widgets/ve.ui.MWMediaInfoFieldWidget.js
@@ -107,14 +107,37 @@
ve.ui.MWMediaInfoFieldWidget.static.tagName = 'div';
/**
+ * Define a height threshold for the description fields.
+ * If the rendered field's height is under the defined limit
+ * (max-height + threshold) we should remove the max-height
+ * and display the field as-is.
+ * This prevents cases where read more appears but only
+ * exposes only a few pixels or a line extra.
+ *
+ * @property {number} Threshold in pixels
+ */
+ve.ui.MWMediaInfoFieldWidget.static.threshold = 24;
+
+/**
* Toggle the read more button according to whether it should be
* visible or not.
*/
-ve.ui.MWMediaInfoFieldWidget.prototype.toggleReadMoreButton = function () {
- var show = this.$text.height() this.$text.prop( 'scrollHeight' );
- // Only show the readMore button if it should be shown, and not while
- // the expansion animation is ongoing
- this.readMoreButton.toggle( show );
+ve.ui.MWMediaInfoFieldWidget.prototype.initialize = function () {
+ var actualHeight, containerHeight;
+
+ if ( this.getType() === 'description' ) {
+ actualHeight = this.$text.prop( 'scrollHeight' );
+ containerHeight = this.$text.outerHeight( true );
+
+ if ( actualHeight containerHeight +
this.constructor.static.threshold ) {
+ // The contained result is big enough to show. Remove
the maximum height
+ this.$text
+ .css( 'maxHeight', '' );
+ } else {
+ // Only show the readMore button if it should be shown
+ this.readMoreButton.toggle( containerHeight
actualHeight );
+ }
+ }
};
/**
--
To view, visit https://gerrit.wikimedia.org/r/193286
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0601e4fa92cb58903641a146500cf560bc029425
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Mooeypoo mor...@gmail.com
Gerrit-Reviewer: Catrope roan.katt...@gmail.com
Gerrit-Reviewer: Mooeypoo mor...@gmail.com
Gerrit-Reviewer: Trevor Parscal tpars...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0ea0691..1a40f3c - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/194370 Change subject: Syncronize VisualEditor: 0ea0691..1a40f3c .. Syncronize VisualEditor: 0ea0691..1a40f3c Change-Id: I4a65f7eea5b0994c94c8b3445be64ea0f42ed24c --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/70/194370/1 diff --git a/VisualEditor b/VisualEditor index 0ea0691..1a40f3c 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0ea0691ad781d47b04c1c7c112e7f3a26e24fdd6 +Subproject commit 1a40f3c0487688b3eaf07247ab9193e9df1e42ec -- To view, visit https://gerrit.wikimedia.org/r/194370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I4a65f7eea5b0994c94c8b3445be64ea0f42ed24c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ 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 (79004c9) - change (mediawiki...VisualEditor)
jenkins-bot has submitted this change and it was merged. Change subject: Update VE core submodule to master (79004c9) .. Update VE core submodule to master (79004c9) New changes: b66e48d Use the inspector's previousSelection for context positioning Change-Id: I7855519f5ad806ace2304ed6e1f5458363ffb440 --- M lib/ve 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Catrope: Looks good to me, approved jenkins-bot: Verified diff --git a/lib/ve b/lib/ve index 7dcd5e8..79004c9 16 --- a/lib/ve +++ b/lib/ve -Subproject commit 7dcd5e831381084809b984301404d5786125b85d +Subproject commit 79004c9a36b483b640d1e64cba28596ad6700eaa -- To view, visit https://gerrit.wikimedia.org/r/194366 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I7855519f5ad806ace2304ed6e1f5458363ffb440 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/VisualEditor Gerrit-Branch: master Gerrit-Owner: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: Catrope roan.katt...@gmail.com Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 1a40f3c..56b95f2 - change (mediawiki/extensions)
Jenkins-mwext-sync has uploaded a new change for review. https://gerrit.wikimedia.org/r/194371 Change subject: Syncronize VisualEditor: 1a40f3c..56b95f2 .. Syncronize VisualEditor: 1a40f3c..56b95f2 Change-Id: I7bd6e1a1929fb312967d903c45a5153fd3867936 --- M VisualEditor 1 file changed, 0 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions refs/changes/71/194371/1 diff --git a/VisualEditor b/VisualEditor index 1a40f3c..56b95f2 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 1a40f3c0487688b3eaf07247ab9193e9df1e42ec +Subproject commit 56b95f2facd55372d90d8d0f119ef2a11f9d00ff -- To view, visit https://gerrit.wikimedia.org/r/194371 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7bd6e1a1929fb312967d903c45a5153fd3867936 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ComboBoxWidget: Add description, example, and mark private m... - change (oojs/ui)
Kmenger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194372
Change subject: ComboBoxWidget: Add description, example, and mark private
methods
..
ComboBoxWidget: Add description, example, and mark private methods
Change-Id: I3eaada60137aa790d50e63daf7a6daf58bd91a4f
---
M src/widgets/ComboBoxWidget.js
1 file changed, 54 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/72/194372/1
diff --git a/src/widgets/ComboBoxWidget.js b/src/widgets/ComboBoxWidget.js
index 3c9b555..f9920b3 100644
--- a/src/widgets/ComboBoxWidget.js
+++ b/src/widgets/ComboBoxWidget.js
@@ -1,5 +1,43 @@
/**
- * Text input with a menu of optional values.
+ * ComboBoxWidgets combine a {@link OO.ui.TextInputWidget text input} (where a
value
+ * can be entered manually) and a {@link OO.ui.MenuSelectWidget menu of
options} (from which
+ * a value can be chosen instead). Users can choose options from the combo box
in one of two ways:
+ *
+ * - by typing a value in the text input field. If the value exactly matches
the value of a menu
+ * option, that option will appear to be selected.
+ * - by choosing a value from the menu. The value of the chosen option will
then appear in the text
+ * input field.
+ *
+ * For more information about menus and options, please see the [OOjs UI
documentation on MediaWiki][1].
+ *
+ * @example
+ * // Example: A ComboBoxWidget.
+ * var comboBox=new OO.ui.ComboBoxWidget( {
+ * label: 'ComboBoxWidget',
+ * input: { value: 'Option One' },
+ * menu: {
+ * items: [
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 1',
+ * label: 'Option One' } ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 2',
+ * label: 'Option Two' } ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 3',
+ * label: 'Option Three'} ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 4',
+ * label: 'Option Four' } ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 5',
+ * label: 'Option Five' } )
+ * ]
+ * }
+ * } );
+ * $('body').append(comboBox.$element);
+ *
+ * [1]:
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options
*
* @class
* @extends OO.ui.Widget
@@ -7,9 +45,11 @@
*
* @constructor
* @param {Object} [config] Configuration options
- * @cfg {Object} [menu] Configuration options to pass to menu widget
- * @cfg {Object} [input] Configuration options to pass to input widget
- * @cfg {jQuery} [$overlay] Overlay layer; defaults to relative positioning
+ * @cfg {Object} [menu] Configuration options to pass to the {@link
OO.ui.MenuSelectWidget menu select widget}.
+ * @cfg {Object} [input] Configuration options to pass to the {@link
OO.ui.TextInputWidget text input widget}.
+ * @cfg {jQuery} [$overlay] Render the menu into a separate layer. This
configuration is useful in cases where
+ * the expanded menu is larger than its containing `div`. The specified
overlay layer is usually on top of the
+ * containing `div` and has a larger area. By default, the menu uses
relative positioning.
*/
OO.ui.ComboBoxWidget = function OoUiComboBoxWidget( config ) {
// Configuration initialization
@@ -86,6 +126,7 @@
/**
* Handle input change events.
*
+ * @private
* @param {string} value New value
*/
OO.ui.ComboBoxWidget.prototype.onInputChange = function ( value ) {
@@ -104,6 +145,8 @@
/**
* Handle mouse click events.
*
+ *
+ * @private
* @param {jQuery.Event} e Mouse click event
*/
OO.ui.ComboBoxWidget.prototype.onClick = function ( e ) {
@@ -117,6 +160,8 @@
/**
* Handle key press events.
*
+ *
+ * @private
* @param {jQuery.Event} e Key press event
*/
OO.ui.ComboBoxWidget.prototype.onKeyPress = function ( e ) {
@@ -129,6 +174,8 @@
/**
* Handle input enter events.
+ *
+ * @private
*/
OO.ui.ComboBoxWidget.prototype.onInputEnter = function () {
if ( !this.isDisabled() ) {
@@ -139,6 +186,7 @@
/**
* Handle menu choose events.
*
+ * @private
* @param {OO.ui.OptionWidget} item Chosen item
*/
OO.ui.ComboBoxWidget.prototype.onMenuChoose = function ( item ) {
@@ -149,6 +197,8 @@
/**
* Handle menu item change events.
+ *
+ * @private
*/
OO.ui.ComboBoxWidget.prototype.onMenuItemsChange = function () {
var match = this.menu.getItemFromData( this.input.getValue() );
--
To view, visit https://gerrit.wikimedia.org/r/194372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I3eaada60137aa790d50e63daf7a6daf58bd91a4f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
[MediaWiki-commits] [Gerrit] typo on cloning repo with git - change (mediawiki...parsoid)
Arlolra has uploaded a new change for review. https://gerrit.wikimedia.org/r/194380 Change subject: typo on cloning repo with git .. typo on cloning repo with git Change-Id: I1ec2ce2605540bdd1adcb885a6924dbfa4661856 --- M guides/setup/README.md 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/services/parsoid refs/changes/80/194380/1 diff --git a/guides/setup/README.md b/guides/setup/README.md index a8d7dd6..52a4c24 100644 --- a/guides/setup/README.md +++ b/guides/setup/README.md @@ -28,7 +28,7 @@ To get the code, you'll need to clone our git repository. Run this command: ``` -$ git checkout https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid +$ git clone https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid ``` ## Installing node.js dependencies -- To view, visit https://gerrit.wikimedia.org/r/194380 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I1ec2ce2605540bdd1adcb885a6924dbfa4661856 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra abrea...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DecoratedOptionWidget: Add description and example - change (oojs/ui)
Kmenger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194381
Change subject: DecoratedOptionWidget: Add description and example
..
DecoratedOptionWidget: Add description and example
Change-Id: I58784524c0be7853140c6245e8f685ecf4d1612c
---
M src/widgets/DecoratedOptionWidget.js
1 file changed, 24 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/81/194381/1
diff --git a/src/widgets/DecoratedOptionWidget.js
b/src/widgets/DecoratedOptionWidget.js
index 9fd8ee8..ca5acb6 100644
--- a/src/widgets/DecoratedOptionWidget.js
+++ b/src/widgets/DecoratedOptionWidget.js
@@ -1,7 +1,29 @@
/**
- * Option widget with an option icon and indicator.
+ * DecoratedOptionWidgets are {@link OO.ui.OptionWidget options} that can be
configured
+ * with an {@link OO.ui.IconElement icon} and/or {@link OO.ui.IndicatorElement
indicator}.
+ * This class is used with OO.ui.SelectWidget to create a selection of
mutually exclusive
+ * options. For more information about options and selects, please see the
+ * [OOjs UI documentation on MediaWiki][1].
*
- * Use together with OO.ui.SelectWidget.
+ * @example
+ * // Decorated options in a select widget
+ * var select=new OO.ui.SelectWidget( {
+ * items: [
+ * new OO.ui.DecoratedOptionWidget( {
+ * data: 'a',
+ * label: 'Option with icon',
+ * icon: 'help'
+ * } ),
+ * new OO.ui.DecoratedOptionWidget( {
+ * data: 'b',
+ * label: 'Option with indicator',
+ * indicator: 'next'
+ * } )
+ * ]
+ * } );
+ * $('body').append(select.$element);
+ *
+ * [1]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options
*
* @class
* @extends OO.ui.OptionWidget
--
To view, visit https://gerrit.wikimedia.org/r/194381
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I58784524c0be7853140c6245e8f685ecf4d1612c
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Kmenger kmen...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] [WikiGrok] Create 'screenwriter' campaign - change (operations/mediawiki-config)
Bmansurov has uploaded a new change for review. https://gerrit.wikimedia.org/r/194378 Change subject: [WikiGrok] Create 'screenwriter' campaign .. [WikiGrok] Create 'screenwriter' campaign Suggestions are 'author', 'actor', and 'film producer' Change-Id: I08c34bb150d4ea919a95e5833b19941945073110 --- M wmf-config/mobile.php 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/78/194378/1 diff --git a/wmf-config/mobile.php b/wmf-config/mobile.php index 108edcd..f9b790d 100644 --- a/wmf-config/mobile.php +++ b/wmf-config/mobile.php @@ -177,6 +177,21 @@ 'Q33999'/* actor */ ), ), + + // https://trello.com/c/Ephr8PNK + 'screenwriter' = array( + 'type' = 'Simple', + 'property' = 'P106'/* occupation */, + 'ifAll' = array( + 'P31'/* instance of */ = 'Q5'/* human */, + 'P106'/* occupation */ = 'Q28389'/* screenwriter */ + ), + 'suggestions' = array( + 'Q482980'/* author */, + 'Q33999'/* actor */, + 'Q3282637'/* film producer */ + ), + ), ); } -- To view, visit https://gerrit.wikimedia.org/r/194378 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I08c34bb150d4ea919a95e5833b19941945073110 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: Bmansurov bmansu...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] A global user page's title is only known if there are conten... - change (mediawiki...GlobalUserPage)
Ricordisamoa has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194379
Change subject: A global user page's title is only known if there are contents
in it
..
A global user page's title is only known if there are contents in it
The new method GlobalUserPage-getParsedOutput() split from
showMissingArticle() returns false for empty global user pages,
allowing users who don't want a global user page to simply wrap
it in noinclude tags.
Bug: T90849
Change-Id: I9b61cc33052dce23e4546a970954cb8f9677aef4
---
M GlobalUserPage.body.php
M GlobalUserPage.hooks.php
2 files changed, 21 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GlobalUserPage
refs/changes/79/194379/1
diff --git a/GlobalUserPage.body.php b/GlobalUserPage.body.php
index cda36a3..dc9442c 100644
--- a/GlobalUserPage.body.php
+++ b/GlobalUserPage.body.php
@@ -29,25 +29,35 @@
$this-cache = $wgMemc;
}
- public function showMissingArticle() {
+ public function getParsedOutput() {
$title = $this-getTitle();
if ( !self::shouldDisplayGlobalPage( $title ) ) {
- parent::showMissingArticle();
- return;
+ return false;
}
$user = User::newFromName( $this-getUsername() );
- $out = $this-getContext()-getOutput();
$parsedOutput = $this-getRemoteParsedText(
self::getCentralTouched( $user ) );
// If the user page is empty or the API request failed, show
the normal
// missing article page
if ( !$parsedOutput || !trim( $parsedOutput['text']['*'] ) ) {
+ return false;
+ }
+ return $parsedOutput;
+ }
+
+ public function showMissingArticle() {
+ $title = $this-getTitle();
+
+ $parsedOutput = $this-getParsedOutput();
+ if ( $parsedOutput === false ) {
parent::showMissingArticle();
return;
}
+
+ $out = $this-getContext()-getOutput();
$out-addHTML( $parsedOutput['text']['*'] );
$out-addModuleStyles( 'ext.GlobalUserPage' );
diff --git a/GlobalUserPage.hooks.php b/GlobalUserPage.hooks.php
index 7b40cec..69669c5 100644
--- a/GlobalUserPage.hooks.php
+++ b/GlobalUserPage.hooks.php
@@ -74,7 +74,13 @@
*/
public static function onTitleIsAlwaysKnown( $title, $isKnown ) {
if ( GlobalUserPage::shouldDisplayGlobalPage( $title ) ) {
- $isKnown = true;
+ $page = new GlobalUserPage(
+ $title,
+
ConfigFactory::getDefaultInstance()-makeConfig( 'globaluserpage' )
+ );
+ if ( $page-getParsedOutput() !== false ) {
+ $isKnown = true;
+ }
}
return true;
--
To view, visit https://gerrit.wikimedia.org/r/194379
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b61cc33052dce23e4546a970954cb8f9677aef4
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GlobalUserPage
Gerrit-Branch: master
Gerrit-Owner: Ricordisamoa ricordisa...@openmailbox.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Put the main menu in a nav element - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Put the main menu in a nav element
..
Hygiene: Put the main menu in a nav element
Change-Id: I996e3e07dfd1eefb98b258ad5ddb652cb83cd82f
---
M includes/skins/MinervaTemplate.php
M less/mainmenu.less
2 files changed, 124 insertions(+), 124 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/skins/MinervaTemplate.php
b/includes/skins/MinervaTemplate.php
index 9704a9d..1633a05 100644
--- a/includes/skins/MinervaTemplate.php
+++ b/includes/skins/MinervaTemplate.php
@@ -369,11 +369,11 @@
echo $data[ 'headelement' ];
?
div id=mw-mf-viewport
- div id=mw-mf-page-left class=navigation-drawer
+ nav id=mw-mf-page-left class=navigation-drawer
?php
$this-renderMainMenu( $data );
?
- /div
+ /nav
div id=mw-mf-page-center
?php
foreach ( $this-data['banners'] as
$banner ):
diff --git a/less/mainmenu.less b/less/mainmenu.less
index f62341a..62b9a74 100644
--- a/less/mainmenu.less
+++ b/less/mainmenu.less
@@ -25,11 +25,7 @@
}
#mw-mf-page-left {
- font-size: 90%;
float: left;
- min-height: 100%;
- background: @mainMenuBackgroundColor;
- border-left: solid @menuBorder @menuBorderColor;
}
// Transparent shield hidden by default
@@ -50,135 +46,139 @@
box-shadow: -5px 0 0 0 rgba(0, 0, 0, 0.3);
}
-.client-js {
- #mw-mf-page-left ul {
- li {
- .icon-secondary {
- border: none;
- position: absolute;
- right: 0;
- top: 0;
- bottom: 0;
- padding-right: 0;
- border-left: 1px solid @colorGray7;
+// FIXME: Remove this once the nav element is delivered to everyone and cached.
+#mw-mf-page-left,
+nav {
+ font-size: 90%;
+ min-height: 100%;
+ background: @mainMenuBackgroundColor;
+ border-left: solid @menuBorder @menuBorderColor;
- // FIXME: Remove when cache cleared and using
mw-ui-icon
- .icon {
- width: 0;
- }
- }
- .icon-profile,
- .mw-ui-icon-profile {
- // 1px for the logout icon border-left
- margin-right: @menuLinkLineHeight * 2 + 1;
- }
- }
- }
-}
+ .client-js {
+ .icon-secondary {
+ border: none;
+ position: absolute;
+ right: 0;
+ top: 0;
+ bottom: 0;
+ padding-right: 0;
+ border-left: 1px solid @colorGray7;
-#mw-mf-page-left ul {
- background-color: @mainMenuBackgroundColor;
-
- :first-child {
- border-bottom: @menuBorder solid @menuBorderColor;
-
- li:first-child {
- border-top: none;
- }
- }
-
- .icon-home {
- .background-image('images/menu/home.png');
- }
-
- .icon-random {
- .background-image('images/menu/random.png');
- }
-
- .icon-watchlist {
- .background-image('images/menu/watchlist.png');
- }
-
- .icon-uploads {
- .background-image('images/menu/uploads.png');
- }
-
- .icon-nearby {
- .background-image('images/menu/nearby.png');
- }
-
- .icon-settings {
- .background-image('images/menu/settings.png');
- }
-
- .icon-secondary-logout {
- .background-image('images/menu/loginout.png');
- }
-
- .icon-profile {
- .background-image('images/menu/user.png');
- }
-
- // FIXME: Remove when mw-ui-icon in stable
- .icon.icon-anon {
- .background-image('images/menu/anon.png');
- }
-
- li {
- position: relative; // ensure the logout link in beta can be
position absolute
- font-size: @menuItemFontSize;
- border-top: 1px solid @colorGray7;
-
- :hover {
- background-color: @colorGray5;
- margin-left: -@menuBorder;
- a {
- border-left:
[MediaWiki-commits] [Gerrit] Add review_questions and review_answers tables - change (wikimedia/iegreview)
jenkins-bot has submitted this change and it was merged. Change subject: Add review_questions and review_answers tables .. Add review_questions and review_answers tables Bug: T89825 Change-Id: I0e002a43758101c17ecdb208c66c816c3cc7a247 --- A data/db/migrations/20150223-add-questions-tables.sql M data/db/schema.mysql 2 files changed, 57 insertions(+), 0 deletions(-) Approvals: BryanDavis: Looks good to me, approved jenkins-bot: Verified diff --git a/data/db/migrations/20150223-add-questions-tables.sql b/data/db/migrations/20150223-add-questions-tables.sql new file mode 100644 index 000..085264c --- /dev/null +++ b/data/db/migrations/20150223-add-questions-tables.sql @@ -0,0 +1,30 @@ +-- Create a new reviews and review_questions table to make them customizable + +DROP TABLE IF EXISTS review_questions; +CREATE TABLE review_questions ( +id INT(11) NOT NULL + , campaignINT(11) NOT NULL + , questionBLOB + , created_by INT(11) + , created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP + , modified_by INT(11) + , modified_at TIMESTAMP + , PRIMARY KEY (id) + , CONSTRAINT FOREIGN KEY (campaign) REFERENCES campaigns(id) ON DELETE CASCADE + , CONSTRAINT FOREIGN KEY (created_by) REFERENCES users(id) ON DELETE RESTRICT + , CONSTRAINT FOREIGN KEY (modified_by) REFERENCES users(id) ON DELETE SET NULL +) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8 ; + +DROP TABLE IF EXISTS review_answers; +CREATE TABLE IF NOT EXISTS review_answers ( +proposalINT(11) NOT NULL + , questionINT(11) NOT NULL + , reviewerINT(11) NOT NULL + , points TINYINT UNSIGNED + , commentsBLOB + , created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP + , PRIMARY KEY (proposal, question, reviewer) + , CONSTRAINT FOREIGN KEY (proposal) REFERENCES proposals (id) ON DELETE CASCADE + , CONSTRAINT FOREIGN KEY (question) REFERENCES review_questions(id) ON DELETE CASCADE + , CONSTRAINT FOREIGN KEY (reviewer) REFERENCES users(id) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8 ; diff --git a/data/db/schema.mysql b/data/db/schema.mysql index 8209d17..70d5653 100644 --- a/data/db/schema.mysql +++ b/data/db/schema.mysql @@ -86,3 +86,30 @@ , CONSTRAINT FOREIGN KEY (campaign_id) REFERENCES campaigns(id) ON DELETE CASCADE , CONSTRAINT FOREIGN KEY (user_id) REFERENCES users(id) ON DELETE CASCADE ) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8 ; + +CREATE TABLE IF NOT EXISTS review_questions ( +id INT(11) NOT NULL + , campaignINT(11) NOT NULL + , questionBLOB + , created_by INT(11) + , created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP + , modified_by INT(11) + , modified_at TIMESTAMP + , PRIMARY KEY (id) + , CONSTRAINT FOREIGN KEY (campaign) REFERENCES campaigns(id) ON DELETE CASCADE + , CONSTRAINT FOREIGN KEY (created_by) REFERENCES users(id) ON DELETE RESTRICT + , CONSTRAINT FOREIGN KEY (modified_by) REFERENCES users(id) ON DELETE SET NULL +) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8 ; + +CREATE TABLE IF NOT EXISTS review_answers ( +proposalINT(11) NOT NULL + , questionINT(11) NOT NULL + , reviewerINT(11) NOT NULL + , points TINYINT UNSIGNED + , commentsBLOB + , created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP + , PRIMARY KEY (proposal, question, reviewer) + , CONSTRAINT FOREIGN KEY (proposal) REFERENCES proposals (id) ON DELETE CASCADE + , CONSTRAINT FOREIGN KEY (question) REFERENCES review_questions(id) ON DELETE CASCADE + , CONSTRAINT FOREIGN KEY (reviewer) REFERENCES users(id) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARACTER SET=utf8 ; -- To view, visit https://gerrit.wikimedia.org/r/192202 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I0e002a43758101c17ecdb208c66c816c3cc7a247 Gerrit-PatchSet: 13 Gerrit-Project: wikimedia/iegreview Gerrit-Branch: master Gerrit-Owner: Niharika29 niharikakohl...@gmail.com Gerrit-Reviewer: BryanDavis bda...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move code out of global functions into a class - change (mediawiki...CharInsert)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194367
Change subject: Move code out of global functions into a class
..
Move code out of global functions into a class
Change-Id: I57d1bd22ace86c3118ba382371ba115044181e32
---
A CharInsert.body.php
M CharInsert.php
2 files changed, 83 insertions(+), 79 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CharInsert
refs/changes/67/194367/1
diff --git a/CharInsert.body.php b/CharInsert.body.php
new file mode 100644
index 000..1bb4374
--- /dev/null
+++ b/CharInsert.body.php
@@ -0,0 +1,81 @@
+?php
+
+class CharInsert {
+ public static function onParserFirstCallInit( Parser $parser ) {
+ $parser-setHook( 'charinsert', 'CharInsert::charInsert' );
+ return true;
+ }
+
+ public static function charInsert( $data, $params, Parser $parser ) {
+ $data = $parser-mStripState-unstripBoth( $data );
+ return implode( br /\n,
+ array_map( 'CharInsert::charInsertLine',
+ explode( \n, trim( $data ) ) ) );
+ }
+ public static function charInsertLine( $data ) {
+ return implode( \n,
+ array_map( 'CharInsert::charInsertItem',
+ preg_split( '/\\s+/', self::charInsertArmor(
$data ) ) ) );
+ }
+
+ public static function charInsertArmor( $data ) {
+ return preg_replace_callback(
+ '!nowiki(.*?)/nowiki!i',
+ 'CharInsert::charInsertNowiki',
+ $data );
+ }
+
+ public static function charInsertNowiki( $matches ) {
+ return str_replace(
+ array( '\t', '\r', ' ' ),
+ array( '#9;', '#12;', '#32;' ),
+ $matches[1] );
+ }
+
+ public static function charInsertItem( $data ) {
+ $chars = explode( '+', $data );
+ if ( count( $chars ) 1 $chars[0] !== '' ) {
+ return self::charInsertChar( $chars[0], $chars[1] );
+ } elseif ( count( $chars ) == 1 ) {
+ return self::charInsertChar( $chars[0] );
+ } else {
+ return self::charInsertChar( '+' );
+ }
+ }
+
+ public static function charInsertChar( $start, $end = '' ) {
+ $estart = self::charInsertJsString( $start );
+ $eend = self::charInsertJsString( $end );
+ if ( $eend == '' ) {
+ $inline = self::charInsertDisplay( $start );
+ } else {
+ $inline = self::charInsertDisplay( $start . $end );
+ }
+ return Xml::element( 'a',
+ array(
+ 'onclick' =
insertTags('$estart','$eend','');return false,
+ 'href'= javascript:void() ),
+ $inline );
+ }
+
+ public static function charInsertJsString( $text ) {
+ return strtr(
+ self::charInsertDisplay( $text ),
+ array(
+ \\ = ,
+ \ = \\\,
+ '= \\',
+ \r\n = \\n,
+ \r = \\n,
+ \n = \\n,
+ ) );
+ }
+
+ public static function charInsertDisplay( $text ) {
+ static $invisibles = array( 'nbsp;', '#160;' );
+ static $visibles = array( 'amp;nbsp;', 'amp;#160;' );
+ return Sanitizer::decodeCharReferences(
+ str_replace( $invisibles, $visibles, $text ) );
+ }
+
+}
diff --git a/CharInsert.php b/CharInsert.php
index bed949c..a5e000f 100644
--- a/CharInsert.php
+++ b/CharInsert.php
@@ -30,7 +30,7 @@
die();
}
-$wgHooks['ParserFirstCallInit'][] = 'setupSpecialChars';
+$wgHooks['ParserFirstCallInit'][] = 'CharInsert::onParserFirstCallInit';
$wgExtensionCredits['parserhook'][] = array(
'path' = __FILE__,
@@ -40,83 +40,6 @@
'descriptionmsg' = 'charinsert-desc',
);
+$wgAutoloadClasses['CharInsert'] = __DIR__ . '/CharInsert.body.php';
$wgMessagesDirs['CharInsert'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['CharInsert'] = __DIR__ . '/CharInsert.i18n.php';
-
-function setupSpecialChars( $parser ) {
- $parser-setHook( 'charinsert', 'charInsert' );
- return true;
-}
-
-function charInsert( $data, $params, $parser ) {
- $data = $parser-mStripState-unstripBoth( $data );
- return implode( br /\n,
- array_map( 'charInsertLine',
- explode( \n, trim( $data ) ) ) );
-}
-
[MediaWiki-commits] [Gerrit] Highlight matching parts of search results - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Highlight matching parts of search results
..
Highlight matching parts of search results
Matching parts of search results are marked up to be highlighted.
Highlight them.
The entire heading is font weight bold, so the strong tag was not
distinguishable in current form.
Change-Id: I5d82070482ee78af2443372b44182fc433583420
---
M less/pagelist.less
1 file changed, 4 insertions(+), 0 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
Bmansurov: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/less/pagelist.less b/less/pagelist.less
index e8507e7..4b6c91e 100644
--- a/less/pagelist.less
+++ b/less/pagelist.less
@@ -35,6 +35,10 @@
a {
color: inherit;
}
+
+ strong {
+ text-decoration: underline;
+ }
}
}
--
To view, visit https://gerrit.wikimedia.org/r/194335
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I5d82070482ee78af2443372b44182fc433583420
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Phuedx g...@samsmith.io
Gerrit-Reviewer: Bmansurov bmansu...@wikimedia.org
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Syncronize VisualEditor: 0ea0691..1a40f3c - change (mediawiki/extensions)
Jenkins-mwext-sync has submitted this change and it was merged. Change subject: Syncronize VisualEditor: 0ea0691..1a40f3c .. Syncronize VisualEditor: 0ea0691..1a40f3c Change-Id: I4a65f7eea5b0994c94c8b3445be64ea0f42ed24c --- 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 0ea0691..1a40f3c 16 --- a/VisualEditor +++ b/VisualEditor -Subproject commit 0ea0691ad781d47b04c1c7c112e7f3a26e24fdd6 +Subproject commit 1a40f3c0487688b3eaf07247ab9193e9df1e42ec -- To view, visit https://gerrit.wikimedia.org/r/194370 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I4a65f7eea5b0994c94c8b3445be64ea0f42ed24c Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions Gerrit-Branch: master Gerrit-Owner: Jenkins-mwext-sync jenkins-...@wikimedia.org Gerrit-Reviewer: Jenkins-mwext-sync jenkins-...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] ComboBoxWidget: Add description, example, and mark private m... - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: ComboBoxWidget: Add description, example, and mark private
methods
..
ComboBoxWidget: Add description, example, and mark private methods
Change-Id: I3eaada60137aa790d50e63daf7a6daf58bd91a4f
---
M src/widgets/ComboBoxWidget.js
1 file changed, 54 insertions(+), 4 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/src/widgets/ComboBoxWidget.js b/src/widgets/ComboBoxWidget.js
index 3c9b555..f9920b3 100644
--- a/src/widgets/ComboBoxWidget.js
+++ b/src/widgets/ComboBoxWidget.js
@@ -1,5 +1,43 @@
/**
- * Text input with a menu of optional values.
+ * ComboBoxWidgets combine a {@link OO.ui.TextInputWidget text input} (where a
value
+ * can be entered manually) and a {@link OO.ui.MenuSelectWidget menu of
options} (from which
+ * a value can be chosen instead). Users can choose options from the combo box
in one of two ways:
+ *
+ * - by typing a value in the text input field. If the value exactly matches
the value of a menu
+ * option, that option will appear to be selected.
+ * - by choosing a value from the menu. The value of the chosen option will
then appear in the text
+ * input field.
+ *
+ * For more information about menus and options, please see the [OOjs UI
documentation on MediaWiki][1].
+ *
+ * @example
+ * // Example: A ComboBoxWidget.
+ * var comboBox=new OO.ui.ComboBoxWidget( {
+ * label: 'ComboBoxWidget',
+ * input: { value: 'Option One' },
+ * menu: {
+ * items: [
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 1',
+ * label: 'Option One' } ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 2',
+ * label: 'Option Two' } ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 3',
+ * label: 'Option Three'} ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 4',
+ * label: 'Option Four' } ),
+ * new OO.ui.MenuOptionWidget( {
+ * data: 'Option 5',
+ * label: 'Option Five' } )
+ * ]
+ * }
+ * } );
+ * $('body').append(comboBox.$element);
+ *
+ * [1]:
https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options#Menu_selects_and_options
*
* @class
* @extends OO.ui.Widget
@@ -7,9 +45,11 @@
*
* @constructor
* @param {Object} [config] Configuration options
- * @cfg {Object} [menu] Configuration options to pass to menu widget
- * @cfg {Object} [input] Configuration options to pass to input widget
- * @cfg {jQuery} [$overlay] Overlay layer; defaults to relative positioning
+ * @cfg {Object} [menu] Configuration options to pass to the {@link
OO.ui.MenuSelectWidget menu select widget}.
+ * @cfg {Object} [input] Configuration options to pass to the {@link
OO.ui.TextInputWidget text input widget}.
+ * @cfg {jQuery} [$overlay] Render the menu into a separate layer. This
configuration is useful in cases where
+ * the expanded menu is larger than its containing `div`. The specified
overlay layer is usually on top of the
+ * containing `div` and has a larger area. By default, the menu uses
relative positioning.
*/
OO.ui.ComboBoxWidget = function OoUiComboBoxWidget( config ) {
// Configuration initialization
@@ -86,6 +126,7 @@
/**
* Handle input change events.
*
+ * @private
* @param {string} value New value
*/
OO.ui.ComboBoxWidget.prototype.onInputChange = function ( value ) {
@@ -104,6 +145,8 @@
/**
* Handle mouse click events.
*
+ *
+ * @private
* @param {jQuery.Event} e Mouse click event
*/
OO.ui.ComboBoxWidget.prototype.onClick = function ( e ) {
@@ -117,6 +160,8 @@
/**
* Handle key press events.
*
+ *
+ * @private
* @param {jQuery.Event} e Key press event
*/
OO.ui.ComboBoxWidget.prototype.onKeyPress = function ( e ) {
@@ -129,6 +174,8 @@
/**
* Handle input enter events.
+ *
+ * @private
*/
OO.ui.ComboBoxWidget.prototype.onInputEnter = function () {
if ( !this.isDisabled() ) {
@@ -139,6 +186,7 @@
/**
* Handle menu choose events.
*
+ * @private
* @param {OO.ui.OptionWidget} item Chosen item
*/
OO.ui.ComboBoxWidget.prototype.onMenuChoose = function ( item ) {
@@ -149,6 +197,8 @@
/**
* Handle menu item change events.
+ *
+ * @private
*/
OO.ui.ComboBoxWidget.prototype.onMenuItemsChange = function () {
var match = this.menu.getItemFromData( this.input.getValue() );
--
To view, visit https://gerrit.wikimedia.org/r/194372
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3eaada60137aa790d50e63daf7a6daf58bd91a4f
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
[MediaWiki-commits] [Gerrit] Add package 'tig' to tin (via deployment role) to assist wit... - change (operations/puppet)
20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194382
Change subject: Add package 'tig' to tin (via deployment role) to assist with
deployment
..
Add package 'tig' to tin (via deployment role) to assist with deployment
I use tig to quickly see the state of a git repo. This would be very
helpful when I'm doing the train deployments.
Change-Id: Idcc2f548f28bdaa0253dcdbfdf0ca03b9f736df9
---
M manifests/role/deployment.pp
1 file changed, 6 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/82/194382/1
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 31e8759..2a12456 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -198,6 +198,12 @@
ensure = latest,
}
+# tig is a ncurses-based git utility which is useful for
+# determining the state of git repos during deployments.
+package { 'tig':
+ensure = latest,
+}
+
sudo::group { 'wikidev_deployment_server':
group = 'wikidev',
privileges = [
--
To view, visit https://gerrit.wikimedia.org/r/194382
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idcc2f548f28bdaa0253dcdbfdf0ca03b9f736df9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: 20after4 mmod...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] DropdownInputWidget: Add description, example, and mark priv... - change (oojs/ui)
Kmenger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194363
Change subject: DropdownInputWidget: Add description, example, and mark private
method
..
DropdownInputWidget: Add description, example, and mark private method
Change-Id: I6376a7f22346b67b74d412a42addec84ea7970dd
---
M src/widgets/DropdownInputWidget.js
1 file changed, 19 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/63/194363/1
diff --git a/src/widgets/DropdownInputWidget.js
b/src/widgets/DropdownInputWidget.js
index 793d866..3ed83ed 100644
--- a/src/widgets/DropdownInputWidget.js
+++ b/src/widgets/DropdownInputWidget.js
@@ -1,6 +1,22 @@
/**
- * A OO.ui.DropdownWidget synchronized with a `input type=hidden` for form
submission. Intended to
- * be used within a OO.ui.FormLayout.
+ * DropdownInputWidget is a {@link OO.ui.DropdownWidget DropdownWidget}
intended to be used
+ * within a {@link OO.ui.FormLayout form}. The selected value is synchronized
with the value
+ * of a hidden HTML `input` tag. Please see the [OOjs UI documentation on
MediaWiki][1] for
+ * more information about input widgets.
+ *
+ * @example
+ * // Example: A DropdownInputWidget with three options
+ * var dropDown=new OO.ui.DropdownInputWidget( {
+ * label: 'Dropdown menu: Select a menu option',
+ * options: [
+ * { data: 'a', label: 'First' } ,
+ * { data: 'b', label: 'Second'} ,
+ * { data: 'c', label: 'Third' }
+ * ]
+ * } );
+ * $('body').append(dropDown.$element);
+ *
+ * [1]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Inputs
*
* @class
* @extends OO.ui.InputWidget
@@ -46,6 +62,7 @@
/**
* Handles menu select events.
*
+ * @private
* @param {OO.ui.MenuOptionWidget} item Selected menu item
*/
OO.ui.DropdownInputWidget.prototype.onMenuSelect = function ( item ) {
--
To view, visit https://gerrit.wikimedia.org/r/194363
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6376a7f22346b67b74d412a42addec84ea7970dd
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Kmenger kmen...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Use the inspector's previousSelection for context positioning - change (VisualEditor/VisualEditor)
jenkins-bot has submitted this change and it was merged.
Change subject: Use the inspector's previousSelection for context positioning
..
Use the inspector's previousSelection for context positioning
This gives us the selection even when opening an inspector while
the context was hidden (e.g. creating a new link).
Bug: T91307
Change-Id: Ia1ca017e0b75e1ac8f75456780992b7e4f81bf83
---
M src/ui/inspectors/ve.ui.AnnotationInspector.js
M src/ui/inspectors/ve.ui.FragmentInspector.js
M src/ui/ve.ui.DesktopContext.js
3 files changed, 7 insertions(+), 20 deletions(-)
Approvals:
Trevor Parscal: Looks good to me, approved
jenkins-bot: Verified
Objections:
Catrope: There's a problem with this change, please improve
diff --git a/src/ui/inspectors/ve.ui.AnnotationInspector.js
b/src/ui/inspectors/ve.ui.AnnotationInspector.js
index 5e9a29c..3164d6d 100644
--- a/src/ui/inspectors/ve.ui.AnnotationInspector.js
+++ b/src/ui/inspectors/ve.ui.AnnotationInspector.js
@@ -19,7 +19,6 @@
ve.ui.FragmentInspector.call( this, config );
// Properties
- this.previousSelection = null;
this.initialSelection = null;
this.initialAnnotation = null;
this.initialAnnotationIsCovering = false;
@@ -173,7 +172,6 @@
surfaceModel = fragment.getSurface(),
annotation = this.getMatchingAnnotations(
fragment, true ).get( 0 );
- this.previousSelection = fragment.getSelection();
surfaceModel.pushStaging();
// Initialize range
@@ -315,7 +313,6 @@
}, this )
.next( function () {
// Reset state
- this.previousSelection = null;
this.initialSelection = null;
this.initialAnnotation = null;
this.initialAnnotationIsCovering = false;
diff --git a/src/ui/inspectors/ve.ui.FragmentInspector.js
b/src/ui/inspectors/ve.ui.FragmentInspector.js
index 8046e0c..fe0f36f 100644
--- a/src/ui/inspectors/ve.ui.FragmentInspector.js
+++ b/src/ui/inspectors/ve.ui.FragmentInspector.js
@@ -19,6 +19,7 @@
// Properties
this.fragment = null;
+ this.previousSelection = null;
};
/* Inheritance */
@@ -127,6 +128,7 @@
throw new Error( 'Cannot open inspector:
opening data must contain a fragment' );
}
this.fragment = data.fragment;
+ this.previousSelection = this.fragment.getSelection();
}, this )
.next( function () {
this.actions.setMode( this.getMode() );
@@ -140,6 +142,7 @@
return ve.ui.FragmentDialog.super.prototype.getTeardownProcess.apply(
this, data )
.next( function () {
this.fragment = null;
+ this.previousSelection = null;
}, this );
};
diff --git a/src/ui/ve.ui.DesktopContext.js b/src/ui/ve.ui.DesktopContext.js
index 8ce3b42..0847187 100644
--- a/src/ui/ve.ui.DesktopContext.js
+++ b/src/ui/ve.ui.DesktopContext.js
@@ -22,7 +22,6 @@
this.popup = new OO.ui.PopupWidget( { $: this.$, $container:
this.surface.$element } );
this.transitioning = null;
this.suppressed = false;
- this.lastClosedSelection = null;
this.onWindowResizeHandler = this.onPosition.bind( this );
this.$window = this.$( this.getElementWindow() );
@@ -174,11 +173,8 @@
}
// updateDimensionsDebounced is not necessary here and causes a
movement flicker
this.updateDimensions();
- } else {
- this.lastClosedSelection = null;
- if ( this.inspector ) {
- this.inspector.close();
- }
+ } else if ( this.inspector ) {
+ this.inspector.close();
}
return promise;
@@ -192,18 +188,11 @@
return;
}
- var startAndEndRects, position, embeddable, middle, boundingRect,
selection,
+ var startAndEndRects, position, embeddable, middle, boundingRect,
rtl = this.surface.getModel().getDocument().getDir() === 'rtl',
surface = this.surface.getView(),
+ selection = this.inspector this.inspector.previousSelection,
focusedNode = surface.getFocusedNode();
-
- // If the inspector is closed use the current selection, otherwise try
and use
- // the last selection before it was opened.
- if ( !this.inspector || ( !this.inspector.isOpening()
!this.inspector.isOpened() ) ) {
- selection = surface.getModel().getSelection();
- } else {
- selection = this.lastClosedSelection ||
surface.getModel().getSelection();
-
[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...CharInsert)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194368
Change subject: Add extension.json
..
Add extension.json
Bug: T87890
Change-Id: If5eb0032c632128d23e61164c4c877e1270be4a6
---
M CharInsert.php
A extension.json
2 files changed, 28 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/CharInsert
refs/changes/68/194368/1
diff --git a/CharInsert.php b/CharInsert.php
index a5e000f..a6de739 100644
--- a/CharInsert.php
+++ b/CharInsert.php
@@ -30,6 +30,11 @@
die();
}
+/**
+ * This PHP entry point is deprecated. Please use wfLoadExtension() and the
extension.json file instead.
+ * See https://www.mediawiki.org/wiki/Manual:Extension_registration for more
details.
+ */
+
$wgHooks['ParserFirstCallInit'][] = 'CharInsert::onParserFirstCallInit';
$wgExtensionCredits['parserhook'][] = array(
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..6ef8475
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,23 @@
+{
+ name: CharInsert,
+ author: Brion Vibber,
+ url: https://www.mediawiki.org/wiki/Extension:CharInsert;,
+ descriptionmsg: charinsert-desc,
+ type: parserhook,
+ ExtensionMessagesFiles: {
+ CharInsert: CharInsert.i18n.php
+ },
+ Hooks: {
+ ParserFirstCallInit: [
+ CharInsert::onParserFirstCallInit
+ ]
+ },
+ MessagesDirs: {
+ CharInsert: [
+ i18n
+ ]
+ },
+ AutoloadClasses: {
+ CharInsert: CharInsert.body.php
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/194368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If5eb0032c632128d23e61164c4c877e1270be4a6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/CharInsert
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] keyholder/eventlogging: replace UTF-8 chars - change (operations/puppet)
Dzahn has uploaded a new change for review. https://gerrit.wikimedia.org/r/194369 Change subject: keyholder/eventlogging: replace UTF-8 chars .. keyholder/eventlogging: replace UTF-8 chars 2 more occurences of UTF-8 chars in *.pp files and then that's all. Replacing them because of T91453 ZeroMQ is a redirect to ØMQ on Wikipedia as well. :p Bug:T91453 Change-Id: I59e95c76520159bcfaac6a6d371f7e8d9b1ada6f --- M modules/eventlogging/manifests/init.pp M modules/keyholder/manifests/init.pp 2 files changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/69/194369/1 diff --git a/modules/eventlogging/manifests/init.pp b/modules/eventlogging/manifests/init.pp index f7b133f..4de008d 100644 --- a/modules/eventlogging/manifests/init.pp +++ b/modules/eventlogging/manifests/init.pp @@ -23,7 +23,7 @@ # incoming events (valid and invalid) to a StatsD host. # # These services communicate with one another using a publisher / -# subscriber model using ØMQ as the transport layer. Different +# subscriber model using ZeroMQ as the transport layer. Different # event-processing patterns can be implemented by freely composing # multiple instances of each type, running locally or distributed across # several hosts. diff --git a/modules/keyholder/manifests/init.pp b/modules/keyholder/manifests/init.pp index ecdf26d..3db511f 100644 --- a/modules/keyholder/manifests/init.pp +++ b/modules/keyholder/manifests/init.pp @@ -14,8 +14,8 @@ # The two services bind domain sockets at these addresses: # # /run/keyholder -# ├── agent.sock (0600) -# └── proxy.sock (0660) +# |__ agent.sock (0600) +# |__ proxy.sock (0660) # # Before the shared SSH agent can be used, it must be armed by a user # with access to the private key. This can be done by running: -- To view, visit https://gerrit.wikimedia.org/r/194369 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I59e95c76520159bcfaac6a6d371f7e8d9b1ada6f Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Dzahn dz...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Update to dev-master#05e196893b1225898de280ef8f97d5f2be684e8f - change (integration/composer)
Legoktm has uploaded a new change for review. https://gerrit.wikimedia.org/r/194364 Change subject: Update to dev-master#05e196893b1225898de280ef8f97d5f2be684e8f .. Update to dev-master#05e196893b1225898de280ef8f97d5f2be684e8f Also use an optimized autoloader while we're at it Bug: T91176 Change-Id: Ibba775cb2778f831452525fad73c19771f91c1e5 --- M composer.json M composer.lock M vendor/autoload.php M vendor/composer/ClassLoader.php M vendor/composer/autoload_classmap.php M vendor/composer/autoload_real.php A vendor/composer/composer/CONTRIBUTING.md M vendor/composer/composer/README.md M vendor/composer/composer/composer.json M vendor/composer/composer/composer.lock M vendor/composer/composer/doc/00-intro.md M vendor/composer/composer/doc/01-basic-usage.md M vendor/composer/composer/doc/02-libraries.md M vendor/composer/composer/doc/03-cli.md M vendor/composer/composer/doc/04-schema.md M vendor/composer/composer/doc/05-repositories.md M vendor/composer/composer/doc/articles/aliases.md M vendor/composer/composer/doc/articles/handling-private-packages-with-satis.md A vendor/composer/composer/doc/articles/http-basic-authentication.md M vendor/composer/composer/doc/articles/troubleshooting.md M vendor/composer/composer/doc/faqs/why-are-unbound-version-constraints-a-bad-idea.md M vendor/composer/composer/res/composer-schema.json M vendor/composer/composer/src/Composer/Autoload/AutoloadGenerator.php M vendor/composer/composer/src/Composer/Autoload/ClassLoader.php M vendor/composer/composer/src/Composer/Autoload/ClassMapGenerator.php M vendor/composer/composer/src/Composer/Cache.php M vendor/composer/composer/src/Composer/Command/AboutCommand.php M vendor/composer/composer/src/Composer/Command/ArchiveCommand.php M vendor/composer/composer/src/Composer/Command/ClearCacheCommand.php M vendor/composer/composer/src/Composer/Command/Command.php M vendor/composer/composer/src/Composer/Command/ConfigCommand.php M vendor/composer/composer/src/Composer/Command/CreateProjectCommand.php M vendor/composer/composer/src/Composer/Command/DependsCommand.php M vendor/composer/composer/src/Composer/Command/DiagnoseCommand.php M vendor/composer/composer/src/Composer/Command/DumpAutoloadCommand.php M vendor/composer/composer/src/Composer/Command/GlobalCommand.php M vendor/composer/composer/src/Composer/Command/HomeCommand.php M vendor/composer/composer/src/Composer/Command/InitCommand.php M vendor/composer/composer/src/Composer/Command/InstallCommand.php M vendor/composer/composer/src/Composer/Command/LicensesCommand.php M vendor/composer/composer/src/Composer/Command/RemoveCommand.php M vendor/composer/composer/src/Composer/Command/RequireCommand.php M vendor/composer/composer/src/Composer/Command/RunScriptCommand.php M vendor/composer/composer/src/Composer/Command/SearchCommand.php M vendor/composer/composer/src/Composer/Command/SelfUpdateCommand.php M vendor/composer/composer/src/Composer/Command/ShowCommand.php M vendor/composer/composer/src/Composer/Command/StatusCommand.php M vendor/composer/composer/src/Composer/Command/UpdateCommand.php M vendor/composer/composer/src/Composer/Command/ValidateCommand.php M vendor/composer/composer/src/Composer/Compiler.php M vendor/composer/composer/src/Composer/Config.php M vendor/composer/composer/src/Composer/Console/Application.php M vendor/composer/composer/src/Composer/Console/HtmlOutputFormatter.php M vendor/composer/composer/src/Composer/DependencyResolver/DefaultPolicy.php M vendor/composer/composer/src/Composer/DependencyResolver/Pool.php M vendor/composer/composer/src/Composer/DependencyResolver/Problem.php M vendor/composer/composer/src/Composer/DependencyResolver/Rule.php M vendor/composer/composer/src/Composer/DependencyResolver/Solver.php M vendor/composer/composer/src/Composer/Downloader/ArchiveDownloader.php M vendor/composer/composer/src/Composer/Downloader/DownloadManager.php M vendor/composer/composer/src/Composer/Downloader/FileDownloader.php M vendor/composer/composer/src/Composer/Downloader/GitDownloader.php M vendor/composer/composer/src/Composer/Downloader/HgDownloader.php M vendor/composer/composer/src/Composer/Downloader/PerforceDownloader.php M vendor/composer/composer/src/Composer/Downloader/SvnDownloader.php M vendor/composer/composer/src/Composer/Downloader/VcsDownloader.php M vendor/composer/composer/src/Composer/EventDispatcher/EventDispatcher.php M vendor/composer/composer/src/Composer/Factory.php M vendor/composer/composer/src/Composer/IO/BufferIO.php M vendor/composer/composer/src/Composer/IO/ConsoleIO.php M vendor/composer/composer/src/Composer/IO/IOInterface.php M vendor/composer/composer/src/Composer/IO/NullIO.php M vendor/composer/composer/src/Composer/Installer.php M vendor/composer/composer/src/Composer/Installer/InstallerEvent.php M vendor/composer/composer/src/Composer/Installer/LibraryInstaller.php A vendor/composer/composer/src/Composer/Installer/PackageEvent.php A
[MediaWiki-commits] [Gerrit] sectionAnchor:Move § from HTML to CSS - change (mediawiki/core)
Gerrit Patch Uploader has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194377
Change subject: sectionAnchor:Move § from HTML to CSS
..
sectionAnchor:Move § from HTML to CSS
This ensures that the HTML not contains a navigation button.
Remove the unused system message section-symbol.
Bug: T18691
Change-Id: I21125761173a1d020b546b249d0fcecfe26d2631
---
M includes/Linker.php
M languages/i18n/en.json
M resources/src/mediawiki/mediawiki.sectionAnchor.css
3 files changed, 6 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/77/194377/1
diff --git a/includes/Linker.php b/includes/Linker.php
index a9c26c64..813ff6d 100644
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@ -1760,8 +1760,7 @@
// navigate, so the symbol is being
read during navigation). Pending T13555 being fixed.
'aria-hidden' = 'true',
'title' = wfMessage(
'headline-anchor-title' )-text()
- ),
- wfMessage( 'section-symbol' )-text()
+ )
)
. span class=\mw-headline\
id=\$anchor\$html/span
. $link
diff --git a/languages/i18n/en.json b/languages/i18n/en.json
index a81a89e..2b8c4c1 100644
--- a/languages/i18n/en.json
+++ b/languages/i18n/en.json
@@ -3676,6 +3676,5 @@
json-error-recursion: One or more recursive references in the value
to be encoded,
json-error-inf-or-nan: One or more NAN or INF values in the value to
be encoded,
json-error-unsupported-type: A value of a type that cannot be
encoded was given,
- headline-anchor-title: Link to this section,
- section-symbol: §
+ headline-anchor-title: Link to this section
}
diff --git a/resources/src/mediawiki/mediawiki.sectionAnchor.css
b/resources/src/mediawiki/mediawiki.sectionAnchor.css
index c2a6f3a..285ccc1 100644
--- a/resources/src/mediawiki/mediawiki.sectionAnchor.css
+++ b/resources/src/mediawiki/mediawiki.sectionAnchor.css
@@ -13,6 +13,10 @@
user-select: none;
}
+.mw-headline-anchor:after {
+ content: §;
+}
+
/* @noflip */
.mw-content-ltr .mw-headline-anchor,
.mw-content-rtl .mw-content-ltr .mw-headline-anchor {
--
To view, visit https://gerrit.wikimedia.org/r/194377
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21125761173a1d020b546b249d0fcecfe26d2631
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gerrit Patch Uploader gerritpatchuploa...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] tests: Add infusion tests - change (oojs/ui)
jenkins-bot has submitted this change and it was merged.
Change subject: tests: Add infusion tests
..
tests: Add infusion tests
Assert that an infused PHP widget generates a DOM tree equivalent to
JS widget with the same config.
Found one bug in older OOUI code (e225125b) and one in infusion
implementation (8b4de9d2).
Change-Id: I945fa084f25429c5e4ca441059efa88fe1419d57
---
M bin/generate-JSPHP-for-karma.php
M tests/JSPHP.test.karma.js
M tests/JSPHP.test.standalone.js
M tests/QUnit.assert.equalDomElement.js
M tests/index.php
5 files changed, 23 insertions(+), 7 deletions(-)
Approvals:
Cscott: Looks good to me, approved
Jforrester: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/bin/generate-JSPHP-for-karma.php b/bin/generate-JSPHP-for-karma.php
index b4b9738..445da65 100644
--- a/bin/generate-JSPHP-for-karma.php
+++ b/bin/generate-JSPHP-for-karma.php
@@ -36,6 +36,7 @@
// Unstub placeholders
$config = $test['config'];
array_walk_recursive( $config, 'unstub' );
+ $config['infusable'] = true;
$instance = new_OOUI( $test['class'], $config );
$testSuiteOutput[$theme][$className][] = $instance;
}
diff --git a/tests/JSPHP.test.karma.js b/tests/JSPHP.test.karma.js
index 9dbd032..1a1473c 100644
--- a/tests/JSPHP.test.karma.js
+++ b/tests/JSPHP.test.karma.js
@@ -18,8 +18,8 @@
}
function makeTest( theme, klassName, tests, output ) {
- QUnit.test( theme + ': ' + klassName, tests.length, function (
assert ) {
- var test, config, instance, $fromPhp, i, testName;
+ QUnit.test( theme + ': ' + klassName, tests.length * 2,
function ( assert ) {
+ var test, config, instance, infused, $fromPhp, i,
testName;
OO.ui.theme = themes[ theme ];
for ( i = 0; i tests.length; i++ ) {
test = tests[ i ];
@@ -29,13 +29,19 @@
instance = new OO.ui[ test.class ]( config );
$fromPhp = $( $.parseHTML( output[ i ] ) );
- $( '#qunit-fixture' ).append(
instance.$element, $fromPhp );
+ $( 'body' ).append( instance.$element, $fromPhp
);
// Updating theme classes is normally
debounced, we need to do it immediately
instance.debouncedUpdateThemeClasses();
testName = JSON.stringify( test.config );
assert.equalDomElement( instance.$element[ 0 ],
$fromPhp[ 0 ], testName, true );
+
+ infused = OO.ui.infuse( $fromPhp[ 0 ] );
+ infused.debouncedUpdateThemeClasses();
+
+ assert.equalDomElement( instance.$element[ 0 ],
infused.$element[ 0 ], testName + ' (infuse)' );
+ instance.$element.add( infused.$element
).detach();
}
} );
}
diff --git a/tests/JSPHP.test.standalone.js b/tests/JSPHP.test.standalone.js
index 13535e3..1cbebc3 100644
--- a/tests/JSPHP.test.standalone.js
+++ b/tests/JSPHP.test.standalone.js
@@ -18,8 +18,8 @@
}
function makeTest( theme, klassName, tests ) {
- QUnit.test( theme + ': ' + klassName, tests.length, function (
assert ) {
- var test, config, instance, id, fromPhp, i, testName;
+ QUnit.test( theme + ': ' + klassName, tests.length * 2,
function ( assert ) {
+ var test, config, instance, infused, id, fromPhp, i,
testName;
OO.ui.theme = themes[ theme ];
for ( i = 0; i tests.length; i++ ) {
test = tests[ i ];
@@ -37,6 +37,11 @@
testName = JSON.stringify( test.config );
assert.equalDomElement( instance.$element[ 0 ],
fromPhp, testName );
+
+ infused = OO.ui.infuse( fromPhp );
+ infused.debouncedUpdateThemeClasses();
+
+ assert.equalDomElement( instance.$element[ 0 ],
infused.$element[ 0 ], testName + ' (infuse)' );
}
} );
}
diff --git a/tests/QUnit.assert.equalDomElement.js
b/tests/QUnit.assert.equalDomElement.js
index dde617c..f041c25 100644
--- a/tests/QUnit.assert.equalDomElement.js
+++ b/tests/QUnit.assert.equalDomElement.js
@@ -23,7 +23,7 @@
* @return {Object} Summary of element.
*/
function getDomElementSummary( element, includeHtml ) {
- var i,
+
[MediaWiki-commits] [Gerrit] typo on cloning repo with git - change (mediawiki...parsoid)
jenkins-bot has submitted this change and it was merged. Change subject: typo on cloning repo with git .. typo on cloning repo with git Change-Id: I1ec2ce2605540bdd1adcb885a6924dbfa4661856 --- M guides/setup/README.md 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jforrester: Looks good to me, approved jenkins-bot: Verified diff --git a/guides/setup/README.md b/guides/setup/README.md index a8d7dd6..52a4c24 100644 --- a/guides/setup/README.md +++ b/guides/setup/README.md @@ -28,7 +28,7 @@ To get the code, you'll need to clone our git repository. Run this command: ``` -$ git checkout https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid +$ git clone https://gerrit.wikimedia.org/r/p/mediawiki/services/parsoid ``` ## Installing node.js dependencies -- To view, visit https://gerrit.wikimedia.org/r/194380 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I1ec2ce2605540bdd1adcb885a6924dbfa4661856 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid Gerrit-Branch: master Gerrit-Owner: Arlolra abrea...@wikimedia.org Gerrit-Reviewer: Jforrester jforres...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Enable mw-ui-radio styles on Special:Preferences - change (mediawiki/core)
Jdlrobson has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194383
Change subject: Enable mw-ui-radio styles on Special:Preferences
..
Enable mw-ui-radio styles on Special:Preferences
This makes the styling of the mobile version of Special:Preferences more
consistent
http://localhost:8080/wiki/Special:Preferences/skin?useformat=mobile
Change-Id: I67aaf1bf5e0e2eaccf948ecacd1860e6e3b31b04
---
M includes/htmlform/HTMLRadioField.php
M includes/specialpage/SpecialPage.php
2 files changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/83/194383/1
diff --git a/includes/htmlform/HTMLRadioField.php
b/includes/htmlform/HTMLRadioField.php
index 8765407..0f00540 100644
--- a/includes/htmlform/HTMLRadioField.php
+++ b/includes/htmlform/HTMLRadioField.php
@@ -56,7 +56,7 @@
$html .= ' ' . Html::rawElement(
'div',
- array( 'class' =
'mw-htmlform-flatlist-item' ),
+ array( 'class' =
'mw-htmlform-flatlist-item mw-ui-radio' ),
$radio
);
}
diff --git a/includes/specialpage/SpecialPage.php
b/includes/specialpage/SpecialPage.php
index 31d679a..f9d1e8a 100644
--- a/includes/specialpage/SpecialPage.php
+++ b/includes/specialpage/SpecialPage.php
@@ -356,6 +356,7 @@
if ( $this-getConfig()-get( 'UseMediaWikiUIEverywhere' ) ) {
$out-addModuleStyles( array(
'mediawiki.ui.input',
+ 'mediawiki.ui.radio',
'mediawiki.ui.checkbox',
) );
}
--
To view, visit https://gerrit.wikimedia.org/r/194383
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67aaf1bf5e0e2eaccf948ecacd1860e6e3b31b04
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] SelectWidget: Add example and link to decorated option widget - change (oojs/ui)
Kmenger has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194384
Change subject: SelectWidget: Add example and link to decorated option widget
..
SelectWidget: Add example and link to decorated option widget
Change-Id: Id527cd226696cc13a764c7bf8bdcb1d74f337e7b
---
M src/widgets/SelectWidget.js
1 file changed, 21 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/84/194384/1
diff --git a/src/widgets/SelectWidget.js b/src/widgets/SelectWidget.js
index de74326..4238089 100644
--- a/src/widgets/SelectWidget.js
+++ b/src/widgets/SelectWidget.js
@@ -4,9 +4,28 @@
* {@link OO.ui.RadioSelectWidget radio selects}, and {@link
OO.ui.MenuSelectWidget
* menu selects}.
*
- * This class should be used together with OO.ui.OptionWidget.
+ * This class should be used together with OO.ui.OptionWidget or
OO.ui.DecoratedOptionWidget. For more
+ * information, please see the [OOjs UI documentation on MediaWiki][1].
*
- * For more information, please see the [OOjs UI documentation on
MediaWiki][1].
+ * @example
+ * // Example of a select widget with three options
+ * var select=new OO.ui.SelectWidget( {
+ * items: [
+ * new OO.ui.OptionWidget( {
+ * data: 'a',
+ * label: 'Option One',
+ * } ),
+ * new OO.ui.OptionWidget( {
+ * data: 'b',
+ * label: 'Option Two',
+ * } ),
+ * new OO.ui.OptionWidget( {
+ * data: 'c',
+ * label: 'Option Three',
+ * } ),
+ * ]
+ * } );
+ * $('body').append(select.$element);
*
* [1]: https://www.mediawiki.org/wiki/OOjs_UI/Widgets/Selects_and_Options
*
--
To view, visit https://gerrit.wikimedia.org/r/194384
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id527cd226696cc13a764c7bf8bdcb1d74f337e7b
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Kmenger kmen...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Corrected some HierarchyBuilder functions to be static. - change (mediawiki...HierarchyBuilder)
Kji has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194375
Change subject: Corrected some HierarchyBuilder functions to be static.
..
Corrected some HierarchyBuilder functions to be static.
Change-Id: I27f7b5d87c2ce16904c536e4dab525adfff71e65
---
M HierarchyBuilder.class.php
1 file changed, 3 insertions(+), 3 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HierarchyBuilder
refs/changes/75/194375/1
diff --git a/HierarchyBuilder.class.php b/HierarchyBuilder.class.php
index f1231c6..7743197 100644
--- a/HierarchyBuilder.class.php
+++ b/HierarchyBuilder.class.php
@@ -349,7 +349,7 @@
*
* @return string: The first page name found within $hierarchyRow.
*/
- public function getPageNameFromHierarchyRow( $hierarchyRow ) {
+ public static function getPageNameFromHierarchyRow( $hierarchyRow ) {
$numMatches = preg_match_all( self::PAGENAMEPATTERN,
$hierarchyRow, $matches );
// give me the first subpattern match to be the name of the
previous page
$pageName = ( $numMatches 0 ? $matches[1][0] : '' );
@@ -367,7 +367,7 @@
*
* @return number: The depth of $hierarchyRow.
*/
- public function getDepthOfHierarchyRow( $hierarchyRow ) {
+ public static function getDepthOfHierarchyRow( $hierarchyRow ) {
$numMatches = preg_match_all( self::DEPTHPATTERN,
$hierarchyRow, $matches );
$depth = ( $numMatches 0 ? strlen( $matches[1][0] ) : 0 );
return $depth;
@@ -681,7 +681,7 @@
* @return string: The value of the specified property from the given
page
* or the empty string if the property does not exist.
*/
- public function getPropertyFromPage( $page, $property ) {
+ public static function getPropertyFromPage( $page, $property ) {
$store = smwfGetStore();
$title = Title::newFromText( $page );
$subject = SMWDIWikiPage::newFromTitle( $title );
--
To view, visit https://gerrit.wikimedia.org/r/194375
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I27f7b5d87c2ce16904c536e4dab525adfff71e65
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HierarchyBuilder
Gerrit-Branch: master
Gerrit-Owner: Kji k...@mitre.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add an example property to parameters - change (mediawiki...TemplateData)
Mooeypoo has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194386
Change subject: Add an example property to parameters
..
Add an example property to parameters
The example is optional and can be translated.
Bug: T53049
Change-Id: I9e2d66a805e25409532a742521886233ce3de569
---
M Specification.md
M TemplateData.php
M TemplateDataBlob.php
M i18n/en.json
M i18n/qqq.json
M modules/ext.templateDataGenerator.data.js
6 files changed, 28 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/TemplateData
refs/changes/86/194386/1
diff --git a/Specification.md b/Specification.md
index 7330233..8ed66c9 100644
--- a/Specification.md
+++ b/Specification.md
@@ -121,6 +121,11 @@
Consumers SHOULD provide this description to a the User when selecting and
altering parameter values.
+ 3.2.2 `example`
+* Value: `null` or `InterfaceText`
+
+An example text for the parameter, to help users fill in the proper value.
+
3.2.3 `required`
* Value: `boolean`
* Default: `false`
diff --git a/TemplateData.php b/TemplateData.php
index 8b361c2..be5f2d0 100644
--- a/TemplateData.php
+++ b/TemplateData.php
@@ -130,6 +130,7 @@
'templatedata-modal-table-param-default',
'templatedata-modal-table-param-deprecated',
'templatedata-modal-table-param-description',
+ 'templatedata-modal-table-param-example',
'templatedata-modal-table-param-importoption',
'templatedata-modal-table-param-importoption-subtitle',
'templatedata-modal-table-param-label',
diff --git a/TemplateDataBlob.php b/TemplateDataBlob.php
index 68cd1c2..523e19d 100644
--- a/TemplateDataBlob.php
+++ b/TemplateDataBlob.php
@@ -90,6 +90,7 @@
'required',
'suggested',
'description',
+ 'example',
'deprecated',
'aliases',
'autovalue',
@@ -232,6 +233,21 @@
$paramObj-description = null;
}
+ // Param.example
+ if ( isset( $paramObj-example ) ) {
+ if ( !is_object( $paramObj-example )
!is_string( $paramObj-example ) ) {
+ // TODO: Also validate that the keys
are valid lang codes and the values strings.
+ return Status::newFatal(
+ 'templatedata-invalid-type',
+ params.{$paramName}.example,
+ 'string|object'
+ );
+ }
+ $paramObj-example =
self::normaliseInterfaceText( $paramObj-example );
+ } else {
+ $paramObj-example = null;
+ }
+
// Param.deprecated
if ( isset( $paramObj-deprecated ) ) {
if ( !is_bool( $paramObj-deprecated )
!is_string( $paramObj-deprecated ) ) {
diff --git a/i18n/en.json b/i18n/en.json
index 2cd1741..592e2af 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -63,6 +63,7 @@
templatedata-modal-table-param-default: Default,
templatedata-modal-table-param-deprecated: Deprecated,
templatedata-modal-table-param-description: Description ($1),
+ templatedata-modal-table-param-example: Example ($1),
templatedata-modal-table-param-importoption: Add $1 suggested
{{PLURAL:$1|parameter|parameters}},
templatedata-modal-table-param-importoption-subtitle: Including: $1,
templatedata-modal-table-param-label: Label ($1),
diff --git a/i18n/qqq.json b/i18n/qqq.json
index b57367b..73cbf97 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -70,6 +70,7 @@
templatedata-modal-table-param-default: Label for a parameter
property input: Default value of the parameter.\n{{Identical|Default}},
templatedata-modal-table-param-deprecated: Label for a parameter
property input: Deprecated status of the parameter.\n{{Identical|Deprecated}},
templatedata-modal-table-param-description: Label for a parameter
property input: Description of the parameter. $1 - currently showing
language.\n{{Identical|Description}},
+ templatedata-modal-table-param-example: Label for a parameter
property input: Example value of the parameter. $1 - currently showing
language\n,
templatedata-modal-table-param-importoption: Label for the import
option in the parameter list in the edit dialog. $1 - number of suggested
parameters that can be imported.,
templatedata-modal-table-param-importoption-subtitle: A list of
[MediaWiki-commits] [Gerrit] Add ValidSkinNames to extension.schema.json and ExtensionP... - change (mediawiki/core)
Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194388
Change subject: Add ValidSkinNames to extension.schema.json and
ExtensionProcessor
..
Add ValidSkinNames to extension.schema.json and ExtensionProcessor
skin.json goes through the same exact code as extension.json does, and needs
to be able to add skins.
Change-Id: Idd0acaf6735b4c308d3ab584c49da4e97448347f
---
M docs/extension.schema.json
M includes/registration/ExtensionProcessor.php
2 files changed, 4 insertions(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/88/194388/1
diff --git a/docs/extension.schema.json b/docs/extension.schema.json
index e7b32de..dd35d05 100644
--- a/docs/extension.schema.json
+++ b/docs/extension.schema.json
@@ -611,6 +611,9 @@
APIListModules: {
type: object
},
+ ValidSkinNames: {
+ type: object
+ },
callback: {
type: [
array,
diff --git a/includes/registration/ExtensionProcessor.php
b/includes/registration/ExtensionProcessor.php
index a2dcd59..f85b878 100644
--- a/includes/registration/ExtensionProcessor.php
+++ b/includes/registration/ExtensionProcessor.php
@@ -44,6 +44,7 @@
'APIMetaModules',
'APIPropModules',
'APIListModules',
+ 'ValidSkinNames',
);
/**
--
To view, visit https://gerrit.wikimedia.org/r/194388
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idd0acaf6735b4c308d3ab584c49da4e97448347f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add extension.json - change (mediawiki...CharInsert)
jenkins-bot has submitted this change and it was merged.
Change subject: Add extension.json
..
Add extension.json
Bug: T87890
Change-Id: If5eb0032c632128d23e61164c4c877e1270be4a6
---
M CharInsert.php
A extension.json
2 files changed, 28 insertions(+), 0 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CharInsert.php b/CharInsert.php
index a5e000f..a6de739 100644
--- a/CharInsert.php
+++ b/CharInsert.php
@@ -30,6 +30,11 @@
die();
}
+/**
+ * This PHP entry point is deprecated. Please use wfLoadExtension() and the
extension.json file instead.
+ * See https://www.mediawiki.org/wiki/Manual:Extension_registration for more
details.
+ */
+
$wgHooks['ParserFirstCallInit'][] = 'CharInsert::onParserFirstCallInit';
$wgExtensionCredits['parserhook'][] = array(
diff --git a/extension.json b/extension.json
new file mode 100644
index 000..6ef8475
--- /dev/null
+++ b/extension.json
@@ -0,0 +1,23 @@
+{
+ name: CharInsert,
+ author: Brion Vibber,
+ url: https://www.mediawiki.org/wiki/Extension:CharInsert;,
+ descriptionmsg: charinsert-desc,
+ type: parserhook,
+ ExtensionMessagesFiles: {
+ CharInsert: CharInsert.i18n.php
+ },
+ Hooks: {
+ ParserFirstCallInit: [
+ CharInsert::onParserFirstCallInit
+ ]
+ },
+ MessagesDirs: {
+ CharInsert: [
+ i18n
+ ]
+ },
+ AutoloadClasses: {
+ CharInsert: CharInsert.body.php
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/194368
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: If5eb0032c632128d23e61164c4c877e1270be4a6
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/CharInsert
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Jforrester jforres...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Add 1.25wmf20 symlinks - change (operations/mediawiki-config)
20after4 has uploaded a new change for review. https://gerrit.wikimedia.org/r/194390 Change subject: Add 1.25wmf20 symlinks .. Add 1.25wmf20 symlinks Change-Id: I5afec1904cdf4d46cb148e98ce9e8acc4f15209b --- A docroot/bits/static-1.25wmf20/extensions A docroot/bits/static-1.25wmf20/resources A docroot/bits/static-1.25wmf20/skins A w/static-1.25wmf20/extensions A w/static-1.25wmf20/resources A w/static-1.25wmf20/skins 6 files changed, 6 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/90/194390/1 diff --git a/docroot/bits/static-1.25wmf20/extensions b/docroot/bits/static-1.25wmf20/extensions new file mode 12 index 000..0315b0b --- /dev/null +++ b/docroot/bits/static-1.25wmf20/extensions @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf20/resources b/docroot/bits/static-1.25wmf20/resources new file mode 12 index 000..8c8d39f --- /dev/null +++ b/docroot/bits/static-1.25wmf20/resources @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf20/skins b/docroot/bits/static-1.25wmf20/skins new file mode 12 index 000..87fdf83 --- /dev/null +++ b/docroot/bits/static-1.25wmf20/skins @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/skins/ \ No newline at end of file diff --git a/w/static-1.25wmf20/extensions b/w/static-1.25wmf20/extensions new file mode 12 index 000..0315b0b --- /dev/null +++ b/w/static-1.25wmf20/extensions @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/extensions \ No newline at end of file diff --git a/w/static-1.25wmf20/resources b/w/static-1.25wmf20/resources new file mode 12 index 000..8c8d39f --- /dev/null +++ b/w/static-1.25wmf20/resources @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/resources \ No newline at end of file diff --git a/w/static-1.25wmf20/skins b/w/static-1.25wmf20/skins new file mode 12 index 000..5936e3e --- /dev/null +++ b/w/static-1.25wmf20/skins @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/194390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5afec1904cdf4d46cb148e98ce9e8acc4f15209b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: 20after4 mmod...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Group0 to 1.25wmf20 - change (operations/mediawiki-config)
20after4 has uploaded a new change for review. https://gerrit.wikimedia.org/r/194392 Change subject: Group0 to 1.25wmf20 .. Group0 to 1.25wmf20 Change-Id: I691b2b72554bebcd1ed725290532ac390f611927 --- M wikiversions.json 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config refs/changes/92/194392/1 diff --git a/wikiversions.json b/wikiversions.json index 83093ed..ce689ff 100644 --- a/wikiversions.json +++ b/wikiversions.json @@ -471,7 +471,7 @@ maiwiki: php-1.25wmf19, map_bmswiki: php-1.25wmf19, mdfwiki: php-1.25wmf19, -mediawikiwiki: php-1.25wmf19, +mediawikiwiki: php-1.25wmf20, metawiki: php-1.25wmf19, mgwiki: php-1.25wmf19, mgwikibooks: php-1.25wmf19, @@ -738,9 +738,9 @@ tawikisource: php-1.25wmf19, tawiktionary: php-1.25wmf19, tenwiki: php-1.25wmf19, -test2wiki: php-1.25wmf19, -testwiki: php-1.25wmf19, -testwikidatawiki: php-1.25wmf19, +test2wiki: php-1.25wmf20, +testwiki: php-1.25wmf20, +testwikidatawiki: php-1.25wmf20, tetwiki: php-1.25wmf19, tewiki: php-1.25wmf19, tewikibooks: php-1.25wmf19, @@ -870,7 +870,7 @@ zawikiquote: php-1.25wmf19, zawiktionary: php-1.25wmf19, zeawiki: php-1.25wmf19, -zerowiki: php-1.25wmf19, +zerowiki: php-1.25wmf20, zh_classicalwiki: php-1.25wmf19, zh_min_nanwiki: php-1.25wmf19, zh_min_nanwikibooks: php-1.25wmf19, -- To view, visit https://gerrit.wikimedia.org/r/194392 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I691b2b72554bebcd1ed725290532ac390f611927 Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: 20after4 mmod...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wikipedias to 1.25wmf19 - change (operations/mediawiki-config)
20after4 has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194391
Change subject: Wikipedias to 1.25wmf19
..
Wikipedias to 1.25wmf19
Change-Id: I21fd8549ca5e59a3cb584323a44775859e6e964b
---
M wikiversions.json
1 file changed, 288 insertions(+), 288 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/mediawiki-config
refs/changes/91/194391/1
diff --git a/wikiversions.json b/wikiversions.json
index 98135c8..83093ed 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,38 +1,38 @@
{
-aawiki: php-1.25wmf18,
+aawiki: php-1.25wmf19,
aawikibooks: php-1.25wmf19,
aawiktionary: php-1.25wmf19,
-abwiki: php-1.25wmf18,
+abwiki: php-1.25wmf19,
abwiktionary: php-1.25wmf19,
-acewiki: php-1.25wmf18,
+acewiki: php-1.25wmf19,
advisorywiki: php-1.25wmf19,
-afwiki: php-1.25wmf18,
+afwiki: php-1.25wmf19,
afwikibooks: php-1.25wmf19,
afwikiquote: php-1.25wmf19,
afwiktionary: php-1.25wmf19,
-akwiki: php-1.25wmf18,
+akwiki: php-1.25wmf19,
akwikibooks: php-1.25wmf19,
akwiktionary: php-1.25wmf19,
-alswiki: php-1.25wmf18,
+alswiki: php-1.25wmf19,
alswikibooks: php-1.25wmf19,
alswikiquote: php-1.25wmf19,
alswiktionary: php-1.25wmf19,
-amwiki: php-1.25wmf18,
+amwiki: php-1.25wmf19,
amwikiquote: php-1.25wmf19,
amwiktionary: php-1.25wmf19,
-angwiki: php-1.25wmf18,
+angwiki: php-1.25wmf19,
angwikibooks: php-1.25wmf19,
angwikiquote: php-1.25wmf19,
angwikisource: php-1.25wmf19,
angwiktionary: php-1.25wmf19,
-anwiki: php-1.25wmf18,
+anwiki: php-1.25wmf19,
anwiktionary: php-1.25wmf19,
arbcom_dewiki: php-1.25wmf19,
arbcom_enwiki: php-1.25wmf19,
arbcom_fiwiki: php-1.25wmf19,
arbcom_nlwiki: php-1.25wmf19,
-arcwiki: php-1.25wmf18,
-arwiki: php-1.25wmf18,
+arcwiki: php-1.25wmf19,
+arwiki: php-1.25wmf19,
arwikibooks: php-1.25wmf19,
arwikimedia: php-1.25wmf19,
arwikinews: php-1.25wmf19,
@@ -40,135 +40,135 @@
arwikisource: php-1.25wmf19,
arwikiversity: php-1.25wmf19,
arwiktionary: php-1.25wmf19,
-arzwiki: php-1.25wmf18,
-astwiki: php-1.25wmf18,
+arzwiki: php-1.25wmf19,
+astwiki: php-1.25wmf19,
astwikibooks: php-1.25wmf19,
astwikiquote: php-1.25wmf19,
astwiktionary: php-1.25wmf19,
-aswiki: php-1.25wmf18,
+aswiki: php-1.25wmf19,
aswikibooks: php-1.25wmf19,
aswikisource: php-1.25wmf19,
aswiktionary: php-1.25wmf19,
auditcomwiki: php-1.25wmf19,
-avwiki: php-1.25wmf18,
+avwiki: php-1.25wmf19,
avwiktionary: php-1.25wmf19,
-aywiki: php-1.25wmf18,
+aywiki: php-1.25wmf19,
aywikibooks: php-1.25wmf19,
aywiktionary: php-1.25wmf19,
-azwiki: php-1.25wmf18,
+azwiki: php-1.25wmf19,
azwikibooks: php-1.25wmf19,
azwikiquote: php-1.25wmf19,
azwikisource: php-1.25wmf19,
azwiktionary: php-1.25wmf19,
-barwiki: php-1.25wmf18,
-bat_smgwiki: php-1.25wmf18,
-bawiki: php-1.25wmf18,
+barwiki: php-1.25wmf19,
+bat_smgwiki: php-1.25wmf19,
+bawiki: php-1.25wmf19,
bawikibooks: php-1.25wmf19,
-bclwiki: php-1.25wmf18,
+bclwiki: php-1.25wmf19,
bdwikimedia: php-1.25wmf19,
-be_x_oldwiki: php-1.25wmf18,
+be_x_oldwiki: php-1.25wmf19,
betawikiversity: php-1.25wmf19,
-bewiki: php-1.25wmf18,
+bewiki: php-1.25wmf19,
bewikibooks: php-1.25wmf19,
bewikimedia: php-1.25wmf19,
bewikiquote: php-1.25wmf19,
bewikisource: php-1.25wmf19,
bewiktionary: php-1.25wmf19,
-bgwiki: php-1.25wmf18,
+bgwiki: php-1.25wmf19,
bgwikibooks: php-1.25wmf19,
bgwikinews: php-1.25wmf19,
bgwikiquote: php-1.25wmf19,
bgwikisource: php-1.25wmf19,
bgwiktionary: php-1.25wmf19,
-bhwiki: php-1.25wmf18,
+bhwiki: php-1.25wmf19,
bhwiktionary: php-1.25wmf19,
-biwiki: php-1.25wmf18,
+biwiki: php-1.25wmf19,
biwikibooks: php-1.25wmf19,
biwiktionary: php-1.25wmf19,
-bjnwiki: php-1.25wmf18,
-bmwiki: php-1.25wmf18,
+bjnwiki: php-1.25wmf19,
+bmwiki: php-1.25wmf19,
bmwikibooks: php-1.25wmf19,
bmwikiquote: php-1.25wmf19,
bmwiktionary: php-1.25wmf19,
-bnwiki: php-1.25wmf18,
+bnwiki: php-1.25wmf19,
bnwikibooks: php-1.25wmf19,
bnwikisource: php-1.25wmf19,
bnwiktionary: php-1.25wmf19,
boardgovcomwiki: php-1.25wmf19,
boardwiki: php-1.25wmf19,
-bowiki: php-1.25wmf18,
+bowiki: php-1.25wmf19,
bowikibooks: php-1.25wmf19,
bowiktionary: php-1.25wmf19,
-bpywiki: php-1.25wmf18,
-brwiki: php-1.25wmf18,
+bpywiki: php-1.25wmf19,
+brwiki: php-1.25wmf19,
brwikimedia: php-1.25wmf19,
brwikiquote: php-1.25wmf19,
brwikisource: php-1.25wmf19,
brwiktionary: php-1.25wmf19,
-bswiki: php-1.25wmf18,
+bswiki: php-1.25wmf19,
[MediaWiki-commits] [Gerrit] Add 1.25wmf20 symlinks - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged. Change subject: Add 1.25wmf20 symlinks .. Add 1.25wmf20 symlinks Change-Id: I5afec1904cdf4d46cb148e98ce9e8acc4f15209b --- A docroot/bits/static-1.25wmf20/extensions A docroot/bits/static-1.25wmf20/resources A docroot/bits/static-1.25wmf20/skins A w/static-1.25wmf20/extensions A w/static-1.25wmf20/resources A w/static-1.25wmf20/skins 6 files changed, 6 insertions(+), 0 deletions(-) Approvals: 20after4: Looks good to me, approved jenkins-bot: Verified diff --git a/docroot/bits/static-1.25wmf20/extensions b/docroot/bits/static-1.25wmf20/extensions new file mode 12 index 000..0315b0b --- /dev/null +++ b/docroot/bits/static-1.25wmf20/extensions @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/extensions \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf20/resources b/docroot/bits/static-1.25wmf20/resources new file mode 12 index 000..8c8d39f --- /dev/null +++ b/docroot/bits/static-1.25wmf20/resources @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/resources \ No newline at end of file diff --git a/docroot/bits/static-1.25wmf20/skins b/docroot/bits/static-1.25wmf20/skins new file mode 12 index 000..87fdf83 --- /dev/null +++ b/docroot/bits/static-1.25wmf20/skins @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/skins/ \ No newline at end of file diff --git a/w/static-1.25wmf20/extensions b/w/static-1.25wmf20/extensions new file mode 12 index 000..0315b0b --- /dev/null +++ b/w/static-1.25wmf20/extensions @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/extensions \ No newline at end of file diff --git a/w/static-1.25wmf20/resources b/w/static-1.25wmf20/resources new file mode 12 index 000..8c8d39f --- /dev/null +++ b/w/static-1.25wmf20/resources @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/resources \ No newline at end of file diff --git a/w/static-1.25wmf20/skins b/w/static-1.25wmf20/skins new file mode 12 index 000..5936e3e --- /dev/null +++ b/w/static-1.25wmf20/skins @@ -0,0 +1 @@ +/srv/mediawiki/php-1.25wmf20/skins \ No newline at end of file -- To view, visit https://gerrit.wikimedia.org/r/194390 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5afec1904cdf4d46cb148e98ce9e8acc4f15209b Gerrit-PatchSet: 1 Gerrit-Project: operations/mediawiki-config Gerrit-Branch: master Gerrit-Owner: 20after4 mmod...@wikimedia.org Gerrit-Reviewer: 20after4 mmod...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Wikipedias to 1.25wmf19 - change (operations/mediawiki-config)
jenkins-bot has submitted this change and it was merged.
Change subject: Wikipedias to 1.25wmf19
..
Wikipedias to 1.25wmf19
Change-Id: I21fd8549ca5e59a3cb584323a44775859e6e964b
---
M wikiversions.json
1 file changed, 288 insertions(+), 288 deletions(-)
Approvals:
20after4: Looks good to me, approved
jenkins-bot: Verified
diff --git a/wikiversions.json b/wikiversions.json
index 98135c8..83093ed 100644
--- a/wikiversions.json
+++ b/wikiversions.json
@@ -1,38 +1,38 @@
{
-aawiki: php-1.25wmf18,
+aawiki: php-1.25wmf19,
aawikibooks: php-1.25wmf19,
aawiktionary: php-1.25wmf19,
-abwiki: php-1.25wmf18,
+abwiki: php-1.25wmf19,
abwiktionary: php-1.25wmf19,
-acewiki: php-1.25wmf18,
+acewiki: php-1.25wmf19,
advisorywiki: php-1.25wmf19,
-afwiki: php-1.25wmf18,
+afwiki: php-1.25wmf19,
afwikibooks: php-1.25wmf19,
afwikiquote: php-1.25wmf19,
afwiktionary: php-1.25wmf19,
-akwiki: php-1.25wmf18,
+akwiki: php-1.25wmf19,
akwikibooks: php-1.25wmf19,
akwiktionary: php-1.25wmf19,
-alswiki: php-1.25wmf18,
+alswiki: php-1.25wmf19,
alswikibooks: php-1.25wmf19,
alswikiquote: php-1.25wmf19,
alswiktionary: php-1.25wmf19,
-amwiki: php-1.25wmf18,
+amwiki: php-1.25wmf19,
amwikiquote: php-1.25wmf19,
amwiktionary: php-1.25wmf19,
-angwiki: php-1.25wmf18,
+angwiki: php-1.25wmf19,
angwikibooks: php-1.25wmf19,
angwikiquote: php-1.25wmf19,
angwikisource: php-1.25wmf19,
angwiktionary: php-1.25wmf19,
-anwiki: php-1.25wmf18,
+anwiki: php-1.25wmf19,
anwiktionary: php-1.25wmf19,
arbcom_dewiki: php-1.25wmf19,
arbcom_enwiki: php-1.25wmf19,
arbcom_fiwiki: php-1.25wmf19,
arbcom_nlwiki: php-1.25wmf19,
-arcwiki: php-1.25wmf18,
-arwiki: php-1.25wmf18,
+arcwiki: php-1.25wmf19,
+arwiki: php-1.25wmf19,
arwikibooks: php-1.25wmf19,
arwikimedia: php-1.25wmf19,
arwikinews: php-1.25wmf19,
@@ -40,135 +40,135 @@
arwikisource: php-1.25wmf19,
arwikiversity: php-1.25wmf19,
arwiktionary: php-1.25wmf19,
-arzwiki: php-1.25wmf18,
-astwiki: php-1.25wmf18,
+arzwiki: php-1.25wmf19,
+astwiki: php-1.25wmf19,
astwikibooks: php-1.25wmf19,
astwikiquote: php-1.25wmf19,
astwiktionary: php-1.25wmf19,
-aswiki: php-1.25wmf18,
+aswiki: php-1.25wmf19,
aswikibooks: php-1.25wmf19,
aswikisource: php-1.25wmf19,
aswiktionary: php-1.25wmf19,
auditcomwiki: php-1.25wmf19,
-avwiki: php-1.25wmf18,
+avwiki: php-1.25wmf19,
avwiktionary: php-1.25wmf19,
-aywiki: php-1.25wmf18,
+aywiki: php-1.25wmf19,
aywikibooks: php-1.25wmf19,
aywiktionary: php-1.25wmf19,
-azwiki: php-1.25wmf18,
+azwiki: php-1.25wmf19,
azwikibooks: php-1.25wmf19,
azwikiquote: php-1.25wmf19,
azwikisource: php-1.25wmf19,
azwiktionary: php-1.25wmf19,
-barwiki: php-1.25wmf18,
-bat_smgwiki: php-1.25wmf18,
-bawiki: php-1.25wmf18,
+barwiki: php-1.25wmf19,
+bat_smgwiki: php-1.25wmf19,
+bawiki: php-1.25wmf19,
bawikibooks: php-1.25wmf19,
-bclwiki: php-1.25wmf18,
+bclwiki: php-1.25wmf19,
bdwikimedia: php-1.25wmf19,
-be_x_oldwiki: php-1.25wmf18,
+be_x_oldwiki: php-1.25wmf19,
betawikiversity: php-1.25wmf19,
-bewiki: php-1.25wmf18,
+bewiki: php-1.25wmf19,
bewikibooks: php-1.25wmf19,
bewikimedia: php-1.25wmf19,
bewikiquote: php-1.25wmf19,
bewikisource: php-1.25wmf19,
bewiktionary: php-1.25wmf19,
-bgwiki: php-1.25wmf18,
+bgwiki: php-1.25wmf19,
bgwikibooks: php-1.25wmf19,
bgwikinews: php-1.25wmf19,
bgwikiquote: php-1.25wmf19,
bgwikisource: php-1.25wmf19,
bgwiktionary: php-1.25wmf19,
-bhwiki: php-1.25wmf18,
+bhwiki: php-1.25wmf19,
bhwiktionary: php-1.25wmf19,
-biwiki: php-1.25wmf18,
+biwiki: php-1.25wmf19,
biwikibooks: php-1.25wmf19,
biwiktionary: php-1.25wmf19,
-bjnwiki: php-1.25wmf18,
-bmwiki: php-1.25wmf18,
+bjnwiki: php-1.25wmf19,
+bmwiki: php-1.25wmf19,
bmwikibooks: php-1.25wmf19,
bmwikiquote: php-1.25wmf19,
bmwiktionary: php-1.25wmf19,
-bnwiki: php-1.25wmf18,
+bnwiki: php-1.25wmf19,
bnwikibooks: php-1.25wmf19,
bnwikisource: php-1.25wmf19,
bnwiktionary: php-1.25wmf19,
boardgovcomwiki: php-1.25wmf19,
boardwiki: php-1.25wmf19,
-bowiki: php-1.25wmf18,
+bowiki: php-1.25wmf19,
bowikibooks: php-1.25wmf19,
bowiktionary: php-1.25wmf19,
-bpywiki: php-1.25wmf18,
-brwiki: php-1.25wmf18,
+bpywiki: php-1.25wmf19,
+brwiki: php-1.25wmf19,
brwikimedia: php-1.25wmf19,
brwikiquote: php-1.25wmf19,
brwikisource: php-1.25wmf19,
brwiktionary: php-1.25wmf19,
-bswiki: php-1.25wmf18,
+bswiki: php-1.25wmf19,
bswikibooks: php-1.25wmf19,
bswikinews: php-1.25wmf19,
[MediaWiki-commits] [Gerrit] Move the list of repositories to mediawiki.org - change (mediawiki/selenium)
jenkins-bot has submitted this change and it was merged. Change subject: Move the list of repositories to mediawiki.org .. Move the list of repositories to mediawiki.org Bug: T91486 Change-Id: Ide383f801f65ae928b2f7c09a48626bf274c68bb --- M README.md 1 file changed, 1 insertion(+), 39 deletions(-) Approvals: Dduvall: Looks good to me, approved Hashar: Looks good to me, but someone else must approve Zfilipin: Looks good to me, but someone else must approve jenkins-bot: Verified diff --git a/README.md b/README.md index 4807563..61dce19 100644 --- a/README.md +++ b/README.md @@ -177,45 +177,7 @@ ## Links -### Gems - -1. mediawiki_selenium: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/selenium), [GitHub](https://github.com/wikimedia/mediawiki-selenium), [RubyGems](https://rubygems.org/gems/mediawiki_selenium), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-selenium) -1. mediawiki_api: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/ruby/api), [GitHub](https://github.com/wikimedia/mediawiki-ruby-api), [RubyGems](https://rubygems.org/gems/mediawiki_api), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-ruby-api) - -### Repositories - -If not stated differently, Selenium tests are in `tests/browser` folder and Jenkins jobs are at [integration.wikimedia.org/ci/view/BrowserTests](https://integration.wikimedia.org/ci/view/BrowserTests/). - -Repositories that use the gem: - -1. ArticleFeedbackv5: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/ArticleFeedbackv5), [GitHub](https://github.com/wikimedia/mediawiki-extensions-ArticleFeedbackv5), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-ArticleFeedbackv5) -1. CentralAuth: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/CentralAuth), [GitHub](https://github.com/wikimedia/mediawiki-extensions-CentralAuth), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-CentralAuth) -1. CirrusSearch: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/CirrusSearch), [GitHub](https://github.com/wikimedia/mediawiki-extensions-CirrusSearch), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-CirrusSearch) -1. ContentTranslation: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/ContentTranslation), [GitHub](https://github.com/wikimedia/mediawiki-extensions-ContentTranslation), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-ContentTranslation) -1. Echo: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Echo), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Echo), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Echo) -1. Flow: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Flow), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Flow), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Flow) -1. GettingStarted: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/GettingStarted), [GitHub](https://github.com/wikimedia/mediawiki-extensions-GettingStarted), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-GettingStarted) -1. Math: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/Math), [GitHub](https://github.com/wikimedia/mediawiki-extensions-Math), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-Math) -1. mediawiki/core: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/core), [GitHub](https://github.com/wikimedia/mediawiki-core), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-core) -1. MobileFrontend: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/MobileFrontend), [GitHub](https://github.com/wikimedia/mediawiki-extensions-MobileFrontend), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-MobileFrontend) -1. MultimediaViewer: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/MultimediaViewer), [GitHub](https://github.com/wikimedia/mediawiki-extensions-MultimediaViewer), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-MultimediaViewer) -1. PageTriage: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/PageTriage), [GitHub](https://github.com/wikimedia/mediawiki-extensions-PageTriage), [Code Climate](https://codeclimate.com/github/wikimedia/mediawiki-extensions-PageTriage) -1. PdfHandler: [Gerrit](https://gerrit.wikimedia.org/r/#/admin/projects/mediawiki/extensions/PdfHandler),
[MediaWiki-commits] [Gerrit] Hygiene: ImageOverlay should use View##events - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: ImageOverlay should use View##events
..
Hygiene: ImageOverlay should use View##events
Bug: T88566
Change-Id: I1c2e4898bb5d27e0b9fb36feb88cf3ac57d045f7
---
M javascripts/modules/mediaViewer/ImageOverlay.js
1 file changed, 12 insertions(+), 4 deletions(-)
Approvals:
Florianschmidtwelzow: Looks good to me, approved
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/javascripts/modules/mediaViewer/ImageOverlay.js
b/javascripts/modules/mediaViewer/ImageOverlay.js
index 1efd782..f33dd23 100644
--- a/javascripts/modules/mediaViewer/ImageOverlay.js
+++ b/javascripts/modules/mediaViewer/ImageOverlay.js
@@ -42,6 +42,11 @@
},
/** @inheritdoc */
+ events: {
+ 'click .image-wrapper': 'onToggleDetails'
+ },
+
+ /** @inheritdoc */
preRender: function ( options ) {
var self = this;
$.each( options.thumbnails, function ( i, thumbnail ) {
@@ -106,11 +111,14 @@
} );
$( window ).on( 'resize', $.proxy( this,
'_positionImage' ) );
+ },
- this.$( '.image-wrapper' ).on( 'click', function () {
- self.$details.toggle();
- self._positionImage();
- } );
+ /**
+* Event handler that toggles the details bar.
+*/
+ onToggleDetails: function () {
+ this.$details.toggle();
+ this._positionImage();
},
/** @inheritdoc */
--
To view, visit https://gerrit.wikimedia.org/r/188622
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I1c2e4898bb5d27e0b9fb36feb88cf3ac57d045f7
Gerrit-PatchSet: 8
Gerrit-Project: mediawiki/extensions/MobileFrontend
Gerrit-Branch: master
Gerrit-Owner: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Florianschmidtwelzow florian.schmidt.wel...@t-online.de
Gerrit-Reviewer: Jdlrobson jrob...@wikimedia.org
Gerrit-Reviewer: Phuedx g...@samsmith.io
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Clean up stores\UserPageCollectionsList - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Clean up stores\UserPageCollectionsList
..
Hygiene: Clean up stores\UserPageCollectionsList
Cleaned up the stores for CollectionsListStorage and UserPageCollectionsList to
follow the Collection store model (previous patch). CollectionsList storage
stores will implement the interface CollectionsListStorage (right now only
UserPageCollectionsList but soon DBCollectionsList).
Introduced the CollectionsList model, which is only an array of CollectionInfo
but it encapsulates the array and the logic for adding private/public items.
(all of this was mangled in the collectionslist store before).
Refactored properly everywhere that those were used.
Cleaned up a couple of things I've seen from php warnings.
Change-Id: Iada0d5d84f1f52026c5a7f7a5ce68f2380d000f8
---
M Gather.php
M extension.json
M includes/api/CollectionsListApi.php
M includes/models/Collection.php
A includes/models/CollectionsList.php
M includes/specials/SpecialGather.php
D includes/stores/CollectionsList.php
A includes/stores/CollectionsListStorage.php
M includes/stores/UserPageCollectionsList.php
M includes/stores/WatchlistCollection.php
M includes/views/CollectionsList.php
11 files changed, 121 insertions(+), 94 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gather.php b/Gather.php
index 5fe4f23..64f74e8 100644
--- a/Gather.php
+++ b/Gather.php
@@ -37,6 +37,7 @@
'Gather\models\CollectionBase' = 'models/CollectionBase',
'Gather\models\CollectionInfo' = 'models/CollectionInfo',
'Gather\models\Collection' = 'models/Collection',
+ 'Gather\models\CollectionsList' = 'models/CollectionsList',
'Gather\models\WithImage' = 'models/WithImage',
'Gather\models\ArraySerializable' = 'models/ArraySerializable',
@@ -45,7 +46,7 @@
'Gather\stores\WatchlistCollection' = 'stores/WatchlistCollection',
'Gather\stores\CollectionStorage' = 'stores/CollectionStorage',
'Gather\stores\UserPageCollection' = 'stores/UserPageCollection',
- 'Gather\stores\CollectionsList' = 'stores/CollectionsList',
+ 'Gather\stores\CollectionsListStorage' =
'stores/CollectionsListStorage',
'Gather\stores\UserPageCollectionsList' =
'stores/UserPageCollectionsList',
'Gather\stores\ItemExtracts' = 'stores/ItemExtracts',
'Gather\stores\ItemImages' = 'stores/ItemImages',
diff --git a/extension.json b/extension.json
index 4da3ff6..f4b2aea 100644
--- a/extension.json
+++ b/extension.json
@@ -26,6 +26,7 @@
Gather\\models\\CollectionBase:
includes/models/CollectionBase.php,
Gather\\models\\CollectionInfo:
includes/models/CollectionInfo.php,
Gather\\models\\Collection: includes/models/Collection.php,
+ Gather\\models\\CollectionsList:
includes/models/CollectionsList.php,
Gather\\models\\WithImage: includes/models/WithImage.php,
Gather\\models\\ArraySerializable:
includes/models/ArraySerializable.php,
Gather\\stores\\Collection: includes/stores/Collection.php,
@@ -33,7 +34,7 @@
Gather\\stores\\WatchlistCollection:
includes/stores/WatchlistCollection.php,
Gather\\stores\\CollectionStorage:
includes/stores/CollectionStorage.php,
Gather\\stores\\UserPageCollection:
includes/stores/UserPageCollection.php,
- Gather\\stores\\CollectionsList:
includes/stores/CollectionsList.php,
+ Gather\\stores\\CollectionsListStorage:
includes/stores/CollectionsListStorage.php,
Gather\\stores\\UserPageCollectionsList:
includes/stores/UserPageCollectionsList.php,
Gather\\stores\\ItemExtracts:
includes/stores/ItemExtracts.php,
Gather\\stores\\ItemImages: includes/stores/ItemImages.php,
diff --git a/includes/api/CollectionsListApi.php
b/includes/api/CollectionsListApi.php
index 102a5ed..b4d86a9 100644
--- a/includes/api/CollectionsListApi.php
+++ b/includes/api/CollectionsListApi.php
@@ -59,8 +59,7 @@
*/
protected function getCollectionsList( $owner ) {
$ownsCollection = $this-getUser()-getName() ===
$owner-getName();
- $collectionsListStore = new stores\UserPageCollectionsList(
$owner, $ownsCollection );
- return $collectionsListStore-getLists();
+ return stores\UserPageCollectionsList::newFromUser( $owner,
$ownsCollection );
}
/**
diff --git a/includes/models/Collection.php b/includes/models/Collection.php
index e4f2c0e..689c28a 100644
--- a/includes/models/Collection.php
+++ b/includes/models/Collection.php
@@ -70,7 +70,7 @@
public function toArray() {
$data = parent::toArray();
$data['items'] = array();
- foreach (
[MediaWiki-commits] [Gerrit] Corrected some HierarchyBuilder functions to be static. - change (mediawiki...HierarchyBuilder)
Kji has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194393
Change subject: Corrected some HierarchyBuilder functions to be static.
..
Corrected some HierarchyBuilder functions to be static.
Change-Id: I27f7b5d87c2ce16904c536e4dab525adfff71e65
Version number is now 1.5.2.
Change-Id: I372dbd12d11649813720b69afb10e77c487f29e0
Updated hierarchyBreadcrumb documentation.
Change-Id: I7688fbeb481135f5c46d17301bf9d1c4b82ac21d
---
M HierarchyBuilder.class.php
M HierarchyBuilder.php
2 files changed, 8 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/HierarchyBuilder
refs/changes/93/194393/1
diff --git a/HierarchyBuilder.class.php b/HierarchyBuilder.class.php
index f1231c6..94ff9f4 100644
--- a/HierarchyBuilder.class.php
+++ b/HierarchyBuilder.class.php
@@ -246,6 +246,10 @@
* This function will compute and return the breadcrumb information for
a
* given page based on the position of that page within a specified
hierarchy.
* The returned breadcrumb will show the display name for the pages it
contains.
+* The previous page in the beadcrumb will have a back arrow or an
up arrow
+* If it is the same as the immediate parent. The immediate parent will
have an
+* up arrow unless it is the same as the previous page, in which case
the
+* parent will not be displayed. The next page will have a forward
arrow.
*
* @param string $currentPage: Name of the page in the hierarchy that
is
* currently being viewed.
@@ -349,7 +353,7 @@
*
* @return string: The first page name found within $hierarchyRow.
*/
- public function getPageNameFromHierarchyRow( $hierarchyRow ) {
+ public static function getPageNameFromHierarchyRow( $hierarchyRow ) {
$numMatches = preg_match_all( self::PAGENAMEPATTERN,
$hierarchyRow, $matches );
// give me the first subpattern match to be the name of the
previous page
$pageName = ( $numMatches 0 ? $matches[1][0] : '' );
@@ -367,7 +371,7 @@
*
* @return number: The depth of $hierarchyRow.
*/
- public function getDepthOfHierarchyRow( $hierarchyRow ) {
+ public static function getDepthOfHierarchyRow( $hierarchyRow ) {
$numMatches = preg_match_all( self::DEPTHPATTERN,
$hierarchyRow, $matches );
$depth = ( $numMatches 0 ? strlen( $matches[1][0] ) : 0 );
return $depth;
@@ -681,7 +685,7 @@
* @return string: The value of the specified property from the given
page
* or the empty string if the property does not exist.
*/
- public function getPropertyFromPage( $page, $property ) {
+ public static function getPropertyFromPage( $page, $property ) {
$store = smwfGetStore();
$title = Title::newFromText( $page );
$subject = SMWDIWikiPage::newFromTitle( $title );
diff --git a/HierarchyBuilder.php b/HierarchyBuilder.php
index 36e2ec5..86a54ed 100644
--- a/HierarchyBuilder.php
+++ b/HierarchyBuilder.php
@@ -46,7 +46,7 @@
$wgExtensionCredits['parserhook'][] = array (
'path' = __FILE__,
'name' = 'HierarchyBuilder',
- 'version' = '1.5.1',
+ 'version' = '1.5.2',
'author' = array(
'[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy
Cicalese]',
'[https://www.mediawiki.org/wiki/User:Kevin.ji Kevin Ji]'
--
To view, visit https://gerrit.wikimedia.org/r/194393
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I7688fbeb481135f5c46d17301bf9d1c4b82ac21d
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/HierarchyBuilder
Gerrit-Branch: master
Gerrit-Owner: Kji k...@mitre.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move APIGetDescriptionMessages hook handler to static class - change (mediawiki...ApiSandbox)
jenkins-bot has submitted this change and it was merged.
Change subject: Move APIGetDescriptionMessages hook handler to static class
..
Move APIGetDescriptionMessages hook handler to static class
Change-Id: I01ffc375d0d8d169923b986cca2b9c36572a1db8
---
A ApiSandbox.hooks.php
M ApiSandbox.php
2 files changed, 16 insertions(+), 11 deletions(-)
Approvals:
Alex Monk: Looks good to me, approved
jenkins-bot: Verified
diff --git a/ApiSandbox.hooks.php b/ApiSandbox.hooks.php
new file mode 100644
index 000..e9ee441
--- /dev/null
+++ b/ApiSandbox.hooks.php
@@ -0,0 +1,14 @@
+?php
+
+class ApiSandboxHooks {
+ /**
+* @param $module ApiBase
+* @param $msgs Message[]
+*/
+ public static function onAPIGetDescriptionMessages( $module, $msgs ) {
+ if ( $module instanceof ApiMain ) {
+ $msgs[] = wfMessage( 'apisb-main-help-text' );
+ }
+ return true;
+ }
+}
diff --git a/ApiSandbox.php b/ApiSandbox.php
index 14a699a..2101a88 100644
--- a/ApiSandbox.php
+++ b/ApiSandbox.php
@@ -16,6 +16,7 @@
$wgExtensionMessagesFiles['ApiSandboxAlias'] = __DIR__ .
'/ApiSandbox.alias.php';
$wgAutoloadClasses['SpecialApiSandbox'] = __DIR__ . '/SpecialApiSandbox.php';
+$wgAutoloadClasses['ApiSandboxHooks'] = __DIR__ . '/ApiSandbox.hooks.php';
$wgSpecialPages['ApiSandbox'] = 'SpecialApiSandbox';
$wgSpecialPageGroups['ApiSandbox'] = 'wiki';
@@ -55,14 +56,4 @@
)
);
-$wgHooks['APIGetDescriptionMessages'][] = 'efASAPIGetDescriptionMessages';
-
-/**
- * @param $module ApiBase
- * @param $msgs Message[]
- */
-function efASAPIGetDescriptionMessages( $module, $msgs ) {
- if ( $module instanceof ApiMain ) {
- $msgs[] = wfMessage( 'apisb-main-help-text' );
- }
-}
+$wgHooks['APIGetDescriptionMessages'][] =
'ApiSandboxHooks::onAPIGetDescriptionMessages';
--
To view, visit https://gerrit.wikimedia.org/r/194006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I01ffc375d0d8d169923b986cca2b9c36572a1db8
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ApiSandbox
Gerrit-Branch: master
Gerrit-Owner: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: Alex Monk kren...@gmail.com
Gerrit-Reviewer: Jackmcbarn jackmcb...@gmail.com
Gerrit-Reviewer: Legoktm legoktm.wikipe...@gmail.com
Gerrit-Reviewer: MaxSem maxsem.w...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Lint all js except node_modules and bower_modules - change (wikimedia...dash)
Ejegg has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194389
Change subject: Lint all js except node_modules and bower_modules
..
Lint all js except node_modules and bower_modules
Yes, even the node bits that run server side. This should match
better the linting that Jenkins does.
Change-Id: Ia1968364862042c923de0964f7657d8cb34c85ca
---
M gulpfile.js
1 file changed, 1 insertion(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/fundraising/dash
refs/changes/89/194389/1
diff --git a/gulpfile.js b/gulpfile.js
index 317ec74..df61593 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -51,7 +51,7 @@
}
});
-var jsfilesToLint = ['src/app/*.js', 'src/components/*/*.js'];
+var jsfilesToLint = ['**/*.js', '!node_modules/**/*.js',
'!src/bower_modules/**/*.js'];
// linting
gulp.task('lint', function () {
--
To view, visit https://gerrit.wikimedia.org/r/194389
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia1968364862042c923de0964f7657d8cb34c85ca
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/fundraising/dash
Gerrit-Branch: master
Gerrit-Owner: Ejegg eeggles...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] base: move instance-upstarts to manifest - change (operations/puppet)
BBlack has submitted this change and it was merged.
Change subject: base: move instance-upstarts to manifest
..
base: move instance-upstarts to manifest
Change-Id: Ie13e9534304af96ca0f7bbf0ae0f5853fd8e75df
---
M modules/base/manifests/init.pp
A modules/base/manifests/instance-upstarts.pp
2 files changed, 10 insertions(+), 11 deletions(-)
Approvals:
BBlack: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/base/manifests/init.pp b/modules/base/manifests/init.pp
index 4c42c36..84817b4 100644
--- a/modules/base/manifests/init.pp
+++ b/modules/base/manifests/init.pp
@@ -1,14 +1,3 @@
-class base::instance-upstarts {
-
-file { '/etc/init/ttyS0.conf':
-owner = 'root',
-group = 'root',
-mode = '0444',
-source = 'puppet:///modules/base/upstart/ttyS0.conf';
-}
-
-}
-
class base {
include apt
diff --git a/modules/base/manifests/instance-upstarts.pp
b/modules/base/manifests/instance-upstarts.pp
new file mode 100644
index 000..e3363b0
--- /dev/null
+++ b/modules/base/manifests/instance-upstarts.pp
@@ -0,0 +1,10 @@
+class base::instance-upstarts {
+
+file { '/etc/init/ttyS0.conf':
+owner = 'root',
+group = 'root',
+mode = '0444',
+source = 'puppet:///modules/base/upstart/ttyS0.conf';
+}
+
+}
\ No newline at end of file
--
To view, visit https://gerrit.wikimedia.org/r/188612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie13e9534304af96ca0f7bbf0ae0f5853fd8e75df
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: Alexandros Kosiaris akosia...@wikimedia.org
Gerrit-Reviewer: Andrew Bogott abog...@wikimedia.org
Gerrit-Reviewer: BBlack bbl...@wikimedia.org
Gerrit-Reviewer: Dzahn dz...@wikimedia.org
Gerrit-Reviewer: John F. Lewis johnflewi...@gmail.com
Gerrit-Reviewer: coren mpellet...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Hygiene: Collection stores as functions fix docs - change (mediawiki...Gather)
jenkins-bot has submitted this change and it was merged.
Change subject: Hygiene: Collection stores as functions fix docs
..
Hygiene: Collection stores as functions fix docs
In preparation for more API work:
I've refactored Collection, UserPageCollection and WatchlistCollection to be
static functions that take parameters and return results. Less object oriented
stuff since oo makes the design for adding, updating and creating hard from
what we where doing.
Also, we should use for collection loading/saving a implementation of
stores\CollectionStorage, right now the only one is UserPageCollection but Rob
is working on DBCollection. This classes should handle internally the
difference between watchlist loading on its hardcoded id (see
UserPageCollection::getByUserAndId for an example).
Also fixed a few of small fixes to php docs that i've noticed form using
phpstorm.
I'm going to refactor the stores\UserPageCollectionsList to follow the same
style as these ones too, for easier handling on the API and a clearer interface
(in following patches)
Change-Id: I09eb6ef45bbdeea9d5f4cf6b2647d8f97631e2fc
---
M Gather.php
M extension.json
M includes/specials/SpecialGather.php
M includes/stores/Collection.php
A includes/stores/CollectionStorage.php
M includes/stores/UserPageCollection.php
M includes/stores/WatchlistCollection.php
M includes/views/CollectionsList.php
M includes/views/View.php
9 files changed, 76 insertions(+), 71 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
jenkins-bot: Verified
diff --git a/Gather.php b/Gather.php
index d154ac7..5fe4f23 100644
--- a/Gather.php
+++ b/Gather.php
@@ -43,6 +43,7 @@
'Gather\stores\JSONPage' = 'stores/JSONPage',
'Gather\stores\Collection' = 'stores/Collection',
'Gather\stores\WatchlistCollection' = 'stores/WatchlistCollection',
+ 'Gather\stores\CollectionStorage' = 'stores/CollectionStorage',
'Gather\stores\UserPageCollection' = 'stores/UserPageCollection',
'Gather\stores\CollectionsList' = 'stores/CollectionsList',
'Gather\stores\UserPageCollectionsList' =
'stores/UserPageCollectionsList',
diff --git a/extension.json b/extension.json
index 306664e..4da3ff6 100644
--- a/extension.json
+++ b/extension.json
@@ -31,6 +31,7 @@
Gather\\stores\\Collection: includes/stores/Collection.php,
Gather\\stores\\JSONPage: includes/stores/JSONPage.php,
Gather\\stores\\WatchlistCollection:
includes/stores/WatchlistCollection.php,
+ Gather\\stores\\CollectionStorage:
includes/stores/CollectionStorage.php,
Gather\\stores\\UserPageCollection:
includes/stores/UserPageCollection.php,
Gather\\stores\\CollectionsList:
includes/stores/CollectionsList.php,
Gather\\stores\\UserPageCollectionsList:
includes/stores/UserPageCollectionsList.php,
diff --git a/includes/specials/SpecialGather.php
b/includes/specials/SpecialGather.php
index b733b77..d9636d0 100644
--- a/includes/specials/SpecialGather.php
+++ b/includes/specials/SpecialGather.php
@@ -70,23 +70,13 @@
* @param int $id collection id
*/
public function renderUserCollection( User $user, $id ) {
- // Watchlist lives at id 0
- if ( (int)$id === 0 ) {
- if ( $this-isOwner( $user ) ) {
- $watchlistStore = new
stores\WatchlistCollection( $user );
- $this-render( new views\Collection(
$watchlistStore-getCollection() ) );
- } else {
- // FIXME: No permissions to visit this. Showing
not found ATM.
- $this-renderNotFoundError();
- }
+ $collection = stores\UserPageCollection::newFromUserAndId(
$user, $id );
+ if ( $collection === null ||
+ ( !$collection-isPublic() !$this-isOwner( $user )
) ) {
+ // FIXME: No permissions to visit this. Showing not
found ATM.
+ $this-renderNotFoundError();
} else {
- $collectionStore = new stores\UserPageCollection(
$user, $id );
- $collection = $collectionStore-getCollection();
- if ( $collection !== null ) {
- $this-render( new views\Collection(
$collection ) );
- } else {
- $this-renderNotFoundError();
- }
+ $this-render( new views\Collection( $collection ) );
}
}
@@ -105,7 +95,7 @@
/**
* Render the special page using CollectionView and given collection
*
-* @param View $view
+* @param views\View $view
*/
public function render(
[MediaWiki-commits] [Gerrit] role::deployment: add codfw deployment master (still tin) - change (operations/puppet)
Giuseppe Lavagetto has submitted this change and it was merged.
Change subject: role::deployment: add codfw deployment master (still tin)
..
role::deployment: add codfw deployment master (still tin)
Change-Id: I79b005a762a5851a5bcfb24c715416cf3ac3ec97
---
M manifests/role/deployment.pp
1 file changed, 1 insertion(+), 0 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/deployment.pp b/manifests/role/deployment.pp
index 573c9db..31e8759 100644
--- a/manifests/role/deployment.pp
+++ b/manifests/role/deployment.pp
@@ -217,6 +217,7 @@
'parent_dir' = '/srv/deployment',
'servers'= {
'eqiad' = $deployment_server,
+'codfw' = $deployment_server,
},
'redis' = {
'host' = $deployment_server,
--
To view, visit https://gerrit.wikimedia.org/r/194341
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I79b005a762a5851a5bcfb24c715416cf3ac3ec97
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: Giuseppe Lavagetto glavage...@wikimedia.org
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Completely rework SectionEditLinkGenerator - change (mediawiki...Wikibase)
Adrian Lang has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194342
Change subject: Completely rework SectionEditLinkGenerator
..
Completely rework SectionEditLinkGenerator
This replaces SectionEditLinkGenerator by the interface EditSectionGenerator,
with a default implementation called ToolbarEditSectionGenerator. All knowledge
about special pages is now encapsulated there. For non-editable entities, a
EmptyEditSectionGenerator is used.
Change-Id: I055282f0840d17b39c8bd8d050ec4ac675357742
---
A repo/includes/View/EditSectionGenerator.php
A repo/includes/View/EmptyEditSectionGenerator.php
M repo/includes/View/EntityTermsView.php
M repo/includes/View/EntityView.php
M repo/includes/View/EntityViewFactory.php
M repo/includes/View/ItemView.php
D repo/includes/View/SectionEditLinkGenerator.php
M repo/includes/View/SiteLinksView.php
M repo/includes/View/StatementGroupListView.php
A repo/includes/View/ToolbarEditSectionGenerator.php
M repo/tests/phpunit/includes/View/ClaimsViewTest.php
A repo/tests/phpunit/includes/View/EmptyEditSectionGeneratorTest.php
M repo/tests/phpunit/includes/View/EntityTermsViewTest.php
D repo/tests/phpunit/includes/View/SectionEditLinkGeneratorTest.php
M repo/tests/phpunit/includes/View/SiteLinksViewTest.php
A repo/tests/phpunit/includes/View/ToolbarEditSectionGeneratorTest.php
16 files changed, 581 insertions(+), 434 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Wikibase
refs/changes/42/194342/1
diff --git a/repo/includes/View/EditSectionGenerator.php
b/repo/includes/View/EditSectionGenerator.php
new file mode 100644
index 000..db45d72
--- /dev/null
+++ b/repo/includes/View/EditSectionGenerator.php
@@ -0,0 +1,63 @@
+?php
+
+namespace Wikibase\Repo\View;
+
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Statement\Statement;
+
+/**
+ * Generates HTML for a section edit link
+ *
+ * @since 0.5
+ * @licence GNU GPL v2+
+ *
+ * @author H. Snater mediaw...@snater.com
+ * @author Daniel Werner
+ * @author Daniel Kinzler
+ * @author Adrian Heine adrian.he...@wikimedia.de
+ */
+interface EditSectionGenerator {
+
+ /**
+* Returns HTML allowing to edit site links.
+*
+* @since 0.5
+*
+* @param EntityId|null $entityId
+* @return string
+*/
+ public function getSiteLinksEditSection( EntityId $entityId = null );
+
+ /**
+* Returns HTML allowing to edit label, description and aliases.
+*
+* @since 0.5
+*
+* @param string $languageCode
+* @param EntityId|null $entityId
+* @return string
+*/
+ public function getLabelDescriptionAliasesEditSection( $languageCode,
EntityId $entityId = null );
+
+ /**
+* Returns HTML allowing to edit a statement
+*
+* @since 0.5
+*
+* @param Statement $statement
+* @return string
+*/
+ public function getStatementEditSection( Statement $statement );
+
+ /**
+* Returns HTML allowing to add a statement to a statementgroup
+*
+* @since 0.5
+*
+* @param PropertyId $propertyId The property of the statement group
+* @param EntityId|null $entityId The id of the entity on which to add
a statement
+* @return string
+*/
+ public function getAddStatementToGroupSection( PropertyId $propertyId,
EntityId $entityId = null );
+}
diff --git a/repo/includes/View/EmptyEditSectionGenerator.php
b/repo/includes/View/EmptyEditSectionGenerator.php
new file mode 100644
index 000..2adc18a
--- /dev/null
+++ b/repo/includes/View/EmptyEditSectionGenerator.php
@@ -0,0 +1,52 @@
+?php
+
+namespace Wikibase\Repo\View;
+
+use Wikibase\DataModel\Entity\EntityId;
+use Wikibase\DataModel\Entity\PropertyId;
+use Wikibase\DataModel\Statement\Statement;
+
+/**
+ * An EditSectionGenerator returning empty string for edit sections
+ *
+ * @author Adrian Heine adrian.he...@wikimedia.de
+ */
+class EmptyEditSectionGenerator implements EditSectionGenerator {
+
+ /**
+* Get an empty string
+*
+* @return string
+*/
+ public function getStatementEditSection( Statement $statement ) {
+ return '';
+ }
+
+ /**
+* Get an empty string
+*
+* @return string
+*/
+ public function getLabelDescriptionAliasesEditSection( $languageCode,
EntityId $entityId = null ) {
+ return '';
+ }
+
+ /**
+* Get an empty string
+*
+* @return string
+*/
+ public function getSiteLinksEditSection( EntityId $entityId = null ) {
+ return '';
+ }
+
+ /**
+* Get an empty string
+*
+* @return string
+*/
+ public function
[MediaWiki-commits] [Gerrit] Add top help link to MediaWiki.org in several pages via indi... - change (mediawiki/core)
jenkins-bot has submitted this change and it was merged.
Change subject: Add top help link to MediaWiki.org in several pages via
indicator
..
Add top help link to MediaWiki.org in several pages via indicator
All the chosen targets are translatable public domain help pages
on MediaWiki.org. Mostly special pages and actions for privileged
users for now.
Adapted from the Translate extension, credit to Niklas Laxström
(TranslateUtils::addSpecialHelpLink).
Depends on 6f5b29ff4e6fdf21b5a8cacaf10d6aceaee26a7d, whose commit
message has a typo addIndicator() instead of setIndicator().
Bug: T45591
Change-Id: I2934b1708a0d207dcf3d940264f140613646f203
---
M includes/OutputPage.php
M includes/actions/DeleteAction.php
M includes/specials/SpecialAllMessages.php
M includes/specials/SpecialBlock.php
M includes/specials/SpecialMergeHistory.php
M includes/specials/SpecialMovepage.php
M includes/specials/SpecialNewimages.php
M includes/specials/SpecialNewpages.php
M includes/specials/SpecialUndelete.php
M includes/specials/SpecialUpload.php
M includes/specials/SpecialUserrights.php
M languages/i18n/en.json
M languages/i18n/qqq.json
M resources/Resources.php
A resources/src/mediawiki/images/help.png
A resources/src/mediawiki/mediawiki.helplink.css
16 files changed, 66 insertions(+), 7 deletions(-)
Approvals:
Bartosz Dziewoński: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/OutputPage.php b/includes/OutputPage.php
index 5c146e4..d62d49b 100644
--- a/includes/OutputPage.php
+++ b/includes/OutputPage.php
@@ -1379,7 +1379,8 @@
}
/**
-* Add an array of indicators, with their identifiers as array keys and
HTML contents as values.
+* Add an array of indicators, with their identifiers as array
+* keys and HTML contents as values.
*
* In case of duplicate keys, existing values are overwritten.
*
@@ -1405,6 +1406,34 @@
}
/**
+* Adds help link with an icon via page indicators.
+* @param string $to
+* @param bool $overrideBaseUrl
+* @since 1.25
+*/
+ public function addHelpLink( $to, $overrideBaseUrl = false ) {
+ $this-addModules( 'mediawiki.helplink' );
+ $text = wfMessage( 'helppage-top-gethelp' )-escaped();
+
+ if ( $overrideBaseUrl ) {
+ $helpUrl = $to;
+ } else {
+ $helpUrl =
//www.mediawiki.org/wiki/Special:MyLanguage/$to;
+ }
+ $link = Html::rawElement(
+ 'a',
+ array(
+ 'href' = $helpUrl,
+ 'target' = '_blank',
+ 'class' = 'mw-helplink',
+ ),
+ $text
+ );
+
+ $this-setIndicators( array( 'mw-helplink' = $link ) );
+ }
+
+ /**
* Do not allow scripts which can be modified by wiki users to load on
this page;
* only allow scripts bundled with, or generated by, the software.
* Site-wide styles are controlled by a config setting, since they can
be
diff --git a/includes/actions/DeleteAction.php
b/includes/actions/DeleteAction.php
index 12f0dff..82424eb 100644
--- a/includes/actions/DeleteAction.php
+++ b/includes/actions/DeleteAction.php
@@ -41,13 +41,14 @@
}
public function show() {
+ $out = $this-getOutput();
if ( $this-getContext()-getConfig()-get(
'UseMediaWikiUIEverywhere' ) ) {
- $out = $this-getOutput();
$out-addModuleStyles( array(
'mediawiki.ui.input',
'mediawiki.ui.checkbox',
) );
}
+ $out-addHelpLink( 'Help:Sysop deleting and undeleting' );
$this-page-delete();
}
}
diff --git a/includes/specials/SpecialAllMessages.php
b/includes/specials/SpecialAllMessages.php
index 0008b10..5211e30 100644
--- a/includes/specials/SpecialAllMessages.php
+++ b/includes/specials/SpecialAllMessages.php
@@ -59,6 +59,7 @@
$this-outputHeader( 'allmessagestext' );
$out-addModuleStyles( 'mediawiki.special' );
+ $out-addHelpLink( 'Help:System message' );
$this-table = new AllmessagesTablePager(
$this,
diff --git a/includes/specials/SpecialBlock.php
b/includes/specials/SpecialBlock.php
index 1d4a860..0323505 100644
--- a/includes/specials/SpecialBlock.php
+++ b/includes/specials/SpecialBlock.php
@@ -103,6 +103,8 @@
$msg = $this-alreadyBlocked ? 'ipb-change-block' : 'ipbsubmit';
$form-setSubmitTextMsg( $msg );
+ $this-getOutput()-addHelpLink( 'Help:Blocking users' );
+
[MediaWiki-commits] [Gerrit] [WIP] VE plugins - change (mediawiki...Flow)
Matthias Mullie has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194346
Change subject: [WIP] VE plugins
..
[WIP] VE plugins
Bug: T90760
Change-Id: I69bc07767cf101fe2d5a3f6adafa96918e8485fc
---
M Resources.php
M modules/editor/editors/ext.flow.editors.visualeditor.js
2 files changed, 47 insertions(+), 73 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/Flow
refs/changes/46/194346/1
diff --git a/Resources.php b/Resources.php
index 494ae52..2538aae 100644
--- a/Resources.php
+++ b/Resources.php
@@ -401,12 +401,15 @@
),
) + $mobile,
'ext.flow.editors.visualeditor' = $flowResourceTemplate + array(
- 'scripts' = 'editor/editors/ext.flow.editors.visualeditor.js',
+ 'scripts' = array(
+ 'editor/editors/ext.flow.editors.visualeditor.js',
+ ),
'dependencies' = array(
'jquery.spinner',
- // ve dependencies will be loaded via JS
+ 'ext.visualEditor.core',
+ // rest of VE dependencies will be loaded via JS
),
- ),
+ ),
'ext.flow.parsoid' = $flowResourceTemplate + array(
'scripts' = array(
diff --git a/modules/editor/editors/ext.flow.editors.visualeditor.js
b/modules/editor/editors/ext.flow.editors.visualeditor.js
index df28715..e3fa3df 100644
--- a/modules/editor/editors/ext.flow.editors.visualeditor.js
+++ b/modules/editor/editors/ext.flow.editors.visualeditor.js
@@ -35,9 +35,8 @@
* @param {string} [content='']
*/
mw.flow.editors.visualeditor.prototype.init = function ( content ) {
- var $veNode, htmlDoc, dmDoc, target,
- $focusedElement = $( ':focus' ),
- flowEditor = this;
+ var target, surface, $veNode,
+ $focusedElement = $( ':focus' );
// ve.createDocumentFromHtml documents support for an empty
string
// to create an empty document, but does not mention other
falsy values.
@@ -46,74 +45,45 @@
// add i18n messages to VE
ve.init.platform.addMessages( mw.messages.values );
+ target = new ve.init.sa.Target( 'desktop' );
+ surface = target.addSurface(
+ ve.dm.converter.getModelFromDom(
+ ve.createDocumentFromHtml( content ),
+ null,
+ mw.config.get( 'wgVisualEditor'
).pageLanguageCode,
+ mw.config.get( 'wgVisualEditor'
).pageLanguageDir
+ )
+ );
+
$.removeSpinner( 'flow-editor-loading' );
- // init ve, save target object
- //
- // We need at least some MW-specific stuff (e.g. links,
MW-style files).
- //
- // But for now we're using standalone, since
- // ve.init.mw.Target has some stuff that is not applicable
- // to us (e.g. submitUrl, this.$checkboxes), and there
- // were glitches when I tried to use it.
- //
- // However, we will have to look at this later.
- target = this.target = new ve.init.sa.Target(
- 'desktop'
+ // attach VE to DOM
+ target.setSurface( surface );
+ surface.$element.parent().insertAfter( this.$node );
+
+ // Add appropriately mw-content-ltr or mw-content-rtl class
+
surface.getView().getDocument().getDocumentNode().$element.addClass(
+ 'mw-content-' + mw.config.get( 'wgVisualEditor'
).pageLanguageDir
);
- htmlDoc = ve.createDocumentFromHtml( content ); // HTMLDocument
+ // focus VE instance if textarea had focus
+ if ( !$focusedElement.length || this.$node.is( $focusedElement
) ) {
+ surface.getView().focus();
+ }
- // Based on ve.init.mw.Target.prototype.setupSurface
- dmDoc = this.dmDoc = ve.dm.converter.getModelFromDom(
- htmlDoc,
- null,
- mw.config.get( 'wgVisualEditor' ).pageLanguageCode,
- mw.config.get( 'wgVisualEditor' ).pageLanguageDir
- );
- dmDoc.buildNodeTree();
+ // add class to editor, to give it our desired look feel
+ $veNode = surface.$element.find( '.ve-ce-documentNode' );
+ $veNode.addClass( 'mw-ui-input' );
- setTimeout( function () {
- var surface = target.addSurface( dmDoc ),
-
[MediaWiki-commits] [Gerrit] For tooltips without links, supply a link to the graph page. - change (mediawiki...GraphViz)
Welterkj has submitted this change and it was merged.
Change subject: For tooltips without links, supply a link to the graph page.
..
For tooltips without links, supply a link to the graph page.
Change-Id: Idc0bc289a3fb505cfd68baaa70e5645b081b1179
---
M GraphViz_body.php
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
Welterkj: Verified; Looks good to me, approved
diff --git a/GraphViz_body.php b/GraphViz_body.php
index 0f9b1f1..a84aac8 100644
--- a/GraphViz_body.php
+++ b/GraphViz_body.php
@@ -1110,7 +1110,8 @@
}
// normalize the map file contents
- if ( !self::normalizeMapFileContents(
$graphParms-getMapPath( $isPreview ), $graphParms-getRenderer(), $errorText )
) {
+ if ( !self::normalizeMapFileContents(
$graphParms-getMapPath( $isPreview ), $graphParms-getRenderer(),
+ $titleText, $errorText ) ) {
wfDebug( __METHOD__ . : $errorText\n );
self::deleteFiles( $graphParms, $isPreview,
false );
return self::errorHTML( $errorText );
@@ -1445,13 +1446,14 @@
*
* @param[in] string $mapPath is the map file (including path).
* @param[in] string $renderer is the name of the renderer used to
produce the map.
+* @param[in] string $pageTitle is the page title to supply for DOT
tooltips that do not have URLs.
* @param[out] string $errorText is populated with an error message in
the event of an error.
*
* @return boolean true upon success, false upon failure.
*
* @author Keith Welter
*/
- protected static function normalizeMapFileContents( $mapPath,
$renderer, $errorText ) {
+ protected static function normalizeMapFileContents( $mapPath,
$renderer, $pageTitle, $errorText ) {
// read the map file contents
$map = file_get_contents( $mapPath );
if ( !empty( $map ) ) {
@@ -1497,12 +1499,12 @@
$map = str_replace( '/map', '', $map );
// DOT and HTML allow tooltips without URLs but
ImageMap does not.
- // We want to allow tooltips without URLs
(hrefs) so add a dummy URL if it is missing.
- // ImageMap accepts the URL http://; so use
that as the dummy href.
+ // We want to allow tooltips without URLs
(hrefs) so supply the page title if it is missing.
// detect missing hrefs and add them as needed
+ $missingHrefReplacement = 'id=$1 href=[[' .
$pageTitle . ']] title=$2';
$map = preg_replace(
'~id=([^]+)[\s\t]+title=([^]+)~',
- 'id=$1 href=http://; title=$2',
+ $missingHrefReplacement,
$map );
// add enclosing square brackets to URLs that
don't have them and add the title
--
To view, visit https://gerrit.wikimedia.org/r/194344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idc0bc289a3fb505cfd68baaa70e5645b081b1179
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GraphViz
Gerrit-Branch: master
Gerrit-Owner: Welterkj welterkj+...@gmail.com
Gerrit-Reviewer: Welterkj welterkj+...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] content: Share code between the where_from and dmca_requests... - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/194349 Change subject: content: Share code between the where_from and dmca_requests graph .. content: Share code between the where_from and dmca_requests graph - Renamed dmcaRequests() to requestsAndGranted() - Add params to take element and date range - Update where_from data so that it includes the 'complied' column - And the 'Requests Granted?' legend to the where_from graph TODO - Tooltips Change-Id: I5891cc0985770ba1f8cf4e054ba21303d509ad7c --- D source/data/#targeted_dmca.csv# D source/data/.#targeted_dmca.csv M source/data/where_from.csv M source/javascripts/content.js M source/localizable/content.html.erb M source/stylesheets/graph.css.scss 6 files changed, 82 insertions(+), 82 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/49/194349/1 diff --git a/source/data/\043targeted_dmca.csv\043 b/source/data/\043targeted_dmca.csv\043 deleted file mode 100644 index a43326a..000 --- a/source/data/\043targeted_dmca.csv\043 +++ /dev/null @@ -1,10 +0,0 @@ -key,url,value,duration -Wikimedia Commons,commons.wikimedia.org,7,juldec13 -English Wikipedia,en.wikipedia.org,6,juldec13 -English Wikisource,en.wikisource.org,1,juldec13 -French Wikisource,fr.wikisource.org,1,juldec13 -Ukrainian Wikipedia,uk.wikipedia.org,1,juldec13 -Wikimedia Commons,commons.wikimedia.org,3,janjun14 -English Wikipedia,en.wikipedia.org,6,janjun14 -Portuguese Wikipedia,pt.wikipedia.org,1,janjun14 -English Wikipedia,en.wikipedia.org, \ No newline at end of file diff --git a/source/data/.\043targeted_dmca.csv b/source/data/.\043targeted_dmca.csv deleted file mode 12 index cf66ef3..000 --- a/source/data/.\043targeted_dmca.csv +++ /dev/null @@ -1 +0,0 @@ -prateeksaxena@Prateek-Saxenas-MacBook-Air.local.6243 \ No newline at end of file diff --git a/source/data/where_from.csv b/source/data/where_from.csv index ee7715f..c318cf8 100644 --- a/source/data/where_from.csv +++ b/source/data/where_from.csv @@ -1,64 +1,64 @@ -key,value,duration,tooltip -USA,54,jul12jun13,One case was American-Brazilian -Germany,21,jul12jun13 -United Kingdom,17,jul12jun13,One case was British-Swiss -France,13,jul12jun13,One case was French-Saudi Arabian -Italy,12,jul12jun13 -Spain,2,jul12jun13,One case was Spanish-Italian -Canada,4,jul12jun13 -Australia,2,jul12jun13 -India,1,jul12jun13 -Netherlands,2,jul12jun13 -New Zealand,1,jul12jun13 -Russia,2,jul12jun13,One case was Russian-British -Austria,1,jul12jun13 -Belgium,1,jul12jun13 -Chile,1,jul12jun13 -Iran,1,jul12jun13 -Ireland,1,jul12jun13 -Israel,1,jul12jun13 -Luxembourg,1,jul12jun13 -Malaysia,1,jul12jun13 -Poland,1,jul12jun13 -Senegal,1,jul12jun13 -Serbia,1,jul12jun13,One case was Serbo-Croat -Singapore,1,jul12jun13 -Switzerland,1,jul12jun13 -Unknown,4,jul12jun13 -Argentina,1,juldec13 -Brazil,2,juldec13 -Bulgaria,1,juldec13 -Denmark,1,juldec13 -France,7,juldec13 -Germany,12,juldec13 -Hong Kong,1,juldec13 -India,2,juldec13 -Italy,2,juldec13 -South Korea,1,juldec13 -Netherlands,3,juldec13 -New Zealand,1,juldec13 -Norway,1,juldec13 -Poland,1,juldec13 -Singapore,1,juldec13 -United Kingdom,4,juldec13 -USA,19,juldec13 -Unknown,6,juldec13 -Australia,1,janjun14 -Austria,2,janjun14 -Brazil,1,janjun14 -Canada,1,janjun14 -France,5,janjun14 -Germany,17,janjun14 -India,2,janjun14 -Ireland,1,janjun14 -Netherlands,1,janjun14 -Russia,2,janjun14 -Slovenia,1,janjun14 -Switzerland,6,janjun14 -United Kingdom,11,janjun14 -USA,33,janjun14 -Unknown,2,janjun14 -Peru,1,janjun14 -Pakistan,1,janjun14 -Israel,1,janjun14 -Latvia,1,janjun14 \ No newline at end of file +key,requests,complied,duration,tooltip +USA,54,0,jul12jun13,One case was American-Brazilian +Germany,21,0,jul12jun13 +United Kingdom,17,0,jul12jun13,One case was British-Swiss +France,13,0,jul12jun13,One case was French-Saudi Arabian +Italy,12,0,jul12jun13 +Spain,2,0,jul12jun13,One case was Spanish-Italian +Canada,4,0,jul12jun13 +Australia,2,0,jul12jun13 +India,1,0,jul12jun13 +Netherlands,2,0,jul12jun13 +New Zealand,1,0,jul12jun13 +Russia,2,0,jul12jun13,One case was Russian-British +Austria,1,0,jul12jun13 +Belgium,1,0,jul12jun13 +Chile,1,0,jul12jun13 +Iran,1,0,jul12jun13 +Ireland,1,0,jul12jun13 +Israel,1,0,jul12jun13 +Luxembourg,1,0,jul12jun13 +Malaysia,1,0,jul12jun13 +Poland,1,0,jul12jun13 +Senegal,1,0,jul12jun13 +Serbia,1,0,jul12jun13,One case was Serbo-Croat +Singapore,1,0,jul12jun13 +Switzerland,1,0,jul12jun13 +Unknown,4,0,jul12jun13 +Argentina,1,0,juldec13 +Brazil,2,0,juldec13 +Bulgaria,1,0,juldec13 +Denmark,1,0,juldec13 +France,7,0,juldec13 +Germany,12,0,juldec13 +Hong Kong,1,0,juldec13 +India,2,0,juldec13 +Italy,2,0,juldec13 +South Korea,1,0,juldec13 +Netherlands,3,0,juldec13 +New Zealand,1,0,juldec13 +Norway,1,0,juldec13 +Poland,1,0,juldec13 +Singapore,1,0,juldec13 +United Kingdom,4,0,juldec13 +USA,19,0,juldec13 +Unknown,6,0,juldec13
[MediaWiki-commits] [Gerrit] dmca_requests: Remove unnecessary column, 'tooltip' - change (wikimedia/TransparencyReport-private)
Prtksxna has uploaded a new change for review. https://gerrit.wikimedia.org/r/194348 Change subject: dmca_requests: Remove unnecessary column, 'tooltip' .. dmca_requests: Remove unnecessary column, 'tooltip' Change-Id: I0323c8dd2398cb29b32f663d37b5adb38dbfa31f --- M source/data/dmca_requests.csv 1 file changed, 5 insertions(+), 5 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/TransparencyReport-private refs/changes/48/194348/1 diff --git a/source/data/dmca_requests.csv b/source/data/dmca_requests.csv index 1cc2fd9..d4a17db 100644 --- a/source/data/dmca_requests.csv +++ b/source/data/dmca_requests.csv @@ -1,8 +1,8 @@ -key,requests,complied,duration,tooltip -USA,13,9,jul12jun13,yes -United Kingdom,3,0,jul12jun13,yes -France,2,0,jul12jun13,yes -Spain,4,1,jul12jun13,yes +key,requests,complied,duration +USA,13,9,jul12jun13 +United Kingdom,3,0,jul12jun13 +France,2,0,jul12jun13 +Spain,4,1,jul12jun13 Canada,1,0,jul12jun13 Australia,2,1,jul12jun13 India,2,1,jul12jun13 -- To view, visit https://gerrit.wikimedia.org/r/194348 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I0323c8dd2398cb29b32f663d37b5adb38dbfa31f Gerrit-PatchSet: 1 Gerrit-Project: wikimedia/TransparencyReport-private Gerrit-Branch: master Gerrit-Owner: Prtksxna psax...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] For tooltips without links, supply a link to the graph page. - change (mediawiki...GraphViz)
Welterkj has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194344
Change subject: For tooltips without links, supply a link to the graph page.
..
For tooltips without links, supply a link to the graph page.
Change-Id: Idc0bc289a3fb505cfd68baaa70e5645b081b1179
---
M GraphViz_body.php
1 file changed, 7 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/GraphViz
refs/changes/44/194344/1
diff --git a/GraphViz_body.php b/GraphViz_body.php
index 0f9b1f1..a84aac8 100644
--- a/GraphViz_body.php
+++ b/GraphViz_body.php
@@ -1110,7 +1110,8 @@
}
// normalize the map file contents
- if ( !self::normalizeMapFileContents(
$graphParms-getMapPath( $isPreview ), $graphParms-getRenderer(), $errorText )
) {
+ if ( !self::normalizeMapFileContents(
$graphParms-getMapPath( $isPreview ), $graphParms-getRenderer(),
+ $titleText, $errorText ) ) {
wfDebug( __METHOD__ . : $errorText\n );
self::deleteFiles( $graphParms, $isPreview,
false );
return self::errorHTML( $errorText );
@@ -1445,13 +1446,14 @@
*
* @param[in] string $mapPath is the map file (including path).
* @param[in] string $renderer is the name of the renderer used to
produce the map.
+* @param[in] string $pageTitle is the page title to supply for DOT
tooltips that do not have URLs.
* @param[out] string $errorText is populated with an error message in
the event of an error.
*
* @return boolean true upon success, false upon failure.
*
* @author Keith Welter
*/
- protected static function normalizeMapFileContents( $mapPath,
$renderer, $errorText ) {
+ protected static function normalizeMapFileContents( $mapPath,
$renderer, $pageTitle, $errorText ) {
// read the map file contents
$map = file_get_contents( $mapPath );
if ( !empty( $map ) ) {
@@ -1497,12 +1499,12 @@
$map = str_replace( '/map', '', $map );
// DOT and HTML allow tooltips without URLs but
ImageMap does not.
- // We want to allow tooltips without URLs
(hrefs) so add a dummy URL if it is missing.
- // ImageMap accepts the URL http://; so use
that as the dummy href.
+ // We want to allow tooltips without URLs
(hrefs) so supply the page title if it is missing.
// detect missing hrefs and add them as needed
+ $missingHrefReplacement = 'id=$1 href=[[' .
$pageTitle . ']] title=$2';
$map = preg_replace(
'~id=([^]+)[\s\t]+title=([^]+)~',
- 'id=$1 href=http://; title=$2',
+ $missingHrefReplacement,
$map );
// add enclosing square brackets to URLs that
don't have them and add the title
--
To view, visit https://gerrit.wikimedia.org/r/194344
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc0bc289a3fb505cfd68baaa70e5645b081b1179
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/GraphViz
Gerrit-Branch: master
Gerrit-Owner: Welterkj welterkj+...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Resolve URLs in LinkContextItem - change (VisualEditor/VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194345
Change subject: Resolve URLs in LinkContextItem
..
Resolve URLs in LinkContextItem
this.model.getHref() is relative to the model DOM, not the view DOM,
so it needs to be remapped.
Because dm.Annotation objects don't have a reference to their
dm.Document for no particularly good reason, getting the HTML
document to resolve against is a bit involved.
Bug: T85622
Change-Id: Ifee722a7f606d2da1293a2bb32f9d9d9463947a0
---
M src/ui/contextitems/ve.ui.LinkContextItem.js
1 file changed, 2 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/VisualEditor/VisualEditor
refs/changes/45/194345/1
diff --git a/src/ui/contextitems/ve.ui.LinkContextItem.js
b/src/ui/contextitems/ve.ui.LinkContextItem.js
index 39d98d2..f9d7b3f 100644
--- a/src/ui/contextitems/ve.ui.LinkContextItem.js
+++ b/src/ui/contextitems/ve.ui.LinkContextItem.js
@@ -52,11 +52,12 @@
* @inheritdoc
*/
ve.ui.LinkContextItem.prototype.renderBody = function () {
+ var htmlDoc =
this.context.getSurface().getModel().getDocument().getHtmlDocument();
this.$body.empty().append(
$( 'a' )
.text( this.getDescription() )
.attr( {
- href: this.model.getHref(),
+ href: ve.resolveUrl( this.model.getHref(),
htmlDoc ),
target: '_blank'
} )
);
--
To view, visit https://gerrit.wikimedia.org/r/194345
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ifee722a7f606d2da1293a2bb32f9d9d9463947a0
Gerrit-PatchSet: 1
Gerrit-Project: VisualEditor/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Resolve URLs in MWInternalLinkContextItem - change (mediawiki...VisualEditor)
Catrope has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194347
Change subject: Resolve URLs in MWInternalLinkContextItem
..
Resolve URLs in MWInternalLinkContextItem
Exactly the same change as Ifee722a7f60.
Because we have such excellent code reuse, or something.
Bug: T85622
Change-Id: I18bd5d3923771b6ff149aa589bb2fa23beecf4f5
---
M modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js
1 file changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/VisualEditor
refs/changes/47/194347/1
diff --git a/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js
b/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js
index 59dcc8c..6b16cdb 100644
--- a/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js
+++ b/modules/ve-mw/ui/contextitems/ve.ui.MWInternalLinkContextItem.js
@@ -46,12 +46,13 @@
* @inheritdoc
*/
ve.ui.MWInternalLinkContextItem.prototype.renderBody = function () {
- var $link = $( 'a' )
- .text( this.getDescription() )
- .attr( {
- href: this.model.getHref(),
- target: '_blank'
- } );
+ var htmlDoc =
this.context.getSurface().getModel().getDocument().getHtmlDocument(),
+ $link = $( 'a' )
+ .text( this.getDescription() )
+ .attr( {
+ href: ve.resolveUrl( this.model.getHref(),
htmlDoc ),
+ target: '_blank'
+ } );
this.$body.empty().append( $link );
// Style based on link cache information
--
To view, visit https://gerrit.wikimedia.org/r/194347
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I18bd5d3923771b6ff149aa589bb2fa23beecf4f5
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/VisualEditor
Gerrit-Branch: master
Gerrit-Owner: Catrope roan.katt...@gmail.com
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Log more information about userid mismatch in upload stash - change (mediawiki/core)
Gilles has uploaded a new change for review.
https://gerrit.wikimedia.org/r/194350
Change subject: Log more information about userid mismatch in upload stash
..
Log more information about userid mismatch in upload stash
It's unclear at this point if this is a true mismatch or an issue
of blank userid in DB and/or for the session
Bug: T90599
Change-Id: I4f70bb6e1a89a92ed5dfc0b4ad12b48350e28d6e
---
M includes/upload/UploadStash.php
1 file changed, 3 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/50/194350/1
diff --git a/includes/upload/UploadStash.php b/includes/upload/UploadStash.php
index 52ce4d3..9f88a1f 100644
--- a/includes/upload/UploadStash.php
+++ b/includes/upload/UploadStash.php
@@ -157,8 +157,9 @@
if ( !$noAuth ) {
if ( $this-fileMetadata[$key]['us_user'] !=
$this-userId ) {
- throw new UploadStashWrongOwnerException( This
file ($key) doesn't
- . belong to the current user. );
+ throw new UploadStashWrongOwnerException( This
file ($key)
+ . with recorded user
({$this-fileMetadata[$key]['us_user']})
+ . doesn't belong to the current user
({$this-userId}). );
}
}
--
To view, visit https://gerrit.wikimedia.org/r/194350
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4f70bb6e1a89a92ed5dfc0b4ad12b48350e28d6e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Gilles gdu...@wikimedia.org
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Four minute abs - change (mediawiki...MobileFrontend)
jenkins-bot has submitted this change and it was merged.
Change subject: Four minute abs
..
Four minute abs
* Allow experiments to be configured server-side and run client-side
** Experiments are all contained in the wgMFExperiments configuration
variable
** You enter a user into an experiment and get the bucket they've been
assigned to by calling
M.require( 'experiments' ).getBucket( experiment );
Here an experiment is a set of buckets and associated weights, e.g. the
user has a 50% likelihood of being assigned to the control bucket, etc.
Change-Id: I309e52d9d85735b904830b5b15cada63a5947bb7
---
M includes/Config.php
M includes/Resources.php
A includes/config/Experiments.php
M includes/skins/SkinMinerva.php
A javascripts/experiments.js
A tests/qunit/test_experiments.js
6 files changed, 220 insertions(+), 0 deletions(-)
Approvals:
Jdlrobson: Looks good to me, approved
Bmansurov: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/includes/Config.php b/includes/Config.php
index 64442c9..6c13fc9 100644
--- a/includes/Config.php
+++ b/includes/Config.php
@@ -3,6 +3,7 @@
require_once __DIR__ . /config/Analytics.php;
require_once __DIR__ . /config/Editing.php;
require_once __DIR__ . /config/Experimental.php;
+ require_once __DIR__ . /config/Experiments.php;
require_once __DIR__ . /config/Legacy.php;
require_once __DIR__ . /config/Nearby.php;
require_once __DIR__ . /config/Site.php;
diff --git a/includes/Resources.php b/includes/Resources.php
index 77ce766..a7def41 100644
--- a/includes/Resources.php
+++ b/includes/Resources.php
@@ -1599,6 +1599,14 @@
'mobile.toc',
),
),
+ 'mobile.experiments' = $wgMFResourceFileModuleBoilerplate + array(
+ 'dependencies' = array(
+ 'mobile.user',
+ ),
+ 'scripts' = array(
+ 'javascripts/experiments.js',
+ ),
+ ),
);
$wgResourceModules = array_merge( $wgResourceModules,
diff --git a/includes/config/Experiments.php b/includes/config/Experiments.php
new file mode 100644
index 000..6f9c520
--- /dev/null
+++ b/includes/config/Experiments.php
@@ -0,0 +1,29 @@
+?php
+// Needs to be called within MediaWiki; not standalone
+if ( !defined( 'MEDIAWIKI' ) ) {
+ die( 'Not an entry point.' );
+}
+
+/**
+ * @var array A set of experiments.
+ *
+ * Consider the following example:
+ *
+ * code
+ * $wgMFExperiments = array(
+ * 'wikigrok' = array(
+ * 'enabled' = true,
+ * 'buckets' = array(
+ * 'control' = 0.33,
+ * 'A' = 0.33,
+ * 'B' = 0.33,
+ * ),
+ * ),
+ * );
+ * /code
+ *
+ * The wikigrok experiment has three buckets: control, A, and B. The user has
a 33% chance of being
+ * being assigned to each bucket. Note well that if the experiment were
disabled, then the user is
+ * always assigned to the control bucket.
+ */
+$wgMFExperiments = array();
diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php
index 6d3be9a..c591a91 100644
--- a/includes/skins/SkinMinerva.php
+++ b/includes/skins/SkinMinerva.php
@@ -849,6 +849,7 @@
if ( $this-isAuthenticatedUser() ) {
$vars['wgMFIsLoggedInUserBlockedFromPage'] =
$user-isBlockedFrom( $title );
+ $vars['wgMFExperiments'] = $config-get(
'MFExperiments' );
}
$vars['wgMFShowRedLinks'] = $user-isLoggedIn()
@@ -897,6 +898,12 @@
$modules[] = 'mobile.newusers';
}
}
+
+ $mfExperiments = $this-getMFConfig()-get(
'MFExperiments' );
+
+ if ( count( $mfExperiments ) 0 ) {
+ $modules[] = 'mobile.experiments';
+ }
}
if ( $this-mobileContext-userCanUpload() ) {
diff --git a/javascripts/experiments.js b/javascripts/experiments.js
new file mode 100644
index 000..6895d88
--- /dev/null
+++ b/javascripts/experiments.js
@@ -0,0 +1,117 @@
+( function ( M ) {
+
+ var CONTROL_BUCKET = 'control',
+ user = M.require( 'user' ),
+ MAX_INT32_UNSIGNED = 4294967295;
+
+ /**
+* An implementation of Jenkins's one-at-a-time hash
+* See http://en.wikipedia.org/wiki/Jenkins_hash_function
+*
+* @param {String} key String to hash.
+* @return {Number} 32-bit integer.
+*
+* @author Ori Livneh o...@wikimedia.org
+* @see http://jsbin.com/kejewi/4/watch?js,console
+*/
+ function hashString( key ) {
+ var hash = 0,
+ i = key.length;
+
+ while ( i-- ) {
+
[MediaWiki-commits] [Gerrit] Initial commit - change (mediawiki...hierator)
MaxSem has submitted this change and it was merged. Change subject: Initial commit .. Initial commit See the RFC for details: https://www.mediawiki.org/wiki/Requests_for_comment/Hierator WIP puppetization for Vagrant: Idf7549c3c788a66e93466a7b04f633e3d4f5a35d Change-Id: I94c007ee876049083d875d2eb2ae44e8b53ce9c8 --- A .gitignore A COPYING A WebContent/META-INF/MANIFEST.MF A WebContent/WEB-INF/web.xml A build-jsesh.sh A pom.xml A readme.txt A src/hierator/HieroglyphLister.java A src/hierator/HttpException.java A src/hierator/HttpNotFoundException.java A src/hierator/PathHandler.java A src/hierator/PngRenderer.java A src/hierator/Renderer.java A src/hierator/RenderingServlet.java A src/hierator/SvgMinifier.java A src/hierator/SvgRenderer.java A src/hierator/Utils.java 17 files changed, 841 insertions(+), 0 deletions(-) Approvals: Manybubbles: Looks good to me, approved MaxSem: Verified diff --git a/.gitignore b/.gitignore new file mode 100644 index 000..e55a27e --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*.jar +*.class +target +build +jsesh +.classpath +.project +.settings +/target/ diff --git a/COPYING b/COPYING new file mode 100644 index 000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ +GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + +Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + +GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The Program, below, +refers to any such program or work, and a work based on the Program +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term modification.) Each licensee is addressed as you. +
[MediaWiki-commits] [Gerrit] GroupWidget and ItemWidget: Mark private - change (oojs/ui)
Kmenger has uploaded a new change for review. https://gerrit.wikimedia.org/r/194387 Change subject: GroupWidget and ItemWidget: Mark private .. GroupWidget and ItemWidget: Mark private Change-Id: Iec0c0162aa213014cc91724866948d5cdfd1004b --- M src/widgets/GroupWidget.js M src/widgets/ItemWidget.js 2 files changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/87/194387/1 diff --git a/src/widgets/GroupWidget.js b/src/widgets/GroupWidget.js index d8eb541..7d9be90 100644 --- a/src/widgets/GroupWidget.js +++ b/src/widgets/GroupWidget.js @@ -3,6 +3,7 @@ * * Use together with OO.ui.ItemWidget to make disabled state inheritable. * + * @private * @abstract * @class * @extends OO.ui.GroupElement diff --git a/src/widgets/ItemWidget.js b/src/widgets/ItemWidget.js index d53331f..292514f 100644 --- a/src/widgets/ItemWidget.js +++ b/src/widgets/ItemWidget.js @@ -6,6 +6,7 @@ * * Use together with OO.ui.GroupWidget to make disabled state inheritable. * + * @private * @abstract * @class * -- To view, visit https://gerrit.wikimedia.org/r/194387 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec0c0162aa213014cc91724866948d5cdfd1004b Gerrit-PatchSet: 1 Gerrit-Project: oojs/ui Gerrit-Branch: master Gerrit-Owner: Kmenger kmen...@wikimedia.org ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Bump src to 06c8cf33 for deploy - change (mediawiki...deploy)
jenkins-bot has submitted this change and it was merged. Change subject: Bump src to 06c8cf33 for deploy .. Bump src to 06c8cf33 for deploy Change-Id: I5cbbb5fef2e20f54f702f05ad321d410f1dc6cf5 --- M src 1 file changed, 0 insertions(+), 0 deletions(-) Approvals: Cscott: Looks good to me, approved jenkins-bot: Verified diff --git a/src b/src index 08643f5..06c8cf3 16 --- a/src +++ b/src -Subproject commit 08643f53428b1d5a3c9e4fe30ef21e6a2861d942 +Subproject commit 06c8cf33378e3da67c9e2531233fd84d59be8c32 -- To view, visit https://gerrit.wikimedia.org/r/194359 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I5cbbb5fef2e20f54f702f05ad321d410f1dc6cf5 Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/services/parsoid/deploy Gerrit-Branch: master Gerrit-Owner: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: Arlolra abrea...@wikimedia.org Gerrit-Reviewer: Cscott canan...@wikimedia.org Gerrit-Reviewer: Subramanya Sastry ssas...@wikimedia.org Gerrit-Reviewer: jenkins-bot ___ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Fix intermittent off by one issues - change (mediawiki...Flow)
jenkins-bot has submitted this change and it was merged.
Change subject: Fix intermittent off by one issues
..
Fix intermittent off by one issues
I'm certain this fixed the problem in UUIDTest.
The api i'm mostly sure but the test is too slow to repeat locally and
trigger the error. The topiclist is sorted by the topic ids (postId of
the topic) so checking against revisionId is an obvious potential
off-by-one issue.
Bug: T75833
Change-Id: I8b61ffa46776846771e33300181e9ec8aebafe78
---
M tests/phpunit/Model/UUIDTest.php
M tests/phpunit/api/ApiFlowViewTopicListTest.php
2 files changed, 3 insertions(+), 3 deletions(-)
Approvals:
Mattflaschen: Looks good to me, approved
jenkins-bot: Verified
diff --git a/tests/phpunit/Model/UUIDTest.php b/tests/phpunit/Model/UUIDTest.php
index 7923985..d6ad604 100644
--- a/tests/phpunit/Model/UUIDTest.php
+++ b/tests/phpunit/Model/UUIDTest.php
@@ -156,7 +156,6 @@
}
public function testConversionToTimestamp() {
- // @todo assert now +-1?
- $this-assertEquals( wfTimestampNow(),
UUID::create()-getTimestamp() );
+ $this-assertEquals( '20150303221220', UUID::create(
'scv3pvbt40kcyy4g' )-getTimestamp() );
}
}
diff --git a/tests/phpunit/api/ApiFlowViewTopicListTest.php
b/tests/phpunit/api/ApiFlowViewTopicListTest.php
index 53bb8f1..80a8d7f 100644
--- a/tests/phpunit/api/ApiFlowViewTopicListTest.php
+++ b/tests/phpunit/api/ApiFlowViewTopicListTest.php
@@ -2,6 +2,7 @@
namespace Flow\Tests\Api;
+use Flow\Model\UUID;
use Title;
/**
@@ -187,7 +188,7 @@
$responseTopic =
$replyResponse['flow']['reply']['result']['topic'];
$topicRevisionId =
$topicData[$topicDataInd]['revisionId'];
$newPostId = end(
$responseTopic['revisions'][$topicRevisionId]['replies'] );
- $topicData[$topicDataInd]['updateTimestamp'] =
$responseTopic['revisions'][$newPostId]['timestamp'];
+ $topicData[$topicDataInd]['updateTimestamp'] =
UUID::create( $newPostId )-getTimestamp();
$topicData[$topicDataInd]['expectedRevision']['last_updated'] = wfTimestamp(
TS_UNIX, $topicData[$topicDataInd]['updateTimestamp'] ) * 1000;
}
--
To view, visit https://gerrit.wikimedia.org/r/194226
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8b61ffa46776846771e33300181e9ec8aebafe78
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/Flow
Gerrit-Branch: master
Gerrit-Owner: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: EBernhardson ebernhard...@wikimedia.org
Gerrit-Reviewer: Mattflaschen mflasc...@wikimedia.org
Gerrit-Reviewer: SG shah...@gmail.com
Gerrit-Reviewer: jenkins-bot
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] Move code out of global functions into a class - change (mediawiki...CharInsert)
jenkins-bot has submitted this change and it was merged.
Change subject: Move code out of global functions into a class
..
Move code out of global functions into a class
Change-Id: I57d1bd22ace86c3118ba382371ba115044181e32
---
A CharInsert.body.php
M CharInsert.php
2 files changed, 83 insertions(+), 79 deletions(-)
Approvals:
Jforrester: Looks good to me, approved
jenkins-bot: Verified
diff --git a/CharInsert.body.php b/CharInsert.body.php
new file mode 100644
index 000..46f8985
--- /dev/null
+++ b/CharInsert.body.php
@@ -0,0 +1,81 @@
+?php
+
+class CharInsert {
+ public static function onParserFirstCallInit( Parser $parser ) {
+ $parser-setHook( 'charinsert', 'CharInsert::charInsertHook' );
+ return true;
+ }
+
+ public static function charInsertHook( $data, $params, Parser $parser )
{
+ $data = $parser-mStripState-unstripBoth( $data );
+ return implode( br /\n,
+ array_map( 'CharInsert::charInsertLine',
+ explode( \n, trim( $data ) ) ) );
+ }
+ public static function charInsertLine( $data ) {
+ return implode( \n,
+ array_map( 'CharInsert::charInsertItem',
+ preg_split( '/\\s+/', self::charInsertArmor(
$data ) ) ) );
+ }
+
+ public static function charInsertArmor( $data ) {
+ return preg_replace_callback(
+ '!nowiki(.*?)/nowiki!i',
+ 'CharInsert::charInsertNowiki',
+ $data );
+ }
+
+ public static function charInsertNowiki( $matches ) {
+ return str_replace(
+ array( '\t', '\r', ' ' ),
+ array( '#9;', '#12;', '#32;' ),
+ $matches[1] );
+ }
+
+ public static function charInsertItem( $data ) {
+ $chars = explode( '+', $data );
+ if ( count( $chars ) 1 $chars[0] !== '' ) {
+ return self::charInsertChar( $chars[0], $chars[1] );
+ } elseif ( count( $chars ) == 1 ) {
+ return self::charInsertChar( $chars[0] );
+ } else {
+ return self::charInsertChar( '+' );
+ }
+ }
+
+ public static function charInsertChar( $start, $end = '' ) {
+ $estart = self::charInsertJsString( $start );
+ $eend = self::charInsertJsString( $end );
+ if ( $eend == '' ) {
+ $inline = self::charInsertDisplay( $start );
+ } else {
+ $inline = self::charInsertDisplay( $start . $end );
+ }
+ return Xml::element( 'a',
+ array(
+ 'onclick' =
insertTags('$estart','$eend','');return false,
+ 'href'= javascript:void() ),
+ $inline );
+ }
+
+ public static function charInsertJsString( $text ) {
+ return strtr(
+ self::charInsertDisplay( $text ),
+ array(
+ \\ = ,
+ \ = \\\,
+ '= \\',
+ \r\n = \\n,
+ \r = \\n,
+ \n = \\n,
+ ) );
+ }
+
+ public static function charInsertDisplay( $text ) {
+ static $invisibles = array( 'nbsp;', '#160;' );
+ static $visibles = array( 'amp;nbsp;', 'amp;#160;' );
+ return Sanitizer::decodeCharReferences(
+ str_replace( $invisibles, $visibles, $text ) );
+ }
+
+}
diff --git a/CharInsert.php b/CharInsert.php
index bed949c..a5e000f 100644
--- a/CharInsert.php
+++ b/CharInsert.php
@@ -30,7 +30,7 @@
die();
}
-$wgHooks['ParserFirstCallInit'][] = 'setupSpecialChars';
+$wgHooks['ParserFirstCallInit'][] = 'CharInsert::onParserFirstCallInit';
$wgExtensionCredits['parserhook'][] = array(
'path' = __FILE__,
@@ -40,83 +40,6 @@
'descriptionmsg' = 'charinsert-desc',
);
+$wgAutoloadClasses['CharInsert'] = __DIR__ . '/CharInsert.body.php';
$wgMessagesDirs['CharInsert'] = __DIR__ . '/i18n';
$wgExtensionMessagesFiles['CharInsert'] = __DIR__ . '/CharInsert.i18n.php';
-
-function setupSpecialChars( $parser ) {
- $parser-setHook( 'charinsert', 'charInsert' );
- return true;
-}
-
-function charInsert( $data, $params, $parser ) {
- $data = $parser-mStripState-unstripBoth( $data );
- return implode( br /\n,
- array_map( 'charInsertLine',
- explode( \n, trim( $data ) ) ) );
-}
-
-function charInsertLine( $data ) {
-
