Changeset 362 for Dev/branches/rest-dojo-ui/client/rft/store.js

Timestamp:

07/16/12 16:27:40 (13 years ago)

Author:

hendrikvanantwerpen

Message:

Selector can be clicked on whole line now.
Question editor in survey page does lazy loading per
category and displays total number of questions.

File:

• Dev/branches/rest-dojo-ui/client/rft/store.js (modified) (3 diffs)

Dev/branches/rest-dojo-ui/client/rft/store.js

@@ -97 +97 @@
                 if ( query === undefined ) {
                     query = '_all_docs';
-                    queryOpts.include_docs = true;
                 }
 
@@ -126 +125 @@
 
                 // Custom options
-                if (options.key) {
+                if (options.key !== undefined) {
                     queryOpts.key = options.key;
-                } else if (options.keys) {
+                } else if (options.keys !== undefined) {
                     queryOpts.keys = options.keys;
-                } else if (options.startkey || options.endkey) {
+                } else if (options.startkey !== undefined || options.endkey !== undefined) {
                     queryOpts.startkey = options.startkey;
                     queryOpts.endkey = options.endkey;
+                }
+                if (options.include_docs !== undefined) {
+                    queryOpts.include_docs = options.include_docs;
+                }
+                if (options.reduce !== undefined) {
+                    queryOpts.reduce = options.reduce;
+                }
+                if (options.group !== undefined) {
+                    queryOpts.group = options.group;
+                    if (options.group_level !== undefined) {
+                        queryOpts.group_level = options.group_level;
+                    }
                 }
 
@@ -152 +163 @@
                         dfd.resolve(
                             array.map(result.rows,
-                                      function(result){ return result.value; }));
+                                      function(result){
+                                          return [result.key, options.include_docs === true ? result.doc : result.value];
+                                      }));
                     }
                 },function(err){
                     dfd.reject(err);
                 });
-                        return QueryResults(dfd.promise);
+                        return CouchResults(dfd.promise);
             }
         });
 
+        function CouchResults(results) {
+            if (!results) {
+                return results;
+            }
+
+                if(results.then){
+                        results = lang.delegate(results);
+                }
+
+            if (!results.forEach) {
+                results.forEach = function(callback) {
+                    return Deferred.when(results, function(results) {
+                        array.forEach(results, function(result) {
+                            callback(result[1],result[0]);
+                        });
+                    });
+                }
+            }
+
+            return results;
+        }
+
         return new CouchStore({target: 'data/rft/'});