add return statements

FirebaseExtended · Jan 15, 2015 · abe2c95 · abe2c95
1 parent a7c767c
commit abe2c95
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/src/FirebaseAuth.js b/src/FirebaseAuth.js
@@ -225,16 +225,20 @@
 
       return this._utils.promise(function(resolve,reject){
         function callback(authData) {
+          // Turn off this onAuth() callback since we just needed to get the authentication data once.
+          ref.offAuth(callback);
+
           if (authData !== null) {
             resolve(authData);
-          } else if (rejectIfAuthDataIsNull) {
+            return;
+          }
+          else if (rejectIfAuthDataIsNull) {
             reject("AUTH_REQUIRED");
-          } else {
+            return;
+          }
+          else {
             resolve(null);
           }
-
-          // Turn off this onAuth() callback since we just needed to get the authentication data once.
-          ref.offAuth(callback);
         }
 
         ref.onAuth(callback);

diff --git a/src/firebase.js b/src/firebase.js
@@ -132,9 +132,11 @@
               ref.transaction(valueFn, function(err, committed, snap) {
                 if( err ) {
                   reject(err);
+                  return;
                 }
                 else {
                   resolve(committed? snap : null);
+                  return;
                 }
               }, applyLocally);
             });