Changeset 382 for Dev/branches/rest-dojo-ui/client/rft/elastic/ElasticReadStore.js

Timestamp:

07/27/12 14:52:36 (13 years ago)

Author:

hendrikvanantwerpen

Message:

• Added description to survey properties form.
• Added crude loading indicator to TabbedQuestionWidget?.
• Organized run.js: dependencies in alpha order and only declaratively used widgets, removed other dependencies, they should be in the modules where they are used.
• ElasticReadStore? and ElasticSearchFilteringSelect? was a mix of old dojo.declare/dojo.require and new AMD style. Changed it completely to AMD style (benefits builds later as well).
• Changed questions view so questions without topics/categories show up as well in the view.

File:

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

Dev/branches/rest-dojo-ui/client/rft/elastic/ElasticReadStore.js

@@ -1 @@
-define(["dojo", "dojox", "dojo/json"], function(dojo, dojox, JSON) {
-        dojo.provide("rft.elastic.ElasticReadStore");
+define([
+    'dojo/_base/declare',
+    "dojo/_base/json",
+    'dojo/_base/lang',
+    'dojo/_base/xhr',
+    'dojox/data/QueryReadStore'
+    ],function(declare, json, lang, xhr, QueryReadStore) {
 
-        dojo.require("dojox.data.QueryReadStore");
-
-        dojo.declare("rft.elastic.ElasticReadStore", dojox.data.QueryReadStore, {
+        return declare("rft.elastic.ElasticReadStore", QueryReadStore, {
             fetch:function(request){
                 var attr = Object.keys(request.query)[0];
@@ -12 +15 @@
                 var q = request.query[attr];
 
-                request.serverQuery = dojo.toJson({ 
+                request.serverQuery = json.toJson({ 
                                                                 query: 
                                                                 {
@@ -27 +30 @@
                 _fetchItems: function(request, fetchHandler, errorHandler){
                         var serverQuery = request.serverQuery;
-                        var xhrHandler = dojo.xhrPost( { url:this.url,
-                                                                handleAs: "json",
-                                                                postData: serverQuery });
+                        var xhrHandler = xhr.post({
+                url: this.url,
+                handleAs: "json",
+                postData: serverQuery
+            });
                         request.abort = function(){
                                 xhrHandler.cancel();
                         };
-                        xhrHandler.addCallback(dojo.hitch(this, function(data){
+                        xhrHandler.addCallback(lang.hitch(this, function(data){
                                 this._xhrFetchHandler(data, request, fetchHandler, errorHandler);
                         }));