You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2017/11/26 16:54:13 UTC
openmeetings git commit: [OPENMEETINGS-1772] WB zoom is fixed
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x ae1b51a99 -> 8f5e3fe48
[OPENMEETINGS-1772] WB zoom is fixed
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/8f5e3fe4
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/8f5e3fe4
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/8f5e3fe4
Branch: refs/heads/4.0.x
Commit: 8f5e3fe486ad782fb4e26196985bf04604481d45
Parents: ae1b51a
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sun Nov 26 23:54:02 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sun Nov 26 23:54:02 2017 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/web/room/wb/WbAction.java | 3 ++-
.../org/apache/openmeetings/web/room/wb/WbPanel.java | 11 ++++++++---
.../java/org/apache/openmeetings/web/room/wb/wb-area.js | 3 +--
.../java/org/apache/openmeetings/web/room/wb/wb-board.js | 8 ++++----
4 files changed, 15 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8f5e3fe4/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbAction.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbAction.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbAction.java
index 3a65411..6eaca7e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbAction.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbAction.java
@@ -19,7 +19,8 @@
package org.apache.openmeetings.web.room.wb;
public enum WbAction {
- createWb
+ create //create wb without additional calls
+ , createWb
, removeWb
, activateWb
, renameWb
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8f5e3fe4/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index c09a68b..91ba21d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -467,7 +467,7 @@ public class WbPanel extends AbstractWbPanel {
.put("width", wb.getWidth())
.put("height", wb.getHeight())
.put("zoom", wb.getZoom())
- .put("zoomMode", wb.getZoomMode());
+ .put("zoomMode", wb.getZoomMode().name());
}
@Override
@@ -658,8 +658,13 @@ public class WbPanel extends AbstractWbPanel {
return wb.save(f.getFile().toPath());
}
- public static StringBuilder loadWhiteboards(Client cl, Whiteboards wbs, Set<Entry<Long, Whiteboard>> boardSet) {
- return loadWhiteboards(new StringBuilder(), cl, wbs, boardSet);
+ public void loadWhiteboards(Whiteboards wbs, Set<Entry<Long, Whiteboard>> boardSet) {
+ for (Entry<Long, Whiteboard> entry : boardSet) {
+ final Whiteboard wb = entry.getValue();
+ sendWbAll(WbAction.create, getAddWbJson(wb));
+ sendWbAll(WbAction.createObj, new JSONObject().put("wbId", wb.getId())
+ .put("obj", getArray(wb.toJson(), null)));
+ }
}
private static StringBuilder loadWhiteboards(StringBuilder sb, Client cl, Whiteboards wbs, Set<Entry<Long, Whiteboard>> boardSet) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8f5e3fe4/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
index 775ba77..833ac54 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
@@ -151,7 +151,7 @@ var DrawWbArea = function() {
});
}
self.init = function() {
- container = $(".room.wb.area");
+ container = $('.room.wb.area');
tabs = container.find('.tabs');
if (tabs.length === 0) return;
tabs.tabs({
@@ -227,7 +227,6 @@ var DrawWbArea = function() {
self.createWb = function(obj) {
if (!_inited) return;
self.create(obj);
- self.setRole(role);
_activateTab(obj.wbId);
};
self.activateWb = function(obj) {
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/8f5e3fe4/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js
index 417db27..af077eb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js
@@ -1,7 +1,7 @@
/* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */
var Wb = function() {
- const ACTIVE = 'active', BUMPER = 100
- , wb = {id: -1, name: ''}, canvases = []
+ const ACTIVE = 'active', BUMPER = 100, wb = {id: -1, name: ''}, canvases = []
+ , area = $('.room.wb.area .wb-area .tabs.ui-tabs'), bar = area.find('.wb-tabbar')
, extraProps = ['uid', 'fileId', 'fileType', 'count', 'slide', 'omType', '_src'];
let a, t, z, s, mode, slide = 0, width = 0, height = 0
, zoom = 1., zoomMode = 'fullFit', role = null;
@@ -512,11 +512,11 @@ var Wb = function() {
function _setSize() {
switch (zoomMode) {
case 'fullFit':
- zoom = Math.min((a.width() - 10) / width, (a.height() - 10) / height);
+ zoom = Math.min((area.width() - 10) / width, (area.height() - bar.height() - 10) / height);
z.find('.zoom').val(zoomMode);
break;
case 'pageWidth':
- zoom = (a.width() - 10) / width;
+ zoom = (area.width() - 10) / width;
z.find('.zoom').val(zoomMode);
break;
default: