Effects: Lint fixes.

This commit is contained in:
Scott González 2012-05-17 19:46:43 -04:00
parent 155e3334b0
commit f67b69a288
2 changed files with 7 additions and 7 deletions

View File

@ -289,7 +289,7 @@ grunt.initConfig({
lint: { lint: {
ui: grunt.file.expandFiles( "ui/*.js" ).filter(function( file ) { ui: grunt.file.expandFiles( "ui/*.js" ).filter(function( file ) {
// TODO remove items from this list once rewritten // TODO remove items from this list once rewritten
return !( /(effects.core|mouse|datepicker|draggable|droppable|resizable|selectable|sortable)\.js$/ ).test( file ); return !( /(mouse|datepicker|draggable|droppable|resizable|selectable|sortable)\.js$/ ).test( file );
}), }),
grunt: "grunt.js", grunt: "grunt.js",
tests: "tests/unit/**/*.js" tests: "tests/unit/**/*.js"

View File

@ -54,27 +54,27 @@ function getRGB(color) {
} }
// Look for rgb(num,num,num) // Look for rgb(num,num,num)
if (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color)) { if ( (result = /rgb\(\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*,\s*([0-9]{1,3})\s*\)/.exec(color)) ) {
return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)]; return [parseInt(result[1],10), parseInt(result[2],10), parseInt(result[3],10)];
} }
// Look for rgb(num%,num%,num%) // Look for rgb(num%,num%,num%)
if (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color)) { if ( (result = /rgb\(\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*,\s*([0-9]+(?:\.[0-9]+)?)\%\s*\)/.exec(color)) ) {
return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55]; return [parseFloat(result[1])*2.55, parseFloat(result[2])*2.55, parseFloat(result[3])*2.55];
} }
// Look for #a0b1c2 // Look for #a0b1c2
if (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)) { if ( (result = /#([a-fA-F0-9]{2})([a-fA-F0-9]{2})([a-fA-F0-9]{2})/.exec(color)) ) {
return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)]; return [parseInt(result[1],16), parseInt(result[2],16), parseInt(result[3],16)];
} }
// Look for #fff // Look for #fff
if (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)) { if ( (result = /#([a-fA-F0-9])([a-fA-F0-9])([a-fA-F0-9])/.exec(color)) ) {
return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)]; return [parseInt(result[1]+result[1],16), parseInt(result[2]+result[2],16), parseInt(result[3]+result[3],16)];
} }
// Look for rgba(0, 0, 0, 0) == transparent in Safari 3 // Look for rgba(0, 0, 0, 0) == transparent in Safari 3
if (result = /rgba\(0, 0, 0, 0\)/.exec(color)) { if ( (result = /rgba\(0, 0, 0, 0\)/.exec(color)) ) {
return colors.transparent; return colors.transparent;
} }
@ -94,7 +94,7 @@ function getColor(elem, attr) {
} }
attr = "backgroundColor"; attr = "backgroundColor";
} while ( elem = elem.parentNode ); } while ( (elem = elem.parentNode) );
return getRGB(color); return getRGB(color);
} }