mediawiki.base: Move $j alias to mediawiki.base.js

This isn't used by mw.loader internally so it can be deferred
to the file that loads right after it (but still before any
other module).

Bug: T192623
Change-Id: I65162567f48670221861af92080ca116f52dde39

diff --git a/resources/src/mediawiki/mediawiki.base.js b/resources/src/mediawiki/mediawiki.base.js
index 9683570..5cec1bb 100644 (file)
--- a/resources/src/mediawiki/mediawiki.base.js
+++ b/resources/src/mediawiki/mediawiki.base.js
@@ -582,4 +582,8 @@
                        }
                };
        }() );
+
+       // Alias $j to jQuery for backwards compatibility
+       // @deprecated since 1.23 Use $ or jQuery instead
+       mw.log.deprecate( window, '$j', $, 'Use $ or jQuery instead.' );
 }() );

diff --git a/resources/src/mediawiki/mediawiki.js b/resources/src/mediawiki/mediawiki.js
index 7d40ce7..406f030 100644 (file)
--- a/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@ -2302,10 +2302,6 @@
 
        };
 
-       // Alias $j to jQuery for backwards compatibility
-       // @deprecated since 1.23 Use $ or jQuery instead
-       mw.log.deprecate( window, '$j', $, 'Use $ or jQuery instead.' );
-
        // Attach to window and globally alias
        window.mw = window.mediaWiki = mw;
 }( jQuery ) );