Skip to content

Commit

Permalink
update slide
Browse files Browse the repository at this point in the history
  • Loading branch information
@yiminghe
yiminghe committed May 22, 2012
1 parent f7f2c94 commit 58845a8
Show file tree
Hide file tree
Showing 29 changed files with 611 additions and 697 deletions.
106 changes: 53 additions & 53 deletions build/switchable-min.js
View file

Large diffs are not rendered by default.

557 changes: 268 additions & 289 deletions build/switchable.js
View file

Large diffs are not rendered by default.

Binary file modified src/editor/src/editor/plugin/uploader/uploader.longzang.swf
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion src/switchable/demo/accordion.html
View file
Expand Up @@ -17,7 +17,7 @@
<script src="../accordion/base.js"></script>
<script src="../accordion/aria.js"></script>
<script src="../autoplay.js"></script>
<script src="../autorender.js"></script>
<script src="../carousel/base.js"></script>
<script src="../carousel/aria.js"></script>
<script src="../effect.js"></script>
Expand Down
31 changes: 1 addition & 30 deletions src/switchable/demo/carousel.html
View file
Expand Up @@ -16,7 +16,7 @@
<script src="../src/accordion/base.js"></script>
<script src="../src/accordion/aria.js"></script>
<script src="../src/autoplay.js"></script>
<script src="../src/autorender.js"></script>

<script src="../src/carousel/base.js"></script>
<script src="../src/carousel/aria.js"></script>
<script src="../src/circular.js"></script>
Expand Down Expand Up @@ -162,7 +162,6 @@ <h3 class="s-title">Carousel - 旋转木马</h3>
prevBtnCls:'prev',
nextBtnCls:'next',
mouseAsTouch:true,
//autoplay:true,
disableBtnCls:'disable',
lazyDataType:'img-src'
});
Expand All @@ -171,40 +170,12 @@ <h3 class="s-title">Carousel - 旋转木马</h3>
//alert('I am selected. src = ' + ev.item.src);
//carousel.remove(ev.item);
});
var btnAdd = S.one('#btnAdd'),
btnDestroy = S.one("#btnDestroy"),
txtAdd = S.one('#addIndex');

btnAdd.on('click', function () {
var index = txtAdd.val();
carousel.add({
index:parseInt(index),
active:true,
trigger:S.DOM.create('<li>&bull;</li>'),
panel:S.DOM.create(' <img alt="" ' +
'data-v="2" ' +
'src="http://img02.taobaocdn.com/tps/i2/T1l_yXXiFyXXXXXXXX-110-135.png"/>')
});
});
btnDestroy.on("click", function () {
carousel.destroy();
});
window.carousel = carousel;
});
});
</script>
</div>
</div>
<div style="margin:10px;">
<label>
位置（整数）：
<input type="text" id="addIndex"/>
</label>
<button id="btnAdd" type="button">添加</button>
</div>
<div style="margin:10px;">
<button id="btnDestroy" type="button">销毁</button>
</div>
<a class="s-view-code" href="#">显示源码</a>
</div>

Expand Down
2 changes: 1 addition & 1 deletion src/switchable/demo/carousel/add-remove.html
View file
Expand Up @@ -16,7 +16,7 @@
<script src="../../src/accordion/base.js"></script>
<script src="../../src/accordion/aria.js"></script>
<script src="../../src/autoplay.js"></script>
<script src="../../src/autorender.js"></script>

<script src="../../src/carousel/base.js"></script>
<script src="../../src/carousel/aria.js"></script>
<script src="../../src/circular.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/switchable/demo/single_slide.html
View file
Expand Up @@ -17,7 +17,7 @@
<script src="../src/accordion/base.js"></script>
<script src="../src/accordion/aria.js"></script>
<script src="../src/autoplay.js"></script>
<script src="../src/autorender.js"></script>

<script src="../src/carousel/base.js"></script>
<script src="../src/carousel/aria.js"></script>
<script src="../src/circular.js"></script>
Expand Down
27 changes: 6 additions & 21 deletions src/switchable/demo/slide.html
View file
Expand Up @@ -17,7 +17,7 @@
<script src="../src/accordion/base.js"></script>
<script src="../src/accordion/aria.js"></script>
<script src="../src/autoplay.js"></script>
<script src="../src/autorender.js"></script>

<script src="../src/carousel/base.js"></script>
<script src="../src/carousel/aria.js"></script>
<script src="../src/circular.js"></script>
Expand Down Expand Up @@ -139,10 +139,9 @@ <h3 class="s-title">Slide - 淘宝首页卡盘</h3>
<img alt="" src="http://img03.taobaocdn.com/tps/i3/T1g25rXaV6XXXXXXXX-490-170.png"/></a></li>
</ol>
</div>
<button id="demo2-btn">stop autoplay</button>
<button id="demo2-add-btn">动态添加</button>
<script>
KISSY.use("event,switchable", function (S, Event, Switchable) {

var Slide = Switchable.Slide;

var DOM = S.DOM;
Expand All @@ -167,24 +166,6 @@ <h3 class="s-title">Slide - 淘宝首页卡盘</h3>
s.on("switch", function () {
//S.log("switch");
});

// S.one("#demo2").delegate("click", "li", function (e) {
// s.remove(e.currentTarget);
// });
var i = 7;
Event.on("#demo2-add-btn", 'click', function () {
s.add({
trigger:DOM.create("<li>" + i + "</li>"),
panel:DOM.create("<li>" + i + "</li>"),
index:s.activeIndex,
active:1
});
i++;
});

Event.on('#demo2-btn', 'click', function () {
s.stop();
})
});
});
</script>
Expand Down Expand Up @@ -330,6 +311,7 @@ <h4><a target="_blank" href="http://www.taobao.com">尚周刊 第三期</a></h4>
S.ready(function (S) {

//var slide =

new Slide('#slideFocus', {
contentCls:'pic-list',
navCls:'thumbs-list',
Expand All @@ -340,6 +322,7 @@ <h4><a target="_blank" href="http://www.taobao.com">尚周刊 第三期</a></h4>

// window.slide = slide;
// 两个拼起来
//if(0)
new Slide('#slideFocus', {
contentCls:'desc-list',
navCls:'thumbs-list',
Expand Down Expand Up @@ -432,6 +415,7 @@ <h3 class="s-title">Slide - 右侧导航卡盘</h3>

<script>
KISSY.use("event,switchable", function (S, Event, Switchable) {

var Slide = Switchable.Slide;
S.ready(function (S) {
Slide('#demo3', {
Expand Down Expand Up @@ -477,6 +461,7 @@ <h3 class="s-title">Slide - 滚动新闻条</h3>
</div>
<script>
KISSY.use("event,switchable", function (S, Event, Switchable) {

var Slide = Switchable.Slide;
S.ready(function (S) {
Slide('#demo5', {
Expand Down
2 changes: 1 addition & 1 deletion src/switchable/demo/slide_gallery.html
View file
Expand Up @@ -17,7 +17,7 @@
<script src="../src/accordion/base.js"></script>
<script src="../src/accordion/aria.js"></script>
<script src="../src/autoplay.js"></script>
<script src="../src/autorender.js"></script>

<script src="../src/carousel/base.js"></script>
<script src="../src/carousel/aria.js"></script>
<script src="../src/circular.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/switchable/demo/tab/add-remove.html
View file
Expand Up @@ -17,7 +17,7 @@
<script src="../../src/accordion/base.js"></script>
<script src="../../src/accordion/aria.js"></script>
<script src="../../src/autoplay.js"></script>
<script src="../../src/autorender.js"></script>

<script src="../../src/carousel/base.js"></script>
<script src="../../src/carousel/aria.js"></script>
<script src="../../src/circular.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/switchable/demo/tabs.html
View file
Expand Up @@ -17,7 +17,7 @@
<script src="../src/accordion/base.js"></script>
<script src="../src/accordion/aria.js"></script>
<script src="../src/autoplay.js"></script>
<script src="../src/autorender.js"></script>

<script src="../src/carousel/base.js"></script>
<script src="../src/carousel/aria.js"></script>
<script src="../src/circular.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/switchable/demo/touch/carousel.html
View file
Expand Up @@ -17,7 +17,7 @@
<script src="../../src/accordion/base.js"></script>
<script src="../../src/accordion/aria.js"></script>
<script src="../../src/autoplay.js"></script>
<script src="../../src/autorender.js"></script>

<script src="../../src/carousel/base.js"></script>
<script src="../../src/carousel/aria.js"></script>
<script src="../../src/circular.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion src/switchable/demo/touch/slide.html
View file
Expand Up @@ -17,7 +17,7 @@
<script src="../../src/accordion/base.js"></script>
<script src="../../src/accordion/aria.js"></script>
<script src="../../src/autoplay.js"></script>
<script src="../../src/autorender.js"></script>

<script src="../../src/carousel/base.js"></script>
<script src="../../src/carousel/aria.js"></script>
<script src="../../src/circular.js"></script>
Expand Down

0 comments on commit 58845a8

Please sign in to comment.