Skip to content
Permalink
Browse files

Update jshintrc to conform to new style guide. Conform to onevar and …

…unused in tests. Fixes #13755.
  • Loading branch information...
timmywil committed Apr 9, 2013
1 parent 0afc92b commit 0fa52c11cbfe70780648b99717f1dd3502befaff
@@ -1,14 +1,17 @@
{
"boss": true,
"curly": true,
"eqeqeq": true,
"latedef": true,
"eqnull": true,
"expr": true,
"immed": true,
"noarg": true,
"noempty": true,
"onevar": true,
"quotmark": "double",
"smarttabs": true,
"trailing": true,
"undef": true,
"unused": true,
"strict": true,
"trailing": true,

"node": true
}
}
@@ -406,7 +406,7 @@ module.exports = function( grunt ) {

// Process files for distribution
grunt.registerTask( "dist", function() {
var flags, paths, stored;
var stored, flags, paths, fs, nonascii;

// Check for stored destination paths
// ( set in dist/.destination.json )
@@ -421,8 +421,8 @@ module.exports = function( grunt ) {
});

// Ensure the dist files are pure ASCII
var fs = require("fs"),
nonascii = false;
fs = require("fs");
nonascii = false;

distpaths.forEach(function( filename ) {
var i, c, map,
@@ -1,18 +1,18 @@
{
"boss": true,
"curly": true,
"eqeqeq": true,
"eqnull": true,
"expr": true,
"newcap": false,
"immed": true,
"noarg": true,
"quotmark": "double",
"smarttabs": true,
"trailing": true,
"undef": true,
"unused": true,
"latedef": false,
"eqeqeq": true,
"maxerr": 100,

"eqnull": true,
"sub": true,
"boss": true,

"browser": true,
"es5": true,
@@ -333,12 +333,12 @@ function dataAttr( elem, key, data ) {
if ( typeof data === "string" ) {
try {
data = data === "true" ? true :
data === "false" ? false :
data === "null" ? null :
// Only convert to a number if it doesn't change the string
+data + "" === data ? +data :
rbrace.test( data ) ?
JSON.parse( data ) : data;
data === "false" ? false :
data === "null" ? null :
// Only convert to a number if it doesn't change the string
+data + "" === data ? +data :
rbrace.test( data ) ? JSON.parse( data ) :
data;
} catch( e ) {}

// Make sure we set the data so it isn't changed later
@@ -1,14 +1,19 @@
{
"boss": true,
"curly": true,
"eqeqeq": true,
"eqnull": true,
"expr": true,
"immed": true,
"noarg": true,
"onevar": true,
"quotmark": "double",
"smarttabs": true,
"trailing": true,
"undef": true,
"maxerr": 100,
"unused": true,

"eqnull": true,
"evil": true,
"smarttabs": true,
"sub": true,

"browser": true,
@@ -1,3 +1,3 @@
var testBar = "bar";
this.testBar = "bar";
jQuery("#ap").html("bar");
ok( true, "test.js executed");
@@ -3,11 +3,12 @@
var amdDefined, fireNative,
originaljQuery = this.jQuery || "jQuery",
original$ = this.$ || "$",
hasPHP = true,
isLocal = window.location.protocol === "file:",
// see RFC 2606
externalHost = "example.com";

this.hasPHP = true;
this.isLocal = window.location.protocol === "file:";

// For testing .noConflict()
this.jQuery = originaljQuery;
this.$ = original$;
@@ -26,15 +27,15 @@ define.amd = {};
* @example q("main", "foo", "bar")
* @result [<div id="main">, <span id="foo">, <input id="bar">]
*/
function q() {
this.q = function() {
var r = [],
i = 0;

for ( ; i < arguments.length; i++ ) {
r.push( document.getElementById( arguments[i] ) );
}
return r;
}
};

/**
* Asserts that a select matches the given IDs
@@ -44,7 +45,7 @@ function q() {
* @example t("Check for something", "//[a]", ["foo", "baar"]);
* @result returns true if "//[a]" return two elements with the IDs 'foo' and 'baar'
*/
function t( a, b, c ) {
this.t = function( a, b, c ) {
var f = jQuery(b).get(),
s = "",
i = 0;
@@ -54,9 +55,9 @@ function t( a, b, c ) {
}

deepEqual(f, q.apply( q, c ), a + " (" + b + ")");
}
};

function createDashboardXML() {
this.createDashboardXML = function() {
var string = '<?xml version="1.0" encoding="UTF-8"?> \
<dashboard> \
<locations class="foo"> \
@@ -70,9 +71,9 @@ function createDashboardXML() {
</dashboard>';

return jQuery.parseXML(string);
}
};

function createWithFriesXML() {
this.createWithFriesXML = function() {
var string = '<?xml version="1.0" encoding="UTF-8"?> \
<soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" \
xmlns:xsd="http://www.w3.org/2001/XMLSchema" \
@@ -100,9 +101,9 @@ function createWithFriesXML() {
</soap:Envelope>';

return jQuery.parseXML( string.replace( /\{\{\s*externalHost\s*\}\}/g, externalHost ) );
}
};

function createXMLFragment() {
this.createXMLFragment = function() {
var xml, frag;
if ( window.ActiveXObject ) {
xml = new ActiveXObject("msxml2.domdocument");
@@ -115,7 +116,7 @@ function createXMLFragment() {
}

return frag;
}
};

fireNative = document.createEvent ?
function( node, type ) {
@@ -142,7 +143,7 @@ function url( value ) {
}

// Ajax testing helper
function ajaxTest( title, expect, options ) {
this.ajaxTest = function( title, expect, options ) {
var requestOptions;
if ( jQuery.isFunction( options ) ) {
options = options();
@@ -205,63 +206,59 @@ function ajaxTest( title, expect, options ) {
}
};
});
}
};

(function () {

this.testIframe = function( fileName, name, fn ) {

test(name, function() {
// pause execution for now
stop();

// load fixture in iframe
var iframe = loadFixture(),
win = iframe.contentWindow,
interval = setInterval( function() {
if ( win && win.jQuery && win.jQuery.isReady ) {
clearInterval( interval );
// continue
start();
// call actual tests passing the correct jQuery instance to use
fn.call( this, win.jQuery, win, win.document );
document.body.removeChild( iframe );
iframe = null;
}
}, 15 );
});

function loadFixture() {
var src = url("./data/" + fileName + ".html"),
iframe = jQuery("<iframe />").appendTo("body")[0];
iframe.style.cssText = "width: 500px; height: 500px; position: absolute; top: -600px; left: -600px; visibility: hidden;";
iframe.contentWindow.location = src;
return iframe;
}
};

this.testIframeWithCallback = function( title, fileName, func ) {
this.testIframe = function( fileName, name, fn ) {

test( title, function() {
var iframe;
test(name, function() {
// pause execution for now
stop();

stop();
window.iframeCallback = function() {
var self = this,
args = arguments;
setTimeout(function() {
window.iframeCallback = undefined;
iframe.remove();
func.apply( self, args );
func = function() {};
// load fixture in iframe
var iframe = loadFixture(),
win = iframe.contentWindow,
interval = setInterval( function() {
if ( win && win.jQuery && win.jQuery.isReady ) {
clearInterval( interval );
// continue
start();
}, 0 );
};
iframe = jQuery( "<div/>" ).append(
jQuery( "<iframe/>" ).attr( "src", url( "./data/" + fileName ) )
).appendTo( "body" );
});
};
// call actual tests passing the correct jQuery instance to use
fn.call( this, win.jQuery, win, win.document );
document.body.removeChild( iframe );
iframe = null;
}
}, 15 );
});

window.iframeCallback = undefined;
}());
function loadFixture() {
var src = url("./data/" + fileName + ".html"),
iframe = jQuery("<iframe />").appendTo("body")[0];
iframe.style.cssText = "width: 500px; height: 500px; position: absolute; top: -600px; left: -600px; visibility: hidden;";
iframe.contentWindow.location = src;
return iframe;
}
};

this.testIframeWithCallback = function( title, fileName, func ) {

test( title, function() {
var iframe;

stop();
window.iframeCallback = function() {
var self = this,
args = arguments;
setTimeout(function() {
window.iframeCallback = undefined;
iframe.remove();
func.apply( self, args );
func = function() {};
start();
}, 0 );
};
iframe = jQuery( "<div/>" ).append(
jQuery( "<iframe/>" ).attr( "src", url( "./data/" + fileName ) )
).appendTo( "body" );
});
};
@@ -10,13 +10,13 @@ jQuery.each( [ jQuery.expando, "getInterface", "Packages", "java", "netscape" ],

// Expose Sizzle for Sizzle's selector tests
// We remove Sizzle's globalization in jQuery
var Sizzle = Sizzle || jQuery.find;
var Sizzle = Sizzle || jQuery.find,

// Allow subprojects to test against their own fixtures
var qunitModule = QUnit.module,
qunitModule = QUnit.module,
qunitTest = QUnit.test;

function testSubproject( label, url, risTests ) {
this.testSubproject = function( label, url, risTests ) {
var sub, fixture, fixtureHTML,
fixtureReplaced = false;

@@ -132,11 +132,11 @@ function testSubproject( label, url, risTests ) {
fn.apply( this, arguments );
};
}
}
};

// Register globals for cleanup and the cleanup code itself
// Explanation at http://perfectionkills.com/understanding-delete/#ie_bugs
var Globals = (function() {
this.Globals = (function() {
var globals = {};
return {
register: function( name ) {
Oops, something went wrong.

0 comments on commit 0fa52c1

Please sign in to comment.
You can’t perform that action at this time.