Merge branch 'master' of github.com:jshint/jshint

jshint · Jul 11, 2012 · 47accba · 47accba
2 parents 7792d0e + abda02c
commit 47accba
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/jshint.js b/jshint.js
@@ -55,8 +55,8 @@
  JSHINT.errors is an array of objects containing these members:
 
  {
-     line      : The line (relative to 0) at which the lint was found
-     character : The character (relative to 0) at which the lint was found
+     line      : The line (relative to 1) at which the lint was found
+     character : The character (relative to 1) at which the lint was found
      reason    : The problem
      evidence  : The text line in which the problem occurred
      raw       : The raw message before the details were inserted
@@ -186,7 +186,8 @@
  Iframe, IframeShim, Image, importScripts, Int16Array, Int32Array, Int8Array,
  Insertion, InputValidator, JSON, Keyboard, Locale, LN10, LN2, LOG10E, LOG2E,
  MAX_VALUE, MIN_VALUE, Mask, Math, MenuItem, MessageChannel, MessageEvent, MessagePort,
- MoveAnimation, MooTools, Native, NEGATIVE_INFINITY, Node, NodeFilter, Number, Object, ObjectRange,
+ MoveAnimation, MooTools, MutationObserver, Native, NEGATIVE_INFINITY, Node, NodeFilter,
+ Number, Object, ObjectRange,
  Option, Options, OverText, PI, POSITIVE_INFINITY, PeriodicalExecuter, Point, Position, Prototype,
  RangeError, Rectangle, ReferenceError, RegExp, ResizeAnimation, Request, RotateAnimation,
  SQRT1_2, SQRT2, ScrollBar, ScriptEngine, ScriptEngineBuildVersion,
@@ -463,6 +464,7 @@ var JSHINT = (function () {
             MessagePort              :  false,
             moveBy                   :  false,
             moveTo                   :  false,
+            MutationObserver         :  false,
             name                     :  false,
             Node                     :  false,
             NodeFilter               :  false,
@@ -4565,5 +4567,6 @@ loop:   for (;;) {
 }());
 
 // Make JSHINT a Node module, if possible.
-if (typeof exports === 'object' && exports)
+if (typeof exports === 'object' && exports){
     exports.JSHINT = JSHINT;
+}
diff --git a/tests/unit/envs.js b/tests/unit/envs.js
@@ -296,6 +296,7 @@ exports.browser = function () {
           , 'MessagePort'
           , 'moveBy'
           , 'moveTo'
+          , 'MutationObserver'
           , 'name'
           , 'Node'
           , 'NodeFilter'

diff --git a/tests/unit/fixtures/browser.js b/tests/unit/fixtures/browser.js
@@ -12,4 +12,7 @@ var dom_str = xs.serializeToString(dom);
 
 // node
 var filterAccept = NodeFilter.FILTER_ACCEPT;
-var elementNode = Node.ELEMENT_NODE;
+var elementNode = Node.ELEMENT_NODE;
+
+// MutationObserver
+var mutationObserver = new MutationObserver(/* callback */);
diff --git a/tests/unit/options.js b/tests/unit/options.js
@@ -1150,6 +1150,7 @@ exports.browser = function () {
 		.addError(10, "'XMLSerializer' is not defined.")
 		.addError(14, "'NodeFilter' is not defined.")
 		.addError(15, "'Node' is not defined.")
+		.addError(18, "'MutationObserver' is not defined.")
 		.test(src, { undef: true });
 
 	TestRun().test(src, { browser: true, undef: true });