Merge pull request googlearchive#35 from firebase/id-uid

ID to UID.
marister · Oct 15, 2014 · d76d269 · d76d269
2 parents 3b2c4c1 + 10b5383
commit d76d269
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.gitignore b/.gitignore
@@ -3,3 +3,4 @@
 *.iml
 *~
 .bundle
+node_modules
diff --git a/www/js/firefeed.js b/www/js/firefeed.js
@@ -173,7 +173,7 @@ Firefeed.prototype.onLogin = function(user) {
   var displayName = user.facebook.displayName.split(' ');
   user.first_name = displayName[0];
   user.last_name = displayName[displayName.length - 1];
-  user.id = user.facebook.id;
+  user.id = user.uid;
   user.name = user.facebook.displayName;
   user.location = '';
   user.bio = '';
-Original file line number
+Diff line change
@@ Expand Up / @@ -3,3 +3,4 @@ @@
     *.iml
     *~
     .bundle
+    node_modules