From 5779f63d7ee06dcdccacace2e17d6cb11b1eb7dc Mon Sep 17 00:00:00 2001
From: Seggy Umboh <seg@seg.gy>
Date: Fri, 5 Sep 2014 12:36:56 -0700
Subject: [PATCH 1/3] Reset data and dataReady on requery

---
 firebase-element.html | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/firebase-element.html b/firebase-element.html
index 02a0f6c..ec09518 100644
--- a/firebase-element.html
+++ b/firebase-element.html
@@ -234,18 +234,20 @@ <h3>My Firebase Data</h3>
         if (this.limit > 0) {
           query = query.limit(this.limit);
         }
-        this.query = query;
       }
+      this.query = query;
     },
     queryChanged: function() {
       // initialize
       this._setData(null);
       // data acquisition
       this.dataReady = false;
-      this.valueLoading = true;
-      this.query.once('value', this.valueLoaded, this);
-      // observe server-side data
-      this.observeQuery();
+      if (this.query) {
+        this.valueLoading = true;
+        this.query.once('value', this.valueLoaded, this);
+        // observe server-side data
+        this.observeQuery();
+      }
     },
     valueLoaded: function(snapshot) {
       this.valueLoading = false;

From 971eb79b2e31fbe5c71384a1236c11a62010517f Mon Sep 17 00:00:00 2001
From: Seggy Umboh <seg@seg.gy>
Date: Mon, 8 Sep 2014 11:10:26 -0700
Subject: [PATCH 2/3] Update the keys when the data goes to null

---
 firebase-element.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/firebase-element.html b/firebase-element.html
index ec09518..598f931 100644
--- a/firebase-element.html
+++ b/firebase-element.html
@@ -382,12 +382,8 @@ <h3>My Firebase Data</h3>
       }
     },
     dataChange: function() {
-      //this.job('change', function() {
-        if (this.data) {
-          this.keys = this.data ? Object.keys(this.data) : [];
-        }
+        this.keys = this.data ? Object.keys(this.data) : [];
         this.fire('data-change');
-      //});
     },
     //
     // client-side effects

From e8e454023414a76ad5d2acf16cd0715cb7ded9ff Mon Sep 17 00:00:00 2001
From: Seggy Umboh <seg@seg.gy>
Date: Mon, 8 Sep 2014 11:11:42 -0700
Subject: [PATCH 3/3] Fixed indent

---
 firebase-element.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/firebase-element.html b/firebase-element.html
index 598f931..1c26dd7 100644
--- a/firebase-element.html
+++ b/firebase-element.html
@@ -382,8 +382,8 @@ <h3>My Firebase Data</h3>
       }
     },
     dataChange: function() {
-        this.keys = this.data ? Object.keys(this.data) : [];
-        this.fire('data-change');
+      this.keys = this.data ? Object.keys(this.data) : [];
+      this.fire('data-change');
     },
     //
     // client-side effects