@@ -640,7 +640,6 @@ firebase.init = arg => {
640640 if ( arg . persist ) {
641641 FIRDatabase . database ( ) . persistenceEnabled = true ;
642642 }
643- firebase . instance = FIRDatabase . database ( ) . reference ( ) ;
644643 }
645644
646645 if ( typeof ( FIRFirestore ) !== "undefined" ) {
@@ -715,7 +714,7 @@ firebase.init = arg => {
715714 firebase . storage = FIRStorage . storage ( ) . referenceForURL ( arg . storageBucket ) ;
716715 }
717716
718- resolve ( firebase . instance ) ;
717+ resolve ( FIRDatabase . database ( ) . reference ( ) ) ;
719718 } catch ( ex ) {
720719 console . log ( "Error in firebase.init: " + ex ) ;
721720 reject ( ex ) ;
@@ -1622,7 +1621,7 @@ firebase._addObservers = (to, updateCallback) => {
16221621firebase . keepInSync = ( path , switchOn ) => {
16231622 return new Promise ( ( resolve , reject ) => {
16241623 try {
1625- const where = firebase . instance . childByAppendingPath ( path ) ;
1624+ const where = FIRDatabase . database ( ) . reference ( ) . childByAppendingPath ( path ) ;
16261625 where . keepSynced ( switchOn ) ;
16271626 resolve ( ) ;
16281627 } catch ( ex ) {
@@ -1635,7 +1634,7 @@ firebase.keepInSync = (path, switchOn) => {
16351634firebase . addChildEventListener = ( updateCallback , path ) => {
16361635 return new Promise ( ( resolve , reject ) => {
16371636 try {
1638- const where = path === undefined ? firebase . instance : firebase . instance . childByAppendingPath ( path ) ;
1637+ const where = path === undefined ? FIRDatabase . database ( ) . reference ( ) : FIRDatabase . database ( ) . reference ( ) . childByAppendingPath ( path ) ;
16391638 resolve ( {
16401639 path : path ,
16411640 listeners : firebase . _addObservers ( where , updateCallback )
@@ -1650,7 +1649,7 @@ firebase.addChildEventListener = (updateCallback, path) => {
16501649firebase . addValueEventListener = ( updateCallback , path ) => {
16511650 return new Promise ( ( resolve , reject ) => {
16521651 try {
1653- const where = path === undefined ? firebase . instance : firebase . instance . childByAppendingPath ( path ) ;
1652+ const where = path === undefined ? FIRDatabase . database ( ) . reference ( ) : FIRDatabase . database ( ) . reference ( ) . childByAppendingPath ( path ) ;
16541653 const listener = where . observeEventTypeWithBlockWithCancelBlock (
16551654 FIRDataEventType . Value ,
16561655 snapshot => {
@@ -1675,7 +1674,7 @@ firebase.addValueEventListener = (updateCallback, path) => {
16751674firebase . getValue = path => {
16761675 return new Promise ( ( resolve , reject ) => {
16771676 try {
1678- const where = path === undefined ? firebase . instance : firebase . instance . childByAppendingPath ( path ) ;
1677+ const where = path === undefined ? FIRDatabase . database ( ) . reference ( ) : FIRDatabase . database ( ) . reference ( ) . childByAppendingPath ( path ) ;
16791678 const listener = where . observeSingleEventOfTypeWithBlockWithCancelBlock (
16801679 FIRDataEventType . Value ,
16811680 snapshot => {
@@ -1694,7 +1693,7 @@ firebase.getValue = path => {
16941693firebase . removeEventListeners = ( listeners , path ) => {
16951694 return new Promise ( ( resolve , reject ) => {
16961695 try {
1697- const where = path === undefined ? firebase . instance : firebase . instance . childByAppendingPath ( path ) ;
1696+ const where = path === undefined ? FIRDatabase . database ( ) . reference ( ) : FIRDatabase . database ( ) . reference ( ) . childByAppendingPath ( path ) ;
16981697 for ( let i = 0 ; i < listeners . length ; i ++ ) {
16991698 const listener = listeners [ i ] ;
17001699 where . removeObserverWithHandle ( listener ) ;
@@ -1710,7 +1709,7 @@ firebase.removeEventListeners = (listeners, path) => {
17101709firebase . push = ( path , val ) => {
17111710 return new Promise ( ( resolve , reject ) => {
17121711 try {
1713- const ref = firebase . instance . childByAppendingPath ( path ) . childByAutoId ( ) ;
1712+ const ref = FIRDatabase . database ( ) . reference ( ) . childByAppendingPath ( path ) . childByAutoId ( ) ;
17141713 ref . setValue ( val ) ;
17151714 resolve ( {
17161715 key : ref . key
@@ -1725,7 +1724,7 @@ firebase.push = (path, val) => {
17251724firebase . setValue = ( path , val ) => {
17261725 return new Promise ( ( resolve , reject ) => {
17271726 try {
1728- firebase . instance . childByAppendingPath ( path ) . setValue ( val ) ;
1727+ FIRDatabase . database ( ) . reference ( ) . childByAppendingPath ( path ) . setValue ( val ) ;
17291728 resolve ( ) ;
17301729 } catch ( ex ) {
17311730 console . log ( "Error in firebase.setValue: " + ex ) ;
@@ -1738,13 +1737,13 @@ firebase.update = (path, val) => {
17381737 return new Promise ( ( resolve , reject ) => {
17391738 try {
17401739 if ( typeof val === "object" ) {
1741- firebase . instance . childByAppendingPath ( path ) . updateChildValues ( val ) ;
1740+ FIRDatabase . database ( ) . reference ( ) . childByAppendingPath ( path ) . updateChildValues ( val ) ;
17421741 } else {
17431742 const lastPartOfPath = path . lastIndexOf ( "/" ) ;
17441743 const pathPrefix = path . substring ( 0 , lastPartOfPath ) ;
17451744 const pathSuffix = path . substring ( lastPartOfPath + 1 ) ;
17461745 const updateObject = '{"' + pathSuffix + '" : "' + val + '"}' ;
1747- firebase . instance . childByAppendingPath ( pathPrefix ) . updateChildValues ( JSON . parse ( updateObject ) ) ;
1746+ FIRDatabase . database ( ) . reference ( ) . childByAppendingPath ( pathPrefix ) . updateChildValues ( JSON . parse ( updateObject ) ) ;
17481747 }
17491748
17501749 resolve ( ) ;
@@ -1758,7 +1757,7 @@ firebase.update = (path, val) => {
17581757firebase . query = ( updateCallback , path , options ) => {
17591758 return new Promise ( ( resolve , reject ) => {
17601759 try {
1761- const where = path === undefined ? firebase . instance : firebase . instance . childByAppendingPath ( path ) ;
1760+ const where = path === undefined ? FIRDatabase . database ( ) . reference ( ) : FIRDatabase . database ( ) . reference ( ) . childByAppendingPath ( path ) ;
17621761 let query ;
17631762
17641763 // orderBy
@@ -1857,7 +1856,7 @@ firebase.query = (updateCallback, path, options) => {
18571856firebase . remove = path => {
18581857 return new Promise ( ( resolve , reject ) => {
18591858 try {
1860- firebase . instance . childByAppendingPath ( path ) . setValue ( null ) ;
1859+ FIRDatabase . database ( ) . reference ( ) . childByAppendingPath ( path ) . setValue ( null ) ;
18611860 resolve ( ) ;
18621861 } catch ( ex ) {
18631862 console . log ( "Error in firebase.remove: " + ex ) ;
0 commit comments