Merge "Make sure we don't use objects by ref in setMwGlobals"

diff --git a/RELEASE-NOTES-1.23 b/RELEASE-NOTES-1.23
index 63e1b28..bb807d9 100644 (file)
--- a/RELEASE-NOTES-1.23
+++ b/RELEASE-NOTES-1.23
@@ -271,6 +271,7 @@ changes to languages because of Bugzilla reports.
 * On Special:PrefixIndex, a table#mw-prefixindex-list-table was changed to
   table.mw-prefixindex-list-table to avoid duplicate ids when the special page
   is transcluded.
+* (bug 62198) window.$j has been deprecated.
 
 ==== Removed classes ====
 * FakeMemCachedClient (deprecated in 1.18)

diff --git a/resources/mediawiki/mediawiki.js b/resources/mediawiki/mediawiki.js
index 9bb86af..26f84f5 100644 (file)
--- a/resources/mediawiki/mediawiki.js
+++ b/resources/mediawiki/mediawiki.js
@@ -2355,7 +2355,7 @@ var mw = ( function ( $, undefined ) {
 }( jQuery ) );
 
 // Alias $j to jQuery for backwards compatibility
-window.$j = jQuery;
+mw.log.deprecate( window, '$j', jQuery, 'Use $ or jQuery instead.' );
 
 // Attach to window and globally alias
 window.mw = window.mediaWiki = mw;

diff --git a/resources/oojs-ui/update-oojs-ui.sh b/resources/oojs-ui/update-oojs-ui.sh
index a42ba0e..6cf631f 100755 (executable)
--- a/resources/oojs-ui/update-oojs-ui.sh
+++ b/resources/oojs-ui/update-oojs-ui.sh
@@ -37,6 +37,11 @@ fi
 # Undo any changes in the oojs-ui directory
 git reset resources/oojs-ui/
 git checkout resources/oojs-ui/
+
+git fetch origin
+# Create a branch of MW if needed, and reset it to master
+git checkout -B update-oojsui origin/master
+
 # Get the old oojs-ui version
 OLDVERSION=$(oojsuihash)
 if [ "x$OLDVERSION" == "x" ]
@@ -64,7 +69,8 @@ then
        exit 0
 fi
 # Build the distribution
-grunt
+npm install || exit 1
+grunt || exit 1
 # Get the list of changes
 NEWCHANGES=$(git log $OLDVERSION.. --oneline --no-merges --reverse --color=never)
 NEWCHANGESDISPLAY=$(git log $OLDVERSION.. --oneline --no-merges --reverse --color=always)

diff --git a/resources/oojs/update-oojs.sh b/resources/oojs/update-oojs.sh
index 0bdea23..57c7625 100755 (executable)
--- a/resources/oojs/update-oojs.sh
+++ b/resources/oojs/update-oojs.sh
@@ -37,6 +37,11 @@ fi
 # Undo any changes in the oojs directory
 git reset resources/oojs/
 git checkout resources/oojs/
+
+git fetch origin
+# Create a branch of MW if needed, and reset it to master
+git checkout -B update-oojs origin/master
+
 # Get the old oojs version
 OLDVERSION=$(oojshash)
 if [ "x$OLDVERSION" == "x" ]
@@ -64,7 +69,8 @@ then
        exit 0
 fi
 # Build the distribution
-grunt
+npm install || exit 1
+grunt || exit 1
 # Get the list of changes
 NEWCHANGES=$(git log $OLDVERSION.. --oneline --no-merges --reverse --color=never)
 NEWCHANGESDISPLAY=$(git log $OLDVERSION.. --oneline --no-merges --reverse --color=always)