Merge "Don't print mediawiki.notification messages"
authorjenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Thu, 20 Feb 2014 12:07:31 +0000 (12:07 +0000)
committerGerrit Code Review <gerrit@wikimedia.org>
Thu, 20 Feb 2014 12:07:31 +0000 (12:07 +0000)
1  2 
resources/Resources.php

diff --combined resources/Resources.php
@@@ -339,9 -339,6 +339,9 @@@ return array
                'scripts' => 'resources/jquery/jquery.textSelection.js',
                'dependencies' => 'jquery.client',
        ),
 +      'jquery.throttle-debounce' => array(
 +              'scripts' => 'resources/jquery/jquery.ba-throttle-debounce.js',
 +      ),
        'jquery.validate' => array(
                'scripts' => 'resources/jquery/jquery.validate.js',
        ),
                'group' => 'jquery.ui',
        ),
  
 +      /* Moment.js */
 +
 +      'moment' => array(
 +              'scripts' => 'resources/moment/moment.js',
 +              'languageScripts' => array(
 +                      'ar-ma' => 'resources/moment/lang/ar-ma.js',
 +                      'ar' => 'resources/moment/lang/ar.js',
 +                      'bg' => 'resources/moment/lang/bg.js',
 +                      'br' => 'resources/moment/lang/br.js',
 +                      'bs' => 'resources/moment/lang/bs.js',
 +                      'ca' => 'resources/moment/lang/ca.js',
 +                      'cs' => 'resources/moment/lang/cs.js',
 +                      'cv' => 'resources/moment/lang/cv.js',
 +                      'cy' => 'resources/moment/lang/cy.js',
 +                      'da' => 'resources/moment/lang/da.js',
 +                      'de' => 'resources/moment/lang/de.js',
 +                      'el' => 'resources/moment/lang/el.js',
 +                      'en-au' => 'resources/moment/lang/en-au.js',
 +                      'en-ca' => 'resources/moment/lang/en-ca.js',
 +                      'en-gb' => 'resources/moment/lang/en-gb.js',
 +                      'eo' => 'resources/moment/lang/eo.js',
 +                      'es' => 'resources/moment/lang/es.js',
 +                      'et' => 'resources/moment/lang/et.js',
 +                      'eu' => 'resources/moment/lang/eu.js',
 +                      'fa' => 'resources/moment/lang/fa.js',
 +                      'fi' => 'resources/moment/lang/fi.js',
 +                      'fo' => 'resources/moment/lang/fo.js',
 +                      'fr-ca' => 'resources/moment/lang/fr-ca.js',
 +                      'fr' => 'resources/moment/lang/fr.js',
 +                      'gl' => 'resources/moment/lang/gl.js',
 +                      'he' => 'resources/moment/lang/he.js',
 +                      'hi' => 'resources/moment/lang/hi.js',
 +                      'hr' => 'resources/moment/lang/hr.js',
 +                      'hu' => 'resources/moment/lang/hu.js',
 +                      'hy-am' => 'resources/moment/lang/hy-am.js',
 +                      'id' => 'resources/moment/lang/id.js',
 +                      'is' => 'resources/moment/lang/is.js',
 +                      'it' => 'resources/moment/lang/it.js',
 +                      'ja' => 'resources/moment/lang/ja.js',
 +                      'ka' => 'resources/moment/lang/ka.js',
 +                      'ko' => 'resources/moment/lang/ko.js',
 +                      'lt' => 'resources/moment/lang/lt.js',
 +                      'lv' => 'resources/moment/lang/lv.js',
 +                      'mk' => 'resources/moment/lang/mk.js',
 +                      'ml' => 'resources/moment/lang/ml.js',
 +                      'mr' => 'resources/moment/lang/mr.js',
 +                      'ms-my' => 'resources/moment/lang/ms-my.js',
 +                      'nb' => 'resources/moment/lang/nb.js',
 +                      'ne' => 'resources/moment/lang/ne.js',
 +                      'nl' => 'resources/moment/lang/nl.js',
 +                      'nn' => 'resources/moment/lang/nn.js',
 +                      'pl' => 'resources/moment/lang/pl.js',
 +                      'pt-br' => 'resources/moment/lang/pt-br.js',
 +                      'pt' => 'resources/moment/lang/pt.js',
 +                      'ro' => 'resources/moment/lang/ro.js',
 +                      'rs' => 'resources/moment/lang/rs.js',
 +                      'ru' => 'resources/moment/lang/ru.js',
 +                      'sk' => 'resources/moment/lang/sk.js',
 +                      'sl' => 'resources/moment/lang/sl.js',
 +                      'sq' => 'resources/moment/lang/sq.js',
 +                      'sv' => 'resources/moment/lang/sv.js',
 +                      'ta' => 'resources/moment/lang/ta.js',
 +                      'th' => 'resources/moment/lang/th.js',
 +                      'tl-ph' => 'resources/moment/lang/tl-ph.js',
 +                      'tr' => 'resources/moment/lang/tr.js',
 +                      'tzm-la' => 'resources/moment/lang/tzm-la.js',
 +                      'tzm' => 'resources/moment/lang/tzm.js',
 +                      'uk' => 'resources/moment/lang/uk.js',
 +                      'uz' => 'resources/moment/lang/uz.js',
 +                      'vn' => 'resources/moment/lang/vn.js',
 +                      'zh-cn' => 'resources/moment/lang/zh-cn.js',
 +                      'zh-tw' => 'resources/moment/lang/zh-tw.js',
 +              ),
 +      ),
 +
        /* MediaWiki */
  
        'mediawiki' => array(
                'targets' => array( 'desktop', 'mobile' ),
        ),
        'mediawiki.notification' => array(
-               'styles' => 'resources/mediawiki/mediawiki.notification.css',
+               'styles' => array(
+                       'resources/mediawiki/mediawiki.notification.css',
+                       'resources/mediawiki/mediawiki.notification.hideForPrint.css' => array( 'media' => 'print' ),
+               ),
                'scripts' => 'resources/mediawiki/mediawiki.notification.js',
                'dependencies' => array(
                        'mediawiki.page.startup',
        ),
        'mediawiki.action.edit.editWarning' => array(
                'scripts' => 'resources/mediawiki.action/mediawiki.action.edit.editWarning.js',
 +              'dependencies' => array(
 +                      'mediawiki.jqueryMsg'
 +              ),
                'messages' => array(
                        'editwarning-warning',
 +                      'prefs-editing'
                ),
        ),
        // Alias for backwards compatibility