Repository: openmeetings Updated Branches: refs/heads/master 085853076 -> e42da7ca5
[OPENMEETINGS-1707] label editor is fixed, animated pointer is fixed Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/e42da7ca Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/e42da7ca Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/e42da7ca Branch: refs/heads/master Commit: e42da7ca5a2a3b6b6d05703bcc14b7dcc89d75f4 Parents: 0858530 Author: Maxim Solodovnik <[email protected]> Authored: Tue Sep 26 13:23:56 2017 +0700 Committer: Maxim Solodovnik <[email protected]> Committed: Tue Sep 26 13:23:56 2017 +0700 ---------------------------------------------------------------------- .../org/apache/openmeetings/db/dao/label/LabelDao.java | 8 ++++---- .../openmeetings/web/admin/labels/LabelsForm.java | 6 ++---- .../apache/openmeetings/web/admin/labels/LangPanel.java | 9 ++------- .../main/java/org/apache/openmeetings/web/room/wb/wb.js | 12 +++++++----- 4 files changed, 15 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e42da7ca/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java ---------------------------------------------------------------------- diff --git a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java index aa1072c..299ee15 100644 --- a/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java +++ b/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/label/LabelDao.java @@ -217,7 +217,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ throw new RuntimeException("Should not be used"); } - public List<StringLabel> get(Locale l, final String search, int start, int count, final SortParam<String> sort) { + public static List<StringLabel> get(Locale l, final String search, int start, int count, final SortParam<String> sort) { List<StringLabel> result = getLabels(l, search); if (sort != null) { Collections.sort(result, new LabelComparator(sort)); @@ -235,7 +235,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ throw new RuntimeException("Should not be used"); } - public long count(Locale l, final String search) { + public static long count(Locale l, final String search) { return getLabels(l, search).size(); } @@ -244,7 +244,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ throw new RuntimeException("Should not be used"); } - public StringLabel update(Locale l, StringLabel entity) throws Exception { + public static StringLabel update(Locale l, StringLabel entity) throws Exception { List<StringLabel> labels = labelCache.get(l); if (!labels.contains(entity)) { labels.add(entity); @@ -259,7 +259,7 @@ public class LabelDao implements IDataProviderDao<StringLabel>{ throw new RuntimeException("Should not be used"); } - public void delete(Locale l, StringLabel entity) throws Exception { + public static void delete(Locale l, StringLabel entity) throws Exception { List<StringLabel> labels = labelCache.get(l); if (labels.contains(entity)) { labels.remove(entity); http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e42da7ca/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java index 9bd555d..fcc7d30 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LabelsForm.java @@ -18,8 +18,6 @@ */ package org.apache.openmeetings.web.admin.labels; -import static org.apache.openmeetings.web.app.Application.getBean; - import org.apache.openmeetings.db.dao.label.LabelDao; import org.apache.openmeetings.db.entity.label.StringLabel; import org.apache.openmeetings.web.admin.AdminBaseForm; @@ -70,7 +68,7 @@ public class LabelsForm extends AdminBaseForm<StringLabel> { @Override protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) { try { - getBean(LabelDao.class).update(panel.language.getValue(), getModelObject()); + LabelDao.update(panel.language.getValue(), getModelObject()); } catch (Exception e) { error("Unexpected error while saving label:" + e.getMessage()); //TODO localize } @@ -82,7 +80,7 @@ public class LabelsForm extends AdminBaseForm<StringLabel> { @Override protected void onDeleteSubmit(AjaxRequestTarget target, Form<?> form) { try { - getBean(LabelDao.class).delete(panel.language.getValue(), getModelObject()); + LabelDao.delete(panel.language.getValue(), getModelObject()); } catch (Exception e) { error("Unexpected error while deleting label:" + e.getMessage()); //TODO localize } http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e42da7ca/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java index 1ba51b9..f41afaa 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java @@ -96,18 +96,13 @@ public class LangPanel extends AdminBasePanel { private static final long serialVersionUID = 1L; @Override - protected LabelDao getDao() { - return (LabelDao)super.getDao(); - } - - @Override public long size() { - return getDao().count(language.getValue(), search); + return LabelDao.count(language.getValue(), search); } @Override public Iterator<? extends StringLabel> iterator(long first, long count) { - return getDao().get(language.getValue(), search, (int)first, (int)count, getSort()).iterator(); + return LabelDao.get(language.getValue(), search, (int)first, (int)count, getSort()).iterator(); } }) { private static final long serialVersionUID = 1L; http://git-wip-us.apache.org/repos/asf/openmeetings/blob/e42da7ca/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js ---------------------------------------------------------------------- diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js index 738935e..680883d 100644 --- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js +++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb.js @@ -281,7 +281,7 @@ var Pointer = function(wb, s) { }; } var APointer = function(wb) { - var pointer = Base(); + let pointer = Base(); pointer.user = ''; pointer.create = function(canvas, o) { fabric.Image.fromURL('./css/images/pointer.png', function(img) { @@ -347,9 +347,12 @@ var APointer = function(wb) { }); } pointer.mouseUp = function(o) { - var canvas = this; - var ptr = canvas.getPointer(o.e); - var obj = { + let canvas = this + , ptr = canvas.getPointer(o.e); + if (pointer.user === '') { + pointer.user = $('.room.sidebar.left .user.list .current .name').text(); + } + let obj = { type: 'pointer' , x: ptr.x , y: ptr.y @@ -363,7 +366,6 @@ var APointer = function(wb) { canvas.selection = false; canvas.on('mouse:up', pointer.mouseUp); }); - pointer.user = $('.room.sidebar.left .user.list .current .name').text(); } pointer.deactivate = function() { wb.eachCanvas(function(canvas) {
