diff --git a/extension.json b/extension.json index f4ccc12ec..bec54db72 100644 --- a/extension.json +++ b/extension.json @@ -57,6 +57,8 @@ } }, "ext.cite.parsoid.styles": { + "localBasePath": "modules/parsoid-styles", + "remoteExtPath": "Cite/modules/parsoid-styles", "class": "Cite\\ResourceLoader\\CiteCSSFileModule", "styles": "ext.cite.parsoid.styles.less" }, diff --git a/modules/ext.cite.parsoid.styles.less b/modules/parsoid-styles/ext.cite.parsoid.styles.less similarity index 100% rename from modules/ext.cite.parsoid.styles.less rename to modules/parsoid-styles/ext.cite.parsoid.styles.less diff --git a/modules/ext.cite.style.af.css b/modules/parsoid-styles/ext.cite.style.af.css similarity index 100% rename from modules/ext.cite.style.af.css rename to modules/parsoid-styles/ext.cite.style.af.css diff --git a/modules/ext.cite.style.ar.css b/modules/parsoid-styles/ext.cite.style.ar.css similarity index 100% rename from modules/ext.cite.style.ar.css rename to modules/parsoid-styles/ext.cite.style.ar.css diff --git a/modules/ext.cite.style.arq.css b/modules/parsoid-styles/ext.cite.style.arq.css similarity index 100% rename from modules/ext.cite.style.arq.css rename to modules/parsoid-styles/ext.cite.style.arq.css diff --git a/modules/ext.cite.style.ary.css b/modules/parsoid-styles/ext.cite.style.ary.css similarity index 100% rename from modules/ext.cite.style.ary.css rename to modules/parsoid-styles/ext.cite.style.ary.css diff --git a/modules/ext.cite.style.arz.css b/modules/parsoid-styles/ext.cite.style.arz.css similarity index 100% rename from modules/ext.cite.style.arz.css rename to modules/parsoid-styles/ext.cite.style.arz.css diff --git a/modules/ext.cite.style.as.css b/modules/parsoid-styles/ext.cite.style.as.css similarity index 100% rename from modules/ext.cite.style.as.css rename to modules/parsoid-styles/ext.cite.style.as.css diff --git a/modules/ext.cite.style.az.css b/modules/parsoid-styles/ext.cite.style.az.css similarity index 100% rename from modules/ext.cite.style.az.css rename to modules/parsoid-styles/ext.cite.style.az.css diff --git a/modules/ext.cite.style.be.css b/modules/parsoid-styles/ext.cite.style.be.css similarity index 100% rename from modules/ext.cite.style.be.css rename to modules/parsoid-styles/ext.cite.style.be.css diff --git a/modules/ext.cite.style.be_tarask.css b/modules/parsoid-styles/ext.cite.style.be_tarask.css similarity index 100% rename from modules/ext.cite.style.be_tarask.css rename to modules/parsoid-styles/ext.cite.style.be_tarask.css diff --git a/modules/ext.cite.style.bg.css b/modules/parsoid-styles/ext.cite.style.bg.css similarity index 100% rename from modules/ext.cite.style.bg.css rename to modules/parsoid-styles/ext.cite.style.bg.css diff --git a/modules/ext.cite.style.bho.css b/modules/parsoid-styles/ext.cite.style.bho.css similarity index 100% rename from modules/ext.cite.style.bho.css rename to modules/parsoid-styles/ext.cite.style.bho.css diff --git a/modules/ext.cite.style.blk.css b/modules/parsoid-styles/ext.cite.style.blk.css similarity index 100% rename from modules/ext.cite.style.blk.css rename to modules/parsoid-styles/ext.cite.style.blk.css diff --git a/modules/ext.cite.style.bn.css b/modules/parsoid-styles/ext.cite.style.bn.css similarity index 100% rename from modules/ext.cite.style.bn.css rename to modules/parsoid-styles/ext.cite.style.bn.css diff --git a/modules/ext.cite.style.bo.css b/modules/parsoid-styles/ext.cite.style.bo.css similarity index 100% rename from modules/ext.cite.style.bo.css rename to modules/parsoid-styles/ext.cite.style.bo.css diff --git a/modules/ext.cite.style.bpy.css b/modules/parsoid-styles/ext.cite.style.bpy.css similarity index 100% rename from modules/ext.cite.style.bpy.css rename to modules/parsoid-styles/ext.cite.style.bpy.css diff --git a/modules/ext.cite.style.br.css b/modules/parsoid-styles/ext.cite.style.br.css similarity index 100% rename from modules/ext.cite.style.br.css rename to modules/parsoid-styles/ext.cite.style.br.css diff --git a/modules/ext.cite.style.bs.css b/modules/parsoid-styles/ext.cite.style.bs.css similarity index 100% rename from modules/ext.cite.style.bs.css rename to modules/parsoid-styles/ext.cite.style.bs.css diff --git a/modules/ext.cite.style.ca.css b/modules/parsoid-styles/ext.cite.style.ca.css similarity index 100% rename from modules/ext.cite.style.ca.css rename to modules/parsoid-styles/ext.cite.style.ca.css diff --git a/modules/ext.cite.style.ckb.css b/modules/parsoid-styles/ext.cite.style.ckb.css similarity index 100% rename from modules/ext.cite.style.ckb.css rename to modules/parsoid-styles/ext.cite.style.ckb.css diff --git a/modules/ext.cite.style.crh_cyrl.css b/modules/parsoid-styles/ext.cite.style.crh_cyrl.css similarity index 100% rename from modules/ext.cite.style.crh_cyrl.css rename to modules/parsoid-styles/ext.cite.style.crh_cyrl.css diff --git a/modules/ext.cite.style.crh_latn.css b/modules/parsoid-styles/ext.cite.style.crh_latn.css similarity index 100% rename from modules/ext.cite.style.crh_latn.css rename to modules/parsoid-styles/ext.cite.style.crh_latn.css diff --git a/modules/ext.cite.style.cs.css b/modules/parsoid-styles/ext.cite.style.cs.css similarity index 100% rename from modules/ext.cite.style.cs.css rename to modules/parsoid-styles/ext.cite.style.cs.css diff --git a/modules/ext.cite.style.cu.css b/modules/parsoid-styles/ext.cite.style.cu.css similarity index 100% rename from modules/ext.cite.style.cu.css rename to modules/parsoid-styles/ext.cite.style.cu.css diff --git a/modules/ext.cite.style.da.css b/modules/parsoid-styles/ext.cite.style.da.css similarity index 100% rename from modules/ext.cite.style.da.css rename to modules/parsoid-styles/ext.cite.style.da.css diff --git a/modules/ext.cite.style.de.css b/modules/parsoid-styles/ext.cite.style.de.css similarity index 100% rename from modules/ext.cite.style.de.css rename to modules/parsoid-styles/ext.cite.style.de.css diff --git a/modules/ext.cite.style.de_ch.css b/modules/parsoid-styles/ext.cite.style.de_ch.css similarity index 100% rename from modules/ext.cite.style.de_ch.css rename to modules/parsoid-styles/ext.cite.style.de_ch.css diff --git a/modules/ext.cite.style.dz.css b/modules/parsoid-styles/ext.cite.style.dz.css similarity index 100% rename from modules/ext.cite.style.dz.css rename to modules/parsoid-styles/ext.cite.style.dz.css diff --git a/modules/ext.cite.style.el.css b/modules/parsoid-styles/ext.cite.style.el.css similarity index 100% rename from modules/ext.cite.style.el.css rename to modules/parsoid-styles/ext.cite.style.el.css diff --git a/modules/ext.cite.style.eo.css b/modules/parsoid-styles/ext.cite.style.eo.css similarity index 100% rename from modules/ext.cite.style.eo.css rename to modules/parsoid-styles/ext.cite.style.eo.css diff --git a/modules/ext.cite.style.es.css b/modules/parsoid-styles/ext.cite.style.es.css similarity index 100% rename from modules/ext.cite.style.es.css rename to modules/parsoid-styles/ext.cite.style.es.css diff --git a/modules/ext.cite.style.et.css b/modules/parsoid-styles/ext.cite.style.et.css similarity index 100% rename from modules/ext.cite.style.et.css rename to modules/parsoid-styles/ext.cite.style.et.css diff --git a/modules/ext.cite.style.eu.css b/modules/parsoid-styles/ext.cite.style.eu.css similarity index 100% rename from modules/ext.cite.style.eu.css rename to modules/parsoid-styles/ext.cite.style.eu.css diff --git a/modules/ext.cite.style.fa.css b/modules/parsoid-styles/ext.cite.style.fa.css similarity index 100% rename from modules/ext.cite.style.fa.css rename to modules/parsoid-styles/ext.cite.style.fa.css diff --git a/modules/ext.cite.style.fi.css b/modules/parsoid-styles/ext.cite.style.fi.css similarity index 100% rename from modules/ext.cite.style.fi.css rename to modules/parsoid-styles/ext.cite.style.fi.css diff --git a/modules/ext.cite.style.fr.css b/modules/parsoid-styles/ext.cite.style.fr.css similarity index 100% rename from modules/ext.cite.style.fr.css rename to modules/parsoid-styles/ext.cite.style.fr.css diff --git a/modules/ext.cite.style.frp.css b/modules/parsoid-styles/ext.cite.style.frp.css similarity index 100% rename from modules/ext.cite.style.frp.css rename to modules/parsoid-styles/ext.cite.style.frp.css diff --git a/modules/ext.cite.style.fur.css b/modules/parsoid-styles/ext.cite.style.fur.css similarity index 100% rename from modules/ext.cite.style.fur.css rename to modules/parsoid-styles/ext.cite.style.fur.css diff --git a/modules/ext.cite.style.fy.css b/modules/parsoid-styles/ext.cite.style.fy.css similarity index 100% rename from modules/ext.cite.style.fy.css rename to modules/parsoid-styles/ext.cite.style.fy.css diff --git a/modules/ext.cite.style.gl.css b/modules/parsoid-styles/ext.cite.style.gl.css similarity index 100% rename from modules/ext.cite.style.gl.css rename to modules/parsoid-styles/ext.cite.style.gl.css diff --git a/modules/ext.cite.style.gu.css b/modules/parsoid-styles/ext.cite.style.gu.css similarity index 100% rename from modules/ext.cite.style.gu.css rename to modules/parsoid-styles/ext.cite.style.gu.css diff --git a/modules/ext.cite.style.hi.css b/modules/parsoid-styles/ext.cite.style.hi.css similarity index 100% rename from modules/ext.cite.style.hi.css rename to modules/parsoid-styles/ext.cite.style.hi.css diff --git a/modules/ext.cite.style.hr.css b/modules/parsoid-styles/ext.cite.style.hr.css similarity index 100% rename from modules/ext.cite.style.hr.css rename to modules/parsoid-styles/ext.cite.style.hr.css diff --git a/modules/ext.cite.style.hu.css b/modules/parsoid-styles/ext.cite.style.hu.css similarity index 100% rename from modules/ext.cite.style.hu.css rename to modules/parsoid-styles/ext.cite.style.hu.css diff --git a/modules/ext.cite.style.hy.css b/modules/parsoid-styles/ext.cite.style.hy.css similarity index 100% rename from modules/ext.cite.style.hy.css rename to modules/parsoid-styles/ext.cite.style.hy.css diff --git a/modules/ext.cite.style.ia.css b/modules/parsoid-styles/ext.cite.style.ia.css similarity index 100% rename from modules/ext.cite.style.ia.css rename to modules/parsoid-styles/ext.cite.style.ia.css diff --git a/modules/ext.cite.style.id.css b/modules/parsoid-styles/ext.cite.style.id.css similarity index 100% rename from modules/ext.cite.style.id.css rename to modules/parsoid-styles/ext.cite.style.id.css diff --git a/modules/ext.cite.style.is.css b/modules/parsoid-styles/ext.cite.style.is.css similarity index 100% rename from modules/ext.cite.style.is.css rename to modules/parsoid-styles/ext.cite.style.is.css diff --git a/modules/ext.cite.style.it.css b/modules/parsoid-styles/ext.cite.style.it.css similarity index 100% rename from modules/ext.cite.style.it.css rename to modules/parsoid-styles/ext.cite.style.it.css diff --git a/modules/ext.cite.style.kaa.css b/modules/parsoid-styles/ext.cite.style.kaa.css similarity index 100% rename from modules/ext.cite.style.kaa.css rename to modules/parsoid-styles/ext.cite.style.kaa.css diff --git a/modules/ext.cite.style.kjp.css b/modules/parsoid-styles/ext.cite.style.kjp.css similarity index 100% rename from modules/ext.cite.style.kjp.css rename to modules/parsoid-styles/ext.cite.style.kjp.css diff --git a/modules/ext.cite.style.kk_arab.css b/modules/parsoid-styles/ext.cite.style.kk_arab.css similarity index 100% rename from modules/ext.cite.style.kk_arab.css rename to modules/parsoid-styles/ext.cite.style.kk_arab.css diff --git a/modules/ext.cite.style.kk_cyrl.css b/modules/parsoid-styles/ext.cite.style.kk_cyrl.css similarity index 100% rename from modules/ext.cite.style.kk_cyrl.css rename to modules/parsoid-styles/ext.cite.style.kk_cyrl.css diff --git a/modules/ext.cite.style.kk_latn.css b/modules/parsoid-styles/ext.cite.style.kk_latn.css similarity index 100% rename from modules/ext.cite.style.kk_latn.css rename to modules/parsoid-styles/ext.cite.style.kk_latn.css diff --git a/modules/ext.cite.style.km.css b/modules/parsoid-styles/ext.cite.style.km.css similarity index 100% rename from modules/ext.cite.style.km.css rename to modules/parsoid-styles/ext.cite.style.km.css diff --git a/modules/ext.cite.style.kn.css b/modules/parsoid-styles/ext.cite.style.kn.css similarity index 100% rename from modules/ext.cite.style.kn.css rename to modules/parsoid-styles/ext.cite.style.kn.css diff --git a/modules/ext.cite.style.ks_arab.css b/modules/parsoid-styles/ext.cite.style.ks_arab.css similarity index 100% rename from modules/ext.cite.style.ks_arab.css rename to modules/parsoid-styles/ext.cite.style.ks_arab.css diff --git a/modules/ext.cite.style.ks_deva.css b/modules/parsoid-styles/ext.cite.style.ks_deva.css similarity index 100% rename from modules/ext.cite.style.ks_deva.css rename to modules/parsoid-styles/ext.cite.style.ks_deva.css diff --git a/modules/ext.cite.style.ksh.css b/modules/parsoid-styles/ext.cite.style.ksh.css similarity index 100% rename from modules/ext.cite.style.ksh.css rename to modules/parsoid-styles/ext.cite.style.ksh.css diff --git a/modules/ext.cite.style.ksw.css b/modules/parsoid-styles/ext.cite.style.ksw.css similarity index 100% rename from modules/ext.cite.style.ksw.css rename to modules/parsoid-styles/ext.cite.style.ksw.css diff --git a/modules/ext.cite.style.ku_arab.css b/modules/parsoid-styles/ext.cite.style.ku_arab.css similarity index 100% rename from modules/ext.cite.style.ku_arab.css rename to modules/parsoid-styles/ext.cite.style.ku_arab.css diff --git a/modules/ext.cite.style.ku_latn.css b/modules/parsoid-styles/ext.cite.style.ku_latn.css similarity index 100% rename from modules/ext.cite.style.ku_latn.css rename to modules/parsoid-styles/ext.cite.style.ku_latn.css diff --git a/modules/ext.cite.style.lbe.css b/modules/parsoid-styles/ext.cite.style.lbe.css similarity index 100% rename from modules/ext.cite.style.lbe.css rename to modules/parsoid-styles/ext.cite.style.lbe.css diff --git a/modules/ext.cite.style.ln.css b/modules/parsoid-styles/ext.cite.style.ln.css similarity index 100% rename from modules/ext.cite.style.ln.css rename to modules/parsoid-styles/ext.cite.style.ln.css diff --git a/modules/ext.cite.style.lo.css b/modules/parsoid-styles/ext.cite.style.lo.css similarity index 100% rename from modules/ext.cite.style.lo.css rename to modules/parsoid-styles/ext.cite.style.lo.css diff --git a/modules/ext.cite.style.lt.css b/modules/parsoid-styles/ext.cite.style.lt.css similarity index 100% rename from modules/ext.cite.style.lt.css rename to modules/parsoid-styles/ext.cite.style.lt.css diff --git a/modules/ext.cite.style.lv.css b/modules/parsoid-styles/ext.cite.style.lv.css similarity index 100% rename from modules/ext.cite.style.lv.css rename to modules/parsoid-styles/ext.cite.style.lv.css diff --git a/modules/ext.cite.style.lzh.css b/modules/parsoid-styles/ext.cite.style.lzh.css similarity index 100% rename from modules/ext.cite.style.lzh.css rename to modules/parsoid-styles/ext.cite.style.lzh.css diff --git a/modules/ext.cite.style.mag.css b/modules/parsoid-styles/ext.cite.style.mag.css similarity index 100% rename from modules/ext.cite.style.mag.css rename to modules/parsoid-styles/ext.cite.style.mag.css diff --git a/modules/ext.cite.style.mk.css b/modules/parsoid-styles/ext.cite.style.mk.css similarity index 100% rename from modules/ext.cite.style.mk.css rename to modules/parsoid-styles/ext.cite.style.mk.css diff --git a/modules/ext.cite.style.mni.css b/modules/parsoid-styles/ext.cite.style.mni.css similarity index 100% rename from modules/ext.cite.style.mni.css rename to modules/parsoid-styles/ext.cite.style.mni.css diff --git a/modules/ext.cite.style.mnw.css b/modules/parsoid-styles/ext.cite.style.mnw.css similarity index 100% rename from modules/ext.cite.style.mnw.css rename to modules/parsoid-styles/ext.cite.style.mnw.css diff --git a/modules/ext.cite.style.mr.css b/modules/parsoid-styles/ext.cite.style.mr.css similarity index 100% rename from modules/ext.cite.style.mr.css rename to modules/parsoid-styles/ext.cite.style.mr.css diff --git a/modules/ext.cite.style.my.css b/modules/parsoid-styles/ext.cite.style.my.css similarity index 100% rename from modules/ext.cite.style.my.css rename to modules/parsoid-styles/ext.cite.style.my.css diff --git a/modules/ext.cite.style.nb.css b/modules/parsoid-styles/ext.cite.style.nb.css similarity index 100% rename from modules/ext.cite.style.nb.css rename to modules/parsoid-styles/ext.cite.style.nb.css diff --git a/modules/ext.cite.style.nds.css b/modules/parsoid-styles/ext.cite.style.nds.css similarity index 100% rename from modules/ext.cite.style.nds.css rename to modules/parsoid-styles/ext.cite.style.nds.css diff --git a/modules/ext.cite.style.ne.css b/modules/parsoid-styles/ext.cite.style.ne.css similarity index 100% rename from modules/ext.cite.style.ne.css rename to modules/parsoid-styles/ext.cite.style.ne.css diff --git a/modules/ext.cite.style.new.css b/modules/parsoid-styles/ext.cite.style.new.css similarity index 100% rename from modules/ext.cite.style.new.css rename to modules/parsoid-styles/ext.cite.style.new.css diff --git a/modules/ext.cite.style.nl.css b/modules/parsoid-styles/ext.cite.style.nl.css similarity index 100% rename from modules/ext.cite.style.nl.css rename to modules/parsoid-styles/ext.cite.style.nl.css diff --git a/modules/ext.cite.style.nn.css b/modules/parsoid-styles/ext.cite.style.nn.css similarity index 100% rename from modules/ext.cite.style.nn.css rename to modules/parsoid-styles/ext.cite.style.nn.css diff --git a/modules/ext.cite.style.nod.css b/modules/parsoid-styles/ext.cite.style.nod.css similarity index 100% rename from modules/ext.cite.style.nod.css rename to modules/parsoid-styles/ext.cite.style.nod.css diff --git a/modules/ext.cite.style.nqo.css b/modules/parsoid-styles/ext.cite.style.nqo.css similarity index 100% rename from modules/ext.cite.style.nqo.css rename to modules/parsoid-styles/ext.cite.style.nqo.css diff --git a/modules/ext.cite.style.oc.css b/modules/parsoid-styles/ext.cite.style.oc.css similarity index 100% rename from modules/ext.cite.style.oc.css rename to modules/parsoid-styles/ext.cite.style.oc.css diff --git a/modules/ext.cite.style.or.css b/modules/parsoid-styles/ext.cite.style.or.css similarity index 100% rename from modules/ext.cite.style.or.css rename to modules/parsoid-styles/ext.cite.style.or.css diff --git a/modules/ext.cite.style.pi.css b/modules/parsoid-styles/ext.cite.style.pi.css similarity index 100% rename from modules/ext.cite.style.pi.css rename to modules/parsoid-styles/ext.cite.style.pi.css diff --git a/modules/ext.cite.style.pl.css b/modules/parsoid-styles/ext.cite.style.pl.css similarity index 100% rename from modules/ext.cite.style.pl.css rename to modules/parsoid-styles/ext.cite.style.pl.css diff --git a/modules/ext.cite.style.pnb.css b/modules/parsoid-styles/ext.cite.style.pnb.css similarity index 100% rename from modules/ext.cite.style.pnb.css rename to modules/parsoid-styles/ext.cite.style.pnb.css diff --git a/modules/ext.cite.style.ps.css b/modules/parsoid-styles/ext.cite.style.ps.css similarity index 100% rename from modules/ext.cite.style.ps.css rename to modules/parsoid-styles/ext.cite.style.ps.css diff --git a/modules/ext.cite.style.pt.css b/modules/parsoid-styles/ext.cite.style.pt.css similarity index 100% rename from modules/ext.cite.style.pt.css rename to modules/parsoid-styles/ext.cite.style.pt.css diff --git a/modules/ext.cite.style.pt_br.css b/modules/parsoid-styles/ext.cite.style.pt_br.css similarity index 100% rename from modules/ext.cite.style.pt_br.css rename to modules/parsoid-styles/ext.cite.style.pt_br.css diff --git a/modules/ext.cite.style.rki.css b/modules/parsoid-styles/ext.cite.style.rki.css similarity index 100% rename from modules/ext.cite.style.rki.css rename to modules/parsoid-styles/ext.cite.style.rki.css diff --git a/modules/ext.cite.style.ro.css b/modules/parsoid-styles/ext.cite.style.ro.css similarity index 100% rename from modules/ext.cite.style.ro.css rename to modules/parsoid-styles/ext.cite.style.ro.css diff --git a/modules/ext.cite.style.ru.css b/modules/parsoid-styles/ext.cite.style.ru.css similarity index 100% rename from modules/ext.cite.style.ru.css rename to modules/parsoid-styles/ext.cite.style.ru.css diff --git a/modules/ext.cite.style.sa.css b/modules/parsoid-styles/ext.cite.style.sa.css similarity index 100% rename from modules/ext.cite.style.sa.css rename to modules/parsoid-styles/ext.cite.style.sa.css diff --git a/modules/ext.cite.style.sah.css b/modules/parsoid-styles/ext.cite.style.sah.css similarity index 100% rename from modules/ext.cite.style.sah.css rename to modules/parsoid-styles/ext.cite.style.sah.css diff --git a/modules/ext.cite.style.sat.css b/modules/parsoid-styles/ext.cite.style.sat.css similarity index 100% rename from modules/ext.cite.style.sat.css rename to modules/parsoid-styles/ext.cite.style.sat.css diff --git a/modules/ext.cite.style.se.css b/modules/parsoid-styles/ext.cite.style.se.css similarity index 100% rename from modules/ext.cite.style.se.css rename to modules/parsoid-styles/ext.cite.style.se.css diff --git a/modules/ext.cite.style.sk.css b/modules/parsoid-styles/ext.cite.style.sk.css similarity index 100% rename from modules/ext.cite.style.sk.css rename to modules/parsoid-styles/ext.cite.style.sk.css diff --git a/modules/ext.cite.style.skr_arab.css b/modules/parsoid-styles/ext.cite.style.skr_arab.css similarity index 100% rename from modules/ext.cite.style.skr_arab.css rename to modules/parsoid-styles/ext.cite.style.skr_arab.css diff --git a/modules/ext.cite.style.sl.css b/modules/parsoid-styles/ext.cite.style.sl.css similarity index 100% rename from modules/ext.cite.style.sl.css rename to modules/parsoid-styles/ext.cite.style.sl.css diff --git a/modules/ext.cite.style.sq.css b/modules/parsoid-styles/ext.cite.style.sq.css similarity index 100% rename from modules/ext.cite.style.sq.css rename to modules/parsoid-styles/ext.cite.style.sq.css diff --git a/modules/ext.cite.style.sr_ec.css b/modules/parsoid-styles/ext.cite.style.sr_ec.css similarity index 100% rename from modules/ext.cite.style.sr_ec.css rename to modules/parsoid-styles/ext.cite.style.sr_ec.css diff --git a/modules/ext.cite.style.sr_el.css b/modules/parsoid-styles/ext.cite.style.sr_el.css similarity index 100% rename from modules/ext.cite.style.sr_el.css rename to modules/parsoid-styles/ext.cite.style.sr_el.css diff --git a/modules/ext.cite.style.sv.css b/modules/parsoid-styles/ext.cite.style.sv.css similarity index 100% rename from modules/ext.cite.style.sv.css rename to modules/parsoid-styles/ext.cite.style.sv.css diff --git a/modules/ext.cite.style.tr.css b/modules/parsoid-styles/ext.cite.style.tr.css similarity index 100% rename from modules/ext.cite.style.tr.css rename to modules/parsoid-styles/ext.cite.style.tr.css diff --git a/modules/ext.cite.style.udm.css b/modules/parsoid-styles/ext.cite.style.udm.css similarity index 100% rename from modules/ext.cite.style.udm.css rename to modules/parsoid-styles/ext.cite.style.udm.css diff --git a/modules/ext.cite.style.uk.css b/modules/parsoid-styles/ext.cite.style.uk.css similarity index 100% rename from modules/ext.cite.style.uk.css rename to modules/parsoid-styles/ext.cite.style.uk.css diff --git a/modules/ext.cite.style.uz.css b/modules/parsoid-styles/ext.cite.style.uz.css similarity index 100% rename from modules/ext.cite.style.uz.css rename to modules/parsoid-styles/ext.cite.style.uz.css diff --git a/modules/ext.cite.style.vi.css b/modules/parsoid-styles/ext.cite.style.vi.css similarity index 100% rename from modules/ext.cite.style.vi.css rename to modules/parsoid-styles/ext.cite.style.vi.css diff --git a/modules/ext.cite.style.wa.css b/modules/parsoid-styles/ext.cite.style.wa.css similarity index 100% rename from modules/ext.cite.style.wa.css rename to modules/parsoid-styles/ext.cite.style.wa.css diff --git a/src/ResourceLoader/CiteCSSFileModule.php b/src/ResourceLoader/CiteCSSFileModule.php index 418c0e329..79cc98f31 100644 --- a/src/ResourceLoader/CiteCSSFileModule.php +++ b/src/ResourceLoader/CiteCSSFileModule.php @@ -26,14 +26,9 @@ class CiteCSSFileModule extends FileModule { // Get the content language code, and all the fallbacks. The first that // has a ext.cite.style..css file present will be used. - $langCodes = array_merge( - [ $contLang->getCode() ], - $contLang->getFallbackLanguages() - ); - foreach ( $langCodes as $lang ) { + foreach ( [ $contLang->getCode(), ...$contLang->getFallbackLanguages() ] as $lang ) { $langStyleFile = 'ext.cite.style.' . strtr( $lang, '-', '_' ) . '.css'; - $localPath = $this->getLocalPath( $langStyleFile ); - if ( file_exists( $localPath ) ) { + if ( file_exists( $this->getLocalPath( $langStyleFile ) ) ) { $this->styles[] = $langStyleFile; break; } diff --git a/tests/phpunit/CiteCSSFileModuleTest.php b/tests/phpunit/CiteCSSFileModuleTest.php index 8d9eeb38b..ff956075b 100644 --- a/tests/phpunit/CiteCSSFileModuleTest.php +++ b/tests/phpunit/CiteCSSFileModuleTest.php @@ -21,7 +21,7 @@ class CiteCSSFileModuleTest extends \MediaWikiIntegrationTestCase { } public function testModule() { - $module = new CiteCSSFileModule( [], __DIR__ . '/../../modules' ); + $module = new CiteCSSFileModule( [], __DIR__ . '/../../modules/parsoid-styles' ); $styles = $module->getStyleFiles( $this->createMock( Context::class ) ); $this->assertSame( [ 'ext.cite.style.fa.css' ], $styles['all'] ); }