Bartosz Dziewoński has uploaded a new change for review.
https://gerrit.wikimedia.org/r/153370
Change subject: Move mediawiki.legacy.* modules from skins/common/ to resources/
......................................................................
Move mediawiki.legacy.* modules from skins/common/ to resources/
Long overdue. Perhaps this will make it easier to kill them off.
Bug: 69277
Change-Id: Id4a8f9470d287c73309ff526ffb88984e2d351b9
---
M resources/Resources.php
R resources/src/mediawiki.legacy/ajax.js
R resources/src/mediawiki.legacy/commonPrint.css
R resources/src/mediawiki.legacy/images/ajax-loader.gif
R resources/src/mediawiki.legacy/images/checker.png
R resources/src/mediawiki.legacy/images/feed-icon.png
R resources/src/mediawiki.legacy/images/feed-icon.svg
R resources/src/mediawiki.legacy/images/help-question-hover.gif
R resources/src/mediawiki.legacy/images/help-question.gif
R resources/src/mediawiki.legacy/images/question.png
R resources/src/mediawiki.legacy/images/question.svg
R resources/src/mediawiki.legacy/images/spinner.gif
R resources/src/mediawiki.legacy/oldshared.css
R resources/src/mediawiki.legacy/protect.js
R resources/src/mediawiki.legacy/shared.css
R resources/src/mediawiki.legacy/upload.js
R resources/src/mediawiki.legacy/wikibits.js
17 files changed, 9 insertions(+), 23 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/70/153370/1
diff --git a/resources/Resources.php b/resources/Resources.php
index 6bbff8b..6483162 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -1383,9 +1383,7 @@
),
'mediawiki.legacy.ajax' => array(
- 'scripts' => 'common/ajax.js',
- 'remoteBasePath' => $GLOBALS['wgStylePath'],
- 'localBasePath' => $GLOBALS['wgStyleDirectory'],
+ 'scripts' => 'resources/src/mediawiki.legacy/ajax.js',
'dependencies' => array(
'mediawiki.util',
'mediawiki.legacy.wikibits',
@@ -1393,14 +1391,10 @@
'position' => 'top', // Temporary hack for legacy support
),
'mediawiki.legacy.commonPrint' => array(
- 'styles' => array( 'common/commonPrint.css' => array( 'media'
=> 'print' ) ),
- 'remoteBasePath' => $GLOBALS['wgStylePath'],
- 'localBasePath' => $GLOBALS['wgStyleDirectory'],
+ 'styles' => array(
'resources/src/mediawiki.legacy/commonPrint.css' => array( 'media' => 'print' )
),
),
'mediawiki.legacy.protect' => array(
- 'scripts' => 'common/protect.js',
- 'remoteBasePath' => $GLOBALS['wgStylePath'],
- 'localBasePath' => $GLOBALS['wgStyleDirectory'],
+ 'scripts' => 'resources/src/mediawiki.legacy/protect.js',
'dependencies' => array(
'jquery.byteLimit',
),
@@ -1408,19 +1402,13 @@
),
'mediawiki.legacy.shared' => array(
// Used in the web installer. Test it after modifying this
definition!
- 'styles' => array( 'common/shared.css' => array( 'media' =>
'screen' ) ),
- 'remoteBasePath' => $GLOBALS['wgStylePath'],
- 'localBasePath' => $GLOBALS['wgStyleDirectory'],
+ 'styles' => array( 'resources/src/mediawiki.legacy/shared.css'
=> array( 'media' => 'screen' ) ),
),
'mediawiki.legacy.oldshared' => array(
- 'styles' => array( 'common/oldshared.css' => array( 'media' =>
'screen' ) ),
- 'remoteBasePath' => $GLOBALS['wgStylePath'],
- 'localBasePath' => $GLOBALS['wgStyleDirectory'],
+ 'styles' => array(
'resources/src/mediawiki.legacy/oldshared.css' => array( 'media' => 'screen' )
),
),
'mediawiki.legacy.upload' => array(
- 'scripts' => 'common/upload.js',
- 'remoteBasePath' => $GLOBALS['wgStylePath'],
- 'localBasePath' => $GLOBALS['wgStyleDirectory'],
+ 'scripts' => 'resources/src/mediawiki.legacy/upload.js',
'dependencies' => array(
'jquery.spinner',
'mediawiki.api',
@@ -1429,9 +1417,7 @@
),
),
'mediawiki.legacy.wikibits' => array(
- 'scripts' => 'common/wikibits.js',
- 'remoteBasePath' => $GLOBALS['wgStylePath'],
- 'localBasePath' => $GLOBALS['wgStyleDirectory'],
+ 'scripts' => 'resources/src/mediawiki.legacy/wikibits.js',
'dependencies' => array(
'mediawiki.util',
),
diff --git a/skins/common/ajax.js b/resources/src/mediawiki.legacy/ajax.js
similarity index 100%
rename from skins/common/ajax.js
rename to resources/src/mediawiki.legacy/ajax.js
diff --git a/skins/common/commonPrint.css
b/resources/src/mediawiki.legacy/commonPrint.css
similarity index 100%
rename from skins/common/commonPrint.css
rename to resources/src/mediawiki.legacy/commonPrint.css
diff --git a/skins/common/images/ajax-loader.gif
b/resources/src/mediawiki.legacy/images/ajax-loader.gif
similarity index 100%
rename from skins/common/images/ajax-loader.gif
rename to resources/src/mediawiki.legacy/images/ajax-loader.gif
Binary files differ
diff --git a/skins/common/images/Checker-16x16.png
b/resources/src/mediawiki.legacy/images/checker.png
similarity index 100%
rename from skins/common/images/Checker-16x16.png
rename to resources/src/mediawiki.legacy/images/checker.png
Binary files differ
diff --git a/skins/common/images/feed-icon.png
b/resources/src/mediawiki.legacy/images/feed-icon.png
similarity index 100%
rename from skins/common/images/feed-icon.png
rename to resources/src/mediawiki.legacy/images/feed-icon.png
Binary files differ
diff --git a/skins/common/images/feed-icon.svg
b/resources/src/mediawiki.legacy/images/feed-icon.svg
similarity index 100%
rename from skins/common/images/feed-icon.svg
rename to resources/src/mediawiki.legacy/images/feed-icon.svg
diff --git a/skins/common/images/help-question-hover.gif
b/resources/src/mediawiki.legacy/images/help-question-hover.gif
similarity index 100%
rename from skins/common/images/help-question-hover.gif
rename to resources/src/mediawiki.legacy/images/help-question-hover.gif
Binary files differ
diff --git a/skins/common/images/help-question.gif
b/resources/src/mediawiki.legacy/images/help-question.gif
similarity index 100%
rename from skins/common/images/help-question.gif
rename to resources/src/mediawiki.legacy/images/help-question.gif
Binary files differ
diff --git a/skins/common/images/question-small.png
b/resources/src/mediawiki.legacy/images/question.png
similarity index 100%
rename from skins/common/images/question-small.png
rename to resources/src/mediawiki.legacy/images/question.png
Binary files differ
diff --git a/skins/common/images/question.svg
b/resources/src/mediawiki.legacy/images/question.svg
similarity index 100%
rename from skins/common/images/question.svg
rename to resources/src/mediawiki.legacy/images/question.svg
diff --git a/skins/common/images/spinner.gif
b/resources/src/mediawiki.legacy/images/spinner.gif
similarity index 100%
rename from skins/common/images/spinner.gif
rename to resources/src/mediawiki.legacy/images/spinner.gif
Binary files differ
diff --git a/skins/common/oldshared.css
b/resources/src/mediawiki.legacy/oldshared.css
similarity index 100%
rename from skins/common/oldshared.css
rename to resources/src/mediawiki.legacy/oldshared.css
diff --git a/skins/common/protect.js b/resources/src/mediawiki.legacy/protect.js
similarity index 100%
rename from skins/common/protect.js
rename to resources/src/mediawiki.legacy/protect.js
diff --git a/skins/common/shared.css b/resources/src/mediawiki.legacy/shared.css
similarity index 99%
rename from skins/common/shared.css
rename to resources/src/mediawiki.legacy/shared.css
index 17ec8c6..7ced64d 100644
--- a/skins/common/shared.css
+++ b/resources/src/mediawiki.legacy/shared.css
@@ -179,7 +179,7 @@
.filehistory a img,
#file img:hover {
/* @embed */
- background: white url(images/Checker-16x16.png) repeat;
+ background: white url(images/checker.png) repeat;
}
/**
@@ -244,7 +244,7 @@
/* SVG support using a transparent gradient to guarantee cross-browser
* compatibility (browsers able to understand gradient syntax support
also SVG).
*
http://pauginer.tumblr.com/post/36614680636/invisible-gradient-technique */
- background-image: url(images/question-small.png);
+ background-image: url(images/question.png);
/* @embed */
background-image: -webkit-linear-gradient(transparent, transparent),
url(images/question.svg);
/* @embed */
diff --git a/skins/common/upload.js b/resources/src/mediawiki.legacy/upload.js
similarity index 100%
rename from skins/common/upload.js
rename to resources/src/mediawiki.legacy/upload.js
diff --git a/skins/common/wikibits.js
b/resources/src/mediawiki.legacy/wikibits.js
similarity index 100%
rename from skins/common/wikibits.js
rename to resources/src/mediawiki.legacy/wikibits.js
--
To view, visit https://gerrit.wikimedia.org/r/153370
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Id4a8f9470d287c73309ff526ffb88984e2d351b9
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Bartosz Dziewoński <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
