Merge "Revert "Adding a bit more documentation to mw.loader.using""

diff --combined resources/src/mediawiki/mediawiki.js
index a0098d0,12888bd..380e4e6
--- 1/resources/src/mediawiki/mediawiki.js
--- 2/resources/src/mediawiki/mediawiki.js
+++ b/resources/src/mediawiki/mediawiki.js
@@@ -607,16 -607,11 +607,16 @@@
                         * Format:
                         *     {
                         *         'moduleName': {
 +                       *             // At registry
                         *             'version': ############## (unix timestamp),
                         *             'dependencies': ['required.foo', 'bar.also', ...], (or) function () {}
                         *             'group': 'somegroup', (or) null,
                         *             'source': 'local', 'someforeignwiki', (or) null
                         *             'state': 'registered', 'loaded', 'loading', 'ready', 'error' or 'missing'
 +                       *             'skip': 'return !!window.Example', (or) null
 +                       *
 +                       *             // Added during implementation
 +                       *             'skipped': true,
                         *             'script': ...,
                         *             'style': ...,
                         *             'messages': { 'key': 'value' },
@@@ -653,14 -648,18 +653,14 @@@
                        /* Private methods */
  
                        function getMarker() {
 -                              // Cached ?
 -                              if ( $marker ) {
 -                                      return $marker;
 -                              }
 -
 -                              $marker = $( 'meta[name="ResourceLoaderDynamicStyles"]' );
 -                              if ( $marker.length ) {
 -                                      return $marker;
 +                              // Cached
 +                              if ( !$marker ) {
 +                                      $marker = $( 'meta[name="ResourceLoaderDynamicStyles"]' );
 +                                      if ( !$marker.length ) {
 +                                              mw.log( 'No <meta name="ResourceLoaderDynamicStyles"> found, inserting dynamically' );
 +                                              $marker = $( '<meta>' ).attr( 'name', 'ResourceLoaderDynamicStyles' ).appendTo( 'head' );
 +                                      }
                                }
 -                              mw.log( 'getMarker> No <meta name="ResourceLoaderDynamicStyles"> found, inserting dynamically.' );
 -                              $marker = $( '<meta>' ).attr( 'name', 'ResourceLoaderDynamicStyles' ).appendTo( 'head' );
 -
                                return $marker;
                        }
  
@@@ -844,7 -843,6 +844,7 @@@
                                        skip = new Function( registry[module].skip );
                                        registry[module].skip = null;
                                        if ( skip() ) {
 +                                              registry[module].skipped = true;
                                                registry[module].dependencies = [];
                                                registry[module].state = 'ready';
                                                handlePending( module );
@@@ -1071,7 -1069,11 +1071,7 @@@
                                                crossDomain: true,
                                                cache: true,
                                                async: true
 -                                      } ).always( function () {
 -                                              if ( callback  ) {
 -                                                      callback();
 -                                              }
 -                                      } );
 +                                      } ).always( callback );
                                } else {
                                        /*jshint evil:true */
                                        document.write( mw.html.element( 'script', { 'src': src }, '' ) );
@@@ -1696,9 -1698,6 +1696,6 @@@
                                /**
                                 * Execute a function as soon as one or more required modules are ready.
                                 *
-                                * If the required modules are already loaded, the function will be
-                                * executed immediately and the modules will not be reloaded.
-                                *
                                 * Example of inline dependency on OOjs:
                                 *
                                 *     mw.loader.using( 'oojs', function () {