Repository: openmeetings Updated Branches: refs/heads/master bc3628c87 -> 6fdcea2db
[OPENMEETINGS-1701] zoom-out is limited to 10%, roundings are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6fdcea2d Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6fdcea2d Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6fdcea2d Branch: refs/heads/master Commit: 6fdcea2dba1b85fb782c82c4163636bd5b7e2d91 Parents: bc3628c Author: Maxim Solodovnik <[email protected]> Authored: Tue Sep 12 21:01:08 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Sep 12 21:01:08 2017 +0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/openmeetings/web/room/wb/wb.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6fdcea2d/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 e52dbc7..ecb62f8 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 @@ -974,6 +974,9 @@ var Wb = function() { _updateZoomPanel(); z.find('.zoom-out').click(function() { zoom -= .2; + if (zoom < .1) { + zoom = .1; + } zoomMode = 'zoom'; _setSize(); wbAction('setSize', JSON.stringify({ @@ -1281,7 +1284,7 @@ var Wb = function() { oo.prop('selected', true); } else { z.find('.zoom').data('custom-val', zoom).find('option[value=custom]') - .text(100. * zoom.toFixed(2) + '%') + .text((100. * zoom).toFixed(0) + '%') .prop('selected', true); } }
