From ef4f591a1d6c348d6236f39a061071457ec192e4 Mon Sep 17 00:00:00 2001 From: alecpl Date: Tue, 1 Feb 2011 09:08:17 +0000 Subject: - Unify typeof and undefined usage --- program/js/common.js | 16 ++++++++-------- program/js/googiespell.js | 6 +++--- program/js/list.js | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/program/js/common.js b/program/js/common.js index b4554a05a..d23124b3b 100644 --- a/program/js/common.js +++ b/program/js/common.js @@ -167,7 +167,7 @@ get_keycode: function(e) get_button: function(e) { e = e || window.event; - return e && (typeof e.button != 'undefined') ? e.button : (e && e.which ? e.which : 0); + return e && e.button !== undefined ? e.button : (e && e.which ? e.which : 0); }, /** @@ -318,7 +318,7 @@ addEventListener: function(evt, func, obj) */ removeEventListener: function(evt, func, obj) { - if (typeof obj == 'undefined') + if (obj === undefined) obj = window; for (var h,i=0; this._events && this._events[evt] && i < this._events[evt].length; i++) @@ -335,22 +335,22 @@ removeEventListener: function(evt, func, obj) triggerEvent: function(evt, e) { var ret, h; - if (typeof e == 'undefined') + if (e === undefined) e = this; - else if (typeof e == 'object') + else if (typeof e === 'object') e.event = evt; if (this._events && this._events[evt] && !this._event_exec) { this._event_exec = true; for (var i=0; i < this._events[evt].length; i++) { if ((h = this._events[evt][i])) { - if (typeof h.func == 'function') + if (typeof h.func === 'function') ret = h.func.call ? h.func.call(h.obj, e) : h.func(e); - else if (typeof h.obj[h.func] == 'function') + else if (typeof h.obj[h.func] === 'function') ret = h.obj[h.func](e); // cancel event execution - if (typeof ret != 'undefined' && !ret) + if (ret !== undefined && !ret) break; } } @@ -513,7 +513,7 @@ function rcube_clone_object(obj) var out = {}; for (var key in obj) { - if (obj[key] && typeof obj[key] == 'object') + if (obj[key] && typeof obj[key] === 'object') out[key] = clone_object(obj[key]); else out[key] = obj[key]; diff --git a/program/js/googiespell.js b/program/js/googiespell.js index 428d7f0dc..22716c457 100644 --- a/program/js/googiespell.js +++ b/program/js/googiespell.js @@ -91,7 +91,7 @@ function GoogieSpell(img_dir, server_url) { this.decorateTextarea = function(id) { - this.text_area = typeof(id) == 'string' ? document.getElementById(id) : id; + this.text_area = typeof id === 'string' ? document.getElementById(id) : id; if (this.text_area) { if (!this.spell_container && this.decoration) { @@ -120,7 +120,7 @@ this.decorateTextarea = function(id) { // API Functions (the ones that you can call) ///// this.setSpellContainer = function(id) { - this.spell_container = typeof(id) == 'string' ? document.getElementById(id) : id; + this.spell_container = typeof id === 'string' ? document.getElementById(id) : id; }; this.setLanguages = function(lang_dict) { @@ -931,7 +931,7 @@ this.checkSpellingState = function(fire) { // Misc. functions ///// this.isDefined = function(o) { - return (o != 'undefined' && o != null) + return (o !== undefined && o !== null) }; this.errorFixed = function() { diff --git a/program/js/list.js b/program/js/list.js index 183223a51..488b2362b 100644 --- a/program/js/list.js +++ b/program/js/list.js @@ -58,7 +58,7 @@ function rcube_list_widget(list, p) this.row_init = function(){}; // overwrite default paramaters - if (p && typeof(p) == 'object') + if (p && typeof p === 'object') for (var n in p) this[n] = p[n]; }; -- cgit v1.2.3