Repository: openmeetings Updated Branches: refs/heads/master 29dded423 -> 39c057c0c
[OPENMEETINGS-1783] formula update is improved Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/39c057c0 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/39c057c0 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/39c057c0 Branch: refs/heads/master Commit: 39c057c0c2dcd42c2ace5b97ad1326430a43d19c Parents: 29dded4 Author: Maxim Solodovnik <[email protected]> Authored: Fri Dec 29 09:43:05 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Fri Dec 29 09:43:31 2017 +0700 ---------------------------------------------------------------------- .../java/org/apache/openmeetings/web/room/wb/tool-math.js | 2 +- .../main/java/org/apache/openmeetings/web/room/wb/wb-board.js | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/39c057c0/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 4d45377..3e8db7a 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 @@ -27,10 +27,10 @@ var StaticTMath = (function() { 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); } + canvas.add(obj).requestRenderAll(); }); }, errCallback); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/39c057c0/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 920798a..a853e59 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 @@ -226,11 +226,12 @@ var Wb = function() { uid: $(this).data('uid') , slide: $(this).data('slide') }); - o.formula = f.find('textarea').val(); - _removeHandler(o); + const json = toOmJson(o); + json.formula = f.find('textarea').val(); const cnvs = canvases[o.slide]; - StaticTMath.create(toOmJson(o), cnvs + StaticTMath.create(json, cnvs , function(obj) { + _removeHandler(o); cnvs.trigger("object:modified", {target: obj}); } , function(msg) {
