From 9f86db20286c2c39ae5f134a31ad2927441340d0 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Sun, 19 Aug 2018 22:23:51 +0100
Subject: [PATCH] resources: Move non-jquery files from /resources/lib/jquery
 to /resources/lib

Per discussion on T193826, these are not part of jquery (the library, or the
module), and should not be in the same subdirectory.

To follow the new convention that all entries directly in /resources/lib
should correspond to single library only (either as file, or as directory),
move them one directory up.

Bug: T193826
Change-Id: I24c05ec5fc5f0a2d54d501a4a022d829675bf850
---
 resources/Resources.php                        | 18 +++++++++---------
 resources/lib/{jquery => }/jquery.async.js     |  0
 .../jquery.ba-throttle-debounce.js             |  0
 resources/lib/{jquery => }/jquery.cookie.js    |  0
 resources/lib/{jquery => }/jquery.form.js      |  0
 .../lib/{jquery => }/jquery.fullscreen.js      |  0
 .../lib/{jquery => }/jquery.hoverIntent.js     |  0
 resources/lib/{jquery => }/jquery.jStorage.js  |  0
 resources/lib/{jquery => }/jquery.mockjax.js   |  0
 resources/lib/{jquery => }/jquery.xmldom.js    |  0
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename resources/lib/{jquery => }/jquery.async.js (100%)
 rename resources/lib/{jquery => }/jquery.ba-throttle-debounce.js (100%)
 rename resources/lib/{jquery => }/jquery.cookie.js (100%)
 rename resources/lib/{jquery => }/jquery.form.js (100%)
 rename resources/lib/{jquery => }/jquery.fullscreen.js (100%)
 rename resources/lib/{jquery => }/jquery.hoverIntent.js (100%)
 rename resources/lib/{jquery => }/jquery.jStorage.js (100%)
 rename resources/lib/{jquery => }/jquery.mockjax.js (100%)
 rename resources/lib/{jquery => }/jquery.xmldom.js (100%)

diff --git a/resources/Resources.php b/resources/Resources.php
index e91224230a..3a452c4012 100644
--- a/resources/Resources.php
+++ b/resources/Resources.php
@@ -174,7 +174,7 @@ return [
 		'targets' => [ 'mobile', 'desktop' ],
 	],
 	'jquery.async' => [
-		'scripts' => 'resources/lib/jquery/jquery.async.js',
+		'scripts' => 'resources/lib/jquery.async.js',
 	],
 	'jquery.byteLength' => [
 		'scripts' => 'resources/src/jquery/jquery.byteLength.js',
@@ -221,14 +221,14 @@ return [
 		'dependencies' => 'mediawiki.jqueryMsg',
 	],
 	'jquery.cookie' => [
-		'scripts' => 'resources/lib/jquery/jquery.cookie.js',
+		'scripts' => 'resources/lib/jquery.cookie.js',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'jquery.form' => [
-		'scripts' => 'resources/lib/jquery/jquery.form.js',
+		'scripts' => 'resources/lib/jquery.form.js',
 	],
 	'jquery.fullscreen' => [
-		'scripts' => 'resources/lib/jquery/jquery.fullscreen.js',
+		'scripts' => 'resources/lib/jquery.fullscreen.js',
 	],
 	'jquery.getAttrs' => [
 		'targets' => [ 'desktop', 'mobile' ],
@@ -248,7 +248,7 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'jquery.hoverIntent' => [
-		'scripts' => 'resources/lib/jquery/jquery.hoverIntent.js',
+		'scripts' => 'resources/lib/jquery.hoverIntent.js',
 	],
 	'jquery.i18n' => [
 		'scripts' => [
@@ -295,7 +295,7 @@ return [
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'jquery.mockjax' => [
-		'scripts' => 'resources/lib/jquery/jquery.mockjax.js',
+		'scripts' => 'resources/lib/jquery.mockjax.js',
 	],
 	'jquery.mw-jump' => [
 		'scripts' => 'resources/src/jquery/jquery.mw-jump.js',
@@ -313,7 +313,7 @@ return [
 	],
 	'jquery.jStorage' => [
 		'deprecated' => 'Please use "mediawiki.storage" instead.',
-		'scripts' => 'resources/lib/jquery/jquery.jStorage.js',
+		'scripts' => 'resources/lib/jquery.jStorage.js',
 	],
 	'jquery.suggestions' => [
 		'targets' => [ 'desktop', 'mobile' ],
@@ -340,11 +340,11 @@ return [
 		'targets' => [ 'mobile', 'desktop' ],
 	],
 	'jquery.throttle-debounce' => [
-		'scripts' => 'resources/lib/jquery/jquery.ba-throttle-debounce.js',
+		'scripts' => 'resources/lib/jquery.ba-throttle-debounce.js',
 		'targets' => [ 'desktop', 'mobile' ],
 	],
 	'jquery.xmldom' => [
-		'scripts' => 'resources/lib/jquery/jquery.xmldom.js',
+		'scripts' => 'resources/lib/jquery.xmldom.js',
 	],
 
 	/* jQuery Tipsy */
diff --git a/resources/lib/jquery/jquery.async.js b/resources/lib/jquery.async.js
similarity index 100%
rename from resources/lib/jquery/jquery.async.js
rename to resources/lib/jquery.async.js
diff --git a/resources/lib/jquery/jquery.ba-throttle-debounce.js b/resources/lib/jquery.ba-throttle-debounce.js
similarity index 100%
rename from resources/lib/jquery/jquery.ba-throttle-debounce.js
rename to resources/lib/jquery.ba-throttle-debounce.js
diff --git a/resources/lib/jquery/jquery.cookie.js b/resources/lib/jquery.cookie.js
similarity index 100%
rename from resources/lib/jquery/jquery.cookie.js
rename to resources/lib/jquery.cookie.js
diff --git a/resources/lib/jquery/jquery.form.js b/resources/lib/jquery.form.js
similarity index 100%
rename from resources/lib/jquery/jquery.form.js
rename to resources/lib/jquery.form.js
diff --git a/resources/lib/jquery/jquery.fullscreen.js b/resources/lib/jquery.fullscreen.js
similarity index 100%
rename from resources/lib/jquery/jquery.fullscreen.js
rename to resources/lib/jquery.fullscreen.js
diff --git a/resources/lib/jquery/jquery.hoverIntent.js b/resources/lib/jquery.hoverIntent.js
similarity index 100%
rename from resources/lib/jquery/jquery.hoverIntent.js
rename to resources/lib/jquery.hoverIntent.js
diff --git a/resources/lib/jquery/jquery.jStorage.js b/resources/lib/jquery.jStorage.js
similarity index 100%
rename from resources/lib/jquery/jquery.jStorage.js
rename to resources/lib/jquery.jStorage.js
diff --git a/resources/lib/jquery/jquery.mockjax.js b/resources/lib/jquery.mockjax.js
similarity index 100%
rename from resources/lib/jquery/jquery.mockjax.js
rename to resources/lib/jquery.mockjax.js
diff --git a/resources/lib/jquery/jquery.xmldom.js b/resources/lib/jquery.xmldom.js
similarity index 100%
rename from resources/lib/jquery/jquery.xmldom.js
rename to resources/lib/jquery.xmldom.js
-- 
2.20.1