Repository: openmeetings Updated Branches: refs/heads/master 987ca57cf -> 59202efa0
[OPENMEETINGS-1752] opacity can be set on various objects Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/59202efa Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/59202efa Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/59202efa Branch: refs/heads/master Commit: 59202efa089bf749b5a1abf758353386e12ca3df Parents: 987ca57 Author: Maxim Solodovnik <solomax...@gmail.com> Authored: Fri Nov 10 11:55:03 2017 +0700 Committer: Maxim Solodovnik <solomax...@gmail.com> Committed: Fri Nov 10 11:55:23 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/web/room/wb/tool-arrow.js | 1 + .../org/apache/openmeetings/web/room/wb/tool-clipart.js | 2 ++ .../org/apache/openmeetings/web/room/wb/tool-ellipse.js | 1 + .../org/apache/openmeetings/web/room/wb/tool-rect.js | 1 + .../org/apache/openmeetings/web/room/wb/tool-util.js | 11 +++++++---- 5 files changed, 12 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/59202efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js index b7315f8..46af4d1 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js @@ -17,6 +17,7 @@ var Arrow = function(wb, s) { , strokeWidth: 2 , 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 }); return arrow.obj; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/59202efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js index 70257d2..de4a0f2 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js @@ -14,6 +14,7 @@ var Clipart = function(wb, btn, s) { , height: 0 , omType: 'Clipart' , _src: imgSrc + , opacity: art.opacity }); canvas.add(art.obj); }); @@ -32,6 +33,7 @@ var Clipart = function(wb, btn, s) { }; art.internalActivate = function() { ToolUtil.disableAllProps(s); + ToolUtil.enableOpacity(s, art); }; return art; }; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/59202efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js index 642c3fa..ad8d426 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js @@ -6,6 +6,7 @@ var Ellipse = function(wb, s) { strokeWidth: ellipse.stroke.width , fill: ellipse.fill.enabled ? ellipse.fill.color : 'rgba(0,0,0,0)' , stroke: ellipse.stroke.enabled ? ellipse.stroke.color : 'rgba(0,0,0,0)' + , opacity: ellipse.opacity , left: ellipse.orig.x , top: ellipse.orig.y , rx: 0 http://git-wip-us.apache.org/repos/asf/openmeetings/blob/59202efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js index f26a450..191772e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js @@ -6,6 +6,7 @@ var Rect = function(wb, s) { strokeWidth: rect.stroke.width , fill: rect.fill.enabled ? rect.fill.color : 'rgba(0,0,0,0)' , stroke: rect.stroke.enabled ? rect.stroke.color : 'rgba(0,0,0,0)' + , opacity: rect.opacity , left: rect.orig.x , top: rect.orig.y , width: 0 http://git-wip-us.apache.org/repos/asf/openmeetings/blob/59202efa/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-util.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-util.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-util.js index 538b31c..169f3dd 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-util.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-util.js @@ -2,26 +2,29 @@ var ToolUtil = (function() { return { enableLineProps: function(s, base) { - const c = s.find('.wb-prop-color'), w = s.find('.wb-prop-width'), o = s.find('.wb-prop-opacity'); + const c = s.find('.wb-prop-color'), w = s.find('.wb-prop-width'), o = this.enableOpacity(s, base); s.find('.wb-prop-fill').prop('disabled', true); s.find('.wb-prop-b, .wb-prop-i, .wb-prop-lock-color, .wb-prop-lock-fill').button("disable"); c.val(base.stroke.color).prop('disabled', false); w.val(base.stroke.width).prop('disabled', false); - o.val(100 * base.opacity).prop('disabled', false); return {c: c, w: w, o: o}; } , enableAllProps: function(s, base) { const c = s.find('.wb-prop-color'), w = s.find('.wb-prop-width') - , o = s.find('.wb-prop-opacity'), f = s.find('.wb-prop-fill') + , o = this.enableOpacity(s, base), f = s.find('.wb-prop-fill') , lc = s.find('.wb-prop-lock-color'), lf = s.find('.wb-prop-lock-fill'); s.find('.wb-prop-b, .wb-prop-i').button("disable"); lc.button("enable").button('option', 'icon', base.stroke.enabled ? 'ui-icon-unlocked' : 'ui-icon-locked'); lf.button("enable").button('option', 'icon', base.fill.enabled ? 'ui-icon-unlocked' : 'ui-icon-locked'); c.val(base.stroke.color).prop('disabled', !base.stroke.enabled); w.val(base.stroke.width).prop('disabled', false); - o.val(100 * base.opacity).prop('disabled', false); f.val(base.fill.color).prop('disabled', !base.fill.enabled); } + , enableOpacity: function(s, base) { + const o = s.find('.wb-prop-opacity') + o.val(100 * base.opacity).prop('disabled', false); + return o; + } , disableAllProps: function(s) { s.find('[class^="wb-prop"]').prop('disabled', true); if (!!s.find('.wb-prop-b').button("instance")) {
