Merge branch 'master' of http://114.215.100.48:3000/ipu/android-share

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

@@ -305,8 +305,8 @@ define(["module","jcl","clientTool"],function(module,Wade,clientTool) {
	 		post:function(action,params,callback,error,settings){
	 			browserTool.ajax.request("mobiledata",action,params,callback,error,Wade.extend({type:"POST",encoding:"UTF-8"},settings));
	 		},
	 		html:function(action,params,callback,error,settings){
	 			browserTool.ajax.request("mobile",action,params,callback,error,Wade.extend({type:"POST",encoding:"UTF-8"},settings),true);
	 		html:function(action,params,callback,error,settings,isContext){
	 			browserTool.ajax.request("mobile",action,params,callback,error,Wade.extend({type:"POST",encoding:"UTF-8"},settings),isContext);
	 		}
	    };
	})();

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

@@ -53,7 +53,7 @@ define(["browserTool","jcl"],function(browserTool,Wade) {
		};
		/*将模板转换成html源码*/
		this.getTemplate = function(action, param, callback, err) {
			browserTool.ajax.html(action, param, callback, err);
			browserTool.ajax.html(action, param, callback, err, null, true);
		};
		/*将Page转换成html源码*/
		this.getPage = function(action, param, callback, err) {

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

@@ -1,7 +1,7 @@
/**
 * 与客户端交互的基础API
 */
window.Mobile = window.WadeMobile = (function(Wade,Base64) {
window.Mobile = window.WadeMobile = (function() {
	//终端类型,a为android,i为ios
	var deviceType = (function(){
		var sUserAgent = navigator.userAgent.toLowerCase();