From 7e4928ed655272564944f4e11f5b34e80eb5a20f Mon Sep 17 00:00:00 2001 From: Timo Tijhof Date: Wed, 9 May 2018 20:10:05 +0100 Subject: [PATCH] mediawiki.htmlform: Move files to their own module directory * mediawiki.htmlform.styles: - mediawiki/htmlform/styles.css - mediawiki/htmlform/images/* Only contains two images, only used by this module. * mediawiki.htmlform.checker.js. * mediawiki.htmlform.ooui: Only Element.js. * mediawiki.htmlform.ooui.styles.less. * mediawiki.htmlform: Other files from mediawiki/htmlform. Bug: T193826 Change-Id: I5c057c758933e905d5c7940ade5bf43282088159 --- resources/Resources.php | 26 +++++++++--------- ...ecker.js => mediawiki.htmlform.checker.js} | 1 + ...ss => mediawiki.htmlform.ooui.styles.less} | 0 .../Element.js} | 1 + .../images/question.png | Bin .../images/question.svg | 0 .../styles.css | 0 .../autocomplete.js | 0 .../autoinfuse.js | 0 .../checkmatrix.js | 0 .../htmlform => mediawiki.htmlform}/cloner.js | 0 .../hide-if.js | 0 .../htmlform.js | 0 .../multiselect.js | 0 .../selectandother.js | 0 .../selectorother.js | 0 16 files changed, 15 insertions(+), 13 deletions(-) rename resources/src/{mediawiki/htmlform/htmlform.Checker.js => mediawiki.htmlform.checker.js} (98%) rename resources/src/{mediawiki/htmlform/ooui.styles.less => mediawiki.htmlform.ooui.styles.less} (100%) rename resources/src/{mediawiki/htmlform/htmlform.Element.js => mediawiki.htmlform.ooui/Element.js} (95%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform.styles}/images/question.png (100%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform.styles}/images/question.svg (100%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform.styles}/styles.css (100%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform}/autocomplete.js (100%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform}/autoinfuse.js (100%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform}/checkmatrix.js (100%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform}/cloner.js (100%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform}/hide-if.js (100%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform}/htmlform.js (100%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform}/multiselect.js (100%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform}/selectandother.js (100%) rename resources/src/{mediawiki/htmlform => mediawiki.htmlform}/selectorother.js (100%) diff --git a/resources/Resources.php b/resources/Resources.php index 1a3d2f049c..81a32c2448 100644 --- a/resources/Resources.php +++ b/resources/Resources.php @@ -1073,15 +1073,15 @@ return [ ], 'mediawiki.htmlform' => [ 'scripts' => [ - 'resources/src/mediawiki/htmlform/htmlform.js', - 'resources/src/mediawiki/htmlform/autocomplete.js', - 'resources/src/mediawiki/htmlform/autoinfuse.js', - 'resources/src/mediawiki/htmlform/checkmatrix.js', - 'resources/src/mediawiki/htmlform/cloner.js', - 'resources/src/mediawiki/htmlform/hide-if.js', - 'resources/src/mediawiki/htmlform/multiselect.js', - 'resources/src/mediawiki/htmlform/selectandother.js', - 'resources/src/mediawiki/htmlform/selectorother.js', + 'resources/src/mediawiki.htmlform/htmlform.js', + 'resources/src/mediawiki.htmlform/autocomplete.js', + 'resources/src/mediawiki.htmlform/autoinfuse.js', + 'resources/src/mediawiki.htmlform/checkmatrix.js', + 'resources/src/mediawiki.htmlform/cloner.js', + 'resources/src/mediawiki.htmlform/hide-if.js', + 'resources/src/mediawiki.htmlform/multiselect.js', + 'resources/src/mediawiki.htmlform/selectandother.js', + 'resources/src/mediawiki.htmlform/selectorother.js', ], 'dependencies' => [ 'mediawiki.RegExp', @@ -1096,7 +1096,7 @@ return [ ], 'mediawiki.htmlform.checker' => [ 'scripts' => [ - 'resources/src/mediawiki/htmlform/htmlform.Checker.js', + 'resources/src/mediawiki.htmlform.checker.js', ], 'dependencies' => [ 'jquery.throttle-debounce', @@ -1105,7 +1105,7 @@ return [ ], 'mediawiki.htmlform.ooui' => [ 'scripts' => [ - 'resources/src/mediawiki/htmlform/htmlform.Element.js', + 'resources/src/mediawiki.htmlform.ooui/Element.js', ], 'dependencies' => [ 'oojs-ui-core', @@ -1113,11 +1113,11 @@ return [ 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.htmlform.styles' => [ - 'styles' => 'resources/src/mediawiki/htmlform/styles.css', + 'styles' => 'resources/src/mediawiki.htmlform.styles/styles.css', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.htmlform.ooui.styles' => [ - 'styles' => 'resources/src/mediawiki/htmlform/ooui.styles.less', + 'styles' => 'resources/src/mediawiki.htmlform.ooui.styles.less', 'targets' => [ 'desktop', 'mobile' ], ], 'mediawiki.icon' => [ diff --git a/resources/src/mediawiki/htmlform/htmlform.Checker.js b/resources/src/mediawiki.htmlform.checker.js similarity index 98% rename from resources/src/mediawiki/htmlform/htmlform.Checker.js rename to resources/src/mediawiki.htmlform.checker.js index 3f53b63600..a9f08db9d8 100644 --- a/resources/src/mediawiki/htmlform/htmlform.Checker.js +++ b/resources/src/mediawiki.htmlform.checker.js @@ -1,5 +1,6 @@ ( function ( mw, $ ) { + // FIXME: mw.htmlform.Element also sets this to empty object mw.htmlform = {}; /** diff --git a/resources/src/mediawiki/htmlform/ooui.styles.less b/resources/src/mediawiki.htmlform.ooui.styles.less similarity index 100% rename from resources/src/mediawiki/htmlform/ooui.styles.less rename to resources/src/mediawiki.htmlform.ooui.styles.less diff --git a/resources/src/mediawiki/htmlform/htmlform.Element.js b/resources/src/mediawiki.htmlform.ooui/Element.js similarity index 95% rename from resources/src/mediawiki/htmlform/htmlform.Element.js rename to resources/src/mediawiki.htmlform.ooui/Element.js index 01108e6573..e195ccbd9e 100644 --- a/resources/src/mediawiki/htmlform/htmlform.Element.js +++ b/resources/src/mediawiki.htmlform.ooui/Element.js @@ -1,5 +1,6 @@ ( function ( mw ) { + // FIXME: mw.htmlform.Checker also sets this to empty object mw.htmlform = {}; /** diff --git a/resources/src/mediawiki/htmlform/images/question.png b/resources/src/mediawiki.htmlform.styles/images/question.png similarity index 100% rename from resources/src/mediawiki/htmlform/images/question.png rename to resources/src/mediawiki.htmlform.styles/images/question.png diff --git a/resources/src/mediawiki/htmlform/images/question.svg b/resources/src/mediawiki.htmlform.styles/images/question.svg similarity index 100% rename from resources/src/mediawiki/htmlform/images/question.svg rename to resources/src/mediawiki.htmlform.styles/images/question.svg diff --git a/resources/src/mediawiki/htmlform/styles.css b/resources/src/mediawiki.htmlform.styles/styles.css similarity index 100% rename from resources/src/mediawiki/htmlform/styles.css rename to resources/src/mediawiki.htmlform.styles/styles.css diff --git a/resources/src/mediawiki/htmlform/autocomplete.js b/resources/src/mediawiki.htmlform/autocomplete.js similarity index 100% rename from resources/src/mediawiki/htmlform/autocomplete.js rename to resources/src/mediawiki.htmlform/autocomplete.js diff --git a/resources/src/mediawiki/htmlform/autoinfuse.js b/resources/src/mediawiki.htmlform/autoinfuse.js similarity index 100% rename from resources/src/mediawiki/htmlform/autoinfuse.js rename to resources/src/mediawiki.htmlform/autoinfuse.js diff --git a/resources/src/mediawiki/htmlform/checkmatrix.js b/resources/src/mediawiki.htmlform/checkmatrix.js similarity index 100% rename from resources/src/mediawiki/htmlform/checkmatrix.js rename to resources/src/mediawiki.htmlform/checkmatrix.js diff --git a/resources/src/mediawiki/htmlform/cloner.js b/resources/src/mediawiki.htmlform/cloner.js similarity index 100% rename from resources/src/mediawiki/htmlform/cloner.js rename to resources/src/mediawiki.htmlform/cloner.js diff --git a/resources/src/mediawiki/htmlform/hide-if.js b/resources/src/mediawiki.htmlform/hide-if.js similarity index 100% rename from resources/src/mediawiki/htmlform/hide-if.js rename to resources/src/mediawiki.htmlform/hide-if.js diff --git a/resources/src/mediawiki/htmlform/htmlform.js b/resources/src/mediawiki.htmlform/htmlform.js similarity index 100% rename from resources/src/mediawiki/htmlform/htmlform.js rename to resources/src/mediawiki.htmlform/htmlform.js diff --git a/resources/src/mediawiki/htmlform/multiselect.js b/resources/src/mediawiki.htmlform/multiselect.js similarity index 100% rename from resources/src/mediawiki/htmlform/multiselect.js rename to resources/src/mediawiki.htmlform/multiselect.js diff --git a/resources/src/mediawiki/htmlform/selectandother.js b/resources/src/mediawiki.htmlform/selectandother.js similarity index 100% rename from resources/src/mediawiki/htmlform/selectandother.js rename to resources/src/mediawiki.htmlform/selectandother.js diff --git a/resources/src/mediawiki/htmlform/selectorother.js b/resources/src/mediawiki.htmlform/selectorother.js similarity index 100% rename from resources/src/mediawiki/htmlform/selectorother.js rename to resources/src/mediawiki.htmlform/selectorother.js -- 2.20.1