Commit 031acdca authored by hbcui1984's avatar hbcui1984

解决switch界面优化关闭窗口的bug

parent c70b4a5c
......@@ -555,30 +555,42 @@ p {
.mui-scrollbar {
position: absolute;
top: 0;
right: 1px;
bottom: 2px;
z-index: 9999;
width: 4px;
overflow: hidden;
pointer-events: none;
opacity: 1;
-webkit-transition: 500ms;
transition: 500ms;
transform: translateZ(0px);
}
.mui-scrollbar-vertical {
top: 0;
right: 1px;
bottom: 2px;
width: 4px;
}
.mui-scrollbar-vertical .mui-scrollbar-indicator {
width: 100%;
}
.mui-scrollbar-horizontal {
right: 2px;
bottom: 0;
left: 2px;
height: 4px;
}
.mui-scrollbar-horizontal .mui-scrollbar-indicator {
height: 100%;
}
.mui-scrollbar-indicator {
position: absolute;
display: block;
width: 100%;
height: 147px;
box-sizing: border-box;
background: rgba(0, 0, 0, .39804);
border: 1px solid rgba(255, 255, 255, .80196);
border-top-left-radius: 2px;
border-top-right-radius: 2px;
border-bottom-right-radius: 2px;
border-bottom-left-radius: 2px;
border-radius: 2px;
-webkit-transition: .01s cubic-bezier(.1, .57, .1, 1);
transition: .01s cubic-bezier(.1, .57, .1, 1);
transform: translate(0px, 0px) translateZ(0px);
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -1815,6 +1815,7 @@ var mui = (function(document, undefined) {
this.wrapper.appendChild(indicator.el);
indicators.push(indicator);
this.wrapper.addEventListener('swiperight', $.stopPropagation);
}
for (var i = indicators.length; i--;) {
......@@ -2356,6 +2357,7 @@ var mui = (function(document, undefined) {
});
};
})(mui, window, document);
(function($, window, document, undefined) {
var CLASS_PULL_TOP_POCKET = 'mui-pull-top-pocket';
var CLASS_PULL_BOTTOM_POCKET = 'mui-pull-bottom-pocket';
......@@ -3595,7 +3597,7 @@ var mui = (function(document, undefined) {
isActive: slideOn
});
toggle.removeEventListener('dragstart', $.stopPropagation);
// toggle.removeEventListener('flick', $.stopPropagation);
toggle.removeEventListener('swiperight', $.stopPropagation);
event.stopPropagation();
};
var dragToggle = function(event) {
......@@ -3619,7 +3621,7 @@ var mui = (function(document, undefined) {
toggle = $.targets.toggle;
if (toggle) {
toggle.addEventListener('dragstart', $.stopPropagation);
// toggle.addEventListener('flick', $.stopPropagation);
toggle.addEventListener('swiperight', $.stopPropagation);
handle = toggle.querySelector(SELECTOR_SWITCH_HANDLE);
toggleWidth = toggle.clientWidth;
handleWidth = handle.clientWidth;
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -122,7 +122,7 @@
<span class="oa-task-time-start">9:00</span><span class="oa-task-time-end mui-h6">10:00</span>
</div>
<div class="oa-task-content mui-table-cell">
<h4 class="mui-ellipsis">左拖(左滑)</h5>
<h4 class="mui-ellipsis">左拖(左滑)</h4>
<p class="mui-h6 mui-ellipsis">
一会议室
</p>
......@@ -143,7 +143,7 @@
<span class="oa-task-time-start">9:00</span><span class="oa-task-time-end mui-h6">10:00</span>
</div>
<div class="oa-task-content mui-table-cell">
<h4 class="mui-ellipsis">右拖(右滑)</h5>
<h4 class="mui-ellipsis">右拖(右滑)</h4>
<p class="mui-h6 mui-ellipsis">
一会议室
</p>
......@@ -167,7 +167,7 @@
<span class="oa-task-time-start">9:00</span><span class="oa-task-time-end mui-h6">10:00</span>
</div>
<div class="oa-task-content mui-table-cell">
<h4 class="mui-ellipsis">左右拖拽(滑动)</h5>
<h4 class="mui-ellipsis">左右拖拽(滑动)</h4>
<p class="mui-h6 mui-ellipsis">
一会议室
</p>
......@@ -191,7 +191,7 @@
<span class="oa-task-time-start">9:00</span><span class="oa-task-time-end mui-h6">10:00</span>
</div>
<div class="oa-task-content mui-table-cell">
<h4 class="mui-ellipsis">左拖</h5>
<h4 class="mui-ellipsis">左拖</h4>
<p class="mui-h6 mui-ellipsis">
一会议室
</p>
......@@ -212,7 +212,7 @@
<span class="oa-task-time-start">10:00</span><span class="oa-task-time-end mui-h6">10:30</span>
</div>
<div class="oa-task-content mui-table-cell">
<h4 class="mui-ellipsis">右拖</h5>
<h4 class="mui-ellipsis">右拖</h4>
<p class="mui-h6 mui-ellipsis">
海淀区皂君庙乙2号院4号楼
</p>
......@@ -236,7 +236,7 @@
<span class="oa-task-time-start">9:00</span><span class="oa-task-time-end mui-h6">10:00</span>
</div>
<div class="oa-task-content mui-table-cell">
<h4 class="mui-ellipsis">左右拖拽</h5>
<h4 class="mui-ellipsis">左右拖拽</h4>
<p class="mui-h6 mui-ellipsis">
一会议室
</p>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment