mirror of
https://github.com/zhigang1992/DefinitelyTyped.git
synced 2026-04-24 05:06:02 +08:00
Merge branch 'master' into patch-2
Conflicts: angularfire/angularfire.d.ts
This commit is contained in:
4
angularfire/angularfire.d.ts
vendored
4
angularfire/angularfire.d.ts
vendored
@@ -94,7 +94,7 @@ interface AngularFireObject extends AngularFireSimpleObject {
|
||||
/**
|
||||
* @returns {Firebase} the original Firebase instance used to create this object.
|
||||
*/
|
||||
$ref(): AngularFire;
|
||||
$ref(): Firebase;
|
||||
|
||||
/**
|
||||
* Creates a 3-way data sync between this object, the Firebase server, and a
|
||||
@@ -277,7 +277,7 @@ interface AngularFireArray extends Array<AngularFireSimpleObject> {
|
||||
/**
|
||||
* @returns {Firebase} the original Firebase ref used to create this object.
|
||||
*/
|
||||
$ref(): AngularFire;
|
||||
$ref(): Firebase;
|
||||
|
||||
/**
|
||||
* Listeners passed into this method are notified whenever a new change (add, updated,
|
||||
|
||||
Reference in New Issue
Block a user