[bugfix] swipe not triggered for reveal mode, z-index: -1 modifed to 0

samphay · Apr 28, 2013 · 80ecacf · 80ecacf
1 parent 9b5cf67
commit 80ecacf
Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/_src/widget/panel.js b/_src/widget/panel.js
@@ -164,27 +164,23 @@
                 $panel = me.root(),
                 $contentWrap = me.$contentWrap,
                 addCls = 'ui-panel-' + dis + ' ui-panel-' + pos,
-                removeCls = 'ui-panel-' + data.display + ' ui-panel-' + data.position + 'ui-panel-animate';
+                removeCls = 'ui-panel-' + data.display + ' ui-panel-' + data.position + ' ui-panel-animate';
 
             if (isOpen) {
                 $panel.removeClass(removeCls).addClass(addCls).show();
                 data.scrollMode === 'fix' && $panel.css('top', $(window).scrollTop());    //fix模式下
                 me._initPanelPos(dis, pos);      //panel及contentWrap位置初始化
                 if (dis === 'reveal') {
-                    me.contPosition = $contentWrap.css('position');
-                    $contentWrap.addClass('ui-panel-contentWrap');
-                    $contentWrap.on(transitionEnd, $.proxy(me._eventHandler, me));    //reveal模式下panel不触发transitionEnd
+                    $contentWrap.addClass('ui-panel-contentWrap').on(transitionEnd, $.proxy(me._eventHandler, me));    //reveal模式下panel不触发transitionEnd;
                 } else {
-                    $contentWrap.off(transitionEnd, $.proxy(me._eventHandler, me));
+                    $contentWrap.removeClass('ui-panel-contentWrap').off(transitionEnd, $.proxy(me._eventHandler, me));
                     $panel.addClass('ui-panel-animate');
                 }
                 me.$panelMask && me.$panelMask.css({     //panel mask状态初始化
                     'left': 'auto',
                     'right': 'auto',
                     'height': document.body.clientHeight
                 });
-            } else {
-                dis === 'reveal' && $contentWrap.css('position', me.contPosition).removeClass('ui-panel-contentWrap');   //打开状态时加上position relative，关闭状态时还原position
             }
             return me;
         },

diff --git a/assets/widget/panel/panel.css b/assets/widget/panel/panel.css
@@ -5,7 +5,7 @@
 
 .ui-panel-contentWrap{
     position: relative;
-    z-index: 100;
+    z-index: 1;
 }
 
 .ui-panel.ui-panel-right{
@@ -23,7 +23,7 @@
     z-index: 1001;
 }
 .ui-panel.ui-panel-reveal{
-    z-index: -1;
+    z-index: 0;
 }
 
 .ui-panel-animate{