Repository: openmeetings Updated Branches: refs/heads/4.0.x 6334f8359 -> 6d7464da0
[OPENMEETINGS-1783] math formula is not-editable by the user with insufficient rights Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/6d7464da Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/6d7464da Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/6d7464da Branch: refs/heads/4.0.x Commit: 6d7464da0c2cafd65737d50b4381163d73d69be2 Parents: 6334f83 Author: Maxim Solodovnik <[email protected]> Authored: Thu Dec 28 14:23:15 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Thu Dec 28 14:23:15 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/web/room/wb/tool-math.js | 8 +++++++- .../java/org/apache/openmeetings/web/room/wb/wb-board.js | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6d7464da/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-math.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-math.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-math.js index af2f783..4d45377 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-math.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-math.js @@ -25,6 +25,8 @@ var StaticTMath = (function() { tex2svg(o.formula, function(svg) { fabric.loadSVGFromString(svg, function(objects, options) { const obj = fabric.util.groupSVGElements(objects, $.extend({}, o, options)); + obj.selectable = canvas.selection; + obj.type = 'group'; canvas.add(obj).requestRenderAll(); if (typeof(callback) === 'function') { callback(obj); @@ -81,7 +83,11 @@ var TMath = function(wb, s) { , function(obj) { math.obj = obj; math.objectCreated(math.obj, canvas); - canvas.setActiveObject(math.obj); + if (wb.getRole() !== NONE) { + canvas.setActiveObject(math.obj); + } + upd.data('uid', math.obj.uid); + upd.data('slide', math.obj.slide); } , function(msg) { err.text(msg); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/6d7464da/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 79e276d..920798a 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 @@ -231,7 +231,6 @@ var Wb = function() { const cnvs = canvases[o.slide]; StaticTMath.create(toOmJson(o), cnvs , function(obj) { - obj.type = 'group'; cnvs.trigger("object:modified", {target: obj}); } , function(msg) {
