Merge "resourceloader: Add minified version of mw.loader.implement() wrapper"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Wed, 31 Jan 2018 13:40:37 +0000 (13:40 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Wed, 31 Jan 2018 13:40:37 +0000 (13:40 +0000)
1  2 
includes/resourceloader/ResourceLoader.php

@@@ -553,7 -553,7 +553,7 @@@ class ResourceLoader implements LoggerA
                                $object->setLogger( $this->logger );
                        } else {
                                if ( !isset( $info['class'] ) ) {
 -                                      $class = 'ResourceLoaderFileModule';
 +                                      $class = ResourceLoaderFileModule::class;
                                } else {
                                        $class = $info['class'];
                                }
                }
                if (
                        isset( $info['class'] ) &&
 -                      $info['class'] !== 'ResourceLoaderFileModule' &&
 -                      !is_subclass_of( $info['class'], 'ResourceLoaderFileModule' )
 +                      $info['class'] !== ResourceLoaderFileModule::class &&
 +                      !is_subclass_of( $info['class'], ResourceLoaderFileModule::class )
                ) {
                        return false;
                }
@@@ -1227,7 -1227,11 +1227,11 @@@ MESSAGE
                $name, $scripts, $styles, $messages, $templates
        ) {
                if ( $scripts instanceof XmlJsCode ) {
-                       $scripts = new XmlJsCode( "function ( $, jQuery, require, module ) {\n{$scripts->value}\n}" );
+                       if ( self::inDebugMode() ) {
+                               $scripts = new XmlJsCode( "function ( $, jQuery, require, module ) {\n{$scripts->value}\n}" );
+                       } else {
+                               $scripts = new XmlJsCode( 'function($,jQuery,require,module){'. $scripts->value . '}' );
+                       }
                } elseif ( !is_string( $scripts ) && !is_array( $scripts ) ) {
                        throw new MWException( 'Invalid scripts error. Array of URLs or string of code expected.' );
                }