Index: /CKEditor/branches/prototype/_dev/jslint/lint.bat =================================================================== --- /CKEditor/branches/prototype/_dev/jslint/lint.bat (revision 2128) +++ /CKEditor/branches/prototype/_dev/jslint/lint.bat (revision 2128) @@ -0,0 +1,45 @@ +@ECHO OFF + +:: +:: CKEditor - The text editor for Internet - http://ckeditor.com +:: Copyright (C) 2003-2008 Frederico Caldeira Knabben +:: +:: == BEGIN LICENSE == +:: +:: Licensed under the terms of any of the following licenses at your +:: choice: +:: +:: - GNU General Public License Version 2 or later (the "GPL") +:: http://www.gnu.org/licenses/gpl.html +:: +:: - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +:: http://www.gnu.org/licenses/lgpl.html +:: +:: - Mozilla Public License Version 1.1 or later (the "MPL") +:: http://www.mozilla.org/MPL/MPL-1.1.html +:: +:: == END LICENSE == +:: +:: Calls the JavaScript Lint (jsl) with the predefined configurations. +:: If a file name is passed as a parameter it writes there the results, +:: otherwise it simply outputs it. +:: + +IF "%1"=="" GOTO NoParam + +ECHO Generating %1... +bin\jsl -conf lint.conf -nofilelisting -nologo > %1 + +ECHO. +ECHO Process completed. +ECHO. + +GOTO End + +:NoParam + +"../_thirdparty/jsl/jsl.exe" -conf lint.conf -nofilelisting -nologo + +ECHO. + +:End Index: /CKEditor/branches/prototype/_dev/jslint/lint.conf =================================================================== --- /CKEditor/branches/prototype/_dev/jslint/lint.conf (revision 2128) +++ /CKEditor/branches/prototype/_dev/jslint/lint.conf (revision 2128) @@ -0,0 +1,143 @@ +# +# Configuration File for JavaScript Lint 0.3.0 +# Developed by Matthias Miller (http://www.JavaScriptLint.com) +# +# This configuration file can be used to lint a collection of scripts, or to enable +# or disable warnings for scripts that are linted via the command line. +# + +### Warnings +# Enable or disable warnings based on requirements. +# Use "+WarningName" to display or "-WarningName" to suppress. +# ++no_return_value # function {0} does not always return a value ++duplicate_formal # duplicate formal argument {0} ++equal_as_assign # test for equality (==) mistyped as assignment (=)?{0} ++var_hides_arg # variable {0} hides argument ++redeclared_var # redeclaration of {0} {1} ++anon_no_return_value # anonymous function does not always return a value ++missing_semicolon # missing semicolon ++meaningless_block # meaningless block; curly braces have no impact ++comma_separated_stmts # multiple statements separated by commas (use semicolons?) ++unreachable_code # unreachable code ++missing_break # missing break statement ++missing_break_for_last_case # missing break statement for last case in switch ++comparison_type_conv # comparisons against null, 0, true, false, or an empty string allowing implicit type conversion (use === or !==) +-inc_dec_within_stmt # increment (++) and decrement (--) operators used as part of greater statement ++useless_void # use of the void type may be unnecessary (void is always undefined) ++multiple_plus_minus # unknown order of operations for successive plus (e.g. x+++y) or minus (e.g. x---y) signs ++use_of_label # use of label +-block_without_braces # block statement without curly braces ++leading_decimal_point # leading decimal point may indicate a number or an object member ++trailing_decimal_point # trailing decimal point may indicate a number or an object member ++octal_number # leading zeros make an octal number ++nested_comment # nested comment ++misplaced_regex # regular expressions should be preceded by a left parenthesis, assignment, colon, or comma ++ambiguous_newline # unexpected end of line; it is ambiguous whether these lines are part of the same statement ++empty_statement # empty statement or extra semicolon +-missing_option_explicit # the "option explicit" control comment is missing ++partial_option_explicit # the "option explicit" control comment, if used, must be in the first script tag ++dup_option_explicit # duplicate "option explicit" control comment ++useless_assign # useless assignment ++ambiguous_nested_stmt # block statements containing block statements should use curly braces to resolve ambiguity ++ambiguous_else_stmt # the else statement could be matched with one of multiple if statements (use curly braces to indicate intent) +-missing_default_case # missing default case in switch statement ++duplicate_case_in_switch # duplicate case in switch statements ++default_not_at_end # the default case is not at the end of the switch statement +-legacy_cc_not_understood # couldn't understand control comment using /*@keyword@*/ syntax ++jsl_cc_not_understood # couldn't understand control comment using /*jsl:keyword*/ syntax ++useless_comparison # useless comparison; comparing identical expressions ++with_statement # with statement hides undeclared variables; use temporary variable instead ++trailing_comma_in_array # extra comma is not recommended in array initializers ++assign_to_function_call # assignment to a function call ++parseint_missing_radix # parseInt missing radix parameter + +### Output format +# Customize the format of the error message. +# __FILE__ indicates current file path +# __FILENAME__ indicates current file name +# __LINE__ indicates current line +# __ERROR__ indicates error message +# +# Visual Studio syntax (default): ++output-format __FILE__(__LINE__): __ERROR__ +# Alternative syntax: +#+output-format __FILE__:__LINE__: __ERROR__ + + +### Context +# Show the in-line position of the error. +# Use "+context" to display or "-context" to suppress. +# ++context + + +### Semicolons +# By default, assignments of an anonymous function to a variable or +# property (such as a function prototype) must be followed by a semicolon. +# ++lambda_assign_requires_semicolon + + +### Control Comments +# Both JavaScript Lint and the JScript interpreter confuse each other with the syntax for +# the /*@keyword@*/ control comments and JScript conditional comments. (The latter is +# enabled in JScript with @cc_on@). The /*jsl:keyword*/ syntax is preferred for this reason, +# although legacy control comments are enabled by default for backward compatibility. +# ++legacy_control_comments + + +### JScript Function Extensions +# JScript allows member functions to be defined like this: +# function MyObj() { /*constructor*/ } +# function MyObj.prototype.go() { /*member function*/ } +# +# It also allows events to be attached like this: +# function window::onload() { /*init page*/ } +# +# This is a Microsoft-only JavaScript extension. Enable this setting to allow them. +# +-jscript_function_extensions + + +### Defining identifiers +# By default, "option explicit" is enabled on a per-file basis. +# To enable this for all files, use "+always_use_option_explicit" ++always_use_option_explicit + +# Define certain identifiers of which the lint is not aware. +# (Use this in conjunction with the "undeclared identifier" warning.) +# +# Common uses for webpages might be: ++define window ++define document ++define location ++define navigator ++define ActiveXObject ++define XMLHttpRequest ++define DOMParser ++define XMLSerializer ++define CKEDITOR + +### Interactive +# Prompt for a keystroke before exiting. +#+pauseatend + + +### Files +# Specify which files to lint +# Use "+recurse" to enable recursion (disabled by default). +# To add a set of files, use "+process FileName", "+process Folder\Path\*.js", +# or "+process Folder\Path\*.htm". +# +#+process jsl-test.js ++recurse + ++process ../../_source/*.js ++process ../../_source/*.html ++process ../../_samples/*.js ++process ../../_samples/*.html ++process ../../ckeditor.js ++process ../../ckeditor_basic.js ++process ../../config.js Index: /CKEditor/branches/prototype/_dev/jslint/lint.sh =================================================================== --- /CKEditor/branches/prototype/_dev/jslint/lint.sh (revision 2128) +++ /CKEditor/branches/prototype/_dev/jslint/lint.sh (revision 2128) @@ -0,0 +1,34 @@ +# +# CKEditor - The text editor for Internet - http://ckeditor.com +# Copyright (C) 2003-2008 Frederico Caldeira Knabben +# +# == BEGIN LICENSE == +# +# Licensed under the terms of any of the following licenses at your +# choice: +# +# - GNU General Public License Version 2 or later (the "GPL") +# http://www.gnu.org/licenses/gpl.html +# +# - GNU Lesser General Public License Version 2.1 or later (the "LGPL") +# http://www.gnu.org/licenses/lgpl.html +# +# - Mozilla Public License Version 1.1 or later (the "MPL") +# http://www.mozilla.org/MPL/MPL-1.1.html +# +# == END LICENSE == +# +# Calls the JavaScript Lint (jsl) with the predefined configurations. +# If a file name is passed as a parameter it writes there the results, +# otherwise it simply outputs it. +# + +if [ "$1" = "" ] +then + ../_thirdparty/jsl/jsl -conf lint.conf -nofilelisting -nologo +else + echo Generating $1 ... + ../_thirdparty/jsl/jsl -conf lint.conf -nofilelisting -nologo > $1 + echo + echo Process completed. +fi Index: /CKEditor/branches/prototype/_samples/sample.js =================================================================== --- /CKEditor/branches/prototype/_samples/sample.js (revision 2127) +++ /CKEditor/branches/prototype/_samples/sample.js (revision 2128) @@ -98,5 +98,5 @@ var alsoBrowsers = ''; - for ( key in env ) + for ( var key in env ) { if ( browsers[ key ] ) Index: /CKEditor/branches/prototype/_samples/sample01.html =================================================================== --- /CKEditor/branches/prototype/_samples/sample01.html (revision 2127) +++ /CKEditor/branches/prototype/_samples/sample01.html (revision 2128) @@ -45,17 +45,19 @@ 
-<p>
+<form action="">
+  <p>
     <label for="editor1">
-        Editor 1:</label><br />
+      Editor 1:</label><br />
     <textarea id="editor1" name="editor1" class="ckeditor" rows="10" cols="80"><p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p></textarea>
-</p>
-<p>
+  </p>
+  <p>
     <label for="editor2">
-        Editor 2:</label><br />
+      Editor 2:</label><br />
     <textarea id="editor2" name="editor2" class="ckeditor" rows="10" cols="80"><p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p></textarea>
-</p>
-<p>
+  </p>
+  <p>
     <input type="submit" value="Submit" />
-</p>
+  </p>
+</form>
Index: /CKEditor/branches/prototype/_samples/sample02.html =================================================================== --- /CKEditor/branches/prototype/_samples/sample02.html (revision 2127) +++ /CKEditor/branches/prototype/_samples/sample02.html (revision 2128) @@ -53,5 +53,21 @@ 
-TODO
+<form action="">
+  <p>
+    <label for="editor1">
+      Editor 1:</label><br />
+    <textarea name="editor1" rows="10" cols="80"><p>This is some <strong>sample text</strong>. You are using <a href="http://www.fckeditor.net/">FCKeditor</a>.</p></textarea>
+    <script type="text/javascript">
+    //<![CDATA[
+
+      CKEDITOR.replace( 'editor1' );
+
+    //]]>
+    </script>
+  </p>
+  <p>
+    <input type="submit" value="Submit" />
+  </p>
+</form>
Index: /CKEditor/branches/prototype/_source/core/ajax.js =================================================================== --- /CKEditor/branches/prototype/_source/core/ajax.js (revision 2127) +++ /CKEditor/branches/prototype/_source/core/ajax.js (revision 2128) @@ -49,8 +49,8 @@ return ( xhr.readyState == 4 && - ( ( xhr.status >= 200 && xhr.status < 300 ) - || xhr.status == 304 - || xhr.status == 0 - || xhr.status == 1223 ) ); + ( ( xhr.status >= 200 && xhr.status < 300 ) || + xhr.status == 304 || + xhr.status === 0 || + xhr.status == 1223 ) ); }; @@ -103,5 +103,5 @@ return /** @lends CKEDITOR.ajax */ { - + /** * Loads data from an URL as plain text. Index: /CKEditor/branches/prototype/_source/core/ckeditor_base.js =================================================================== --- /CKEditor/branches/prototype/_source/core/ckeditor_base.js (revision 2127) +++ /CKEditor/branches/prototype/_source/core/ckeditor_base.js (revision 2128) @@ -99,5 +99,5 @@ { // Absolute path. - if ( path.indexOf( '/' ) == 0 ) + if ( path.indexOf( '/' ) === 0 ) path = location.href.match( /^.*?:\/\/[^\/]*/ )[0] + path; // Relative path. Index: /CKEditor/branches/prototype/_source/core/ckeditor_basic.js =================================================================== --- /CKEditor/branches/prototype/_source/core/ckeditor_basic.js (revision 2127) +++ /CKEditor/branches/prototype/_source/core/ckeditor_basic.js (revision 2128) @@ -91,8 +91,5 @@ if ( !textarea ) - { throw '[CKEDITOR.replace] The