enhance switchable on touch

smallsilver · May 3, 2012 · e0b2328 · e0b2328
1 parent dc5f477
commit e0b2328
Show file tree

Hide file tree

Showing 11 changed files with 627 additions and 698 deletions.
diff --git a/build/switchable-min.js b/build/switchable-min.js
diff --git a/build/switchable.js b/build/switchable.js
diff --git a/src/switchable/demo.html b/src/switchable/demo.html
@@ -38,28 +38,31 @@ <h1 class="logo"><a alt="KISSY" href="http://docs.kissyui.com/"><img src="../../
         .s-section dt {
             margin: 10px 0;
         }
+
         .s-section dd {
             margin-left: 20px;
         }
     </style>
     <dl class="s-section">
-        <dt class="s-title">S.Tabs:</dt>
+        <dt class="s-title">Switchable..Tabs:</dt>
         <dd>- <a href="demo/tabs.html">普通标签页</a></dd>
         <dd>- <a href="http://docs.kissyui.com/docs/html/api/component/switchable/tabs.html">API文档</a></dd>
 
-        <dt class="s-title">S.Slide:</dt>
+        <dt class="s-title">Switchable.Slide:</dt>
         <dd>- <a href="demo/slide.html#demo2">淘宝首页卡盘</a></dd>
         <dd>- <a href="demo/slide.html#demo3">右侧导航卡盘</a></dd>
         <dd>- <a href="demo/slide.html#demo5">滚动新闻条</a></dd>
         <dd>- <a href="demo/slide.html#slideFocus">组合效果</a></dd>
+        <dd>- <a href="demo/touch/slide.html">Slide 触屏支持</a></dd>
         <dd>- <a href="http://docs.kissyui.com/docs/html/api/component/switchable/slide.html">API文档</a></dd>
 
-        <dt class="s-title">S.Carousel:</dt>
+        <dt class="s-title">Switchable.Carousel:</dt>
         <dd>- <a href="demo/carousel.html#demo4">普通旋转木马</a></dd>
         <dd>- <a href="demo/carousel.html#J_TinySlide">首页旋转木马</a></dd>
+        <dd>- <a href="demo/touch/carousel.html">Carousel 触屏支持</a></dd>
         <dd>- <a href="http://docs.kissyui.com/docs/html/api/component/switchable/carousel.html">API文档</a></dd>
 
-        <dt class="s-title">S.Accordion:</dt>
+        <dt class="s-title">Switchable..Accordion:</dt>
         <dd>- <a href="demo/accordion.html">手风琴</a></dd>
         <dd>- <a href="http://docs.kissyui.com/docs/html/api/component/switchable/accordion.html">API文档</a></dd>
 

diff --git a/src/switchable/demo/slide.php b/src/switchable/demo/slide.php
diff --git a/src/switchable/src/accordion/aria.js b/src/switchable/src/accordion/aria.js
@@ -85,7 +85,7 @@ KISSY.add('switchable/accordion/aria', function(S, DOM, Event, Aria, Accordion)
 
     function _currentTabFromEvent(t) {
         var triggers = this.triggers,
-            trigger;
+            trigger=null;
         S.each(triggers, function(ct) {
             if (ct == t || DOM.contains(ct, t)) {
                 trigger = ct;
@@ -107,8 +107,9 @@ KISSY.add('switchable/accordion/aria', function(S, DOM, Event, Aria, Accordion)
     }
 
     function getTabFromPanel(panel) {
-        var triggers = this.triggers,
-            panels = this.panels;
+        var self=this,
+            triggers = self.triggers,
+            panels = self.panels;
         return triggers[S.indexOf(panel, panels)];
     }
 
@@ -280,7 +281,8 @@ KISSY.add('switchable/accordion/aria', function(S, DOM, Event, Aria, Accordion)
     }
 
     function enter(trigger) {
-        this.switchTo(S.indexOf(trigger, this.triggers));
+        var self=this;
+        self.switchTo(S.indexOf(trigger, self.triggers));
     }
 
 

diff --git a/src/switchable/src/accordion/base.js b/src/switchable/src/accordion/base.js
@@ -2,7 +2,7 @@
  * @fileOverview Accordion Widget
  * @author fool2fish@gmail.com, yiminghe@gmail.com
  */
-KISSY.add('switchable/accordion/base', function(S, DOM, Switchable) {
+KISSY.add('switchable/accordion/base', function (S, DOM, Switchable) {
 
 
     /**
@@ -22,52 +22,52 @@ KISSY.add('switchable/accordion/base', function(S, DOM, Switchable) {
 
     S.extend(Accordion, Switchable, {
 
-            _switchTrigger: function(fromTrigger, toTrigger/*, index*/) {
-                var self = this,
-                    cfg = self.config;
-                if (cfg.multiple) {
-                    DOM.toggleClass(toTrigger, cfg.activeTriggerCls);
-                } else {
-                    Accordion.superclass._switchTrigger.apply(self, arguments);
-                }
-            },
+        _switchTrigger:function (fromTrigger, toTrigger) {
+            var self = this,
+                cfg = self.config;
+            if (cfg.multiple) {
+                DOM.toggleClass(toTrigger, cfg.activeTriggerCls);
+            } else {
+                Accordion.superclass._switchTrigger.apply(self, arguments);
+            }
+        },
 
-            /**
-             * 重复触发时的有效判断
-             */
-            _triggerIsValid: function(index) {
-                // multiple 模式下，再次触发意味着切换展开/收缩状态
-                return this.config.multiple ||
-                    Accordion.superclass._triggerIsValid.call(this, index);
-            },
+        /**
+         * 重复触发时的有效判断
+         */
+        _triggerIsValid:function (index) {
+            // multiple 模式下，再次触发意味着切换展开/收缩状态
+            return this.config.multiple ||
+                Accordion.superclass._triggerIsValid.call(this, index);
+        },
 
-            /**
-             * 切换视图
-             */
-            _switchView: function(fromPanels, toPanels, fromIndex,index, direction, ev, callback) {
-                var self = this,
-                    cfg = self.config,
-                    panel = toPanels[0];
+        /**
+         * 切换视图
+         */
+        _switchView:function (direction, ev, callback) {
+            var self = this,
+                cfg = self.config,
+                panel = self._getFromToPanels().toPanels;
 
-                if (cfg.multiple) {
-                    DOM.toggle(panel);
-                    this._fireOnSwitch(fromIndex,index, ev);
-                    callback && callback.call(this);
-                } else {
-                    Accordion.superclass._switchView.apply(self, arguments);
-                }
+            if (cfg.multiple) {
+                DOM.toggle(panel);
+                this._fireOnSwitch(ev);
+                callback && callback.call(this);
+            } else {
+                Accordion.superclass._switchView.apply(self, arguments);
             }
-        });
+        }
+    });
 
     Accordion.Plugins = [];
     Accordion.Config = {
-        markupType: 1,
-        triggerType: 'click',
-        multiple: false
+        markupType:1,
+        triggerType:'click',
+        multiple:false
     };
     return Accordion;
 
-}, { requires:["dom","../base"]});
+}, { requires:["dom", "../base"]});
 
 /**
  * TODO: