Merge branch 'master' of yuisource.corp.yahoo.com:yui3

yui · Jan 12, 2011 · f332140 · f332140
2 parents e8f0be1 + c99f1bf
commit f332140
Show file tree

Hide file tree

Showing 27 changed files with 90 additions and 55 deletions.
diff --git a/build/autocomplete/autocomplete-debug.js b/build/autocomplete/autocomplete-debug.js
@@ -1776,7 +1776,8 @@ ACSources.prototype = {
 
                     env        = that.get('yqlEnv');
                     maxResults = that.get(MAX_RESULTS);
-                    opts       = {proto: that.get('yqlProtocol')};
+
+                    opts = {proto: that.get('yqlProtocol')};
 
                     yqlQuery = Lang.sub(source, {
                         maxResults: maxResults > 0 ? maxResults : 1000,
@@ -1789,11 +1790,16 @@ ACSources.prototype = {
                     if (yqlRequest) {
                         yqlRequest._callback   = callback;
                         yqlRequest._opts       = opts;
-                        yqlRequest._params.env = env;
                         yqlRequest._params.q   = yqlQuery;
+
+                        if (env) {
+                            yqlRequest._params.env = env;
+                        }
                     } else {
-                        yqlRequest = new Y.YQLRequest(yqlQuery, callback,
-                                env ? {env: env} : null, opts);
+                        yqlRequest = new Y.YQLRequest(yqlQuery, {
+                            on: {success: callback},
+                            allowCache: false // temp workaround until JSONP has per-URL callback proxies
+                        }, env ? {env: env} : null, opts);
                     }
 
                     yqlRequest.send();
@@ -2695,7 +2701,7 @@ Y.AutoCompleteList = List;
 Y.AutoComplete = List;
 
 
-}, '@VERSION@' ,{after:['autocomplete-sources'], requires:['autocomplete-base', 'selector-css3', 'widget', 'widget-position', 'widget-position-align', 'widget-stack'], lang:['en'], skinnable:true});
+}, '@VERSION@' ,{lang:['en'], requires:['autocomplete-base', 'selector-css3', 'widget', 'widget-position', 'widget-position-align', 'widget-stack'], after:['autocomplete-sources'], skinnable:true});
 YUI.add('autocomplete-plugin', function(Y) {
 
 /**

diff --git a/build/autocomplete/autocomplete-list-debug.js b/build/autocomplete/autocomplete-list-debug.js
@@ -782,4 +782,4 @@ Y.AutoCompleteList = List;
 Y.AutoComplete = List;
 
 
-}, '@VERSION@' ,{after:['autocomplete-sources'], requires:['autocomplete-base', 'selector-css3', 'widget', 'widget-position', 'widget-position-align', 'widget-stack'], lang:['en'], skinnable:true});
+}, '@VERSION@' ,{lang:['en'], requires:['autocomplete-base', 'selector-css3', 'widget', 'widget-position', 'widget-position-align', 'widget-stack'], after:['autocomplete-sources'], skinnable:true});
diff --git a/build/autocomplete/autocomplete-list-min.js b/build/autocomplete/autocomplete-list-min.js
diff --git a/build/autocomplete/autocomplete-list.js b/build/autocomplete/autocomplete-list.js
@@ -782,4 +782,4 @@ Y.AutoCompleteList = List;
 Y.AutoComplete = List;
 
 
-}, '@VERSION@' ,{after:['autocomplete-sources'], requires:['autocomplete-base', 'selector-css3', 'widget', 'widget-position', 'widget-position-align', 'widget-stack'], lang:['en'], skinnable:true});
+}, '@VERSION@' ,{lang:['en'], requires:['autocomplete-base', 'selector-css3', 'widget', 'widget-position', 'widget-position-align', 'widget-stack'], after:['autocomplete-sources'], skinnable:true});