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 2018/09/29 15:43:59 UTC
[openmeetings] branch OPENMEETINGS-1934-delete-btn created (now
2715c71)
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a change to branch OPENMEETINGS-1934-delete-btn
in repository https://gitbox.apache.org/repos/asf/openmeetings.git.
at 2715c71 [OPENMEETINGS-1934] initial work on btn replacement
This branch includes the following new commits:
new 2715c71 [OPENMEETINGS-1934] initial work on btn replacement
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[openmeetings] 01/01: [OPENMEETINGS-1934] initial work on btn
replacement
Posted by so...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch OPENMEETINGS-1934-delete-btn
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
commit 2715c717678e7707e82db1884ec5690b5c879470
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Sep 29 22:43:26 2018 +0700
[OPENMEETINGS-1934] initial work on btn replacement
---
.../main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
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 c43d0ef..7101c80 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
@@ -3,8 +3,9 @@ var Wb = function() {
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', 'formula']
- , arrowImg = new Image();
+ , arrowImg = new Image(), delImg = new Image();
arrowImg.src = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABwAAAAICAYAAADqSp8ZAAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAAAygAAAMoBawMUsgAAABl0RVh0U29mdHdhcmUAd3d3Lmlua3NjYXBlLm9yZ5vuPBoAAAFsSURBVCiRrdI/SEJRFMfx37lPGxqKoGwxKJoaImhpCf8NEUFL9WgLUrPnIyEIa6reVEPQn0GeWDS4NDQETQ2JT4waojUoHBqCoJKWINB3720yIhGl+q7ncj5nuIQ6jWiaq1xmU4IwBACQ5GCAU5D8IECRAkUQzt8V++wmlSrX20e1BoFIrFdwHidIIQhH5O68sgzD/vnOF4m0QyijJGgMQIHZtJdJJ4oNg6qqNr20dKwBaOWKvZFPpZ7qXV3JH4wNSMbjJHGZ7XIlYRiiFkiBsL4CphwLwbck5E7uwMw3ClXD2iRIm [...]
+ delImg.src = arrowImg.src;
let a, t, z, s, f, mode, slide = 0, width = 0, height = 0
, zoom = 1., zoomMode = 'pageWidth', role = null;
@@ -654,6 +655,11 @@ var Wb = function() {
, y = top + (size - arrowImg.height) / 2;
ctx.drawImage(arrowImg, x, y);
}
+ , tr: function trControlCallback (ctx, left, top, size) {
+ const x = left + (size - delImg.width) / 2
+ , y = top + (size - delImg.height) / 2;
+ ctx.drawImage(delImg, x, y);
+ }
}
});
canvas.wbId = wb.id;