From 6c2fa35bb55ad460943c0234053e07a848fded1d Mon Sep 17 00:00:00 2001
From: 1099438829 <1099438829@qq.com>
Date: Thu, 16 Jan 2020 14:35:02 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
README.md | 2 +-
js/mac.js | 6 ++++++
plugins/shortcut-drawer/shortcut-drawer.js | 2 --
plugins/shortcut-drawer/shortcut-drawer.min.js | 2 +-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/README.md b/README.md
index 88a227d..c8b9ea2 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ v1.1.2.3
## 预览
- ![1] http://win10ui.yuri2.cn/mac-preview/
+ ![1] http://www.apecloud.cn:8081/
diff --git a/js/mac.js b/js/mac.js
index 8e97336..2487756 100644
--- a/js/mac.js
+++ b/js/mac.js
@@ -53,6 +53,12 @@ window.Win10 = {
}
},
_iframe_click_lock_children:{},
+ _renderBar:function () {
+ //调整任务栏项目的宽度
+ if(this._countTask<=0){return;} //防止除以0
+ var btns=$("#win10_btn_group_middle>.btn");
+ btns.css('width',('calc('+(1/this._countTask*100)+'% - 1px )'))
+ },
_handleReady:[],
_hideShortcut:function () {
var that=$("#win10 #win10-shortcuts .shortcut");
diff --git a/plugins/shortcut-drawer/shortcut-drawer.js b/plugins/shortcut-drawer/shortcut-drawer.js
index e4b5433..d986670 100644
--- a/plugins/shortcut-drawer/shortcut-drawer.js
+++ b/plugins/shortcut-drawer/shortcut-drawer.js
@@ -6,13 +6,11 @@ Win10.onReady(function () {
$('body').on('click', '.shortcut-drawer.win10-open-window', function() {
//>> 获取当前点击的对象
$this = $(this);
- console.log( $this);
//>> 判断url地址是否为空 如果为空 不予处理
if($this.data('url') !== "") {
//>> 获取弹窗标题
var title = $this.data('title')||'',
areaAndOffset,icon;
-
//>> 判断是否有标题图片
var bg=$this.data('icon-bg')?$this.data('icon-bg'):'';
if($this.data('icon-image')) {
diff --git a/plugins/shortcut-drawer/shortcut-drawer.min.js b/plugins/shortcut-drawer/shortcut-drawer.min.js
index 7354bc0..534d99c 100644
--- a/plugins/shortcut-drawer/shortcut-drawer.min.js
+++ b/plugins/shortcut-drawer/shortcut-drawer.min.js
@@ -1 +1 @@
-Win10.onReady(function(){(function(){$('body').on('click','.shortcut-drawer.win10-open-window',function(){$this=$(this);console.log($this);if($this.data('url')!==""){var title=$this.data('title')||'',areaAndOffset,icon;var bg=$this.data('icon-bg')?$this.data('icon-bg'):'';if($this.data('icon-image')){icon='+')
'}if($this.data('icon-font')){icon=''}if(!title&&$this.children('.icon').length===1&&$this.children('.title').length===1){title=$this.children('.title').html();if(!icon){icon=$this.children('.icon').prop("outerHTML")}}if($this.data('area-offset')){areaAndOffset=$this.data('area-offset');if(areaAndOffset.indexOf(',')!==-1){areaAndOffset=eval(areaAndOsffset)}}Win10.openUrl($this.data('url'),icon,title,areaAndOffset)}})})(),$('body').on('click','.win10-drawer',function(){var content=$(this).find('.win10-drawer-box').html();var title=$(this).children('.title').html();var index=layer.open({type:1,shadeClose:true,skin:'drawer',area:[Win10.isSmallScreen()?"80%":"60%","80%"],closeBtn:0,title:title,content:content,});var layero=Win10.getLayeroByIndex(index);layero.find('.shortcut-drawer').click(function(){layer.close(index)})})});
\ No newline at end of file
+Win10.onReady(function(){(function(){$('body').on('click','.shortcut-drawer.win10-open-window',function(){$this=$(this);if($this.data('url')!==""){var title=$this.data('title')||'',areaAndOffset,icon;var bg=$this.data('icon-bg')?$this.data('icon-bg'):'';if($this.data('icon-image')){icon=''}if($this.data('icon-font')){icon=''}if(!title&&$this.children('.icon').length===1&&$this.children('.title').length===1){title=$this.children('.title').html();if(!icon){icon=$this.children('.icon').prop("outerHTML")}}if($this.data('area-offset')){areaAndOffset=$this.data('area-offset');if(areaAndOffset.indexOf(',')!==-1){areaAndOffset=eval(areaAndOsffset)}}Win10.openUrl($this.data('url'),icon,title,areaAndOffset)}})})(),$('body').on('click','.win10-drawer',function(){var content=$(this).find('.win10-drawer-box').html();var title=$(this).children('.title').html();var index=layer.open({type:1,shadeClose:true,skin:'drawer',area:[Win10.isSmallScreen()?"80%":"60%","80%"],closeBtn:0,title:title,content:content,});var layero=Win10.getLayeroByIndex(index);layero.find('.shortcut-drawer').click(function(){layer.close(index)})})});
\ No newline at end of file