Repository: openmeetings Updated Branches: refs/heads/master 2b96f6c14 -> db57bb0ea
[OPENMEETINGS-1642] page up/down seems to work Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/db57bb0e Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/db57bb0e Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/db57bb0e Branch: refs/heads/master Commit: db57bb0eafe920b7f5c12429521be5fd06316f39 Parents: 2b96f6c Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Fri Aug 4 17:51:38 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Fri Aug 4 17:51:38 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/web/room/wb/wb.js | 34 +++++++++++++++----- 1 file changed, 26 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/db57bb0e/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js index de236fe..75c66b7 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js @@ -585,12 +585,23 @@ var Wb = function() { var ccount = canvases.length; if (ccount > 1 && role === PRESENTER) { z.find('.doc-group').show(); - z.find('.doc-group .curr-slide').val(slide).attr('max', ccount); + var ns = 1 * slide; + z.find('.doc-group .curr-slide').val(ns + 1).attr('max', ccount); + z.find('.doc-group .up').prop('disabled', ns < 1); + z.find('.doc-group .down').prop('disabled', ns > ccount - 2); z.find('.doc-group .last-page').text(ccount); } else { z.find('.doc-group').hide(); } } + function _setSlide(_sld) { + slide = _sld; + wbAction('setSlide', JSON.stringify({ + wbId: wb.id + , slide: _sld + })); + _updateZoom(); + } function internalInit() { t.draggable({ snap: "parent" @@ -617,6 +628,18 @@ var Wb = function() { clearAll.click(function() { confirmDlg('clear-all-confirm', function() { wbAction('clearAll', JSON.stringify({wbId: wb.id})); }); }).removeClass('disabled'); + z.find('.curr-slide').change(function() { + _setSlide($(this).val() - 1); + showCurrentSlide(); + }); + z.find('.doc-group .up').click(function () { + _setSlide(1 * slide - 1); + showCurrentSlide(); + }); + z.find('.doc-group .down').click(function () { + _setSlide(1 * slide + 1); + showCurrentSlide(); + }); case WHITEBOARD: _updateZoom(); if (role === WHITEBOARD) { @@ -898,15 +921,10 @@ var Wb = function() { function scrollHandler(e) { $(this).find('.canvas-container').each(function(idx) { var h = $(this).height(), pos = $(this).position(); - if (slide != idx &&pos.top > BUMPER - h && pos.top < BUMPER) { + if (slide != idx && pos.top > BUMPER - h && pos.top < BUMPER) { //TODO FIXME might be done without iterating //console.log("Found:", idx); - slide = idx; - wbAction('setSlide', JSON.stringify({ - wbId: wb.id - , slide: idx - })); - _updateZoom(); + _setSlide(idx); return false; } });
