Changeset 18488 for lang

Timestamp:

08/30/08 22:36:22 (4 months ago)

Author:

stomita

Message:

lang/javascript/jsonptester : changed according to wedata jsonp directory schema

Files:

• lang/javascript/jsonptester/trunk/js/jsonptester.js (modified) (5 diffs)

lang/javascript/jsonptester/trunk/js/jsonptester.js

@@ -226 +226 @@
     var data = rec.data;
     var url = data.url;
+    var queryParams = data.queryParams ? data.queryParams.split(/\s+/) : [];
  
     var wrapper = Ext.getCmp('directoryFormWrapper');
@@ -247 +248 @@
     wrapper.doLayout();
 
-    function createFields(rec) {
-     var params = [];
+    function createFields() {
+      var params = [];
       url.replace(/\{([^\}]+)\}/g, function($1,$2) { params.push($2) });
+      Array.prototype.push.apply(params, queryParams);
       return $.map(params, function(paramName) {
         var type = data[paramName+':datatype'] || 'string';
@@ -263 +265 @@
     function getJSONPValues() {
       var values = Ext.getCmp('directoryForm').getForm().getValues();
+      var params = [] 
+      var jsonpUrl = url.replace(/\{([^\}]+)\}/g, function($1, $2) {
+        return encodeURIComponent(values[$2] || '');
+      });
+      $.map(queryParams, function(paramName) {
+        if (values[paramName]) {
+          params.push({ name : paramName, value : values[paramName] });
+        }
+      });
+      if (params.length>0) {
+        jsonpUrl += jsonpUrl.indexOf('?')>=0 ? '&' : '?';
+        jsonpUrl += $.map(params, function(param) {
+          return param.name + '=' + encodeURIComponent(param.value);
+        }).join('&');
+      }
       return {
-        url : url.replace(/\{([^\}]+)\}/g, function($1, $2) {
-          var v = values[$2] || '';
-          return data[$2+':encodeURI'] ? encodeURIComponent(v) : v;
-        }),
+        url : jsonpUrl,
         callbackParam : data.jsonpParam
-      };
+      }
     }
   }
@@ -362 +376 @@
         dataType : 'jsonp',
         jsonp : node.attributes.callbackParam,
+        params : node.attributes.params,
         cache : !node.attributes.nocache,
         success : onSuccess,
@@ -395 +410 @@
       };
     }
+
   }