From: Volker E <volker.e@wikimedia.org>
Date: Thu, 17 Jan 2019 07:14:51 +0000 (-0800)
Subject: Return to LESS multiple value escape mechanism to prevent invalid output
X-Git-Tag: 1.34.0-rc.0~3042^2
X-Git-Url: http://git.cyclocoop.org/%24action?a=commitdiff_plain;h=d1c808c3615e0be250890359da12aabc14b08733;p=lhc%2Fweb%2Fwiklou.git

Return to LESS multiple value escape mechanism to prevent invalid output

LESS doesn't accept JS evaluation in PHP via `'@{arguments}'.replace`,
therefore we need to go back to manual escaping multiple comma separated
values.

Change-Id: I4c46afc012d804350ccee2cd5b1eed4e6ea61d8a
---

diff --git a/resources/src/mediawiki.widgets.datetime/CalendarWidget.less b/resources/src/mediawiki.widgets.datetime/CalendarWidget.less
index 5e4df479a3..dff313dbca 100644
--- a/resources/src/mediawiki.widgets.datetime/CalendarWidget.less
+++ b/resources/src/mediawiki.widgets.datetime/CalendarWidget.less
@@ -65,11 +65,7 @@
 			.oo-ui-buttonElement-button {
 				width: 100%;
 				border: 1px solid rgba( 255, 255, 255, 0 );
-				.oo-ui-transition(
-					background-color @transition-base,
-					color @transition-base,
-					border-color @transition-base
-				);
+				.oo-ui-transition( ~'background-color @{transition-base}, color @{transition-base}, border-color @{transition-base}' );
 			}
 
 			&.mw-widgets-datetime-calendarWidget-extra .oo-ui-buttonElement-button {
diff --git a/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.definitions.less b/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.definitions.less
index a0d6f4acc4..1dfc73b1d3 100644
--- a/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.definitions.less
+++ b/resources/src/mediawiki.widgets.datetime/mediawiki.widgets.datetime.definitions.less
@@ -25,8 +25,7 @@
 	}
 }
 
-.oo-ui-transition( @value1, @value2: X, ... ) {
-	@value: ~`'@{arguments}'.replace(/[\[\]]|\,\sX/g, '')`; // stylelint-disable-line function-comma-space-after, function-parentheses-space-inside, function-whitespace-after, value-keyword-case
+.oo-ui-transition( @value ) {
 	-webkit-transition: @value;
 	-moz-transition: @value;
 	transition: @value;