Repository: openmeetings Updated Branches: refs/heads/4.0.x d5bcb1475 -> 9a3d466ba
[OPENMEETINGS-1824] ability to set wb-text fontFamily is added Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/9a3d466b Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/9a3d466b Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/9a3d466b Branch: refs/heads/4.0.x Commit: 9a3d466ba650631c711ce88a70d5074cf41d4620 Parents: d5bcb14 Author: Maxim Solodovnik <[email protected]> Authored: Tue Jan 30 23:59:51 2018 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Jan 30 23:59:51 2018 +0700 ---------------------------------------------------------------------- .../src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html | 1 + .../src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js | 2 ++ 2 files changed, 3 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9a3d466b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html index e08b071..24325cb 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.html @@ -27,6 +27,7 @@ </div> <div style="display:none;"> + <div id="wb-text-style-block"></div> <div id="wb-tabbar-ctrls-left"> <div class="add clickable om-icon big"></div> <div class="prev clickable om-icon big"></div> http://git-wip-us.apache.org/repos/asf/openmeetings/blob/9a3d466b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js index 7ce25f8..70eae8e 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js @@ -22,6 +22,7 @@ var Text = function(wb, s) { , stroke: text.stroke.enabled ? text.stroke.color : 'rgba(0,0,0,0)' //, strokeWidth: text.stroke.width , fontSize: text.stroke.width + , fontFamily: text.fontFamily , opacity: text.opacity }); if (text.style.bold) { @@ -44,6 +45,7 @@ var Text = function(wb, s) { } }); }); + text.fontFamily = $('#wb-text-style-block').css('font-family'); ToolUtil.enableAllProps(s, text); const b = s.find('.wb-prop-b').button("enable"); if (text.style.bold) {
