Merge "Replace deprecated jQuery event aliases"

diff --git a/resources/src/jquery/jquery.arrowSteps.js b/resources/src/jquery/jquery.arrowSteps.js
index 629ce32..b0c36c6 100644 (file)
--- a/resources/src/jquery/jquery.arrowSteps.js
+++ b/resources/src/jquery/jquery.arrowSteps.js
@@ -51,7 +51,7 @@
                $stepDiv = $steps.filter( ':not(:last-child)' ).addClass( 'arrow' ).find( 'div' );
 
                // Execute when complete page is fully loaded, including all frames, objects and images
-               $( window ).load( function () {
+               $( window ).on( 'load', function () {
                        arrowWidth = parseInt( $el.outerHeight(), 10 );
                        $stepDiv.css( paddingSide, arrowWidth.toString() + 'px' );
                } );

diff --git a/resources/src/mediawiki/api/upload.js b/resources/src/mediawiki/api/upload.js
index 614c001..3036237 100644 (file)
--- a/resources/src/mediawiki/api/upload.js
+++ b/resources/src/mediawiki/api/upload.js
@@ -218,7 +218,7 @@
                                } );
                        } );
 
-                       $iframe.error( function ( error ) {
+                       $iframe.on( 'error', function ( error ) {
                                deferred.reject( 'http', error );
                        } );