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/06 09:12:16 UTC
openmeetings git commit: [OPENMEETINGS-1744] context menu is added
Repository: openmeetings
Updated Branches:
refs/heads/4.0.x 6b0fdc17b -> bfba80784
[OPENMEETINGS-1744] context menu is added
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/bfba8078
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/bfba8078
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/bfba8078
Branch: refs/heads/4.0.x
Commit: bfba807849c1b346bf63335690ac3d9877398170
Parents: 6b0fdc1
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Mon Nov 6 16:12:03 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Mon Nov 6 16:12:03 2017 +0700
----------------------------------------------------------------------
.../core/data/whiteboard/WhiteboardCache.java | 2 +-
.../web/app/Application.properties.xml | 1 +
.../web/app/Application_ar.properties.xml | 1 +
.../web/app/Application_bg.properties.xml | 1 +
.../web/app/Application_ca.properties.xml | 1 +
.../web/app/Application_cs.properties.xml | 1 +
.../web/app/Application_da.properties.xml | 1 +
.../web/app/Application_de.properties.xml | 1 +
.../web/app/Application_el.properties.xml | 1 +
.../web/app/Application_es.properties.xml | 1 +
.../web/app/Application_fa.properties.xml | 1 +
.../web/app/Application_fi.properties.xml | 1 +
.../web/app/Application_fr.properties.xml | 1 +
.../web/app/Application_gl.properties.xml | 1 +
.../web/app/Application_he.properties.xml | 1 +
.../web/app/Application_hu.properties.xml | 1 +
.../web/app/Application_id.properties.xml | 1 +
.../web/app/Application_it.properties.xml | 1 +
.../web/app/Application_ja.properties.xml | 1 +
.../web/app/Application_ko.properties.xml | 1 +
.../web/app/Application_nl.properties.xml | 1 +
.../web/app/Application_pl.properties.xml | 1 +
.../web/app/Application_pt.properties.xml | 1 +
.../web/app/Application_pt_BR.properties.xml | 1 +
.../web/app/Application_ru.properties.xml | 1 +
.../web/app/Application_sk.properties.xml | 1 +
.../web/app/Application_sv.properties.xml | 1 +
.../web/app/Application_th.properties.xml | 1 +
.../web/app/Application_tr.properties.xml | 1 +
.../web/app/Application_uk.properties.xml | 1 +
.../web/app/Application_zh_CN.properties.xml | 1 +
.../web/app/Application_zh_TW.properties.xml | 1 +
.../org/apache/openmeetings/web/room/room.js | 11 +++++++-
.../openmeetings/web/room/wb/WbPanel.html | 3 +++
.../openmeetings/web/room/wb/WbPanel.java | 4 +--
.../apache/openmeetings/web/room/wb/wb-area.js | 27 +++++++++++++-------
36 files changed, 65 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
----------------------------------------------------------------------
diff --git a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
index 9dbed0a..9bba020 100644
--- a/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
+++ b/openmeetings-core/src/main/java/org/apache/openmeetings/core/data/whiteboard/WhiteboardCache.java
@@ -81,7 +81,7 @@ public class WhiteboardCache {
return wbs;
}
- public static Set<Entry<Long, Whiteboard>> list(long roomId, Long langId) {
+ public static Set<Entry<Long, Whiteboard>> list(long roomId) {
Whiteboards wbs = get(roomId);
return wbs.getWhiteboards().entrySet();
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index fd1f75d..0e53f4b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (drag and drop item here)]]></entry>
<entry key="706"><![CDATA[My files (home drive)]]></entry>
<entry key="707"><![CDATA[Room files (public drive)]]></entry>
+ <entry key="711">Edit name</entry>
<entry key="712"><![CDATA[New folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index acae69e..7b13173 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[قمامة]]></entry>
<entry key="706"><![CDATA[ملفاتي (Home Drive)]]></entry>
<entry key="707"><![CDATA[غرفة الملفات (Public Drive)]]></entry>
+ <entry key="711">تحرير إسم</entry>
<entry key="712"><![CDATA[مجلد جديد]]></entry>
<entry key="713"><![CDATA[هل أنت متأكد أنك تريد حذف هذا البند؟]]></entry>
<entry key="714"><![CDATA[بحث]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index c0d48c0..eb9cb26 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Кошче]]></entry>
<entry key="706"><![CDATA[Моите файлове (home)]]></entry>
<entry key="707"><![CDATA[Файлове за стаята]]></entry>
+ <entry key="711">Редактиране на име</entry>
<entry key="712"><![CDATA[Нова папка]]></entry>
<entry key="713"><![CDATA[Сигурни ли сте, че искате да изтриете този елемент?]]></entry>
<entry key="714"><![CDATA[Търсене]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 6147ce6..787fb2f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Papelera]]></entry>
<entry key="706"><![CDATA[Els meus Arxius (Dispositiu personal)]]></entry>
<entry key="707"><![CDATA[Arxius de la Sala (Dispositiu públic)]]></entry>
+ <entry key="711">Editar nom</entry>
<entry key="712"><![CDATA[Nova Carpeta]]></entry>
<entry key="713"><![CDATA[Està segur que vol esborrar aquest ítem?)]]></entry>
<entry key="714"><![CDATA[Buscar]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index 122f334..d9e6090 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (Drag and Drop item here)]]></entry>
<entry key="706"><![CDATA[My Files (Home Drive)]]></entry>
<entry key="707"><![CDATA[Room Files (Public Drive)]]></entry>
+ <entry key="711">Edit Name</entry>
<entry key="712"><![CDATA[New Folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this Item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index 45835d9..25eed7c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Papirkurv]]></entry>
<entry key="706"><![CDATA[Mine filer (Privat drev)]]></entry>
<entry key="707"><![CDATA[Rum filer (Offentligt drev)]]></entry>
+ <entry key="711">Ret navn</entry>
<entry key="712"><![CDATA[Ny mappe]]></entry>
<entry key="713"><![CDATA[Er du sikker på at du vil slette dette emne?]]></entry>
<entry key="714"><![CDATA[Søg]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index bac6c3d..03b2f3d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Papierkorb (Ziehen Sie eine Datei mit der Maus hierher)]]></entry>
<entry key="706"><![CDATA[Meine Dateien (persönliches Laufwerk)]]></entry>
<entry key="707"><![CDATA[Konferenzdokumente (öffentliches Laufwerk)]]></entry>
+ <entry key="711">Name bearbeiten</entry>
<entry key="712"><![CDATA[Neuer Ordner]]></entry>
<entry key="713"><![CDATA[Sind Sie sicher, dass Sie dieses Element löschen wollen?]]></entry>
<entry key="714"><![CDATA[Suche]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index b1be16e..301e050 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Σκουπίδια]]></entry>
<entry key="706"><![CDATA[Τα Αρχεία Μου (Home Drive)]]></entry>
<entry key="707"><![CDATA[Αρχεία Δωματίου (Public Drive)]]></entry>
+ <entry key="711">Επεξεργασία Ονόματος</entry>
<entry key="712"><![CDATA[Νέος Φάκελος]]></entry>
<entry key="713"><![CDATA[Θέλετε σίγουρα να διαγράψετε το συγκεκριμένο Στοιχείο;]]></entry>
<entry key="714"><![CDATA[Αναζήτηση]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index 45ab5f3..38c7c62 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Papelera]]></entry>
<entry key="706"><![CDATA[Mis archivos (Dispositivo personal)]]></entry>
<entry key="707"><![CDATA[Archivos de la sala (Dispositivo público)]]></entry>
+ <entry key="711">Editar nombre</entry>
<entry key="712"><![CDATA[Nueva carpeta]]></entry>
<entry key="713"><![CDATA[¿Está seguro de que quiere borrar este ítem?]]></entry>
<entry key="714"><![CDATA[Buscar]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index 3351505..ecafd42 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (Drag and Drop item here)]]></entry>
<entry key="706"><![CDATA[My Files (Home Drive)]]></entry>
<entry key="707"><![CDATA[Room Files (Public Drive)]]></entry>
+ <entry key="711">Edit Name</entry>
<entry key="712"><![CDATA[New Folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this Item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 587ca6e..898eff0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (Drag and Drop item here)]]></entry>
<entry key="706"><![CDATA[My Files (Home Drive)]]></entry>
<entry key="707"><![CDATA[Room Files (Public Drive)]]></entry>
+ <entry key="711">Edit Name</entry>
<entry key="712"><![CDATA[New Folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this Item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 8857981..ba4b534 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Poubelle]]></entry>
<entry key="706"><![CDATA[Mes fichiers personnels]]></entry>
<entry key="707"><![CDATA[Les fichiers de la salle (Public)]]></entry>
+ <entry key="711">Modifier le nom</entry>
<entry key="712"><![CDATA[Nouveau dossier]]></entry>
<entry key="713"><![CDATA[Etes-vous sûr de vouloir supprimer cet item ?]]></entry>
<entry key="714"><![CDATA[Recherche]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 0c1074a..7950cad 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Lixo]]></entry>
<entry key="706"><![CDATA[Meus ficheiros Files (Dispositivo personal)]]></entry>
<entry key="707"><![CDATA[Ficheiros da sala (Dispositivo público)]]></entry>
+ <entry key="711">Editar o nome</entry>
<entry key="712"><![CDATA[Novo cartafol]]></entry>
<entry key="713"><![CDATA[Ten a certeza de que desexa eliminar este elemento?]]></entry>
<entry key="714"><![CDATA[Buscar]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
index fd1f75d..0e53f4b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_he.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (drag and drop item here)]]></entry>
<entry key="706"><![CDATA[My files (home drive)]]></entry>
<entry key="707"><![CDATA[Room files (public drive)]]></entry>
+ <entry key="711">Edit name</entry>
<entry key="712"><![CDATA[New folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index 6c67d5c..df742b2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Kuka (húzza bele a kiválasztott elemet)]]></entry>
<entry key="706"><![CDATA[Saját fileok (Home Drive)]]></entry>
<entry key="707"><![CDATA[Terem fileok (Public Drive)]]></entry>
+ <entry key="711">Név szerkesztése</entry>
<entry key="712"><![CDATA[Új könyvtár]]></entry>
<entry key="713"><![CDATA[Biztosan törli ezt az elemet?]]></entry>
<entry key="714"><![CDATA[Keresés]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index ab49d41..71d1d38 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (Drag and Drop item here)]]></entry>
<entry key="706"><![CDATA[My Files (Home Drive)]]></entry>
<entry key="707"><![CDATA[Room Files (Public Drive)]]></entry>
+ <entry key="711">Edit Name</entry>
<entry key="712"><![CDATA[New Folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this Item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index e6a40be..820c360 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Cestino (Trascina le voci qui)]]></entry>
<entry key="706"><![CDATA[Miei File (Spazio privato)]]></entry>
<entry key="707"><![CDATA[Files della stanza (Spazio pubblico)]]></entry>
+ <entry key="711">Modifica nome</entry>
<entry key="712"><![CDATA[Nuova cartella]]></entry>
<entry key="713"><![CDATA[Sei sicuro di voler cancellare questo elemento?]]></entry>
<entry key="714"><![CDATA[Ricerca]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 700aee0..953d8af 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[ゴミ箱 (アイテムをここにドラッグ&ドロップ)]]></entry>
<entry key="706"><![CDATA[私のファイル (ホーム・ドライブ)]]></entry>
<entry key="707"><![CDATA[会議室のファイル (パブリック・ドライブ)]]></entry>
+ <entry key="711">名前を編集する</entry>
<entry key="712"><![CDATA[新規フォルダ]]></entry>
<entry key="713"><![CDATA[このアイテムを消去してよろしいですか?]]></entry>
<entry key="714"><![CDATA[検索]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index 079b065..12309e0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (Drag and Drop item here)]]></entry>
<entry key="706"><![CDATA[My Files (Home Drive)]]></entry>
<entry key="707"><![CDATA[Room Files (Public Drive)]]></entry>
+ <entry key="711">Edit Name</entry>
<entry key="712"><![CDATA[New Folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this Item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 27ea0c3..b399c4f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Vuilnisbak]]></entry>
<entry key="706"><![CDATA[Mijn bestanden]]></entry>
<entry key="707"><![CDATA[Bestanden in de kamer]]></entry>
+ <entry key="711">Naam wijzigen</entry>
<entry key="712"><![CDATA[Nieuwe directory]]></entry>
<entry key="713"><![CDATA[Weet je zeker dat je dit wilt verwijderen?]]></entry>
<entry key="714"><![CDATA[Zoek]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index 91971fb..3319030 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Śmietnik]]></entry>
<entry key="706"><![CDATA[Moje pliki]]></entry>
<entry key="707"><![CDATA[Pliki publiczne (dla pokoju)]]></entry>
+ <entry key="711">Zmień nazwę</entry>
<entry key="712"><![CDATA[Nowy folder]]></entry>
<entry key="713"><![CDATA[Jesteś pewien, że chcesz to skasować?]]></entry>
<entry key="714"><![CDATA[Szukaj]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index 75f9c98..447db19 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (Drag and Drop item here)]]></entry>
<entry key="706"><![CDATA[My Files (Home Drive)]]></entry>
<entry key="707"><![CDATA[Room Files (Public Drive)]]></entry>
+ <entry key="711">Edit Name</entry>
<entry key="712"><![CDATA[New Folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this Item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index 7777ba9..0465003 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Lixeira]]></entry>
<entry key="706"><![CDATA[Meus Arquivos (Home Drive)]]></entry>
<entry key="707"><![CDATA[Arquivos da sala (Public Drive)]]></entry>
+ <entry key="711">Edita Nome</entry>
<entry key="712"><![CDATA[Nova pasta]]></entry>
<entry key="713"><![CDATA[Tem certeza que quer excluir esse item?]]></entry>
<entry key="714"><![CDATA[Busca]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index 0a2bcf0..7487fa2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Корзина]]></entry>
<entry key="706"><![CDATA[Мои файлы (Локальное устройство)]]></entry>
<entry key="707"><![CDATA[Файлы из комнаты (Общее устройство)]]></entry>
+ <entry key="711">Редактировать имя</entry>
<entry key="712"><![CDATA[Новая папка]]></entry>
<entry key="713"><![CDATA[Вы уверены, что хотите удалить этот пункт?]]></entry>
<entry key="714"><![CDATA[Поиск]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index ffad78a..b5963d3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Kôš]]></entry>
<entry key="706"><![CDATA[Moje súbory]]></entry>
<entry key="707"><![CDATA[Súbory v miestnosti(verejné)]]></entry>
+ <entry key="711">Zmeniť meno</entry>
<entry key="712"><![CDATA[Nový priečinok]]></entry>
<entry key="713"><![CDATA[Naozaj chcete zmazať túto položku?]]></entry>
<entry key="714"><![CDATA[Hľadať]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index a886227..73653a0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (Drag and Drop item here)]]></entry>
<entry key="706"><![CDATA[My Files (Home Drive)]]></entry>
<entry key="707"><![CDATA[Room Files (Public Drive)]]></entry>
+ <entry key="711">Edit Name</entry>
<entry key="712"><![CDATA[New Folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this Item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 315b971..5272c40 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (Drag and Drop item here)]]></entry>
<entry key="706"><![CDATA[My Files (Home Drive)]]></entry>
<entry key="707"><![CDATA[Room Files (Public Drive)]]></entry>
+ <entry key="711">Edit Name</entry>
<entry key="712"><![CDATA[New Folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this Item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index fe58a1a..3a16a68 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (Drag and Drop item here)]]></entry>
<entry key="706"><![CDATA[My Files (Home Drive)]]></entry>
<entry key="707"><![CDATA[Room Files (Public Drive)]]></entry>
+ <entry key="711">Edit Name</entry>
<entry key="712"><![CDATA[New Folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this Item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index 0b4ad0f..75e33be 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Кошик]]></entry>
<entry key="706"><![CDATA[Мої файли (Локальний пристрій)]]></entry>
<entry key="707"><![CDATA[Файли з кімнати (Загальне пристрій)]]></entry>
+ <entry key="711">Редагувати ім'я</entry>
<entry key="712"><![CDATA[Нова папка]]></entry>
<entry key="713"><![CDATA[Ви впевнені, що хочете видалити цей пункт?]]></entry>
<entry key="714"><![CDATA[Пошук]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index 604693c..31d7df9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[回收站]]></entry>
<entry key="706"><![CDATA[我的文件(Home Drive)]]></entry>
<entry key="707"><![CDATA[会议室文件 (Public Drive)]]></entry>
+ <entry key="711">编辑文件名</entry>
<entry key="712"><![CDATA[新建文件夹]]></entry>
<entry key="713"><![CDATA[您确定要删除此项目？]]></entry>
<entry key="714"><![CDATA[搜索]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 8c4bb84..cfd52de 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -307,6 +307,7 @@ see http://openmeetings.apache.org/LanguageEditor.html for Details
<entry key="705"><![CDATA[Trash (Drag and Drop item here)]]></entry>
<entry key="706"><![CDATA[My Files (Home Drive)]]></entry>
<entry key="707"><![CDATA[Room Files (Public Drive)]]></entry>
+ <entry key="711">Edit Name</entry>
<entry key="712"><![CDATA[New Folder]]></entry>
<entry key="713"><![CDATA[Are you sure you want to delete this Item?]]></entry>
<entry key="714"><![CDATA[Search]]></entry>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/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 8f58609..b6ec7fb 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
@@ -605,6 +605,14 @@ var Room = (function() {
break;
}
}
+ if (e.which === 27) {
+ $('#wb-rename-menu').hide();
+ }
+ }
+ function _mouseHandler(e) {
+ if (e.which === 1) {
+ $('#wb-rename-menu').hide();
+ }
}
function _setSize() {
const sb = $(".room.sidebar")
@@ -667,6 +675,7 @@ var Room = (function() {
Wicket.Event.subscribe("/websocket/closed", _close);
Wicket.Event.subscribe("/websocket/error", _close);
$(window).keyup(_keyHandler);
+ $(document).click(_mouseHandler);
}
function _unload() {
$(window).off('resize.openmeetings');
@@ -681,6 +690,7 @@ var Room = (function() {
}
$('.ui-dialog.user-video').remove();
$(window).off('keyup', _keyHandler);
+ $(document).off('click', _mouseHandler);
}
function _showClipboard(txt) {
const dlg = $('#clipboard-dialog');
@@ -706,7 +716,6 @@ var Room = (function() {
self.getOptions = function() { return JSON.parse(JSON.stringify(options)); };
self.setRights = function(_r) { return options.rights = _r; };
self.setSize = _setSize;
- self.keyHandler = _keyHandler;
self.load = _load;
self.unload = _unload;
self.showClipboard = _showClipboard;
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/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 27d943f..60823d0 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
@@ -149,6 +149,9 @@
<wicket:message key="1313"/>
</div>
</div>
+ <ul id="wb-rename-menu" style="position: absolute; display: none;">
+ <li class="wb-rename"><div><span class="ui-icon ui-icon-pencil"></span><wicket:message key="711"/></div></li>
+ </ul>
<div wicket:id="filename"></div>
</wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
index d42b153..bde2aae 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/WbPanel.java
@@ -190,7 +190,7 @@ public class WbPanel extends AbstractWbPanel {
}
}
Whiteboards wbs = WhiteboardCache.get(roomId, langId);
- loadWhiteboards(sb, rp.getClient(), wbs, WhiteboardCache.list(roomId, langId));
+ loadWhiteboards(sb, rp.getClient(), wbs, WhiteboardCache.list(roomId));
JSONObject wbj = getWbJson(wbs.getActiveWb());
sb.append("WbArea.activateWb(").append(wbj).append(");");
Whiteboard wb = wbs.get(wbs.getActiveWb());
@@ -250,7 +250,7 @@ public class WbPanel extends AbstractWbPanel {
{
StringBuilder sb = new StringBuilder("WbArea.initVideos(");
JSONArray arr = new JSONArray();
- for (Entry<Long, Whiteboard> entry : WhiteboardCache.list(roomId, rp.getClient().getUser().getLanguageId())) {
+ for (Entry<Long, Whiteboard> entry : WhiteboardCache.list(roomId)) {
Whiteboard wb = entry.getValue();
for (JSONObject o : wb.list()) {
String ft = o.optString(ATTR_FILE_TYPE);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/bfba8078/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
----------------------------------------------------------------------
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 71cc2d4..4da8f4f 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
@@ -53,6 +53,9 @@ var DrawWbArea = function() {
break;
}
}
+ function _getWbTab(wbId) {
+ return tabs.find('li[data-wb-id="' + wbId + '"]');
+ }
function _activateTab(wbId) {
container.find('.wb-tabbar li').each(function(idx) {
if (wbId === 1 * $(this).data('wb-id')) {
@@ -67,12 +70,7 @@ var DrawWbArea = function() {
.find('span').text(name)
}
function _renameTab(obj) {
- container.find('.wb-tabbar li').each(function(idx) {
- if (obj.wbId === 1 * $(this).data('wb-id')) {
- _setTabName($(this), obj.name)
- return false;
- }
- });
+ _setTabName(_getWbTab(obj.wbId), obj.name);
}
function _resizeWbs() {
const w = area.width(), hh = area.height()
@@ -187,6 +185,9 @@ 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");
+ });
};
self.destroy = function() {
$(window).off('keyup', deleteHandler);
@@ -194,8 +195,16 @@ var DrawWbArea = function() {
self.create = function(obj) {
if (!_inited) return;
const tid = self.getWbTabId(obj.wbId)
- , li = $('#wb-area-tab').clone().attr('id', '').data('wb-id', obj.wbId)
- , wb = $('#wb-area').clone().attr('id', tid);
+ , wb = $('#wb-area').clone().attr('id', tid)
+ , li = $('#wb-area-tab').clone().attr('id', '').data('wb-id', obj.wbId).attr('data-wb-id', obj.wbId)
+ .contextmenu(function(e) {
+ if (role !== PRESENTER) {
+ return;
+ }
+ e.preventDefault();
+ $('#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);
_setTabName(li, obj.name)
.dblclick(function() {
@@ -270,7 +279,7 @@ var DrawWbArea = function() {
self.removeWb = function(obj) {
if (!_inited) return;
const tabId = self.getWbTabId(obj.wbId);
- tabs.find('li[aria-controls="' + tabId + '"]').remove();
+ _getWbTab(obj.wbId).remove();
$("#" + tabId).remove();
refreshTabs();
};