added: preview from current page

Jinjiang · Jul 23, 2013 · f3f37d3 · f3f37d3
1 parent c273134
commit f3f37d3
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/index.html b/index.html
@@ -28,7 +28,15 @@
       <ul class="nav pull-right">
         <li><a href="#theme-manager" data-toggle="modal"><i class="icon-briefcase"></i> Themes</a></li>
         <li><a href="#reset-confirm" data-toggle="modal"><i class="icon-repeat"></i> Reset</a></li>
-        <li><a href="#" id="preview-btn"><i class="icon-play"></i> Preview</a></li>
+        <li>
+          <a href="#" class="dropdown-toggle" data-toggle="dropdown">
+            <i class="icon-play"></i> Preview <b class="caret"></b>
+          </a>
+          <ul class="dropdown-menu pull-right">
+            <li><a href="#" id="preview-btn">From start</a></li>
+            <li><a href="#" id="preview-current-btn">From current page</a></li>
+          </ul>
+        </li>
         <!-- <li><a href="#" id="publish-btn"><i class="icon-ok"></i> Publish</a></li> -->
         <!-- <li><a href="#" id="remove-btn"><i class="icon-remove"></i> Remove</a></li> -->
       </ul>

diff --git a/js/player.js b/js/player.js
@@ -1,5 +1,6 @@
-define(['data', 'design', 'types'], function (dataManager, designManager, typeMap) {
+define(['data', 'design', 'types', 'vm'], function (dataManager, designManager, typeMap, vm) {
     var btnPreview = $('#preview-btn');
+    var btnPreviewCurrent = $('#preview-current-btn');
 
     var player = $('#player');
     var editor = $('#editor');
@@ -60,7 +61,7 @@ define(['data', 'design', 'types'], function (dataManager, designManager, typeMa
     function bindFullscreenChange(handler) {
         if (fullscreenEnabled) {
             document.onwebkitfullscreenchange = function (e) {
-                handler(isFullscreen());
+                handler && handler(isFullscreen());
             };
         }
     }
@@ -318,7 +319,7 @@ define(['data', 'design', 'types'], function (dataManager, designManager, typeMa
     /**
         启动播放器，初始化幻灯片和屏幕
      */
-    function doPlay() {
+    function doPlay(page) {
         var design = dataManager.getDesign();
         var transition = dataManager.getTransition();
         var title = dataManager.getTitle();
@@ -339,8 +340,8 @@ define(['data', 'design', 'types'], function (dataManager, designManager, typeMa
         txtSum.text(slideLength);
         gotoNumber.attr('min', 1);
         gotoNumber.attr('max', slideLength);
-
-        gotoPage(0);
+            
+        gotoPage(parseInt(page) || 0);
 
         $(window).bind('keydown', keydown);
 
@@ -395,8 +396,19 @@ define(['data', 'design', 'types'], function (dataManager, designManager, typeMa
         doPlay();
     }
 
+    /**
+        绑定点击播放按钮的事件
+     */
+    function clickPreviewCurrent(e) {
+        e.preventDefault();
+        editor.hide();
+        player.show();
+        doPlay(vm.currentPage());
+    }
+
 
     btnPreview.click(clickPreview);
+    btnPreviewCurrent.click(clickPreviewCurrent);
     btnNext.click(clickNext);
     btnPrev.click(clickPrev);
     btnGoto.click(clickGoto);