From 769a71298e0daa1c331e3c8e83101cb7b0c53a78 Mon Sep 17 00:00:00 2001
From: Jeff Williams <jeffrey.l.williams@gmail.com>
Date: Wed, 4 Jul 2012 15:59:33 -0700
Subject: [PATCH] enable JSHint's "forin" test

---
 .jshintrc                                |  2 +-
 jsdoc.js                                 |  9 +++--
 rhino_modules/jsdoc/augment.js           | 26 ++++++++-----
 rhino_modules/jsdoc/tutorial/resolver.js | 47 +++++++++++++-----------
 templates/default/publish.js             | 26 +++++++------
 5 files changed, 62 insertions(+), 48 deletions(-)

diff --git a/.jshintrc b/.jshintrc
index 08eb3b40..737dd285 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -2,7 +2,7 @@
   "bitwise":      true,
   "curly":        true,
   "eqeqeq":       false,
-  "forin":        false,
+  "forin":        true,
   "immed":        false,
   "latedef":      false,
   "newcap":       false,
diff --git a/jsdoc.js b/jsdoc.js
index e2f3d19c..66dada0a 100644
--- a/jsdoc.js
+++ b/jsdoc.js
@@ -8,6 +8,8 @@
 
 //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~//
 
+var hasOwnProp = Object.prototype.hasOwnProperty;
+
 /** Data representing the environment in which this app is running.
     @namespace
 */
@@ -151,7 +153,9 @@ function installPlugins(plugins, p) {
         //...register event handlers
         if (plugin.handlers) {
             for (var eventName in plugin.handlers) {
-                parser.on(eventName, plugin.handlers[eventName]);
+                if ( hasOwnProp.call(plugin.handlers, eventName) ) {
+                    parser.on(eventName, plugin.handlers[eventName]);
+                }
             }
         }
 
@@ -168,8 +172,7 @@ function installPlugins(plugins, p) {
 }
 
 function indexAll(docs) {
-    var lookupTable = {},
-        hasOwnProp = Object.prototype.hasOwnProperty;
+    var lookupTable = {};
 
     docs.forEach(function(doc) {
         if ( !hasOwnProp.call(lookupTable, doc.longname) ) {
diff --git a/rhino_modules/jsdoc/augment.js b/rhino_modules/jsdoc/augment.js
index bd9d1ecc..1923e8aa 100644
--- a/rhino_modules/jsdoc/augment.js
+++ b/rhino_modules/jsdoc/augment.js
@@ -23,14 +23,16 @@ var doop = require("jsdoc/util/doop").doop;
     function mapDependencies(index) {
         var doclets, doc, len, dependencies = {};
         for (var name in index) {
-            doclets = index[name];
-            for (var i=0, ii=doclets.length; i<ii; ++i) {
-                doc = doclets[i];
-                if (doc.kind === "class") {
-                    dependencies[name] = {};
-                    len = doc.augments && doc.augments.length || 0;
-                    for (var j=0; j<len; ++j) {
-                        dependencies[name][doc.augments[j]] = true;
+            if ( hasOwnProp.call(index, name) ) {
+                doclets = index[name];
+                for (var i=0, ii=doclets.length; i<ii; ++i) {
+                    doc = doclets[i];
+                    if (doc.kind === "class") {
+                        dependencies[name] = {};
+                        len = doc.augments && doc.augments.length || 0;
+                        for (var j=0; j<len; ++j) {
+                            dependencies[name][doc.augments[j]] = true;
+                        }
                     }
                 }
             }
@@ -83,7 +85,9 @@ var doop = require("jsdoc/util/doop").doop;
     Sorter.prototype = {
         sort: function() {
             for (var key in this.dependencies) {
-                this.visit(key);
+                if ( hasOwnProp.call(this.dependencies, key) ) {
+                    this.visit(key);
+                }
             }
             return this.sorted;
         },
@@ -94,7 +98,9 @@ var doop = require("jsdoc/util/doop").doop;
                     throw new Error("Missing dependency: " + key);
                 }
                 for (var path in this.dependencies[key]) {
-                    this.visit(path);
+                    if ( hasOwnProp.call(this.dependencies[key], path) ) {
+                        this.visit(path);
+                    }
                 }
                 this.sorted.push(key);
             }
diff --git a/rhino_modules/jsdoc/tutorial/resolver.js b/rhino_modules/jsdoc/tutorial/resolver.js
index 1ee97869..0f0d1943 100644
--- a/rhino_modules/jsdoc/tutorial/resolver.js
+++ b/rhino_modules/jsdoc/tutorial/resolver.js
@@ -10,6 +10,7 @@
 
 var tutorial = require('jsdoc/tutorial'),
     fs = require('fs'),
+    hasOwnProp = Object.prototype.hasOwnProperty,
     conf = {},
     tutorials = {},
     finder = /^(.*)\.(x(?:ht)?ml|html?|md|markdown|js(?:on)?)$/i;
@@ -97,32 +98,34 @@ exports.resolve = function() {
     var item,
         current;
     for (var name in conf) {
-        // should we be restrictive here?
-        // what is someone just wants to keep sample sources in same directory with tutorials?
-        // I've decided to leave such cases alone
-        if (!(name in tutorials)) {
-            continue;
-        }
+        if ( hasOwnProp.call(conf, name) ) {
+            // should we be restrictive here?
+            // what is someone just wants to keep sample sources in same directory with tutorials?
+            // I've decided to leave such cases alone
+            if (!(name in tutorials)) {
+                continue;
+            }
 
-        item = conf[name];
-        current = tutorials[name]
+            item = conf[name];
+            current = tutorials[name]
 
-        // set title
-        if (item.title) {
-            current.title = item.title;
-        }
+            // set title
+            if (item.title) {
+                current.title = item.title;
+            }
 
-        // add children
-        if (item.children) {
-            item.children.forEach(function(child) {
-                // I really didn't want to throw you an exception in most cases
-                // but now, user, you pissed me off ;)
-                if (!(child in tutorials)) {
-                    throw new Error("Missing child tutorial: " + child);
-                }
+            // add children
+            if (item.children) {
+                item.children.forEach(function(child) {
+                    // I really didn't want to throw you an exception in most cases
+                    // but now, user, you pissed me off ;)
+                    if (!(child in tutorials)) {
+                        throw new Error("Missing child tutorial: " + child);
+                    }
 
-                tutorials[child].setParent(current);
-            });
+                    tutorials[child].setParent(current);
+                });
+            }
         }
     }
 };
diff --git a/templates/default/publish.js b/templates/default/publish.js
index fd40ea8a..2f5b2283 100644
--- a/templates/default/publish.js
+++ b/templates/default/publish.js
@@ -381,23 +381,25 @@
         view.nav = nav;
 
         for (var longname in helper.longnameToUrl) {
-            var classes = find({kind: 'class', longname: longname});
-            if (classes.length) { generate('Class: '+classes[0].name, classes, helper.longnameToUrl[longname]); }
+            if ( hasOwnProp.call(helper.longnameToUrl, longname) ) {
+                var classes = find({kind: 'class', longname: longname});
+                if (classes.length) { generate('Class: '+classes[0].name, classes, helper.longnameToUrl[longname]); }
         
-            var modules = find({kind: 'module', longname: longname});
-            if (modules.length) { generate('Module: '+modules[0].name, modules, helper.longnameToUrl[longname]); }
+                var modules = find({kind: 'module', longname: longname});
+                if (modules.length) { generate('Module: '+modules[0].name, modules, helper.longnameToUrl[longname]); }
             
-            var namespaces = find({kind: 'namespace', longname: longname});
-            if (namespaces.length) { generate('Namespace: '+namespaces[0].name, namespaces, helper.longnameToUrl[longname]); }
+                var namespaces = find({kind: 'namespace', longname: longname});
+                if (namespaces.length) { generate('Namespace: '+namespaces[0].name, namespaces, helper.longnameToUrl[longname]); }
             
-//             var constants = find({kind: 'constant', longname: longname});
-//             if (constants.length) { generate('Constant: '+constants[0].name, constants, helper.longnameToUrl[longname]); }
+//                var constants = find({kind: 'constant', longname: longname});
+//                if (constants.length) { generate('Constant: '+constants[0].name, constants, helper.longnameToUrl[longname]); }
 
-            var mixins = find({kind: 'mixin', longname: longname});
-            if (mixins.length) { generate('Mixin: '+mixins[0].name, mixins, helper.longnameToUrl[longname]); }
+                var mixins = find({kind: 'mixin', longname: longname});
+                if (mixins.length) { generate('Mixin: '+mixins[0].name, mixins, helper.longnameToUrl[longname]); }
         
-            var externals = find({kind: 'external', longname: longname});
-            if (externals.length) { generate('External: '+externals[0].name, externals, helper.longnameToUrl[longname]); }
+                var externals = find({kind: 'external', longname: longname});
+                if (externals.length) { generate('External: '+externals[0].name, externals, helper.longnameToUrl[longname]); }
+            }
         }
 
         if (globals.length) { generate('Global', [{kind: 'globalobj'}], 'global.html'); }