@@ -23,17 +23,17 @@ firebase.admob.defaults = {
2323 size : firebase . admob . AD_SIZE . SMART_BANNER
2424} ;
2525
26- firebase . merge = function merge ( obj1 , obj2 ) { // Our merge function
26+ firebase . merge = function merge ( obj1 , obj2 ) { // Our merge function
2727 var result = { } ; // return result
28- for ( var i in obj1 ) { // for every property in obj1
29- if ( ( i in obj2 ) && ( typeof obj1 [ i ] === "object" ) && ( i !== null ) ) {
30- result [ i ] = merge ( obj1 [ i ] , obj2 [ i ] ) ; // if it's an object, merge
31- } else {
28+ for ( var i in obj1 ) { // for every property in obj1
29+ if ( ( i in obj2 ) && ( typeof obj1 [ i ] === "object" ) && ( i !== null ) ) {
30+ result [ i ] = merge ( obj1 [ i ] , obj2 [ i ] ) ; // if it's an object, merge
31+ } else {
3232 result [ i ] = obj1 [ i ] ; // add it to result
3333 }
3434 }
35- for ( i in obj2 ) { // add the remaining properties from object 2
36- if ( i in result ) { //conflict
35+ for ( i in obj2 ) { // add the remaining properties from object 2
36+ if ( i in result ) { //conflict
3737 continue ;
3838 }
3939 result [ i ] = obj2 [ i ] ;
@@ -44,6 +44,7 @@ firebase.merge = function merge(obj1, obj2){ // Our merge function
4444firebase . LoginType = {
4545 ANONYMOUS : "anonymous" ,
4646 PASSWORD : "password" ,
47+ PHONE : "phone" ,
4748 CUSTOM : "custom" ,
4849 FACEBOOK : "facebook" ,
4950 GOOGLE : "google"
@@ -53,14 +54,14 @@ firebase.QueryOrderByType = {
5354 KEY : "key" ,
5455 VALUE : "value" ,
5556 CHILD : "child" ,
56- PRIORITY : "priority"
57+ PRIORITY : "priority"
5758} ;
5859
5960firebase . QueryLimitType = {
6061 FIRST : "first" ,
6162 LAST : "last"
6263} ;
63-
64+
6465firebase . QueryRangeType = {
6566 START_AT : "startAt" ,
6667 END_AT : "endAt" ,
@@ -74,14 +75,14 @@ firebase.authStateListeners = [];
7475firebase . _receivedNotificationCallback = null ;
7576firebase . _DynamicLinkCallback = null ;
7677
77- firebase . addAuthStateListener = function ( listener ) {
78+ firebase . addAuthStateListener = function ( listener ) {
7879 if ( firebase . authStateListeners . indexOf ( listener ) === - 1 ) {
7980 firebase . authStateListeners . push ( listener ) ;
8081 }
8182 return true ;
8283} ;
83-
84- firebase . removeAuthStateListener = function ( listener ) {
84+
85+ firebase . removeAuthStateListener = function ( listener ) {
8586 var index = firebase . authStateListeners . indexOf ( listener ) ;
8687 if ( index >= 0 ) {
8788 firebase . authStateListeners . splice ( index , 1 ) ;
@@ -90,11 +91,11 @@ firebase.removeAuthStateListener = function(listener) {
9091 }
9192} ;
9293
93- firebase . hasAuthStateListener = function ( listener ) {
94+ firebase . hasAuthStateListener = function ( listener ) {
9495 return firebase . authStateListeners . indexOf ( listener ) >= 0 ;
9596} ;
9697
97- firebase . notifyAuthStateListeners = function ( data ) {
98+ firebase . notifyAuthStateListeners = function ( data ) {
9899 firebase . authStateListeners . forEach ( function ( listener ) {
99100 try {
100101 if ( listener . thisArg ) {
0 commit comments