oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for UTF8 URLs in static JS files. Next, all templated/snippet based JS has to be reviewed. Partial fix for bug#12065

Browse source
This commit is contained in:
Colin Kuskie 2011-03-28 12:39:31 -07:00
parent 0c1486c8d4
commit 25fe87db19
16 changed files with 65 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

18
www/extras/wobject/Dashboard/draggable.js
View file

@ -317,7 +317,7 @@ function dragable_dragStop(e) {
}
}
var url = replUrl + "?func=ajaxInlineView";
var url = encodeURI(replUrl) + "?func=ajaxInlineView";
var status = YAHOO.util.Connect.asyncRequest('GET',url,callback);
}
startTD=null;
@ -365,7 +365,7 @@ function dragable_postNewContentMap() {
}
}
var url = pageURL;
var url = encodeURI(pageURL);
var dataParts = "func=setContentPositions&map=" + dragable_getContentMap();
var status = YAHOO.util.Connect.asyncRequest('POST',url,callback,dataParts);
@ -528,6 +528,7 @@ function dashboard_toggleEditForm(event,shortcutId,editFormUrl) {
}
}
editFormUrl = encodeURI(editFormUrl);
var status = YAHOO.util.Connect.asyncRequest('GET',editFormUrl,callback);
}
@ -571,7 +572,7 @@ function dashboard_toggleEditDashletForm(event,assetId,dashboardUrl) {
}
}
var url = dashboardUrl + "?func=editDashlet;dashletAssetId="+assetId;
var url = encodeURI(dashboardUrl) + "?func=editDashlet;dashletAssetId="+assetId;
var status = YAHOO.util.Connect.asyncRequest('GET',url,callback);
}
@ -595,7 +596,7 @@ function dashboard_reloadDashlet(event,shortcutId,shortcutUrl) {
}
}
var url = shortcutUrl + "?func=ajaxInlineView";
var url = encodeURI(shortcutUrl) + "?func=ajaxInlineView";
var status = YAHOO.util.Connect.asyncRequest('GET',url,callback);
}
@ -922,7 +923,7 @@ function dragable_dragStop(e) {
}
}
var url = replUrl + "?func=ajaxInlineView";
var url = encodeURI(replUrl) + "?func=ajaxInlineView";
var status = YAHOO.util.Connect.asyncRequest('GET',url,callback);
}
startTD=null;
@ -970,7 +971,7 @@ function dragable_postNewContentMap() {
}
}
var url = pageURL;
var url = encodeURI(pageURL);
var dataParts = "func=setContentPositions&map=" + dragable_getContentMap();
var status = YAHOO.util.Connect.asyncRequest('POST',url,callback,dataParts);
@ -1133,6 +1134,7 @@ function dashboard_toggleEditForm(event,shortcutId,editFormUrl) {
}
}
editFormUrl = encodeURI(editFormUrl);
var status = YAHOO.util.Connect.asyncRequest('GET',editFormUrl,callback);
}
@ -1176,7 +1178,7 @@ function dashboard_toggleEditDashletForm(event,assetId,dashboardUrl) {
}
}
var url = dashboardUrl + "?func=editDashlet;dashletAssetId="+assetId;
var url = encodeURI(dashboardUrl) + "?func=editDashlet;dashletAssetId="+assetId;
var status = YAHOO.util.Connect.asyncRequest('GET',url,callback);
}
@ -1200,7 +1202,7 @@ function dashboard_reloadDashlet(event,shortcutId,shortcutUrl) {
}
}
var url = shortcutUrl + "?func=ajaxInlineView";
var url = encodeURI(shortcutUrl) + "?func=ajaxInlineView";
var status = YAHOO.util.Connect.asyncRequest('GET',url,callback);
}

2
www/extras/wobject/ProjectManager/modal.js
View file

@ -69,7 +69,7 @@ function showPopWin( e ) {
}
var status = YAHOO.util.Connect.asyncRequest('POST',url,callback,dataPart);
var status = YAHOO.util.Connect.asyncRequest('POST',encodeURI(url),callback,dataPart);
}

21
www/extras/wobject/Survey/administersurvey/comm.js
View file

@ -6,7 +6,7 @@ if (typeof Survey === "undefined") {
(function(){
var callMade = 0;
var request = function(sUrl, callback, postData, form, hasFile){
var request = function(sQuery, callback, postData, form, hasFile){
if (form) {
if (hasFile) {
YAHOO.util.Connect.setForm(form, true);
@ -23,8 +23,9 @@ if (typeof Survey === "undefined") {
}
else {
callMade = 1;
YAHOO.log(sUrl);
YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);
YAHOO.log(sQuery);
var url = encodeURI(location.pathname) + sQuery;
YAHOO.util.Connect.asyncRequest('POST', url, callback, postData);
}
};
@ -79,13 +80,13 @@ if (typeof Survey === "undefined") {
}
},
submitSummary: function(data,functionName){
var sUrl = "?func=loadQuestions;shownSummary=1";
var sQuery = "?func=loadQuestions;shownSummary=1";
var revision = Survey.Comm.getRevision();
if (revision) {
sUrl += ";revision=" + revision;
sQuery += ";revision=" + revision;
}
request(sUrl, this.callback, null, null, null);
request(sQuery, this.callback, null, null, null);
},
getRevision: function() {
@ -104,15 +105,15 @@ if (typeof Survey === "undefined") {
postData = "data=" + YAHOO.lang.JSON.stringify(data, data);
}
//var sUrl = this.url + "?func="+functionName;
var sUrl = "?func=" + functionName;
//var sQuery = this.url + "?func="+functionName;
var sQuery = "?func=" + functionName;
var revision = Survey.Comm.getRevision();
if (revision) {
sUrl += ";revision=" + revision;
sQuery += ";revision=" + revision;
}
request(sUrl, this.callback, postData, form, hasFile);
request(sQuery, this.callback, postData, form, hasFile);
}
};
})();

41
www/extras/wobject/Survey/editsurvey/comm.js
View file

@ -6,13 +6,14 @@ if (typeof Survey == "undefined") {
Survey.Comm = new function(){
var callMade = 0;
var request = function(sUrl,callback,postData){
var request = function(sQuery,callback,postData){
YAHOO.util.Dom.setStyle('mask-all','display','block');
if(callMade == 1){
alert("Waiting on previous request");
}else{
callMade = 1;
YAHOO.util.Connect.asyncRequest('POST', sUrl, callback, postData);
var url = encodeURI(location.pathname) + sQuery;
YAHOO.util.Connect.asyncRequest('POST', url, callback, postData);
}
};
this.callback = {
@ -31,49 +32,49 @@ Survey.Comm = new function(){
};
this.loadSurvey = function(p){
var postData = "data="+p;
var sUrl = "?func=loadSurvey";
request(sUrl,this.callback,postData);
var sQuery = "?func=loadSurvey";
request(sQuery,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 sUrl = "?func=dragDrop";
request(sUrl,this.callback,postData);
var sQuery = "?func=dragDrop";
request(sQuery,this.callback,postData);
};
this.submitEdit = function(p){
var postData = "data="+YAHOO.lang.JSON.stringify(p);
var sUrl = "?func=submitEdit";
request(sUrl,this.callback,postData);
var sQuery = "?func=submitEdit";
request(sQuery,this.callback,postData);
};
this.newSection = function(){
var sUrl = "?func=newObject";
request(sUrl,this.callback);
var sQuery = "?func=newObject";
request(sQuery,this.callback);
};
this.newQuestion = function(id){
var postData = "data="+id;
var sUrl = "?func=newObject";
request(sUrl,this.callback,postData);
var sQuery = "?func=newObject";
request(sQuery,this.callback,postData);
};
this.newAnswer = function(id){
var postData = "data="+id;
var sUrl = "?func=newObject";
request(sUrl,this.callback,postData);
var sQuery = "?func=newObject";
request(sQuery,this.callback,postData);
};
this.deleteAnswer = function(id){
var postData = "data="+id;
var sUrl = "?func=deleteAnswer";
request(sUrl,this.callback,postData);
var sQuery = "?func=deleteAnswer";
request(sQuery,this.callback,postData);
};
this.deleteQuestion = function(id){
var postData = "data="+id;
var sUrl = "?func=deleteQuestion";
request(sUrl,this.callback,postData);
var sQuery = "?func=deleteQuestion";
request(sQuery,this.callback,postData);
};
this.deleteSection = function(id){
var postData = "data="+id;
var sUrl = "?func=deleteSection";
request(sUrl,this.callback,postData);
var sQuery = "?func=deleteSection";
request(sQuery,this.callback,postData);
};
}();

10
www/extras/wobject/Thingy/thingy.js
View file

@ -75,7 +75,7 @@ function initOptionalFields(prefix,fieldId) {
var getFieldValues = function() {
var fieldInOtherThingId = this.value;
var url = location.pathname + "?func=selectDefaultFieldValue;thingId=" + thingId + ";fieldInOtherThingId=" + fieldInOtherThingId + ";fieldId=" + fieldId;
var url = encodeURI(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 = location.pathname + "?func=selectFieldInThing;thingId=" + thingId + ";prefix=" +prefix + ";fieldId=" + fieldId;
var url = encodeURI(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', url, callbackGetForm);
var request = YAHOO.util.Connect.asyncRequest('GET', encodeURI(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', url, callback, postData);
var request = YAHOO.util.Connect.asyncRequest('POST', encodeURI(url), callback, postData);
}
}
@ -482,7 +482,7 @@ YAHOO.extend(YAHOO.draglist.DDList, YAHOO.util.DDProxy, {
success:handleSuccess,
failure:handleFailure
};
var url = location.pathname;
var url = encodeURI(location.pathname);
//curRank = curRank +1;
//origRank = origRank +1;
var postData = "func=moveFieldConfirm;fieldId=" + srcEl.id + ";targetFieldId=" + destination+";direction="+direction;//currentRank="+curRank+";originalRank="+origRank+";