isEscape改造

display-server/web/res/js/mobile/expand-mobile.js

@@ -279,14 +279,16 @@ define(["require"],function(require) {
				storageCallback("aliPay",callback);
				execute("aliPay",[tradeNo,subject,body,price],err);	
			},uploadWithServlet:function(filePath,dataAction,param,callback,err){
				var isEscape = true;
				if(typeof(filePath)=="string"){
					filePath = [filePath];
				}
				storageCallback("uploadWithServlet",callback);
				execute("uploadWithServlet",[filePath,dataAction,param],err);	
				storageCallback("uploadWithServlet",callback,isEscape);
				execute("uploadWithServlet",[filePath,dataAction,param,isEscape],err);	
			},downloadWithServlet:function(savePath,dataAction,param,callback,err){
				storageCallback("downloadWithServlet",callback);
				execute("downloadWithServlet",[savePath,dataAction,param],err);	
				var isEscape = true;
				storageCallback("downloadWithServlet",callback,isEscape);
				execute("downloadWithServlet",[savePath,dataAction,param,isEscape],err);	
			},uploadFile:function(filePath,servletUrl,callback,err){
				storageCallback("uploadFile",callback);
				execute("uploadFile",[filePath,servletUrl],err);	

display-server/web/res/js/mobile/mobile-browser.js

@@ -17,8 +17,8 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
		};
		/******************数据请求**********************/
		/*调用服务*/
		this.dataRequest = function(action, param, callback, isEscape, err) {
			browserTool.ajax.post(action, param, callback, isEscape, err);
		this.dataRequest = function(action, param, callback, err) {
			browserTool.ajax.post(action, param, callback, err);
			/*browserTool.ajax.post(action, param, function(resultData){
				resultData = Wade.DataMap(resultData);
				var x_resultcode = resultData.get("X_RESULTCODE");
@@ -27,7 +27,7 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
				}else{
					callback(resultData);
				};
			}, isEscape, err);*/
			}, err);*/
		};
		/******************页面跳转**********************/
		/*页面跳转,url为跳转目标*/

display-server/web/res/js/mobile/mobile-client.js

@@ -15,9 +15,9 @@ define(["wadeMobile","clientTool"],function(WadeMobile,clientTool) {
		};
		/******************数据请求**********************/
		/*调用服务*/
		this.dataRequest = function(action, param, callback, isEscape, err) {
		this.dataRequest = function(action, param, callback, err) {
			param = param ? param : "";
			WadeMobile.dataRequest(callback, action, param.toString(), isEscape, null, null, null, err);
			WadeMobile.dataRequest(callback, action, param.toString(), null, null, null, err);
		};
		/******************页面跳转**********************/
		/*页面跳转,url为跳转目标*/

display-server/web/res/js/mobile/wade-mobile.js

@@ -37,19 +37,15 @@ define(["jcl","base64","jcl","res/js/mobile/expand-mobile.js","biz/js/common/biz
					confirm = true;
				}
				execute("close", [confirm],err);
			},httpRequest:function(callback,requestUrl,isEscape,encode,conTimeout,readTimeout,err){
				if (isEscape == undefined) {
					isEscape = true;
				}
			},httpRequest:function(callback,requestUrl,encode,conTimeout,readTimeout,err){
				var isEscape = true;
				if(terminalType=="i"){
					requestUrl = encodeURIComponent(requestUrl);
				}
				WadeMobile.callback.storageCallback("httpRequest",callback,isEscape);
				execute("httpRequest", [requestUrl,isEscape,encode,conTimeout,readTimeout],err);
			},dataRequest:function(callback,dataAction,param,isEscape,encode,conTimeout,readTimeout,err){
				if (isEscape == undefined) {
					isEscape = true;
				}
				var isEscape = true;
				WadeMobile.callback.storageCallback("dataRequest",callback,isEscape);
				execute("dataRequest", [dataAction,param,isEscape,encode,conTimeout,readTimeout],err);
			},openUrl:function(url,err){
@@ -70,23 +66,20 @@ define(["jcl","base64","jcl","res/js/mobile/expand-mobile.js","biz/js/common/biz
				execute("getTemplate", [action,context,isEscape],err);
			},storageDataByThread:function(dataAction,param,waitoutTime,err){
				execute("storageDataByThread", [dataAction,param,waitoutTime],err);
			},openDialog:function(callback,pageAction,param,width,height,isEscape,err){
				if (isEscape == undefined) {
					isEscape = true;
				}
			},openDialog:function(callback,pageAction,param,width,height,err){
				var isEscape = true;
				WadeMobile.callback.storageCallback("openDialog",callback,isEscape);
				execute("openDialog", [pageAction,param,width,height,isEscape],err);
			},closeDialog:function(result,state,err){
				execute("closeDialog", [result,state],err);
			},openWindow:function(callback,pageAction,param,isEscape,err){
				if (isEscape == undefined) {
					isEscape = true;
				}
			},openWindow:function(callback,pageAction,param,err){
				var isEscape = true;
				WadeMobile.callback.storageCallback("openWindow",callback,isEscape);
				execute("openWindow", [pageAction,param,isEscape],err);
			},closeWindow:function(result,state,err){
				execute("closeWindow", [result,state],err);
			},openSlidingMenu:function(callback,action,param,width,height,leftMargin,topMargin,isEscape,err){
			},openSlidingMenu:function(callback,action,param,width,height,leftMargin,topMargin,err){
				var isEscape = true;
				WadeMobile.callback.storageCallback("openSlidingMenu",callback,isEscape);
				execute("openSlidingMenu", [action,param,width,height,leftMargin,topMargin,isEscape],err);
			},closeSlidingMenu:function(result,state,err){
@@ -218,10 +211,10 @@ define(["jcl","base64","jcl","res/js/mobile/expand-mobile.js","biz/js/common/biz
			    }else{
			    	alert(message);
			    }
			},storageCallback:function(action,callback,isEscape,isBase64){
			},storageCallback:function(action,callback,isEscape){
				var callbackKey = action+callbackId;
				if (callback) {
		            callbackDefine[callbackKey] = {callback:callback,isEscape:isEscape,isBase64:isBase64};
		            callbackDefine[callbackKey] = {callback:callback,isEscape:isEscape};
		        }
			},execCallback:function(callbackKey, data){
				globalErrorKey = callbackKey;
@@ -231,9 +224,10 @@ define(["jcl","base64","jcl","res/js/mobile/expand-mobile.js","biz/js/common/biz
		        	if(data){
		        		if(callbackItem.isEscape==true){
		        			data = unescape(data);
		        		}else if(callbackItem.isBase64==true){
		        			data = Base64.decode64(data);
		        		}
		        		/*else if(callbackItem.isBase64==true){
		        			data = Base64.decode64(data);
		        		}*/
		        	}
		            if (callbackItem.callback) {   
		                if(typeof callbackItem.callback==="function"){