Permalink
Browse files

update plugins.js to be jshint compliant. fixes #952

  • Loading branch information...
1 parent d7e6682 commit ce0c28932b44af38755d5e98f35b7888dfc498ef @paulirish paulirish committed Feb 1, 2012
Showing with 6 additions and 13 deletions.
  1. +3 −1 build/build.xml
  2. +3 −12 js/plugins.js
View
@@ -182,6 +182,7 @@
<fileset dir="./${dir.source}/">
<include name="**/${dir.js}/*.js"/>
<exclude name="**/*.min.js"/>
+ <exclude name="${dir.intermediate}/**/*.js"/>
<exclude name="**/${dir.js.libs}/"/>
<exclude name="**/${dir.publish}/"/>
</fileset>
@@ -199,8 +200,9 @@
<target name="jshint">
<apply dir="${dir.source}/${dir.js}" executable="java" parallel="false" failonerror="true">
<fileset dir="./${dir.source}/">
- <include name="**/${dir.js}/*.js"/>
+ <include name="**/${dir.js}/*.js"/>
<exclude name="**/*.min.js"/>
+ <exclude name="${dir.intermediate}/**/*.js"/>
<exclude name="**/${dir.js.libs}/"/>
<exclude name="**/${dir.publish}/"/>
</fileset>
View
@@ -1,19 +1,10 @@
-
// usage: log('inside coolFunc', this, arguments);
// paulirish.com/2009/log-a-lightweight-wrapper-for-consolelog/
-window.log = function(){
- log.history = log.history || []; // store logs to an array for reference
- log.history.push(arguments);
- if(this.console) {
- arguments.callee = arguments.callee.caller;
- var newarr = [].slice.call(arguments);
- (typeof console.log === 'object' ? log.apply.call(console.log, console, newarr) : console.log.apply(console, newarr));
- }
-};
+window.log = function f(){ log.history = log.history || []; log.history.push(arguments); if(this.console) { var args = arguments, newarr; args.callee = args.callee.caller; newarr = [].slice.call(args); if (typeof console.log === 'object') log.apply.call(console.log, console, newarr); else console.log.apply(console, newarr);}};
// make it safe to use console.log always
-(function(b){function c(){}for(var d="assert,clear,count,debug,dir,dirxml,error,exception,firebug,group,groupCollapsed,groupEnd,info,log,memoryProfile,memoryProfileEnd,profile,profileEnd,table,time,timeEnd,timeStamp,trace,warn".split(","),a;a=d.pop();){b[a]=b[a]||c}})((function(){try
-{console.log();return window.console;}catch(err){return window.console={};}})());
+(function(a){function b(){}for(var c="assert,count,debug,dir,dirxml,error,exception,group,groupCollapsed,groupEnd,info,log,markTimeline,profile,profileEnd,time,timeEnd,trace,warn".split(","),d;!!(d=c.pop());){a[d]=a[d]||b;}})
+(function(){try{console.log();return window.console;}catch(a){return (window.console={});}}());
// place any jQuery/helper plugins in here, instead of separate, slower script files.

0 comments on commit ce0c289

Please sign in to comment.