Repository: openmeetings Updated Branches: refs/heads/master ce4e69d2a -> dd651cf41
[OPENMEETINGS-1714] more issues are fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/dd651cf4 Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/dd651cf4 Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/dd651cf4 Branch: refs/heads/master Commit: dd651cf41f6fc924425e21fee6ce01fecd47cd3c Parents: ce4e69d Author: Maxim Solodovnik <[email protected]> Authored: Sat Sep 30 23:56:34 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Sat Sep 30 23:56:34 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/db/entity/label/StringLabel.java | 2 +- .../org/apache/openmeetings/screenshare/ScreenV1Encoder.java | 2 +- .../openmeetings/screenshare/gui/ScreenSharerFrame.java | 2 +- .../openmeetings/service/calendar/AppointmentLogic.java | 2 +- .../org/apache/openmeetings/web/admin/rooms/RoomForm.java | 2 +- .../org/apache/openmeetings/web/admin/users/UserForm.java | 2 +- .../java/org/apache/openmeetings/web/app/WebSession.java | 4 ++-- .../web/data/SearchableGroupAdminDataProvider.java | 4 ++-- .../src/main/java/org/apache/openmeetings/web/pages/om-ga.js | 2 +- .../src/main/java/org/apache/openmeetings/web/room/room.js | 8 ++++---- .../main/java/org/apache/openmeetings/web/room/settings.js | 2 +- .../java/org/apache/openmeetings/web/room/wb/tool-ellipse.js | 2 +- .../java/org/apache/openmeetings/web/room/wb/tool-line.js | 2 +- .../java/org/apache/openmeetings/web/room/wb/tool-rect.js | 2 +- .../java/org/apache/openmeetings/web/room/wb/wb-board.js | 4 ++-- .../openmeetings/web/user/calendar/calendar-functions.js | 2 +- .../main/java/org/apache/openmeetings/web/user/chat/chat.js | 4 ++-- .../java/org/apache/openmeetings/web/user/dashboard/rss.js | 2 +- 18 files changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java index b470154..652449c 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/entity/label/StringLabel.java @@ -36,7 +36,7 @@ public class StringLabel extends SimpleEntry<String, String> implements IDataPro @Override public int hashCode() { - return (getKey() == null ? 0 : getKey().hashCode()); + return getKey() == null ? 0 : getKey().hashCode(); } @Override http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java index 302194a..a36faba 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/ScreenV1Encoder.java @@ -135,7 +135,7 @@ public class ScreenV1Encoder extends BaseScreenEncoder { //next row prev.x = 0; //reset position prev.width = blockSize; //reset width - prev.height = (prev.y > blockSize ? blockSize : prev.y); + prev.height = prev.y > blockSize ? blockSize : prev.y; prev.y -= prev.height; } else { prev.x += blockSize; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java ---------------------------------------------------------------------- diff --git a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java index fa3bca1..5572fcb 100644 --- a/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java +++ b/openmeetings-screenshare/src/main/java/org/apache/openmeetings/screenshare/gui/ScreenSharerFrame.java @@ -159,7 +159,7 @@ public class ScreenSharerFrame extends JFrame { if (obj instanceof KeyValue) { @SuppressWarnings("unchecked") KeyValue<T> kv = (KeyValue<T>) obj; - return (kv.value.equals(this.value)); + return kv.value.equals(this.value); } return false; } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java ---------------------------------------------------------------------- diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java index d64cd4c..fc109ae 100644 --- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java +++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/calendar/AppointmentLogic.java @@ -106,7 +106,7 @@ public class AppointmentLogic { return; } - long milliseconds = (minutesReminderSend * 60 * 1000L); + long milliseconds = minutesReminderSend * 60 * 1000L; Calendar start = Calendar.getInstance(); if (milliseconds < 0) { start.setTimeInMillis(start.getTimeInMillis() + milliseconds); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java index 573ea0c..ac4eaa3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomForm.java @@ -420,7 +420,7 @@ public class RoomForm extends AdminBaseForm<Room> { } void updateClients(AjaxRequestTarget target) { - long roomId = (getModelObject().getId() != null ? getModelObject().getId() : 0); + long roomId = getModelObject().getId() != null ? getModelObject().getId() : 0; final List<StreamClient> clientsInRoom = getBean(ISessionManager.class).listByRoom(roomId); clients.setDefaultModelObject(clientsInRoom); target.add(clientsContainer); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java index eaa7ba8..0689ce3 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java @@ -181,7 +181,7 @@ public class UserForm extends AdminBaseForm<User> { protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) { User u = getModelObject(); try { - boolean isNew = (u.getId() == null); + boolean isNew = u.getId() == null; boolean sendEmailAtRegister = getBean(ConfigurationDao.class).getBool(CONFIG_EMAIL_AT_REGISTER, false); if (isNew && sendEmailAtRegister) { u.setActivatehash(UUID.randomUUID().toString()); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java index 49df48b..057ed7a 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/WebSession.java @@ -518,13 +518,13 @@ public class WebSession extends AbstractAuthenticatedWebSession implements IWebS if (!showMyRoomConfValue) { iter.remove(); } - } else if ((w.getClass().equals(RssWidget.class))) { + } else if (w.getClass().equals(RssWidget.class)) { // RssWidget is stored in the profile of user. Now, Show_RSS_Key is disable. existRssWidget = true; if (!showRssConfValue) { iter.remove(); } - } else if ((w.getClass().equals(AdminWidget.class))) { + } else if (w.getClass().equals(AdminWidget.class)) { // AdminWidget is stored in the profile of user. check if user is admin. existAdminWidget = true; if (!showAdminWidget) { http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableGroupAdminDataProvider.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableGroupAdminDataProvider.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableGroupAdminDataProvider.java index 6cbcf29..4e65b41 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableGroupAdminDataProvider.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/data/SearchableGroupAdminDataProvider.java @@ -48,8 +48,8 @@ public class SearchableGroupAdminDataProvider<T extends IDataProviderEntity> ext @Override public long size() { - return (hasGroupAdminLevel(getRights()) + return hasGroupAdminLevel(getRights()) ? getDao().count(search, getUserId()) - : getDao().count(search)); + : getDao().count(search); } } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js index 43b33e3..e7e73f4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/om-ga.js @@ -16,7 +16,7 @@ function init() { function initHash() { ga('send', 'pageview', window.location.hash); - $(window).bind( 'hashchange', function( e ) { + $(window).bind('hashchange', function() { ga('send', 'pageview', window.location.hash); }); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js index d24b4c7..32ad97b 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room.js @@ -222,7 +222,7 @@ var Video = (function() { _resize(w, h); swf[0].vidResize(w, h); } - , close: function(event, ui) { + , close: function() { VideoManager.close(c.uid, true); } }).dialogExtend({ @@ -588,14 +588,14 @@ var Room = (function() { WbArea.resize(sb.width() + 5, w, h); } } - function _reload(event, ui) { + function _reload() { if (!!options.reloadUrl) { window.location.href = options.reloadUrl; } else { window.location.reload(); } } - function _close(jqEvent, msg) { + function _close() { _unload(); $(".room.holder").remove(); $("#chatPanel").remove(); @@ -623,7 +623,7 @@ var Room = (function() { }); $(".room.sidebar.left").resizable({ handles: "e" - , stop: function(event, ui) { + , stop: function() { _setSize(); } }); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js index b473e5b..df48ae4 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings.js @@ -148,7 +148,7 @@ var VideoSettings = (function() { _readValues(); swf.resChanged(s.video.width, s.video.height); }); - res.find('option').each(function(idx) { + res.find('option').each(function() { const o = $(this).data(); if (o.width === s.video.width && o.height === s.video.height) { $(this).prop('selected', true); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/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 1f2461f..5421164 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 @@ -1,7 +1,7 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Ellipse = function(wb, s) { let ellipse = Rect(wb, s); - ellipse.createShape = function(canvas) { + ellipse.createShape = function() { ellipse.obj = new fabric.Ellipse({ strokeWidth: ellipse.stroke.width , fill: ellipse.fill.enabled ? ellipse.fill.color : 'rgba(0,0,0,0)' http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-line.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-line.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-line.js index fa7f319..ec8f7fa 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-line.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-line.js @@ -1,7 +1,7 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Line = function(wb, s) { let line = Shape(wb); - line.createShape = function(canvas) { + line.createShape = function() { line.obj = new fabric.Line([line.orig.x, line.orig.y, line.orig.x, line.orig.y], { strokeWidth: line.stroke.width , fill: line.stroke.color http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/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 99859ee..313a5f3 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 @@ -1,7 +1,7 @@ /* Licensed under the Apache License, Version 2.0 (the "License") http://www.apache.org/licenses/LICENSE-2.0 */ var Rect = function(wb, s) { let rect = Shape(wb); - rect.createShape = function(canvas) { + rect.createShape = function() { rect.obj = new fabric.Rect({ strokeWidth: rect.stroke.width , fill: rect.fill.enabled ? rect.fill.color : 'rgba(0,0,0,0)' http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/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 ab85a29..de95ca4 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 @@ -448,7 +448,7 @@ var Wb = function() { o.path.slide = this.slide; wbObjCreatedHandler(o.path); }; - function scrollHandler(e) { + function scrollHandler() { $(this).find('.canvas-container').each(function(idx) { let h = $(this).height(), pos = $(this).position(); if (slide !== idx && pos.top > BUMPER - h && pos.top < BUMPER) { @@ -618,7 +618,7 @@ var Wb = function() { zoomMode = wbo.zoomMode; _setSize(); } - wb.resize = function(w, h) { + wb.resize = function() { if (t.position().left + t.width() > a.width()) { t.position({ my: "right" http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js index cc755b8..cb47006 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/calendar-functions.js @@ -47,7 +47,7 @@ function addCalButton(rtl, id) { onChangeMonthYear: function(year, month, inst) { $('#${markupId}').fullCalendar('gotoDate', year + '-' + ('0' + month).slice(-2) + '-' + inst.selectedDay); }, - onSelect: function(dateText, inst) { + onSelect: function(dateText) { var date = new Date(dateText); $('#${markupId}').fullCalendar('gotoDate', date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + date.getDate()); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js index 9264f50..e498a02 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat.js @@ -164,7 +164,7 @@ var Chat = function() { if (playPromise !== undefined) { playPromise.then(function() { // Automatic playback started! - }).catch(function(error) { + }).catch(function() { // Automatic playback failed. }); } @@ -212,7 +212,7 @@ var Chat = function() { $('#chatPopup .control.block').removeClass('ui-state-highlight'); $('#chatPanel, #chatPopup').animate({height: openedHeight}, 1000); $('#chatPanel').resizable("option", "disabled", false); - $('#chat .messageArea').each(function(idx) { + $('#chat .messageArea').each(function() { $(this).scrollTop($(this)[0].scrollHeight); }); } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/dd651cf4/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js index 805078a..0be5a13 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/rss.js @@ -25,7 +25,7 @@ function getRssItems(url, next) { , crossDomain: true , dataType: 'xml' , cache: false - , success: function(data, status, xhr) { + , success: function(data) { var $xml = $(data); var counter = MAX_ITEM_COUNT; $xml.find("item").each(function() {
