Merge "es5-shim: Add polyfill for Object.create"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 28 Aug 2014 16:58:56 +0000 (16:58 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 28 Aug 2014 16:58:56 +0000 (16:58 +0000)
1  2 
resources/Resources.php

diff --combined resources/Resources.php
@@@ -117,12 -117,6 +117,12 @@@ return array
                'targets' => array( 'desktop', 'mobile' ),
        ),
  
 +      'mediawiki.skinning.content.externallinks' => array(
 +              'styles' => array(
 +                      'resources/src/mediawiki.skinning/content.externallinks.css' => array( 'media' => 'screen' ),
 +              ),
 +      ),
 +
        /* jQuery */
  
        'jquery' => array(
        'es5-shim' => array(
                'scripts' => array(
                        'resources/lib/es5-shim/es5-shim.js',
+                       'resources/src/polyfill-object-create.js',
                ),
                'targets' => array( 'desktop', 'mobile' ),
                'skipFunction' => 'resources/src/es5-skip.js',