This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new d969a0e [OPENMEETINGS-2081] undo is fixed
d969a0e is described below
commit d969a0ebb4830446371473e8627a98918449766c
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Aug 27 12:14:59 2019 +0700
[OPENMEETINGS-2081] undo is fixed
---
.../src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-arrow.js | 1 +
.../main/java/org/apache/openmeetings/web/room/wb/raw-tool-ellipse.js | 1 +
.../src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-line.js | 1 +
.../src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-rect.js | 1 +
.../src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 1 +
5 files changed, 5 insertions(+)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-arrow.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-arrow.js
index f9fdb0e..a921acd 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-arrow.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-arrow.js
@@ -19,6 +19,7 @@ var Arrow = function(wb, s, sBtn) {
, fill: arrow.fill.enabled ? arrow.fill.color :
'rgba(0,0,0,0)'
, stroke: arrow.stroke.enabled ?
arrow.stroke.color : 'rgba(0,0,0,0)'
, opacity: arrow.opacity
+ , omType: 'arrow'
});
return arrow.obj;
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-ellipse.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-ellipse.js
index 541e585..ba28275 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-ellipse.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-ellipse.js
@@ -13,6 +13,7 @@ var Ellipse = function(wb, s, sBtn) {
, ry: 0
, originX: 'center'
, originY: 'center'
+ , omType: 'ellipse'
});
return ellipse.obj;
};
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-line.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-line.js
index b18e18d..7bced0d 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-line.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-line.js
@@ -7,6 +7,7 @@ var Line = function(wb, s, sBtn) {
, fill: line.stroke.color
, stroke: line.stroke.color
, opacity: line.opacity
+ , omType: 'line'
});
return line.obj;
};
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-rect.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-rect.js
index 05699c5..1745218 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-rect.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-rect.js
@@ -11,6 +11,7 @@ var Rect = function(wb, s, sBtn) {
, top: rect.orig.y
, width: 0
, height: 0
+ , omType: 'rect'
});
return rect.obj;
};
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
index 398ba72..07e7c75 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
@@ -622,6 +622,7 @@ var Wb = function() {
function pathCreatedHandler(o) {
o.path.uid = uuidv4();
o.path.slide = this.slide;
+ o.path.omType = 'freeDraw';
objCreatedHandler(o.path);
};
function scrollHandler() {
