#126 getValue

Author: EddyVerbruggen

docs/DATABASE.md

@@ -85,7 +85,8 @@ Let's say we have the structure as defined at `setValue`, then use this query to
         "/companies",
         {
             // set this to true if you want to check if the value exists or just want the event to fire once
-            // default false, so it listens continuously
+            // default false, so it listens continuously.
+            // Only when true this function will return the date in the promise as well!
             singleEvent: true,
             // order by company.country
             orderBy: {

firebase.android.js

@@ -982,18 +982,24 @@ firebase.query = function (updateCallback, path, options) {
         var listener = new com.google.firebase.database.ValueEventListener({
           onDataChange: function (snapshot) {
             updateCallback(firebase.getCallbackData('ValueChanged', snapshot));
+            // resolve promise with data in case of single event, see https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/126
+            resolve(firebase.getCallbackData('ValueChanged', snapshot));
           },
           onCancelled: function (databaseError) {
             updateCallback({
               error: databaseError.getMessage()
             });
+            // see comment at 'onDataChange'
+            resolve({
+              error: databaseError.getMessage()
+            });
           }
         });
         query.addListenerForSingleValueEvent(listener);
       } else {
         firebase._addObservers(query, updateCallback);
+        resolve();
       }
-      resolve();
     } catch (ex) {
       console.log("Error in firebase.query: " + ex);
       reject(ex);

firebase.ios.js

@@ -1024,11 +1024,13 @@ firebase.query = function (updateCallback, path, options) {
       if (options.singleEvent) {
         query.observeSingleEventOfTypeWithBlock(FIRDataEventType.FIRDataEventTypeValue, function (snapshot) {
           updateCallback(firebase.getCallbackData('ValueChanged', snapshot));
+          // resolve promise with data in case of single event, see https://github.com/EddyVerbruggen/nativescript-plugin-firebase/issues/126
+          resolve(firebase.getCallbackData('ValueChanged', snapshot));
         });
       } else {
         firebase._addObservers(query, updateCallback);
-      }
       resolve();
+      }
     } catch (ex) {
       console.log("Error in firebase.query: " + ex);
       reject(ex);

package.json

@@ -1,6 +1,6 @@
 {
   "name": "nativescript-plugin-firebase",
-  "version": "3.6.1",
+  "version": "3.6.2-dev",
   "description" : "Fire. Base. Firebase!",
   "main" : "firebase.js",
   "nativescript": {