- Safer usage of Object.hasOwnProperty()

- Minor code formatting/cleanup/refactoring

core/events.js

@@ -5,37 +5,38 @@
 		var counters = {};
 		return {
 			increment: function (name) {
-				if (counters.hasOwnProperty(name)) {
+				if (Object.hasOwnProperty.call(counters, name)) {
 					counters[name]++;
 				} else {
 					counters[name] = 1;
 				}
 			},
 			decrement: function (name) {
-				if (counters.hasOwnProperty(name)) {
+				if (Object.hasOwnProperty.call(counters, name)) {
 					counters[name]--;
 					if (counters[name] === 0) {
 						delete counters[name];
 					}
 				}
 			},
 			isEmpty: function (name) {
-				return !(counters.hasOwnProperty(name) && counters[name] !== 0);
+				return !Object.hasOwnProperty.call(counters, name)
+					|| counters[name] === 0;
 			}
 		};
 	})();
 
 	var events = {
 		subscribe: function (name, callback) {
-			if (!callbacks.hasOwnProperty(name)) {
+			if (!Object.hasOwnProperty.call(callbacks, name)) {
 				callbacks[name] = [];
 			}
 			if (callbacks[name].indexOf(callback) === -1) {
 				callbacks[name].push(callback);
 			}
 		},
 		unsubscribe: function (name, callback) {
-			if (callbacks.hasOwnProperty(name)) {
+			if (Object.hasOwnProperty.call(callbacks, name)) {
 				var position = callbacks[name].indexOf(callback);
 				if (position !== -1) {
 					if (iterators.isEmpty(name)) {
@@ -56,7 +57,7 @@
 		publish: function (name) {
 			var payload = Array.prototype.slice.call(arguments, 1);
 			console.log.apply(console, ["[Events]", name].concat(payload));
-			if (callbacks.hasOwnProperty(name)) {
+			if (Object.hasOwnProperty.call(callbacks, name)) {
 				// Count recursive publish/unsubscribe calls
 				iterators.increment(name);
 

core/settings.js

@@ -46,12 +46,15 @@ function (events) {
 				case "string":
 				case "number":
 				case "boolean":
-					if (!target.hasOwnProperty(key)) {
+					if (!Object.hasOwnProperty.call(target, key)) {
 						target[key] = template[key];
 					}
 					break;
 				case "object":
-					if (!target.hasOwnProperty(key) || (template[key] instanceof Array && !(target[key] instanceof Array))) {
+					if (!Object.hasOwnProperty.call(target, key)
+						|| (template[key] instanceof Array
+							&& !(target[key] instanceof Array))
+					) {
 						target[key] = template[key] instanceof Array ? [] : {};
 					}
 					stubCopy(target[key], template[key]);

core/ui/dock.js

@@ -173,7 +173,7 @@ function (ui, css, mustache, dockTemplate) {
 			}
 		}, false);
 		Object.keys(defaults).forEach(function (key) {
-			if (descriptor.hasOwnProperty(key)) {
+			if (Object.hasOwnProperty.call(descriptor, key)) {
 				api[key] = descriptor[key];
 			} else {
 				api[key] = defaults[key];

core/ui/gadget.js

@@ -37,7 +37,7 @@
 		document.querySelector("#gadgets menu").appendChild(container);
 
 		"title content".split(" ").forEach(function (key) {
-			if (descriptor.hasOwnProperty(key)) {
+			if (Object.hasOwnProperty.call(descriptor, key)) {
 				api[key] = descriptor[key];
 			}
 		});

core/ui/navigation.js

@@ -68,7 +68,7 @@
 		};
 
 		"title tooltip callback target url path".split(" ").forEach(function (key) {
-			if (descriptor.hasOwnProperty(key)) {
+			if (Object.hasOwnProperty.call(descriptor, key)) {
 				api[key] = descriptor[key];
 			}
 		});

core/xmpp.js

@@ -24,9 +24,9 @@
 			uri = handler.xmlns(prefix);
 		}
 		if (uri === null) {
-			if (handler.xmlns && handler.xmlns.hasOwnProperty(prefix)) {
+			if (handler.xmlns && Object.hasOwnProperty.call(handler.xmlns, prefix)) {
 				uri = handler.xmlns[prefix];
-			} else if (xpathXmlns.hasOwnProperty(prefix)) {
+			} else if (Object.hasOwnProperty.call(xpathXmlns, prefix)) {
 				uri = xpathXmlns[prefix];
 			}
 		}
@@ -59,7 +59,7 @@
 		filter: function (stanza) {
 			var id = stanza.getAttributeNS("", "id");
 			return (stanza.tagName === "iq" // IQ stanza
-				&& id !== null && id !== "" && iqCallbacks.hasOwnProperty(id) // Match the ID attribute
+				&& id !== null && id !== "" && Object.hasOwnProperty.call(iqCallbacks, id) // Match the ID attribute
 				&& iqCallbacks[id].from.indexOf(stanza.getAttributeNS("", "from")) !== -1 // Match the from address
 				&& iqCallbacks[id].type.indexOf(stanza.getAttributeNS("", "type")) !== -1 // Match the response type
 			);
@@ -143,9 +143,8 @@
 			if (callback instanceof Function) {
 				var id = iq.getAttributeNS("", "id");
 				if (id === null || id === "") {
-					do {
-						id = Math.floor(Math.random() * 0xffffffff).toString(16);
-					} while (iqCallbacks.hasOwnProperty(id));
+					do { id = Math.floor(Math.random() * 0xffffffff).toString(16); }
+					while (Object.hasOwnProperty.call(iqCallbacks, id));
 					iq.setAttribute("id", id);
 				}
 				iqCallbacks[id] = {

core/xpath.js

@@ -69,7 +69,9 @@ define(function () {return function (node, xpath, type, xmlns) {
 	} else if (!(xmlns instanceof Function)) {
 		var _xmlns = xmlns;
 		xmlns = function (prefix) {
-			return _xmlns.hasOwnProperty(prefix) ? _xmlns[prefix] : null;
+			return Object.hasOwnProperty.call(_xmlns, prefix)
+				? _xmlns[prefix]
+				: null;
 		};
 	}
 

modules/contactList.js

@@ -108,7 +108,7 @@ function (events, dock, roster, template, settings) {
 			});
 			// Remove from old groups
 			Object.keys(htmlCache).filter(function (group) {
-				return htmlCache[group].hasOwnProperty(jid) &&
+				return Object.hasOwnProperty.call(htmlCache[group], jid) &&
 					(changedContacts[jid].groups.indexOf(group) === -1);
 			}).forEach(function (group) {
 				removeContactFromCache(group, jid);

modules/roster.js

@@ -192,11 +192,13 @@ function (events, xmpp, xpath, rosterCache, jidParser) {
 		callback: function (presence) {
 			var jid = jidParser(presence.getAttribute("from"));
 			if (jid && Object.hasOwnProperty.call(roster.contacts, jid.bare)) {
-				var contact = roster.contacts[jid.bare];
-				var resource = Object.hasOwnProperty.call(contact.resources, jid.resource) ?
-								contact.resources[jid.resource] :
-								(contact.resources[jid.resource] = {});
-				var type = presence.hasAttribute("type") ? presence.getAttribute("type") : "";
+				var contact = roster.contacts[jid.bare],
+					resource = Object.hasOwnProperty.call(contact.resources, jid.resource)
+						? contact.resources[jid.resource]
+						: (contact.resources[jid.resource] = {}),
+					type = presence.hasAttribute("type")
+						? presence.getAttribute("type")
+						: "";
 				switch (type) {
 					case "": // Available is indicated by lack of "type" attribute
 						["show", "status", "priority"].forEach(function (tagName) {
@@ -255,8 +257,9 @@ function (events, xmpp, xpath, rosterCache, jidParser) {
 					contact[property] = item.getAttribute(property) || "";
 				});
 				contact.groups = [];
-				contact.resources = Object.hasOwnProperty.call(roster.contacts, jid) ?
-									roster.contacts[jid].resources : {};
+				contact.resources = Object.hasOwnProperty.call(roster.contacts, jid)
+					? roster.contacts[jid].resources
+					: {};
 				xpath(item, "roster:group", Array, xmlns).forEach(function (group) {
 					if (contact.groups.indexOf(group.textContent) === -1) {
 						contact.groups.push(group.textContent);

modules/rosterCache.js

@@ -60,14 +60,18 @@
 			if (!rosterCache) {
 				loadFromStorage();
 			}
-			return Object.hasOwnProperty.call(rosterCache, jid) ? rosterCache[jid] : {version: "", contacts: {}};
+			return Object.hasOwnProperty.call(rosterCache, jid)
+				? rosterCache[jid]
+				: {version: "", contacts: {}};
 		},
 
 		version: function (jid) {
 			if (!rosterCache) {
 				loadFromStorage();
 			}
-			return Object.hasOwnProperty.call(rosterCache, jid) ? rosterCache[jid].version : "";
+			return Object.hasOwnProperty.call(rosterCache, jid)
+				? rosterCache[jid].version
+				: "";
 		}
 	};
 });