OSDN Git Service

am eb41035f: docs: add the ability to pause the carousel
authorScott Main <smain@google.com>
Tue, 15 Jan 2013 05:07:29 +0000 (21:07 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 15 Jan 2013 05:07:29 +0000 (21:07 -0800)
* commit 'eb41035fcfe1c223a794a24ee2fe8a8b133e67b1':
  docs: add the ability to pause the carousel

tools/droiddoc/templates-sdk/assets/css/default.css
tools/droiddoc/templates-sdk/assets/js/docs.js
tools/droiddoc/templates-sdk/trailer.cs

index cd25dc5..247a6d3 100644 (file)
@@ -1138,6 +1138,9 @@ td {
   background-color:inherit;
   border:solid 1px #DDD;
 }
+td *:last-child {
+  margin-bottom:0;
+}
 th {
   background-color: #999;
   color: #fff;
index d603269..43bcb8f 100644 (file)
@@ -1144,6 +1144,7 @@ function hideExpandable(ids) {
  *  Options:
  *  btnPrev:    optional identifier for previous button
  *  btnNext:    optional identifier for next button
+ *  btnPause:   optional identifier for pause button
  *  auto:       whether or not to auto-proceed
  *  speed:      animation speed
  *  autoTime:   time between auto-rotation
@@ -1161,6 +1162,7 @@ function hideExpandable(ids) {
      o = $.extend({
          btnPrev:   null,
          btnNext:   null,
+         btnPause:  null,
          auto:      true,
          speed:     500,
          autoTime:  12000,
@@ -1231,6 +1233,17 @@ function hideExpandable(ids) {
                  e.preventDefault();
                  return go(curr+o.scroll);
              });
+
+         //Pause button
+         if(o.btnPause)
+             $(o.btnPause).click(function(e) {
+                 e.preventDefault();
+                 if ($(this).hasClass('paused')) {
+                     startRotateTimer();
+                 } else {
+                     pauseRotateTimer();
+                 }
+             });
          
          //Auto rotation
          if(o.auto) startRotateTimer();
@@ -1244,6 +1257,12 @@ function hideExpandable(ids) {
                     go(curr+o.scroll);  
                   } 
               }, o.autoTime);
+             $(o.btnPause).removeClass('paused');
+         }
+
+         function pauseRotateTimer() {
+             clearInterval(timer);
+             $(o.btnPause).addClass('paused');
          }
 
          //Go to an item
index f0b8a2f..1cf8793 100644 (file)
@@ -29,7 +29,8 @@ window.gOverride = {
 <script type="text/javascript">
 $('.slideshow-container').dacSlideshow({
     btnPrev: '.slideshow-prev',
-    btnNext: '.slideshow-next'
+    btnNext: '.slideshow-next',
+    btnPause: '#pauseButton'
 });
 </script>
 <?cs /if ?>