Merge pull request #258 from katowulf/master

Fixes #255 - orderByPriority always returns an array

Author: anantn

angularfire.js

@@ -39,38 +39,35 @@
   // for more info see: https://www.firebase.com/docs/ordered-data.html
   angular.module("firebase").filter("orderByPriority", function() {
     return function(input) {
-      if (!input) {
-        return [];
-      }
-      if (!input.$getIndex || typeof input.$getIndex != "function") {
-        // If input is an object, map it to an array for the time being.
-        var type = Object.prototype.toString.call(input);
-        if (typeof input == "object" && type == "[object Object]") {
-          var ret = [];
-          for (var prop in input) {
-            if (input.hasOwnProperty(prop)) {
-              ret.push(input[prop]);
-            }
+      var sorted = [];
+      if (input) {
+        if (!input.$getIndex || typeof input.$getIndex != "function") {
+          // input is not an angularFire instance
+          if( angular.isArray(input) ) {
+            // if input is an array, copy it
+            sorted = input.slice(0);
+          }
+          else if( angular.isObject(input) ) {
+            // If input is an object, map it to an array
+            angular.forEach(input, function(prop) {
+              sorted.push(prop);
+            });
           }
-          return ret;
         }
-        return input;
-      }
-
-      var sorted = [];
-      var index = input.$getIndex();
-      if (index.length <= 0) {
-        return input;
-      }
-
-      for (var i = 0; i < index.length; i++) {
-        var val = input[index[i]];
-        if (val) {
-          val.$id = index[i];
-          sorted.push(val);
+        else {
+          // input is an angularFire instance
+          var index = input.$getIndex();
+          if (index.length > 0) {
+            for (var i = 0; i < index.length; i++) {
+              var val = input[index[i]];
+              if (val) {
+                val.$id = index[i];
+                sorted.push(val);
+              }
+            }
+          }
         }
       }
-
       return sorted;
     };
   });