Skip to content
This repository was archived by the owner on Apr 4, 2023. It is now read-only.

Commit b1a0c45

Browse files
Merge branch 'master' into master
2 parents 094b7e6 + 68592fa commit b1a0c45

File tree

7 files changed

+708
-643
lines changed

7 files changed

+708
-643
lines changed

CHANGELOG.md

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,19 @@
33
[Firebase iOS SDK Changelog](https://firebase.google.com/support/release-notes/ios)
44
[Firebase Android SDK Changelog](https://firebase.google.com/support/release-notes/android)
55

6+
## 4.0.6 (2017, August 23)
7+
8+
### New
9+
- [#443](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/pull/443) fixed invitation sample code
10+
- [#444](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/pull/444) Updated how options.*.value is checked to allow booleans and numbers
11+
- [#449](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/pull/449) Mark init and getRemoteConfig for profiling
12+
13+
### Fixes
14+
- [#328](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/328) Query range with START_AT not fetching data as expected
15+
- [#438](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/438) Query : range not working when value is number
16+
- [#445](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/pull/445) Skip linking for anonymous users
17+
- [464](https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/464) 'phoneNumber' is missing in login result TypeScript definition
18+
619

720
## 4.0.5 (2017, July 22)
821

docs/AUTHENTICATION.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,8 @@ Don't forget to enable email-password login in your firebase instance.
175175

176176
#### Managing email-password accounts
177177
##### Creating a Password account
178+
This may not work on an (Android) simulator. See #463.
179+
178180
```js
179181
firebase.createUser({
180182

firebase-common.js

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -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
4444
firebase.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

5960
firebase.QueryLimitType = {
6061
FIRST: "first",
6162
LAST: "last"
6263
};
63-
64+
6465
firebase.QueryRangeType = {
6566
START_AT: "startAt",
6667
END_AT: "endAt",
@@ -74,14 +75,14 @@ firebase.authStateListeners = [];
7475
firebase._receivedNotificationCallback = null;
7576
firebase._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

Comments
 (0)