Check for null and undefined explicitly

buremba · Jul 7, 2016 · 84e8b2a · 84e8b2a
1 parent e921efb
commit 84e8b2a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/rakam.js b/rakam.js
@@ -636,8 +636,8 @@ Rakam.prototype.setUserId = function (userId) {
         var previousUserId = this.options.userId;
         this.options.userId = (userId !== undefined && userId !== null && ('' + userId)) || null;
 
-        if (userId !== null && userId !== undefined && ((this._eventId > 0 && previousUserId === null) ||
-            (previousUserId !== null && this.deviceIdCreatedAt !== undefined))) {
+        if (userId !== null && userId !== undefined && ((this._eventId > 0 && (previousUserId === null || previousUserId === undefined)) ||
+            (previousUserId !== null && previousUserId !== undefined && this.deviceIdCreatedAt !== undefined))) {
             var _this = this;
             this.User()._merge(previousUserId, this.deviceIdCreatedAt, function () {
                 _this.deviceIdCreatedAt = undefined;