Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/201587
Change subject: Make colorize-svg.js actually work more often
......................................................................
Make colorize-svg.js actually work more often
Follow-up to e4358fdba586dd6266e1c800a71375614c7510fa.
We allow the following formats:
* { "file": "foo.svg" }
* { "file": { default: "foo.svg" } }
* { "file": { ltr: "foo.svg", rtl: "foo.svg" } }
But the second didn't work at all.
Also simplified how we handle images without LTR/RTL variants.
Change-Id: I00e992ec692957a60d4e23a427774251903457f8
---
M build/tasks/colorize-svg.js
1 file changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/oojs/ui refs/changes/87/201587/1
diff --git a/build/tasks/colorize-svg.js b/build/tasks/colorize-svg.js
index 0328b34..15de4c8 100644
--- a/build/tasks/colorize-svg.js
+++ b/build/tasks/colorize-svg.js
@@ -173,8 +173,8 @@
var selector, declarations, direction, lang, langSelector,
deferred = Q.defer(),
file = typeof this.file === 'string' ?
- { default: this.file } :
- { ltr: this.file.ltr, rtl: this.file.rtl },
+ { ltr: this.file, rtl: this.file } :
+ { ltr: this.file.ltr || this.file.default, rtl:
this.file.rtl || this.file.default },
moreLangs = this.file.lang || {},
name = this.name,
sourcePath = this.list.getPath(),
@@ -185,7 +185,6 @@
cssPrependPath = this.list.options.cssPrependPath,
originalSvg = {},
rules = {
- default: [],
ltr: [],
rtl: []
},
@@ -319,9 +318,6 @@
}
deferred.reject( 'Failed to generate some images' );
} else {
- rules.ltr = rules.ltr.concat( rules.default );
- rules.rtl = rules.rtl.concat( rules.default );
- delete rules.default;
deferred.resolve( {
rules: rules,
files: files
--
To view, visit https://gerrit.wikimedia.org/r/201587
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I00e992ec692957a60d4e23a427774251903457f8
Gerrit-PatchSet: 1
Gerrit-Project: oojs/ui
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <matma....@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
