Merge "jshint: Enable 'es3' option"

diff --git a/.jshintrc b/.jshintrc
index 9d6c4d2..4eec7a0 100644 (file)
--- a/.jshintrc
+++ b/.jshintrc
@@ -3,6 +3,7 @@
 
        // Enforcing
        "eqeqeq": true,
+       "es3": true,
        "latedef": true,
        "noarg": true,
        "nonew": true,

diff --git a/resources/src/mediawiki/mediawiki.debug.profile.js b/resources/src/mediawiki/mediawiki.debug.profile.js
index f6bc81d..9b0711a 100644 (file)
--- a/resources/src/mediawiki/mediawiki.debug.profile.js
+++ b/resources/src/mediawiki/mediawiki.debug.profile.js
@@ -194,7 +194,7 @@
                                        [ tail, 8 ],
                                        [ tail, 19 ],
                                        [ tail - 8, 8 ],
-                                       [ tail, 8 ],
+                                       [ tail, 8 ]
                                ] ) );
                                g.appendChild( node );
 
@@ -277,7 +277,7 @@
                                trigger: 'manual',
                                title: function () {
                                        return profile.buildFlyout( $( this ).data( 'period' ) ).html();
-                               },
+                               }
                        } ).on( 'mouseenter', function () {
                                hide();
                                addClass( this, 'tipsy-visible' );
@@ -305,7 +305,7 @@
                 */
                xCoord: function ( msTimestamp ) {
                        return ( msTimestamp - profile.data.timespan.start ) * profile.ratio;
-               },
+               }
        };
 
        function ProfileData( data, width, mergeThresholdPx, dropThresholdPx ) {
@@ -382,7 +382,7 @@
                return Object.keys( groups ).map( function ( group ) {
                        return {
                                name: group,
-                               events: groups[group],
+                               events: groups[group]
                        };
                } );
        };
@@ -401,7 +401,7 @@
                                return [{
                                        start: period.start,
                                        end: period.end,
-                                       contained: [period],
+                                       contained: [period]
                                }];
                        }
                        var last = result[result.length - 1];
@@ -417,7 +417,7 @@
                                result.push({
                                        start: period.start,
                                        end: period.end,
-                                       contained: [period],
+                                       contained: [period]
                                });
                        }
                        return result;

diff --git a/resources/src/mediawiki/mediawiki.jqueryMsg.js b/resources/src/mediawiki/mediawiki.jqueryMsg.js
index 0a0b4f6..8ea71d9 100644 (file)
--- a/resources/src/mediawiki/mediawiki.jqueryMsg.js
+++ b/resources/src/mediawiki/mediawiki.jqueryMsg.js
@@ -1179,7 +1179,7 @@
                 * @param {Array} nodes List of nodes
                 * @return {string} Other message
                 */
-               int: function ( nodes ) {
+               'int': function ( nodes ) {
                        return mw.jqueryMsg.getMessageFunction()( nodes[0].toLowerCase() );
                },
 

diff --git a/skins/common/IEFixes.js b/skins/common/IEFixes.js
index 03f133e..3174af1 100644 (file)
--- a/skins/common/IEFixes.js
+++ b/skins/common/IEFixes.js
@@ -91,7 +91,7 @@ relativeforfloats = window.relativeforfloats = function () {
 setrelative = window.setrelative = function ( nodes ) {
        var i = 0;
        while ( i < nodes.length ) {
-               if ( ( ( nodes[i].style.float && nodes[i].style.float !== ( 'none' ) ||
+               if ( ( ( nodes[i].style['float'] && nodes[i].style['float'] !== ( 'none' ) ||
                        ( nodes[i].align && nodes[i].align !== ( 'none' ) ) ) &&
                        ( !nodes[i].style.position || nodes[i].style.position !== 'relative' ) ) )
                {

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
index f49be49..f5fd16d 100644 (file)
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Title.test.js
@@ -1,3 +1,4 @@
+/*jshint -W024 */
 ( function ( mw, $ ) {
        // mw.Title relies on these three config vars
        // Restore them after each test run

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
index b6a8a46..7a58d38 100644 (file)
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.Uri.test.js
@@ -1,3 +1,4 @@
+/*jshint -W024 */
 ( function ( mw, $ ) {
        QUnit.module( 'mediawiki.Uri', QUnit.newMwEnvironment( {
                setup: function () {

diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
index e1fcb6a..f20ce67 100644 (file)
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.test.js
@@ -1,3 +1,4 @@
+/*jshint -W024 */
 ( function ( mw, $ ) {
        var specialCharactersPageName;
 

diff --git a/tests/qunit/suites/resources/startup.test.js b/tests/qunit/suites/resources/startup.test.js
index 8fd789a..4e26bdc 100644 (file)
--- a/tests/qunit/suites/resources/startup.test.js
+++ b/tests/qunit/suites/resources/startup.test.js
@@ -73,7 +73,7 @@
                        'Mozilla/5.0 (Series40; NokiaX3-02/05.60; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/3.2.0.0.6',
                        'Mozilla/5.0 (Series40; Nokia305/05.92; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/3.7.0.0.11',
                        // Google Glass
-                       'Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Glass 1 Build/IMM76L; XE11) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30',
+                       'Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Glass 1 Build/IMM76L; XE11) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30'
                ],
                // No explicit support for or against these browsers, they're
                // given a shot at Grade A at their own risk.