modify dojo rebuild script to remove uncompressed files

[tt-rss.git] / lib / dojo / store / util / SimpleQueryEngine.js.uncompressed.js

diff --git a/lib/dojo/store/util/SimpleQueryEngine.js.uncompressed.js b/lib/dojo/store/util/SimpleQueryEngine.js.uncompressed.js
index 4f241e6f12028e46fe3a7afef97e0d0267b3dade..faf7127815ba6226dc0e41b806a078504527bd67 100644 (file)
--- a/lib/dojo/store/util/SimpleQueryEngine.js.uncompressed.js
+++ b/lib/dojo/store/util/SimpleQueryEngine.js.uncompressed.js
@@ -1,8 +1,7 @@
-define("dojo/store/util/SimpleQueryEngine", ["../../_base/array"], function(arrayUtil) {
-  //  module:
-  //    dojo/store/util/SimpleQueryEngine
-  //  summary:
-  //    The module defines a simple filtering query engine for object stores. 
+define("dojo/store/util/SimpleQueryEngine", ["../../_base/array" /*=====, "../api/Store" =====*/], function(arrayUtil /*=====, Store =====*/){
+
+// module:
+//             dojo/store/util/SimpleQueryEngine
 
 return function(query, options){
        // summary:
@@ -26,10 +25,10 @@ return function(query, options){
        //              An object hash with fields that may match fields of items in the store.
        //              Values in the hash will be compared by normal == operator, but regular expressions
        //              or any object that provides a test() method are also supported and can be
-       //              used to match strings by more complex expressions
-       //              (and then the regex's or object's test() method will be used to match values).
+       //              used to match strings by more complex expressions
+       //              (and then the regex's or object's test() method will be used to match values).
        //
-       // options: dojo.store.util.SimpleQueryEngine.__queryOptions?
+       // options: dojo/store/api/Store.QueryOptions?
        //              An object that contains optional information such as sort, start, and count.
        //
        // returns: Function
@@ -41,10 +40,10 @@ return function(query, options){
        //
        //      |       var myStore = function(options){
        //      |               //      ...more properties here
-       //      |               this.queryEngine = dojo.store.util.SimpleQueryEngine;
+       //      |               this.queryEngine = SimpleQueryEngine;
        //      |               //      define our query method
        //      |               this.query = function(query, options){
-       //      |                       return dojo.store.util.QueryResults(this.queryEngine(query, options)(this.data));
+       //      |                       return QueryResults(this.queryEngine(query, options)(this.data));
        //      |               };
        //      |       };
 
@@ -58,7 +57,8 @@ return function(query, options){
                                for(var key in queryObject){
                                        var required = queryObject[key];
                                        if(required && required.test){
-                                               if(!required.test(object[key])){
+                                               // an object can provide a test method, which makes it work with regex
+                                               if(!required.test(object[key], object)){
                                                        return false;
                                                }
                                        }else if(required != object[key]){
@@ -82,13 +82,14 @@ return function(query, options){
                // execute the whole query, first we filter
                var results = arrayUtil.filter(array, query);
                // next we sort
-               if(options && options.sort){
-                       results.sort(function(a, b){
-                               for(var sort, i=0; sort = options.sort[i]; i++){
+               var sortSet = options && options.sort;
+               if(sortSet){
+                       results.sort(typeof sortSet == "function" ? sortSet : function(a, b){
+                               for(var sort, i=0; sort = sortSet[i]; i++){
                                        var aValue = a[sort.attribute];
                                        var bValue = b[sort.attribute];
-                                       if (aValue != bValue) {
-                                               return !!sort.descending == aValue > bValue ? -1 : 1;
+                                       if (aValue != bValue){
+                                               return !!sort.descending == (aValue == null || aValue > bValue) ? -1 : 1;
                                        }
                                }
                                return 0;
@@ -105,4 +106,5 @@ return function(query, options){
        execute.matches = query;
        return execute;
 };
+
 });