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 2017/11/04 13:19:58 UTC
[2/2] openmeetings git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/openmeetings
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/openmeetings
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/2f472369
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/2f472369
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/2f472369
Branch: refs/heads/master
Commit: 2f472369fda3b3d476369c569174ce9d29d66b6d
Parents: 435c350 c648c9d
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Sat Nov 4 20:19:49 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Sat Nov 4 20:19:49 2017 +0700
----------------------------------------------------------------------
openmeetings-web/pom.xml | 2 +-
.../web/app/Application.properties.xml | 5 ++--
.../web/app/Application_ar.properties.xml | 5 ++--
.../web/app/Application_bg.properties.xml | 5 ++--
.../web/app/Application_ca.properties.xml | 5 ++--
.../web/app/Application_cs.properties.xml | 5 ++--
.../web/app/Application_da.properties.xml | 5 ++--
.../web/app/Application_de.properties.xml | 5 ++--
.../web/app/Application_el.properties.xml | 5 ++--
.../web/app/Application_es.properties.xml | 5 ++--
.../web/app/Application_fa.properties.xml | 5 ++--
.../web/app/Application_fi.properties.xml | 5 ++--
.../web/app/Application_fr.properties.xml | 5 ++--
.../web/app/Application_gl.properties.xml | 5 ++--
.../web/app/Application_he.properties.xml | 5 ++--
.../web/app/Application_hu.properties.xml | 5 ++--
.../web/app/Application_id.properties.xml | 5 ++--
.../web/app/Application_it.properties.xml | 5 ++--
.../web/app/Application_ja.properties.xml | 5 ++--
.../web/app/Application_ko.properties.xml | 5 ++--
.../web/app/Application_nl.properties.xml | 5 ++--
.../web/app/Application_pl.properties.xml | 5 ++--
.../web/app/Application_pt.properties.xml | 5 ++--
.../web/app/Application_pt_BR.properties.xml | 5 ++--
.../web/app/Application_ru.properties.xml | 5 ++--
.../web/app/Application_sk.properties.xml | 5 ++--
.../web/app/Application_sv.properties.xml | 5 ++--
.../web/app/Application_th.properties.xml | 5 ++--
.../web/app/Application_tr.properties.xml | 5 ++--
.../web/app/Application_uk.properties.xml | 5 ++--
.../web/app/Application_zh_CN.properties.xml | 5 ++--
.../web/app/Application_zh_TW.properties.xml | 5 ++--
.../org/apache/openmeetings/web/room/room.js | 28 ++++++++++++++++++++
.../openmeetings/web/room/wb/WbPanel.html | 5 +++-
.../apache/openmeetings/web/room/wb/wb-area.js | 2 +-
.../apache/openmeetings/web/room/wb/wb-board.js | 26 ++----------------
.../webservice/AbstractWebServiceTest.java | 5 ++--
pom.xml | 2 +-
38 files changed, 133 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2f472369/openmeetings-web/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/2f472369/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js
----------------------------------------------------------------------
diff --cc openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js
index 9ee6b04,93de5e3..306d418
--- 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
@@@ -47,31 -47,9 +47,9 @@@ var Wb = function()
c.find('ul li').prepend(old);
c.find('a').prepend(cur);
});
- initToolBtn(cur.data('mode'), false, Clipart(wb, cur));
+ initToolBtn(cur.data('mode'), false, Clipart(wb, cur, s));
});
}
- function confirmDlg(_id, okHandler) {
- const confirm = $('#' + _id);
- confirm.dialog({
- modal: true
- , buttons: [
- {
- text: confirm.data('btn-ok')
- , click: function() {
- okHandler();
- $(this).dialog("close");
- }
- }
- , {
- text: confirm.data('btn-cancel')
- , click: function() {
- $(this).dialog("close");
- }
- }
- ]
- });
- return confirm;
- }
function _updateZoomPanel() {
const ccount = canvases.length;
if (ccount > 1 && role === PRESENTER) {