diff options
| author | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
|---|---|---|
| committer | Andreas Gohr <andi@splitbrain.org> | 2010-08-29 14:22:01 +0200 |
| commit | 2c053ed58376c6709596ab48fc40dceb90d4e89d (patch) | |
| tree | c8d0f78c2f47f373473419396d3c0855ec671eca /lib/scripts/helpers.js | |
| parent | cb4a07568e84d853fbcd9d5eca37f572fa10786f (diff) | |
| parent | 5479a8c3341247ca228026819f20f3ab5c34a80f (diff) | |
| download | rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.gz rpg-2c053ed58376c6709596ab48fc40dceb90d4e89d.tar.bz2 | |
Merge branch 'master' into stable
Conflicts:
conf/msg
lib/plugins/acl/ajax.php
Diffstat (limited to 'lib/scripts/helpers.js')
| -rw-r--r-- | lib/scripts/helpers.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/scripts/helpers.js b/lib/scripts/helpers.js index 8d4f3ea78..129964d29 100644 --- a/lib/scripts/helpers.js +++ b/lib/scripts/helpers.js @@ -109,7 +109,7 @@ function isEmpty (prop /* :Object */) /* :Boolean */ { if (isRegExp(prop) && new RegExp("").toString() == prop.toString()) return true; if (isString(prop) || isNumber(prop)) return !prop; if (Boolean(prop)&&false != prop) { - for (var i in prop) if(prop.hasOwnProperty(i)) return false + for (var i in prop) if(prop.hasOwnProperty(i)) return false; } return true; } @@ -124,7 +124,7 @@ function isEmpty (prop /* :Object */) /* :Boolean */ { if ('undefined' == typeof Object.hasOwnProperty) { Object.prototype.hasOwnProperty = function (prop) { return !('undefined' == typeof this[prop] || this.constructor && this.constructor.prototype[prop] && this[prop] === this.constructor.prototype[prop]); - } + }; } /** |