resourceloader: remove internal use of using() in mediawiki.js
authorAaron Schulz <aschulz@wikimedia.org>
Wed, 20 Jun 2018 14:48:32 +0000 (15:48 +0100)
committerKrinkle <krinklemail@gmail.com>
Sat, 23 Jun 2018 23:05:34 +0000 (23:05 +0000)
Bug: T192623
Change-Id: Id10ddf9f98661a8e328f40717b12cc08cbc04064

resources/src/mediawiki/mediawiki.js

index 406f030..adce33f 100644 (file)
                                script.parentNode.removeChild( script );
                        }
 
+                       /**
+                        * Add one or more modules to the module load queue.
+                        *
+                        * See also #work().
+                        *
+                        * @private
+                        * @param {string|string[]} dependencies Module name or array of string module names
+                        * @param {Function} [ready] Callback to execute when all dependencies are ready
+                        * @param {Function} [error] Callback to execute when any dependency fails
+                        */
+                       function enqueue( dependencies, ready, error ) {
+                               // Allow calling by single module name
+                               if ( typeof dependencies === 'string' ) {
+                                       dependencies = [ dependencies ];
+                               }
+
+                               if ( allReady( dependencies ) ) {
+                                       // Run ready immediately
+                                       if ( ready !== undefined ) {
+                                               ready();
+                                       }
+
+                                       return;
+                               }
+
+                               if ( anyFailed( dependencies ) ) {
+                                       if ( error !== undefined ) {
+                                               // Execute error immediately if any dependencies have errors
+                                               error(
+                                                       new Error( 'One or more dependencies failed to load' ),
+                                                       dependencies
+                                               );
+                                       }
+
+                                       return;
+                               }
+
+                               // Not all dependencies are ready, add to the load queue...
+
+                               // Add ready and error callbacks if they were given
+                               if ( ready !== undefined || error !== undefined ) {
+                                       jobs.push( {
+                                               // Narrow down the list to modules that are worth waiting for
+                                               dependencies: dependencies.filter( function ( module ) {
+                                                       var state = mw.loader.getState( module );
+                                                       return state === 'registered' || state === 'loaded' || state === 'loading' || state === 'executing';
+                                               } ),
+                                               ready: ready,
+                                               error: error
+                                       } );
+                               }
+
+                               dependencies.forEach( function ( module ) {
+                                       var state = mw.loader.getState( module );
+                                       // Only queue modules that are still in the initial 'registered' state
+                                       // (not ones already loading, ready or error).
+                                       if ( state === 'registered' && queue.indexOf( module ) === -1 ) {
+                                               // Private modules must be embedded in the page. Don't bother queuing
+                                               // these as the server will deny them anyway (T101806).
+                                               if ( registry[ module ].group === 'private' ) {
+                                                       registry[ module ].state = 'error';
+                                                       handlePending( module );
+                                                       return;
+                                               }
+                                               queue.push( module );
+                                       }
+                               } );
+
+                               mw.loader.work();
+                       }
+
                        /**
                         * Executes a loaded module, making it ready to use
                         *
                                ( function () {
                                        var pending = 0;
                                        checkCssHandles = function () {
+                                               var ex, dependencies;
                                                // cssHandlesRegistered ensures we don't take off too soon, e.g. when
                                                // one of the cssHandles is fired while we're still creating more handles.
                                                if ( cssHandlesRegistered && pending === 0 && runScript ) {
                                                        if ( module === 'user' ) {
                                                                // Implicit dependency on the site module. Not real dependency because
                                                                // it should run after 'site' regardless of whether it succeeds or fails.
-                                                               mw.loader.using( [ 'site' ] ).always( runScript );
+                                                               // Note: This is a simplified version of mw.loader.using(), inlined here
+                                                               // as using() depends on jQuery (T192623).
+                                                               try {
+                                                                       dependencies = resolve( [ 'site' ] );
+                                                               } catch ( e ) {
+                                                                       ex = e;
+                                                                       runScript();
+                                                               }
+                                                               if ( ex === undefined ) {
+                                                                       enqueue( dependencies, runScript, runScript );
+                                                               }
                                                        } else {
                                                                runScript();
                                                        }
                                checkCssHandles();
                        }
 
-                       /**
-                        * Add one or more modules to the module load queue.
-                        *
-                        * See also #work().
-                        *
-                        * @private
-                        * @param {string|string[]} dependencies Module name or array of string module names
-                        * @param {Function} [ready] Callback to execute when all dependencies are ready
-                        * @param {Function} [error] Callback to execute when any dependency fails
-                        */
-                       function enqueue( dependencies, ready, error ) {
-                               // Allow calling by single module name
-                               if ( typeof dependencies === 'string' ) {
-                                       dependencies = [ dependencies ];
-                               }
-
-                               // Add ready and error callbacks if they were given
-                               if ( ready !== undefined || error !== undefined ) {
-                                       jobs.push( {
-                                               // Narrow down the list to modules that are worth waiting for
-                                               dependencies: dependencies.filter( function ( module ) {
-                                                       var state = mw.loader.getState( module );
-                                                       return state === 'registered' || state === 'loaded' || state === 'loading' || state === 'executing';
-                                               } ),
-                                               ready: ready,
-                                               error: error
-                                       } );
-                               }
-
-                               dependencies.forEach( function ( module ) {
-                                       var state = mw.loader.getState( module );
-                                       // Only queue modules that are still in the initial 'registered' state
-                                       // (not ones already loading, ready or error).
-                                       if ( state === 'registered' && queue.indexOf( module ) === -1 ) {
-                                               // Private modules must be embedded in the page. Don't bother queuing
-                                               // these as the server will deny them anyway (T101806).
-                                               if ( registry[ module ].group === 'private' ) {
-                                                       registry[ module ].state = 'error';
-                                                       handlePending( module );
-                                                       return;
-                                               }
-                                               queue.push( module );
-                                       }
-                               } );
-
-                               mw.loader.work();
-                       }
-
                        function sortQuery( o ) {
                                var key,
                                        sorted = {},
                                        } catch ( e ) {
                                                return deferred.reject( e ).promise();
                                        }
-                                       if ( allReady( dependencies ) ) {
-                                               // Run ready immediately
+
+                                       enqueue( dependencies, function () {
                                                deferred.resolve( mw.loader.require );
-                                       } else if ( anyFailed( dependencies ) ) {
-                                               // Execute error immediately if any dependencies have errors
-                                               deferred.reject(
-                                                       new Error( 'One or more dependencies failed to load' ),
-                                                       dependencies
-                                               );
-                                       } else {
-                                               // Not all dependencies are ready, add to the load queue
-                                               enqueue( dependencies, function () {
-                                                       deferred.resolve( mw.loader.require );
-                                               }, deferred.reject );
-                                       }
+                                       }, deferred.reject );
 
                                        return deferred.promise();
                                },
                                        // Resolve remaining list using the known dependency tree.
                                        // This also filters out modules with unknown dependencies. (T36853)
                                        filtered = resolveStubbornly( filtered );
-                                       // If all modules are ready, or if any modules have errors, nothing to be done.
-                                       if ( allReady( filtered ) || anyFailed( filtered ) ) {
-                                               return;
-                                       }
-                                       if ( filtered.length === 0 ) {
-                                               return;
-                                       }
                                        // Some modules are not yet ready, add to module load queue.
                                        enqueue( filtered, undefined, undefined );
                                },