diff --git a/docs/changelog/7.x.x.txt b/docs/changelog/7.x.x.txt index c9ff0da9d..2b068a9f9 100644 --- a/docs/changelog/7.x.x.txt +++ b/docs/changelog/7.x.x.txt @@ -1,10 +1,8 @@ 7.10.13 - added #12079: Carousel Auto Play - - fixed #12065: "Data error" in AssetManager if URL is Cyrillic - fixed #12075: Underground Style - Search does not search - fixed #12084: Greenportal links are sometimes white on white - - rfe #618: Syndicated Content Asset: Make images in the downloaded - RSS-feeds available in the template. + - rfe #618: Syndicated Content Asset: Make images in the downloaded RSS-feeds available in the template. 7.10.12 - fixed #12072: Product, related and accessory assets diff --git a/www/extras/Fork/poll.js b/www/extras/Fork/poll.js index 4f43d06ce..5bb1a7761 100644 --- a/www/extras/Fork/poll.js +++ b/www/extras/Fork/poll.js @@ -7,7 +7,6 @@ ns.poll = function(args) { function fetch() { var first = true; - var url = encodeURI(args.url), YAHOO.util.Connect.asyncRequest('GET', args.url, { success: function (o) { var data, e; diff --git a/www/extras/VendorPayout/vendorPayout.js b/www/extras/VendorPayout/vendorPayout.js index f2b9ba132..496b3bd6b 100644 --- a/www/extras/VendorPayout/vendorPayout.js +++ b/www/extras/VendorPayout/vendorPayout.js @@ -77,8 +77,7 @@ WebGUI.VendorPayout.prototype.initialize = function (aaa, bbb,ccc,ddd) { // Submit button this.submitPayoutsButton = new YAHOO.widget.Button({ label: this.i18n( 'submit scheduled payouts button' ), container: this.buttonDiv }); this.submitPayoutsButton.on( 'click', function () { - var buttonUrl = encodeURI(location.pathname) + '?shop=vendor;method=submitScheduledPayouts'; - YAHOO.util.Connect.asyncRequest( 'GET', buttonUrl, { + YAHOO.util.Connect.asyncRequest( 'GET', '?shop=vendor;method=submitScheduledPayouts', { success: obj.initialize, scope: obj } ); @@ -88,7 +87,7 @@ WebGUI.VendorPayout.prototype.initialize = function (aaa, bbb,ccc,ddd) { this.payoutDetails = document.createElement('div'); this.container.appendChild( this.payoutDetails ); - this.itemBaseUrl = encodeURI(location.pathname) + '?shop=vendor;method=payoutDataAsJSON;'; + this.itemBaseUrl = '?shop=vendor;method=payoutDataAsJSON;'; this.initVendorList(); this.initPayoutDetails(); @@ -106,7 +105,7 @@ WebGUI.VendorPayout.prototype.initVendorList = function () { ]; // setup data source - var url = encodeURI(location.pathname) + '?shop=vendor;method=vendorTotalsAsJSON;'; + var url = '?shop=vendor;method=vendorTotalsAsJSON;'; this.vendorDataSource = new YAHOO.util.DataSource( url ); this.vendorDataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; this.vendorDataSource.responseSchema = { @@ -247,7 +246,7 @@ WebGUI.VendorPayout.prototype.initPayoutDetails = function () { }; var status = record.getData( 'vendorPayoutStatus' ) === 'NotPaid' ? 'Scheduled' : 'NotPaid'; - var url = encodeURI(location.pathname) + '?shop=vendor;method=setPayoutStatus' + ';itemId=' + record.getData( 'itemId' ) + ';status=' + status; + var url = '?shop=vendor;method=setPayoutStatus' + ';itemId=' + record.getData( 'itemId' ) + ';status=' + status; YAHOO.util.Connect.asyncRequest( 'post', url, callback ); } ); } diff --git a/www/extras/form/fieldCheck.js b/www/extras/form/fieldCheck.js index 31d186231..981ee342e 100644 --- a/www/extras/form/fieldCheck.js +++ b/www/extras/form/fieldCheck.js @@ -72,8 +72,7 @@ WebGUI.FieldCheck.AjaxEvent.prototype = { return false; } else { this.sUri = (!sUri) ? this.sUri : sUri; - var url = encodeURI(this.sUri); - YAHOO.util.Connect.asyncRequest('GET', url, { + YAHOO.util.Connect.asyncRequest('GET', this.sUri, { success: function (o) { var oJSON = eval("(" + o.responseText + ")"); var imgEltId=fieldId+"_Img"; diff --git a/www/extras/shop/cart.js b/www/extras/shop/cart.js index f9abe3661..b6ba0dc72 100644 --- a/www/extras/shop/cart.js +++ b/www/extras/shop/cart.js @@ -412,7 +412,7 @@ // This is a very thin layer on top of YAHOO.util.Connect.asyncRequest. request: function (method, params, success) { - var url = encodeURI(this.baseUrl), + var url = this.baseUrl, cb = { success: success }, query = _(params).map(function (v, k) { return [k, escape(v)].join('='); diff --git a/www/extras/templatePreview.js b/www/extras/templatePreview.js index 18b59208e..3d8cf841b 100644 --- a/www/extras/templatePreview.js +++ b/www/extras/templatePreview.js @@ -55,7 +55,7 @@ } function fetch(k) { - var url = encodeURI(document.getElementById('previewFetchUrl').value), + var url = document.getElementById('previewFetchUrl').value, abs, b; if (!url) { diff --git a/www/extras/wobject/Dashboard/draggable.js b/www/extras/wobject/Dashboard/draggable.js index a8df61773..35b7066b4 100644 --- a/www/extras/wobject/Dashboard/draggable.js +++ b/www/extras/wobject/Dashboard/draggable.js @@ -317,7 +317,7 @@ function dragable_dragStop(e) { } } - var url = encodeURI(replUrl) + "?func=ajaxInlineView"; + var url = replUrl + "?func=ajaxInlineView"; var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); } startTD=null; @@ -365,7 +365,7 @@ function dragable_postNewContentMap() { } } - var url = encodeURI(pageURL); + var url = pageURL; var dataParts = "func=setContentPositions&map=" + dragable_getContentMap(); var status = YAHOO.util.Connect.asyncRequest('POST',url,callback,dataParts); @@ -528,7 +528,6 @@ function dashboard_toggleEditForm(event,shortcutId,editFormUrl) { } } - editFormUrl = encodeURI(editFormUrl); var status = YAHOO.util.Connect.asyncRequest('GET',editFormUrl,callback); } @@ -572,7 +571,7 @@ function dashboard_toggleEditDashletForm(event,assetId,dashboardUrl) { } } - var url = encodeURI(dashboardUrl) + "?func=editDashlet;dashletAssetId="+assetId; + var url = dashboardUrl + "?func=editDashlet;dashletAssetId="+assetId; var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); } @@ -596,7 +595,7 @@ function dashboard_reloadDashlet(event,shortcutId,shortcutUrl) { } } - var url = encodeURI(shortcutUrl) + "?func=ajaxInlineView"; + var url = shortcutUrl + "?func=ajaxInlineView"; var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); } @@ -923,7 +922,7 @@ function dragable_dragStop(e) { } } - var url = encodeURI(replUrl) + "?func=ajaxInlineView"; + var url = replUrl + "?func=ajaxInlineView"; var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); } startTD=null; @@ -971,7 +970,7 @@ function dragable_postNewContentMap() { } } - var url = encodeURI(pageURL); + var url = pageURL; var dataParts = "func=setContentPositions&map=" + dragable_getContentMap(); var status = YAHOO.util.Connect.asyncRequest('POST',url,callback,dataParts); @@ -1134,7 +1133,6 @@ function dashboard_toggleEditForm(event,shortcutId,editFormUrl) { } } - editFormUrl = encodeURI(editFormUrl); var status = YAHOO.util.Connect.asyncRequest('GET',editFormUrl,callback); } @@ -1178,7 +1176,7 @@ function dashboard_toggleEditDashletForm(event,assetId,dashboardUrl) { } } - var url = encodeURI(dashboardUrl) + "?func=editDashlet;dashletAssetId="+assetId; + var url = dashboardUrl + "?func=editDashlet;dashletAssetId="+assetId; var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); } @@ -1202,7 +1200,7 @@ function dashboard_reloadDashlet(event,shortcutId,shortcutUrl) { } } - var url = encodeURI(shortcutUrl) + "?func=ajaxInlineView"; + var url = shortcutUrl + "?func=ajaxInlineView"; var status = YAHOO.util.Connect.asyncRequest('GET',url,callback); } diff --git a/www/extras/wobject/ProjectManager/modal.js b/www/extras/wobject/ProjectManager/modal.js index 7fe708ea5..5df4df1da 100644 --- a/www/extras/wobject/ProjectManager/modal.js +++ b/www/extras/wobject/ProjectManager/modal.js @@ -69,7 +69,7 @@ function showPopWin( e ) { } - var status = YAHOO.util.Connect.asyncRequest('POST',encodeURI(url),callback,dataPart); + var status = YAHOO.util.Connect.asyncRequest('POST',url,callback,dataPart); } diff --git a/www/extras/wobject/Survey/administersurvey/comm.js b/www/extras/wobject/Survey/administersurvey/comm.js index f30dc2199..d0f5e395f 100644 --- a/www/extras/wobject/Survey/administersurvey/comm.js +++ b/www/extras/wobject/Survey/administersurvey/comm.js @@ -6,7 +6,7 @@ if (typeof Survey === "undefined") { (function(){ var callMade = 0; - var request = function(sQuery, callback, postData, form, hasFile){ + var request = function(sUrl, callback, postData, form, hasFile){ if (form) { if (hasFile) { YAHOO.util.Connect.setForm(form, true); @@ -23,9 +23,8 @@ if (typeof Survey === "undefined") { } else { callMade = 1; - YAHOO.log(sQuery); - var url = encodeURI(location.pathname) + sQuery; - YAHOO.util.Connect.asyncRequest('POST', url, callback, postData); + YAHOO.log(sUrl); + YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData); } }; @@ -80,13 +79,13 @@ if (typeof Survey === "undefined") { } }, submitSummary: function(data,functionName){ - var sQuery = "?func=loadQuestions;shownSummary=1"; + var sUrl = "?func=loadQuestions;shownSummary=1"; var revision = Survey.Comm.getRevision(); if (revision) { - sQuery += ";revision=" + revision; + sUrl += ";revision=" + revision; } - request(sQuery, this.callback, null, null, null); + request(sUrl, this.callback, null, null, null); }, getRevision: function() { @@ -105,15 +104,15 @@ if (typeof Survey === "undefined") { postData = "data=" + YAHOO.lang.JSON.stringify(data, data); } - //var sQuery = this.url + "?func="+functionName; - var sQuery = "?func=" + functionName; + //var sUrl = this.url + "?func="+functionName; + var sUrl = "?func=" + functionName; var revision = Survey.Comm.getRevision(); if (revision) { - sQuery += ";revision=" + revision; + sUrl += ";revision=" + revision; } - request(sQuery, this.callback, postData, form, hasFile); + request(sUrl, this.callback, postData, form, hasFile); } }; })(); diff --git a/www/extras/wobject/Survey/editsurvey/comm.js b/www/extras/wobject/Survey/editsurvey/comm.js index 155b5c82d..80551b8b8 100644 --- a/www/extras/wobject/Survey/editsurvey/comm.js +++ b/www/extras/wobject/Survey/editsurvey/comm.js @@ -6,14 +6,13 @@ if (typeof Survey == "undefined") { Survey.Comm = new function(){ var callMade = 0; - var request = function(sQuery,callback,postData){ + var request = function(sUrl,callback,postData){ YAHOO.util.Dom.setStyle('mask-all','display','block'); if(callMade == 1){ alert("Waiting on previous request"); }else{ callMade = 1; - var url = encodeURI(location.pathname) + sQuery; - YAHOO.util.Connect.asyncRequest('POST', url, callback, postData); + YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData); } }; this.callback = { @@ -32,49 +31,49 @@ Survey.Comm = new function(){ }; this.loadSurvey = function(p){ var postData = "data="+p; - var sQuery = "?func=loadSurvey"; - request(sQuery,this.callback,postData); + var sUrl = "?func=loadSurvey"; + request(sUrl,this.callback,postData); }; this.dragDrop = function(target,before){ var p = {}; p.target = target; p.before = before; var postData = "data="+YAHOO.lang.JSON.stringify(p); - var sQuery = "?func=dragDrop"; - request(sQuery,this.callback,postData); + var sUrl = "?func=dragDrop"; + request(sUrl,this.callback,postData); }; this.submitEdit = function(p){ var postData = "data="+YAHOO.lang.JSON.stringify(p); - var sQuery = "?func=submitEdit"; - request(sQuery,this.callback,postData); + var sUrl = "?func=submitEdit"; + request(sUrl,this.callback,postData); }; this.newSection = function(){ - var sQuery = "?func=newObject"; - request(sQuery,this.callback); + var sUrl = "?func=newObject"; + request(sUrl,this.callback); }; this.newQuestion = function(id){ var postData = "data="+id; - var sQuery = "?func=newObject"; - request(sQuery,this.callback,postData); + var sUrl = "?func=newObject"; + request(sUrl,this.callback,postData); }; this.newAnswer = function(id){ var postData = "data="+id; - var sQuery = "?func=newObject"; - request(sQuery,this.callback,postData); + var sUrl = "?func=newObject"; + request(sUrl,this.callback,postData); }; this.deleteAnswer = function(id){ var postData = "data="+id; - var sQuery = "?func=deleteAnswer"; - request(sQuery,this.callback,postData); + var sUrl = "?func=deleteAnswer"; + request(sUrl,this.callback,postData); }; this.deleteQuestion = function(id){ var postData = "data="+id; - var sQuery = "?func=deleteQuestion"; - request(sQuery,this.callback,postData); + var sUrl = "?func=deleteQuestion"; + request(sUrl,this.callback,postData); }; this.deleteSection = function(id){ var postData = "data="+id; - var sQuery = "?func=deleteSection"; - request(sQuery,this.callback,postData); + var sUrl = "?func=deleteSection"; + request(sUrl,this.callback,postData); }; }(); diff --git a/www/extras/wobject/Thingy/thingy.js b/www/extras/wobject/Thingy/thingy.js index ee4ceae28..2a850a9a8 100644 --- a/www/extras/wobject/Thingy/thingy.js +++ b/www/extras/wobject/Thingy/thingy.js @@ -75,7 +75,7 @@ function initOptionalFields(prefix,fieldId) { var getFieldValues = function() { var fieldInOtherThingId = this.value; - var url = encodeURI(location.pathname) + "?func=selectDefaultFieldValue;thingId=" + thingId + ";fieldInOtherThingId=" + fieldInOtherThingId + ";fieldId=" + fieldId; + var url = location.pathname + "?func=selectDefaultFieldValue;thingId=" + thingId + ";fieldInOtherThingId=" + fieldInOtherThingId + ";fieldId=" + fieldId; var handleSuccess = function(o){ defaultFieldInThing_module.setBody(o.responseText); @@ -100,7 +100,7 @@ function initOptionalFields(prefix,fieldId) { fieldInThing_module.show(); defaultFieldInThing_module.show(); }else{ - var url = encodeURI(location.pathname) + "?func=selectFieldInThing;thingId=" + thingId + ";prefix=" +prefix + ";fieldId=" + fieldId; + var url = location.pathname + "?func=selectFieldInThing;thingId=" + thingId + ";prefix=" +prefix + ";fieldId=" + fieldId; var handleSuccess = function(o){ fieldInThing_module.setBody(o.responseText); fieldInThing_module.show(); @@ -202,7 +202,7 @@ function editListItem(url,fieldId,copy) { cache:false }; - var request = YAHOO.util.Connect.asyncRequest('GET', encodeURI(url), callbackGetForm); + var request = YAHOO.util.Connect.asyncRequest('GET', url, callbackGetForm); } function addListItemHTML(listItemId, newInnerHTML,label){ @@ -355,7 +355,7 @@ if (confirm("Are you sure you want to delete this field?")){ }; var postData = "func=deleteFieldConfirm;fieldId=" + listItemId + ";thingId=" + thingId; - var request = YAHOO.util.Connect.asyncRequest('POST', encodeURI(url), callback, postData); + var request = YAHOO.util.Connect.asyncRequest('POST', url, callback, postData); } } @@ -482,7 +482,7 @@ YAHOO.extend(YAHOO.draglist.DDList, YAHOO.util.DDProxy, { success:handleSuccess, failure:handleFailure }; - var url = encodeURI(location.pathname); + var url = location.pathname; //curRank = curRank +1; //origRank = origRank +1; var postData = "func=moveFieldConfirm;fieldId=" + srcEl.id + ";targetFieldId=" + destination+";direction="+direction;//currentRank="+curRank+";originalRank="+origRank+"; diff --git a/www/extras/yui-webgui/build/assetHistory/assetHistory.js b/www/extras/yui-webgui/build/assetHistory/assetHistory.js index 5fbaa9c3a..ca8034648 100644 --- a/www/extras/yui-webgui/build/assetHistory/assetHistory.js +++ b/www/extras/yui-webgui/build/assetHistory/assetHistory.js @@ -78,7 +78,7 @@ WebGUI.AssetHistory.initDataTable = function (o) { // initialize the data source WebGUI.AssetHistory.DataSource - = new YAHOO.util.DataSource( encodeURI(location.pathname) + '?op=assetHistory;method=getHistoryAsJson;', {connTimeout:30000} ); + = new YAHOO.util.DataSource( '?op=assetHistory;method=getHistoryAsJson;',{connTimeout:30000} ); WebGUI.AssetHistory.DataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; WebGUI.AssetHistory.DataSource.responseSchema diff --git a/www/extras/yui-webgui/build/assetManager/assetManager.js b/www/extras/yui-webgui/build/assetManager/assetManager.js index 4400eae91..eb418c639 100644 --- a/www/extras/yui-webgui/build/assetManager/assetManager.js +++ b/www/extras/yui-webgui/build/assetManager/assetManager.js @@ -263,7 +263,7 @@ WebGUI.AssetManager.initDataTable = function (o) { // initialize the data source WebGUI.AssetManager.DataSource - = new YAHOO.util.DataSource( encodeURI(location.pathname) + '?op=assetManager;method=ajaxGetManagerPage;', {connTimeout:30000} ); + = new YAHOO.util.DataSource( '?op=assetManager;method=ajaxGetManagerPage;',{connTimeout:30000} ); WebGUI.AssetManager.DataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; WebGUI.AssetManager.DataSource.responseSchema diff --git a/www/extras/yui-webgui/build/friendManager/friendManager.js b/www/extras/yui-webgui/build/friendManager/friendManager.js index 232b0501c..0887885f4 100644 --- a/www/extras/yui-webgui/build/friendManager/friendManager.js +++ b/www/extras/yui-webgui/build/friendManager/friendManager.js @@ -104,7 +104,7 @@ WebGUI.FriendManager.MakeTable = function (groupId, containerId) { }); that.DataSource - = new YAHOO.util.DataSource(encodeURI(location.pathname) + '?op=account;module=friendManager;do=getFriendsAsJson;groupId='+groupId+';',{connTimeout:30000} ); + = new YAHOO.util.DataSource('?op=account;module=friendManager;do=getFriendsAsJson;groupId='+groupId+';',{connTimeout:30000} ); that.DataSource.responseType = YAHOO.util.DataSource.TYPE_JSON; that.DataSource.responseSchema = WebGUI.FriendManager.responseSchema; that.DataTable = new YAHOO.widget.DataTable( diff --git a/www/extras/yui-webgui/build/i18n/i18n.js b/www/extras/yui-webgui/build/i18n/i18n.js index 6101d2389..651a9cbf9 100644 --- a/www/extras/yui-webgui/build/i18n/i18n.js +++ b/www/extras/yui-webgui/build/i18n/i18n.js @@ -20,7 +20,7 @@ if (typeof WebGUI == "undefined") { */ WebGUI.i18n = function ( opt ) { - this.url = opt.url || location.pathname; + this.url = opt.url || ""; this.namespaces = {}; this.evPreload = this.createEvent( "preload" ); @@ -59,7 +59,7 @@ WebGUI.i18n.prototype.get */ WebGUI.i18n.prototype.load = function ( obj, preload ) { - var requestUrl = encodeURI(this.url) + "?op=ajaxGetI18N" + var requestUrl = this.url + "?op=ajaxGetI18N" var callback = { failure : function ( o, preload ) { // TODO: YUI logger for this diff --git a/www/extras/yui-webgui/build/thingyRecord/thingyRecord.js b/www/extras/yui-webgui/build/thingyRecord/thingyRecord.js index b1e760e6e..ee15a7127 100644 --- a/www/extras/yui-webgui/build/thingyRecord/thingyRecord.js +++ b/www/extras/yui-webgui/build/thingyRecord/thingyRecord.js @@ -29,7 +29,7 @@ WebGUI.ThingyRecord.getThingFields } }; - var url = encodeURI(location.pathname) + '?op=formHelper;class=ThingFieldsList;sub=getThingFields;thingId=' + var url = '?op=formHelper;class=ThingFieldsList;sub=getThingFields;thingId=' + thingId ; YAHOO.util.Connect.asyncRequest( 'GET', url, callback );