openmeetings git commit: [OPENMEETINGS-1642] page up/down seems to work
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
Authored: Fri Aug 4 17:51:38 2017 +0700
Committer: Maxim Solodovnik
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;
}
});
[jira] [Commented] (OPENMEETINGS-1642) Page controls and Zoom need to be added to WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1642?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16114237#comment-16114237 ] ASF subversion and git services commented on OPENMEETINGS-1642: --- Commit db57bb0eafe920b7f5c12429521be5fd06316f39 in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=db57bb0 ] [OPENMEETINGS-1642] page up/down seems to work > Page controls and Zoom need to be added to WB > - > > Key: OPENMEETINGS-1642 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1642 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/WhiteBoard >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > Attachments: om_dashboard_pager_and_zoom.png > > > Page controls and Zoom need to be added to WB (sketch is attached) -- This message was sent by Atlassian JIRA (v6.4.14#64029)
openmeetings git commit: [OPENMEETINGS-1642] more work on zoom panel
Repository: openmeetings
Updated Branches:
refs/heads/master 666b05587 -> 2b96f6c14
[OPENMEETINGS-1642] more work on zoom panel
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/2b96f6c1
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/2b96f6c1
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/2b96f6c1
Branch: refs/heads/master
Commit: 2b96f6c14e9918db9874c3db0e008abb2ea9d892
Parents: 666b055
Author: Maxim Solodovnik
Authored: Fri Aug 4 15:48:28 2017 +0700
Committer: Maxim Solodovnik
Committed: Fri Aug 4 15:48:28 2017 +0700
--
.../openmeetings/db/dto/room/Whiteboard.java| 6 -
.../openmeetings/web/room/wb/WbPanel.html | 14 +--
.../openmeetings/web/room/wb/WbPanel.java | 11 +++--
.../web/room/wb/WbWebSocketHelper.java | 6 -
.../org/apache/openmeetings/web/room/wb/wb.js | 25 ++--
5 files changed, 44 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2b96f6c1/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
--
diff --git
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
index 81a4534..5c3e818 100644
---
a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
+++
b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dto/room/Whiteboard.java
@@ -34,6 +34,7 @@ import com.github.openjson.JSONObject;
public class Whiteboard implements Serializable {
private static final long serialVersionUID = 1L;
+ public static final String ITEMS_KEY = "roomItems";
private long id;
private Integer x = 0;
private Integer y = 0;
@@ -162,7 +163,10 @@ public class Whiteboard implements Serializable {
//deep-copy
JSONObject json = new JSONObject(new
JSONObject(this).toString(new NullStringer()));
json.remove("id"); //filtering
- JSONObject items = json.getJSONObject("roomItems");
+ if (!json.has(ITEMS_KEY)) {
+ json.put(ITEMS_KEY, new JSONObject());
+ }
+ JSONObject items = json.getJSONObject(ITEMS_KEY);
for (String uid : items.keySet()) {
JSONObject o = items.getJSONObject(uid);
o.remove("_src");
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2b96f6c1/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
--
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
index 143e2f9..bf0b1a9 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html
@@ -58,18 +58,18 @@
-
-
+
+
-
- of
- 14
+
+
+ 1
-
-
+
+
Automatic Zoom
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2b96f6c1/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 afeca53..9c655ed 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
@@ -18,10 +18,12 @@
*/
package org.apache.openmeetings.web.room.wb;
+import static org.apache.openmeetings.db.dto.room.Whiteboard.ITEMS_KEY;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetin
[jira] [Commented] (OPENMEETINGS-1642) Page controls and Zoom need to be added to WB
[ https://issues.apache.org/jira/browse/OPENMEETINGS-1642?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16114129#comment-16114129 ] ASF subversion and git services commented on OPENMEETINGS-1642: --- Commit 2b96f6c14e9918db9874c3db0e008abb2ea9d892 in openmeetings's branch refs/heads/master from [~solomax] [ https://git-wip-us.apache.org/repos/asf?p=openmeetings.git;h=2b96f6c ] [OPENMEETINGS-1642] more work on zoom panel > Page controls and Zoom need to be added to WB > - > > Key: OPENMEETINGS-1642 > URL: https://issues.apache.org/jira/browse/OPENMEETINGS-1642 > Project: Openmeetings > Issue Type: Bug > Components: HTML5/WhiteBoard >Affects Versions: 4.0.0 >Reporter: Maxim Solodovnik >Assignee: Maxim Solodovnik > Fix For: 4.0.0 > > Attachments: om_dashboard_pager_and_zoom.png > > > Page controls and Zoom need to be added to WB (sketch is attached) -- This message was sent by Atlassian JIRA (v6.4.14#64029)
