Skip to content

Commit

Permalink
remove option.windows
Browse files Browse the repository at this point in the history
  • Loading branch information
Douglas Crockford committed May 18, 2013
1 parent a8ae1b0 commit 1d8c1f8
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 28 deletions.
5 changes: 2 additions & 3 deletions jslint.html
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,8 @@
<div title=browser><button></button><var></var> a browser</div>
<div title=couch><button></button><var></var> CouchDB</div>
<div title=devel><button></button><var></var> console,alert,&nbsp;...</div>
<div title=node><button></button><var></var> <a href="http://nodejs.org/">Node.js</a></div>
<div title=rhino><button></button><var></var> <a href="http://www.mozilla.org/rhino/">Rhino</a></div>
<div title=windows><button></button><var></var> Windows</div>
<div title=node><button></button><var></var> Node.js</div>
<div title=rhino><button></button><var></var> Rhino</div>
<br>
<div title=passfail><button></button><var></var> Stop on first error</div>
</div>
Expand Down
16 changes: 2 additions & 14 deletions jslint.js
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,6 @@
// todo true, if TODO comments are tolerated
// vars true, if multiple var statements per function should be allowed
// white true, if sloppy whitespace is tolerated
// windows true, if MS Windows-specific globals should be predefined

// The properties directive declares an exclusive list of property names.
// Any properties named in the program that are not in the list will
Expand Down Expand Up @@ -258,8 +257,7 @@
use_or, use_param, use_spaces, used, used_before_a, var, var_a_not,
var_loop, vars, varstatement, warn, warning, was, weird_assignment,
weird_condition, weird_new, weird_program, weird_relation, weird_ternary,
white, windows, wrap, wrap_immediate, wrap_regexp, write_is_wrong,
writeable
white, wrap, wrap_immediate, wrap_regexp, write_is_wrong, writeable
*/

// The global directive is used to declare global variables that can
Expand Down Expand Up @@ -316,8 +314,7 @@ var JSLINT = (function () {
sub : true,
todo : true,
vars : true,
white : true,
windows : true
white : true
},
anonname, // The guessed name for anonymous functions.

Expand Down Expand Up @@ -597,11 +594,6 @@ var JSLINT = (function () {
var_mode,
warnings,

windows = array_to_object([
'ActiveXObject', 'CScript', 'Debug', 'Enumerator', 'System',
'VBArray', 'WScript', 'WSH'
], false),

// Regular expressions. Some of these are stupidly long.

// carriage return, carriage return linefeed, or linefeed
Expand Down Expand Up @@ -700,10 +692,6 @@ var JSLINT = (function () {
add_to_predefined(rhino);
option.rhino = false;
}
if (option.windows) {
add_to_predefined(windows);
option.windows = false;
}
}


Expand Down
12 changes: 1 addition & 11 deletions lint.html
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ <h1 id=global>Global Variables</h1>
</blockquote>
<blockquote><code>/*global Buffer: false, clearInterval: false, clearTimeout: false, console: false, exports: false, global: false, module: false, process: false, querystring: false, require: false, setInterval: false, setTimeout: false, __filename: false, __dirname: false */</code>
</blockquote>
<p id=windows>Select the <i>Assume Couch</i> (<code>couch</code>)
<p id=couch>Select the <i>Assume Couch</i> (<code>couch</code>)
<a href="#options">option</a> to predefine the global properties provided by Couch DB. It has the same effect as this directive:</p>
<blockquote>
<code>/*jslint es5: true */</code>
Expand All @@ -209,11 +209,6 @@ <h1 id=global>Global Variables</h1>
<blockquote>
<code>/*global defineClass: false, deserialize: false, gc: false, help: false, load: false, loadClass: false, print: false, quit: false, readFile: false, readUrl: false, runCommand: false, seal: false, serialize: false, spawn: false, sync: false, toint32: false, version: false */ </code>
</blockquote>
<p id=windows>Select the <i>Assume Windows</i> (<code>windows</code>)
<a href="#options">option</a> to predefine the global properties provided by Microsoft Windows. It has the same effect as this directive:</p>
<blockquote>
<code>/*global ActiveXObject: false, CScript: false, Debug: false, Enumerator: false, System: false, VBArray: false, WScript: false, WSH: false */</code>
</blockquote>
<h1 id=semicolon>Semicolon</h1>
<p>JavaScript uses a C-like syntax which requires the use of semicolons to delimit certain
statements. JavaScript attempts to make those semicolons optional with a semicolon
Expand Down Expand Up @@ -673,11 +668,6 @@ <h1 id=options>Options</h1>
<td><code>white</code></td>
<td><code>true</code> if strict whitespace rules should be ignored.</td>
</tr>
<tr>
<td>Assume Windows</td>
<td><code>windows</code></td>
<td><code>true</code> if the Windows globals should be predefined. <a href="#windows"><small>(more)</small></a></td>
</tr>
</tbody>
</table>
<h1 id=report>Report</h1>
Expand Down

0 comments on commit 1d8c1f8

Please sign in to comment.