Skip to content

Commit a5582b0

Browse files
author
Jacob Wenger
committed
Merge pull request #44 from firebase/jw-geofire-302
Fixed Node.js bug
2 parents e179609 + 804ae15 commit a5582b0

File tree

11 files changed

+10
-12
lines changed

11 files changed

+10
-12
lines changed

build/header

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@
1212

1313
// Include RSVP if this is being run in node
1414
if (typeof module !== "undefined" && typeof process !== "undefined") {
15-
// We need this `Firebase || require("firebase")` hack to get GeoFire to work properly in Node.js
16-
// since otherwise, checking for `instanceof Firebase` fails.
17-
var Firebase = Firebase || require("firebase");
1815
var RSVP = require("rsvp");
1916
}
2017

changelog.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
fixed - Fixed typo in 3.0.1 release which caused it to be unusable.

examples/fish1/js/vendor/geofire.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/fish2/js/vendor/geofire.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/fish3/js/vendor/geofire.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/html5Geolocation/js/vendor/geofire.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/queryBuilder/js/vendor/geofire.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/sfVehicles/js/vendor/geofire.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/geoFire.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ var GeoFire = function(firebaseRef) {
9999
/*****************/
100100
/* CONSTRUCTOR */
101101
/*****************/
102-
if (firebaseRef instanceof Firebase === false) {
102+
if (Object.prototype.toString.call(firebaseRef) !== "[object Object]") {
103103
throw new Error("firebaseRef must be an instance of Firebase");
104104
}
105105

src/geoQuery.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ var GeoQuery = function (firebaseRef, queryCriteria) {
489489
/* CONSTRUCTOR */
490490
/*****************/
491491
// Firebase reference of the GeoFire which created this query
492-
if (firebaseRef instanceof Firebase === false) {
492+
if (Object.prototype.toString.call(firebaseRef) !== "[object Object]") {
493493
throw new Error("firebaseRef must be an instance of Firebase");
494494
}
495495
var _firebaseRef = firebaseRef;

0 commit comments

Comments
 (0)