Merge branch 'master' of http://10.1.235.20:3000/ipu/ipu-guide

show-server/src/main/webapp/biz/js/plugins/imagecache.js

@@ -45,11 +45,11 @@ require(["wadeMobile","jcl"], function(WadeMobile,$) {
		});
		
		$("#loadimgs").click(function() {
			
			/*
			 * 第1个参数是图片url数组，第2个参数是回调，每张图片加载完成都会调用回调
			 */
			WadeMobile.setImageWithURLs([url, url1, url2, url3, url4, url5, url6, url7, url8, url9,
		        url10, url11, url12, url13, url14, url15, url16, url17, url18, url19, url20],function(result) {
			 * 每张图片触发一次IMGDOWNLOAD事件
			*/
			WadeMobile.listenerEvent('IMGDOWNLOAD', function(result) {
				var value=$.parseJSON(result);
				if (value.url == url) {
					$("#pic3").attr("src",value.path);
@@ -59,6 +59,11 @@ require(["wadeMobile","jcl"], function(WadeMobile,$) {
				}
				cacheURl = value.path;
			});
			/*
			 * 参数是图片url数组，用上面的事件监听结果
			 */
			WadeMobile.setImageWithURLs([url, url1, url2, url3, url4, url5, url6, url7, url8, url9,
		        url10, url11, url12, url13, url14, url15, url16, url17, url18, url19, url20]);
			$("#buttons").hide();
		});
		

show-server/src/main/webapp/ipu/frame/mobile/expand-mobile.js

@@ -442,8 +442,7 @@ define(["require","jcl"],function(require,Wade) {
			},setImageWithURL:function(url,callback,forceDownload){
				storageCallback("setImageWithURL",callback);
				execute("setImageWithURL",[url,forceDownload]);
			},setImageWithURLs:function(url,callback,forceDownload){
				storageCallback("setImageWithURLs",callback);
			},setImageWithURLs:function(url,forceDownload){
				execute("setImageWithURLs",[url,forceDownload]);
			},clearImageCache:function(callback){
				storageCallback("clearImageCache",callback);

show-server/src/main/webapp/ipu/frame/mobile/wade-mobile.js

@@ -271,7 +271,7 @@ define(["jcl","base64","mobileExpand","bizMobileExpand"],function(Wade, Base64,
				if (callback) {
		            callbackDefine[callbackKey] = {callback:callback};
		        }
			},execCallback:function(callbackKey, data, isSave){
			},execCallback:function(callbackKey, data){
				globalErrorKey = callbackKey;
				var callbackItem = callbackDefine[callbackKey];
				if (callbackItem) {
@@ -291,10 +291,8 @@ define(["jcl","base64","mobileExpand","bizMobileExpand"],function(Wade, Base64,
	                	}
		            }
		           
		            if(isSave !== true && isSave !== "true"){
		                if (callbackItem) {
			                delete callbackDefine[callbackKey];
		                }
		            if (callbackItem) {
			            delete callbackDefine[callbackKey];
		            }
			        
			    }