This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new e597a3e [OPENMEETINGS-1905] clear WB should work as expected
e597a3e is described below
commit e597a3e7c598f92254401d90e0ba1942e1c20f20
Author: Maxim Solodovnik <[email protected]>
AuthorDate: Tue Jul 17 22:48:07 2018 +0700
[OPENMEETINGS-1905] clear WB should work as expected
---
.../org/apache/openmeetings/web/room/wb/wb-area.js | 44 +++++++++++-----------
.../apache/openmeetings/web/room/wb/wb-board.js | 32 ++++++++--------
2 files changed, 38 insertions(+), 38 deletions(-)
diff --git
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
index 43fb480..88f97cf 100644
---
a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
+++
b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
@@ -6,10 +6,10 @@ var DrawWbArea = function() {
let container, area, tabs, scroll, role = NONE, _inited = false;
function refreshTabs() {
-
tabs.tabs("refresh").find('ul').removeClass('ui-corner-all').removeClass('ui-widget-header');
+
tabs.tabs('refresh').find('ul').removeClass('ui-corner-all').removeClass('ui-widget-header');
}
function getActive() {
- const idx = tabs.tabs("option", 'active');
+ const idx = tabs.tabs('option', 'active');
if (idx > -1) {
const href = tabs.find('a')[idx];
if (!!href) {
@@ -52,7 +52,7 @@ var DrawWbArea = function() {
function _activateTab(wbId) {
container.find('.wb-tabbar li').each(function(idx) {
if (wbId === 1 * $(this).data('wb-id')) {
- tabs.tabs("option", "active", idx);
+ tabs.tabs('option', 'active', idx);
$(this)[0].scrollIntoView();
return false;
}
@@ -67,14 +67,14 @@ var DrawWbArea = function() {
}
function _resizeWbs() {
const w = area.width(), hh = area.height()
- , wbTabs = area.find(".tabs.ui-tabs")
- , tabPanels = wbTabs.find(".ui-tabs-panel")
- , wbah = hh - 5 -
wbTabs.find("ul.ui-tabs-nav").height();
+ , wbTabs = area.find('.tabs.ui-tabs')
+ , tabPanels = wbTabs.find('.ui-tabs-panel')
+ , wbah = hh - 5 -
wbTabs.find('ul.ui-tabs-nav').height();
tabPanels.height(wbah);
tabPanels.each(function() {
$(this).data().resize(w - 25, wbah - 20);
});
- wbTabs.find(".ui-tabs-panel .scroll-container").height(wbah);
+ wbTabs.find('.ui-tabs-panel .scroll-container').height(wbah);
}
function _addCloseBtn(li) {
if (role !== PRESENTER) {
@@ -105,7 +105,7 @@ var DrawWbArea = function() {
}
self.getWbTabId = function(id) {
- return "wb-tab-" + id;
+ return 'wb-tab-' + id;
};
self.getWb = function(id) {
return $('#' + self.getWbTabId(id)).data();
@@ -116,8 +116,8 @@ var DrawWbArea = function() {
self.setRole = function(_role) {
if (!_inited) return;
role = _role;
- const tabsNav = tabs.find(".ui-tabs-nav");
- tabsNav.sortable(role === PRESENTER ? "enable" : "disable");
+ const tabsNav = tabs.find('.ui-tabs-nav');
+ tabsNav.sortable(role === PRESENTER ? 'enable' : 'disable');
const prev = tabs.find('.prev.om-icon'), next =
tabs.find('.next.om-icon');
if (role === PRESENTER) {
if (prev.length === 0) {
@@ -148,7 +148,7 @@ var DrawWbArea = function() {
}
self.removeDeleteHandler();
}
- tabs.find(".ui-tabs-panel").each(function() {
+ tabs.find('.ui-tabs-panel').each(function() {
$(this).data().setRole(role);
});
}
@@ -169,9 +169,9 @@ var DrawWbArea = function() {
}
});
scroll = tabs.find('.scroll-container');
- area = container.find(".wb-area");
- tabs.find(".ui-tabs-nav").sortable({
- axis: "x"
+ area = container.find('.wb-area');
+ tabs.find('.ui-tabs-nav').sortable({
+ axis: 'x'
, stop: function() {
refreshTabs();
}
@@ -179,7 +179,7 @@ var DrawWbArea = function() {
_inited = true;
self.setRole(role);
$('#wb-rename-menu').menu().find('.wb-rename').click(function()
{
- _getWbTab($(this).parent().data('wb-id')).find('a
span').trigger("dblclick");
+ _getWbTab($(this).parent().data('wb-id')).find('a
span').trigger('dblclick');
});
};
self.destroy = function() {
@@ -198,7 +198,7 @@ var DrawWbArea = function() {
$('#wb-rename-menu').show().data('wb-id', obj.wbId)
.position({my: 'left top',
collision: 'none', of: _getWbTab(obj.wbId)});
});
- li.find('a').attr('href', "#" + tid);
+ li.find('a').attr('href', '#' + tid);
_setTabName(li, obj.name)
.dblclick(function() {
if (role !== PRESENTER) {
@@ -208,7 +208,7 @@ var DrawWbArea = function() {
, name =
$(this).hide().after(editor.val(obj.name));
editor.focus().blur(function() {
const newName = $(this).val();
- if (newName !== "") {
+ if (newName !== '') {
wbAction('renameWb',
JSON.stringify({wbId: obj.wbId, name: newName}));
}
$(this).remove();
@@ -216,7 +216,7 @@ var DrawWbArea = function() {
});
});
- tabs.find(".ui-tabs-nav").append(li);
+ tabs.find('.ui-tabs-nav').append(li);
tabs.append(wb);
refreshTabs();
_addCloseBtn(li);
@@ -272,16 +272,16 @@ var DrawWbArea = function() {
if (!_inited) return;
const tabId = self.getWbTabId(obj.wbId);
_getWbTab(obj.wbId).remove();
- $("#" + tabId).remove();
+ $('#' + tabId).remove();
refreshTabs();
};
self.resize = function(sbW, chW, w, h) {
const hh = h - 5;
- container.width(w).height(h).css('left', (Settings.isRtl ? chW
: sbW) + "px");
+ container.width(w).height(h).css('left', (Settings.isRtl ? chW
: sbW) + 'px');
if (!container || !_inited) return;
area.width(w).height(hh);
- const wbTabs = area.find(".tabs.ui-tabs");
+ const wbTabs = area.find('.tabs.ui-tabs');
wbTabs.height(hh);
_resizeWbs();
}
@@ -340,7 +340,7 @@ var DrawWbArea = function() {
return self;
};
$(function() {
- Wicket.Event.subscribe("/websocket/message", function(jqEvent, msg) {
+ Wicket.Event.subscribe('/websocket/message', function(jqEvent, msg) {
try {
if (msg instanceof Blob) {
return; //ping
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 a853e59..56d69a3 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
@@ -7,7 +7,7 @@ var Wb = function() {
, zoom = 1., zoomMode = 'pageWidth', role = null;
function getBtn(m) {
- return !!t ? t.find(".om-icon." + (m || mode)) : null;
+ return !!t ? t.find('.om-icon.' + (m || mode)) : null;
}
function initToolBtn(m, def, obj) {
const btn = getBtn(m);
@@ -73,8 +73,8 @@ var Wb = function() {
}
function internalInit() {
t.draggable({
- snap: "parent"
- , containment: "parent"
+ snap: 'parent'
+ , containment: 'parent'
, scroll: false
, stop: function(event, ui) {
const pos = ui.helper.position();
@@ -86,8 +86,8 @@ var Wb = function() {
}
});
z.draggable({
- snap: "parent"
- , containment: "parent"
+ snap: 'parent'
+ , containment: 'parent'
, scroll: false
});
const clearAll = t.find('.om-icon.clear-all');
@@ -124,10 +124,10 @@ var Wb = function() {
initToolBtn('arrow', _firstToolItem, Arrow(wb,
s));
initToolBtn('math', _firstToolItem, TMath(wb,
s));
initCliparts();
- t.find(".om-icon.settings").click(function() {
+ t.find('.om-icon.settings').click(function() {
s.show();
});
- t.find(".om-icon.math").click(function() {
+ t.find('.om-icon.math').click(function() {
f.show();
});
t.find('.om-icon.clear-slide').click(function()
{
@@ -232,7 +232,7 @@ var Wb = function() {
StaticTMath.create(json, cnvs
, function(obj) {
_removeHandler(o);
-
cnvs.trigger("object:modified", {target: obj});
+
cnvs.trigger('object:modified', {target: obj});
}
, function(msg) {
const err =
f.find('.status');
@@ -357,7 +357,7 @@ var Wb = function() {
} else {
let scale = width / _o.width;
scale = scale < 1 ? 1 : scale;
-
canvas.setBackgroundImage(_o._src + "&slide=" + i, canvas.renderAll.bind(canvas)
+
canvas.setBackgroundImage(_o._src + '&slide=' + i, canvas.renderAll.bind(canvas)
, {scaleX:
scale, scaleY: scale});
}
}
@@ -454,7 +454,7 @@ var Wb = function() {
if (role === NONE && o.type !== 'pointer') return;
o.includeDefaultValues = false;
- if ("activeSelection" === o.type) {
+ if ('activeSelection' === o.type) {
o.clone(function(_o) {
// ungrouping
_o.includeDefaultValues = false;
@@ -640,7 +640,7 @@ var Wb = function() {
t.attr('style', 'position: absolute; top: 20px; ' +
(Settings.isRtl ? 'left' : 'right') + ': 20px;');
a.append(t).append(z);
showCurrentSlide();
- t = a.find('.tools'), s = a.find(".wb-settings");
+ t = a.find('.tools'), s = a.find('.wb-settings');
wb.eachCanvas(function(canvas) {
setHandlers(canvas);
canvas.forEachObject(function(__o) { //TODO
reduce iterations
@@ -676,15 +676,15 @@ var Wb = function() {
my: (Settings.isRtl ? 'left' : 'right')
, at: (Settings.isRtl ? 'left' : 'right') +
'-20'
, of: '#' + a[0].id
- , collision: "fit"
+ , collision: 'fit'
});
}
if (z.position().left + z.width() > a.width()) {
z.position({
my: (Settings.isRtl ? 'right' : 'left') + ' top'
- , at: "center top"
+ , at: 'center top'
, of: '#' + a[0].id
- , collision: "fit"
+ , collision: 'fit'
});
}
if (zoomMode !== 'zoom') {
@@ -699,7 +699,7 @@ var Wb = function() {
const arr = [], del = [], _arr = Array.isArray(obj) ? obj :
[obj];
for (let i = 0; i < _arr.length; ++i) {
const o = _arr[i];
- if (!!o.deleted && "Presentation" !== o.fileType) {
+ if (!!o.deleted && 'Presentation' !== o.fileType) {
del.push(o);
continue;
}
@@ -770,7 +770,7 @@ var Wb = function() {
};
wb.clearAll = function() {
for (let i = 1; i < canvases.length; ++i) {
- const cc = $('#can-wb-tab-0-slide-' +
i).closest('.canvas-container');
+ const cc = $('#can-wb-tab-' + wb.id + '-slide-' +
i).closest('.canvas-container');
cc.remove();
canvases[i].dispose();
}
