muzi
/
macUI
mirror of https://github.com/1099438829/macUI.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

修正优化

This commit is contained in:
muzi 2019-08-07 23:05:13 +08:00
parent 6b10ed9b26
commit f420a56577
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
js/mac.js
View File

@ -255,16 +255,16 @@ window.Win10 = {
if($this.data('url') !== "") { if($this.data('url') !== "") {
//>> 获取弹窗标题 //>> 获取弹窗标题
var title = $this.data('title')||'', var title = $this.data('title')||'',
areaAndOffset; areaAndOffset,icon;
//>> 判断是否有标题图片 //>> 判断是否有标题图片
var bg=$this.data('icon-bg')?$this.data('icon-bg'):''; var bg=$this.data('icon-bg')?$this.data('icon-bg'):'';
if($this.data('icon-image')) { if($this.data('icon-image')) {
//>> 加入到标题中 //>> 加入到标题中
title = '<img class="icon '+bg+'" src="' + $this.data('icon-image') + '"/>' + title; icon = '<img class="icon '+bg+'" src="' + $this.data('icon-image') + '"/>';
} }
if($this.data('icon-font')) { if($this.data('icon-font')) {
//>> 加入到标题中 //>> 加入到标题中
title = '<i class="fa fa-fw fa-'+$this.data('icon-font')+' icon '+bg+'"></i>' + title; icon = '<i class="fa fa-fw fa-'+$this.data('icon-font')+' icon '+bg+'"></i>';
} }
if(!title && $this.children('.icon').length===1 && $this.children('.title').length===1){ if(!title && $this.children('.icon').length===1 && $this.children('.title').length===1){
title = $this.children('.icon').prop("outerHTML")+$this.children('.title').html(); title = $this.children('.icon').prop("outerHTML")+$this.children('.title').html();
@ -278,7 +278,7 @@ window.Win10 = {
} }
} }
//>> 调用win10打开url方法 //>> 调用win10打开url方法
Win10.openUrl($this.data('url'), title, areaAndOffset); Win10.openUrl($this.data('url'),icon, title, areaAndOffset);
} }
}) })
}, },
@ -402,7 +402,7 @@ window.Win10 = {
}, function (value, i) { }, function (value, i) {
layer.close(i); layer.close(i);
layer.msg(Win10.lang('请稍候...','Hold on please...'),{time:1500},function () { layer.msg(Win10.lang('请稍候...','Hold on please...'),{time:1500},function () {
Win10.openUrl(value,value); Win10.openUrl(value,'',value);
}); });
}); });
}); });