Changeset 446

Timestamp:

06/08/13 17:43:13 (12 years ago)

Author:

hendrikvanantwerpen

Message:

Rewrote CouchStore? to use dojo/request.

File:

• Dev/trunk/src/qed-client/store/CouchStore.js (modified) (6 diffs)

Dev/trunk/src/qed-client/store/CouchStore.js

@@ -1 +1 @@
 define([
-    'dojo/_base/array',
-    'dojo/_base/declare',
-    'dojo/_base/Deferred',
-    'dojo/_base/json',
-    'dojo/_base/lang',
-    'dojo/_base/xhr',
-    'dojo/store/util/QueryResults'
-],function(array,declare,Deferred,json,lang,xhr,QueryResults){
+    "dojo/_base/Deferred",
+    "dojo/_base/array",
+    "dojo/_base/declare",
+    "dojo/_base/json",
+    "dojo/_base/lang",
+    "dojo/request",
+    "dojo/store/util/QueryResults"
+], function(Deferred, array, declare, json, lang, request, QueryResults) {
     
     function getCouchError(err){
@@ -39 +39 @@
         info: function(){
             var dfd = new Deferred();
-            xhr("GET", {
-                url: this.target,
+            request(this.target, {
+                method: "GET",
                 handleAs: "json",
                 headers: {
@@ -58 +58 @@
         get: function(id){
             var dfd = new Deferred();
-            xhr("GET", {
-                url: this.target + id,
-                handleAs: "json",
-                headers: {
-                    Accept: this.accepts
-                }
-            }).then(function(result){
-                if ( result.error ) {
-                    dfd.reject(result.reason);
-                } else {
+            request(this.target + encodeURIComponent(id), {
+                method: "GET",
+                handleAs: "json",
+                headers: {
+                    Accept: this.accepts
+                }
+            }).then(function(result){
+                if ( result.error ) {
+                    dfd.reject(result.reason);
+                } else {
+                    result[this.idProperty] = result[this._responseIdProperty];
+                    result[this.revProperty] = result[this._responseRevProperty];
                     dfd.resolve(result);
                 }
@@ -101 +103 @@
             var id = options.id ? options.id : this.getIdentity(object);
             var hasId = typeof id !== "undefined";
-            xhr(hasId ? "PUT" : "POST", {
-                url: hasId ? this.target + id : this.target,
-                postData: json.toJson(object),
+            request(hasId ? this.target + encodeURIComponent(id) : this.target, {
+                method: hasId ? "PUT" : "POST",
+                data: json.toJson(object),
                 handleAs: "json",
                 headers:{
@@ -127 +129 @@
         remove: function(id,rev){
             var dfd = new Deferred();
-            xhr("DELETE",{
-                url: this.target + id,
+            request(this.target + encodeURIComponent(id), {
+                method: "DELETE",
                 headers: {
                     'If-Match': rev
@@ -237 +239 @@
             }
 
-            for (var qp in queryOpts) {
-                queryOpts[qp] = json.toJson(queryOpts[qp]);
-            }
-            query += '?' + xhr.objectToQuery(queryOpts);
-
-            xhr("GET", {
-                url: this.target + query,
-                handleAs: "json",
+            for ( var opt in queryOpts ) {
+                queryOpts[opt] = json.toJson(queryOpts[opt]);
+            }
+            
+            request(this.target + query, {
+                method: "GET", 
+                handleAs: "json",
+                query: queryOpts,
                 headers: {
                     Accept: this.accepts