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 2018/07/26 15:26:43 UTC
[openmeetings] branch master updated: [OPENMEETINGS-1896] resources
are reorganized, filtering is improved
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/master by this push:
new 16d571d [OPENMEETINGS-1896] resources are reorganized, filtering is improved
16d571d is described below
commit 16d571d95bdc7666f3b7e6797ef38e32afb996a7
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Thu Jul 26 22:15:50 2018 +0700
[OPENMEETINGS-1896] resources are reorganized, filtering is improved
---
.../src/main/assembly/components/templates.xml | 12 ++
openmeetings-web/pom.xml | 138 ++++++++++++++-------
.../web/room/{nettest-base.js => raw-nettest.js} | 0
.../web/room/{room-base.js => raw-room.js} | 0
.../web/room/{settings-base.js => raw-settings.js} | 0
.../{video-manager.js => raw-video-manager.js} | 0
.../web/room/{video-util.js => raw-video-util.js} | 0
.../web/room/{video.js => raw-video.js} | 0
.../{interview-area.js => raw-interview-area.js} | 0
.../web/room/wb/{player.js => raw-player.js} | 0
.../wb/{tool-apointer.js => raw-tool-apointer.js} | 0
.../room/wb/{tool-arrow.js => raw-tool-arrow.js} | 0
.../web/room/wb/{tool-base.js => raw-tool-base.js} | 0
.../wb/{tool-clipart.js => raw-tool-clipart.js} | 0
.../wb/{tool-ellipse.js => raw-tool-ellipse.js} | 0
.../web/room/wb/{tool-line.js => raw-tool-line.js} | 0
.../web/room/wb/{tool-math.js => raw-tool-math.js} | 0
.../room/wb/{tool-paint.js => raw-tool-paint.js} | 0
.../wb/{tool-pointer.js => raw-tool-pointer.js} | 0
.../web/room/wb/{tool-rect.js => raw-tool-rect.js} | 0
.../{tool-shape-base.js => raw-tool-shape-base.js} | 0
.../room/wb/{tool-shape.js => raw-tool-shape.js} | 0
.../web/room/wb/{tool-text.js => raw-tool-text.js} | 0
.../room/wb/{tool-uline.js => raw-tool-uline.js} | 0
.../web/room/wb/{tool-util.js => raw-tool-util.js} | 0
.../web/room/wb/{wb-all.js => raw-wb-all.js} | 0
.../web/room/wb/{wb-area.js => raw-wb-area.js} | 0
.../web/room/wb/{wb-board.js => raw-wb-board.js} | 0
.../web/user/chat/{chat-base.js => raw-chat.js} | 4 +-
.../chat/{cssemoticons.js => raw-cssemoticons.js} | 0
.../util/upload/BootstrapFileUploadBehavior.java | 4 +-
.../css/{activities.css => raw-activities.css} | 0
.../main/webapp/css/{admin.css => raw-admin.css} | 0
.../webapp/css/{calendar.css => raw-calendar.css} | 0
.../src/main/webapp/css/{chat.css => raw-chat.css} | 0
.../css/{cssemoticons.css => raw-cssemoticons.css} | 0
.../css/{general-rtl.css => raw-general-rtl.css} | 0
.../webapp/css/{general.css => raw-general.css} | 0
.../src/main/webapp/css/{menu.css => raw-menu.css} | 0
.../webapp/css/{nettest.css => raw-nettest.css} | 0
.../src/main/webapp/css/{room.css => raw-room.css} | 0
.../src/main/webapp/css/{tree.css => raw-tree.css} | 0
.../src/main/webapp/css/{wb.css => raw-wb.css} | 0
43 files changed, 109 insertions(+), 49 deletions(-)
diff --git a/openmeetings-server/src/main/assembly/components/templates.xml b/openmeetings-server/src/main/assembly/components/templates.xml
index 681f76c..15ad58b 100644
--- a/openmeetings-server/src/main/assembly/components/templates.xml
+++ b/openmeetings-server/src/main/assembly/components/templates.xml
@@ -30,6 +30,18 @@
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
+ <excludes>
+ <exclude>**/raw-*.css</exclude>
+ <exclude>**/raw-*.js</exclude>
+ <exclude>**/uuid.js</exclude>
+ <exclude>**/fabric.js</exclude>
+ <exclude>**/MathJax*.js</exclude>
+ <exclude>**/fileinput.js</exclude>
+ <exclude>**/fileinput.css</exclude>
+ <exclude>**/jquery.dialogextend.js</exclude>
+ <exclude>**/kurento-utils.js</exclude>
+ <exclude>**/network.js</exclude>
+ </excludes>
</fileSet>
<fileSet>
<directory>${project.parent.basedir}/openmeetings-web/target/generated-sources/main/java</directory>
diff --git a/openmeetings-web/pom.xml b/openmeetings-web/pom.xml
index d85e7e8..8cd335c 100644
--- a/openmeetings-web/pom.xml
+++ b/openmeetings-web/pom.xml
@@ -95,17 +95,17 @@
<configuration>
<charset>UTF-8</charset>
<cssSourceFiles>
- <cssSourceFile>nettest.css</cssSourceFile>
- <cssSourceFile>general.css</cssSourceFile>
- <cssSourceFile>activities.css</cssSourceFile>
- <cssSourceFile>admin.css</cssSourceFile>
- <cssSourceFile>calendar.css</cssSourceFile>
- <cssSourceFile>cssemoticons.css</cssSourceFile>
- <cssSourceFile>chat.css</cssSourceFile>
- <cssSourceFile>menu.css</cssSourceFile>
- <cssSourceFile>room.css</cssSourceFile>
- <cssSourceFile>tree.css</cssSourceFile>
- <cssSourceFile>wb.css</cssSourceFile>
+ <cssSourceFile>raw-nettest.css</cssSourceFile>
+ <cssSourceFile>raw-general.css</cssSourceFile>
+ <cssSourceFile>raw-activities.css</cssSourceFile>
+ <cssSourceFile>raw-admin.css</cssSourceFile>
+ <cssSourceFile>raw-calendar.css</cssSourceFile>
+ <cssSourceFile>raw-cssemoticons.css</cssSourceFile>
+ <cssSourceFile>raw-chat.css</cssSourceFile>
+ <cssSourceFile>raw-menu.css</cssSourceFile>
+ <cssSourceFile>raw-room.css</cssSourceFile>
+ <cssSourceFile>raw-tree.css</cssSourceFile>
+ <cssSourceFile>raw-wb.css</cssSourceFile>
</cssSourceFiles>
<cssFinalFile>theme.css</cssFinalFile>
</configuration>
@@ -118,7 +118,7 @@
<configuration>
<charset>UTF-8</charset>
<cssSourceFiles>
- <cssSourceFile>general-rtl.css</cssSourceFile>
+ <cssSourceFile>raw-general-rtl.css</cssSourceFile>
</cssSourceFiles>
<cssFinalFile>theme-rtl.css</cssFinalFile>
</configuration>
@@ -132,9 +132,9 @@
<charset>UTF-8</charset>
<jsSourceDir>../java/org/apache/openmeetings/web/room/wb</jsSourceDir>
<jsSourceFiles>
- <jsSourceFile>wb-all.js</jsSourceFile>
+ <jsSourceFile>raw-wb-all.js</jsSourceFile>
<jsSourceFile>uuid.js</jsSourceFile>
- <jsSourceFile>interview-area.js</jsSourceFile>
+ <jsSourceFile>raw-interview-area.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>interviewwb.js</jsFinalFile>
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/room/wb/</jsTargetDir>
@@ -153,25 +153,26 @@
<jsSourceFile>fabric.js</jsSourceFile>
<jsSourceFile>MathJax-config.js</jsSourceFile>
<jsSourceFile>MathJax.js</jsSourceFile>
- <jsSourceFile>wb-all.js</jsSourceFile>
- <jsSourceFile>tool-util.js</jsSourceFile>
- <jsSourceFile>player.js</jsSourceFile>
- <jsSourceFile>tool-base.js</jsSourceFile>
- <jsSourceFile>tool-pointer.js</jsSourceFile>
- <jsSourceFile>tool-apointer.js</jsSourceFile>
- <jsSourceFile>tool-shape-base.js</jsSourceFile>
- <jsSourceFile>tool-text.js</jsSourceFile>
- <jsSourceFile>tool-math.js</jsSourceFile>
- <jsSourceFile>tool-paint.js</jsSourceFile>
- <jsSourceFile>tool-shape.js</jsSourceFile>
- <jsSourceFile>tool-line.js</jsSourceFile>
- <jsSourceFile>tool-uline.js</jsSourceFile>
- <jsSourceFile>tool-rect.js</jsSourceFile>
- <jsSourceFile>tool-ellipse.js</jsSourceFile>
- <jsSourceFile>tool-arrow.js</jsSourceFile>
- <jsSourceFile>tool-clipart.js</jsSourceFile>
- <jsSourceFile>wb-board.js</jsSourceFile>
- <jsSourceFile>wb-area.js</jsSourceFile>
+ <jsSourceFile>raw-wb-all.js</jsSourceFile>
+ <!-- TODO jsSourceFile>uuid.js</jsSourceFile-->
+ <jsSourceFile>raw-tool-util.js</jsSourceFile>
+ <jsSourceFile>raw-player.js</jsSourceFile>
+ <jsSourceFile>raw-tool-base.js</jsSourceFile>
+ <jsSourceFile>raw-tool-pointer.js</jsSourceFile>
+ <jsSourceFile>raw-tool-apointer.js</jsSourceFile>
+ <jsSourceFile>raw-tool-shape-base.js</jsSourceFile>
+ <jsSourceFile>raw-tool-text.js</jsSourceFile>
+ <jsSourceFile>raw-tool-math.js</jsSourceFile>
+ <jsSourceFile>raw-tool-paint.js</jsSourceFile>
+ <jsSourceFile>raw-tool-shape.js</jsSourceFile>
+ <jsSourceFile>raw-tool-line.js</jsSourceFile>
+ <jsSourceFile>raw-tool-uline.js</jsSourceFile>
+ <jsSourceFile>raw-tool-rect.js</jsSourceFile>
+ <jsSourceFile>raw-tool-ellipse.js</jsSourceFile>
+ <jsSourceFile>raw-tool-arrow.js</jsSourceFile>
+ <jsSourceFile>raw-tool-clipart.js</jsSourceFile>
+ <jsSourceFile>raw-wb-board.js</jsSourceFile>
+ <jsSourceFile>raw-wb-area.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>wb.js</jsFinalFile>
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/room/wb/</jsTargetDir>
@@ -189,15 +190,14 @@
<jsSourceFiles>
<jsSourceFile>fileinput.js</jsSourceFile>
</jsSourceFiles>
- <jsFinalFile>fileinput.js</jsFinalFile>
+ <jsFinalFile>omfileinput.js</jsFinalFile>
<jsTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/util/upload</jsTargetDir>
<jsEngine>CLOSURE</jsEngine>
<cssSourceDir>../java/org/apache/openmeetings/web/util/upload</cssSourceDir>
<cssSourceFiles>
<cssSourceFile>fileinput.css</cssSourceFile>
</cssSourceFiles>
- <skipMerge>true</skipMerge>
- <cssFinalFile>fileinput.css</cssFinalFile>
+ <cssFinalFile>omfileinput.css</cssFinalFile>
<cssTargetDir>../generated-sources/main/java/org/apache/openmeetings/web/util/upload</cssTargetDir>
</configuration>
</execution>
@@ -211,10 +211,10 @@
<jsSourceDir>../java/org/apache/openmeetings/web/room</jsSourceDir>
<jsSourceFiles>
<jsSourceFile>jquery.dialogextend.js</jsSourceFile>
- <jsSourceFile>video-util.js</jsSourceFile>
- <jsSourceFile>video.js</jsSourceFile>
- <jsSourceFile>video-manager.js</jsSourceFile>
- <jsSourceFile>room-base.js</jsSourceFile>
+ <jsSourceFile>raw-video-util.js</jsSourceFile>
+ <jsSourceFile>raw-video.js</jsSourceFile>
+ <jsSourceFile>raw-video-manager.js</jsSourceFile>
+ <jsSourceFile>raw-room.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>room.js</jsFinalFile>
<jsEngine>CLOSURE</jsEngine>
@@ -230,7 +230,7 @@
<charset>UTF-8</charset>
<jsSourceDir>../java/org/apache/openmeetings/web/room</jsSourceDir>
<jsSourceFiles>
- <jsSourceFile>settings-base.js</jsSourceFile>
+ <jsSourceFile>raw-settings.js</jsSourceFile>
<jsSourceFile>kurento-utils.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>settings.js</jsFinalFile>
@@ -247,7 +247,7 @@
<charset>UTF-8</charset>
<jsSourceDir>../java/org/apache/openmeetings/web/room</jsSourceDir>
<jsSourceFiles>
- <jsSourceFile>nettest-base.js</jsSourceFile>
+ <jsSourceFile>raw-nettest.js</jsSourceFile>
<jsSourceFile>network.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>nettest.js</jsFinalFile>
@@ -264,8 +264,8 @@
<charset>UTF-8</charset>
<jsSourceDir>../java/org/apache/openmeetings/web/user/chat</jsSourceDir>
<jsSourceFiles>
- <jsSourceFile>cssemoticons.js</jsSourceFile>
- <jsSourceFile>chat-base.js</jsSourceFile>
+ <jsSourceFile>raw-cssemoticons.js</jsSourceFile>
+ <jsSourceFile>raw-chat.js</jsSourceFile>
</jsSourceFiles>
<jsFinalFile>chat.js</jsFinalFile>
<jsEngine>CLOSURE</jsEngine>
@@ -279,7 +279,31 @@
<artifactId>maven-war-plugin</artifactId>
<configuration>
<archiveClasses>true</archiveClasses>
- <packagingExcludes>**/*.class</packagingExcludes>
+ <packagingExcludes>
+ **/*.class,
+ **/raw-*.css,
+ **/raw-*.js,
+ **/uuid.js,
+ **/fabric.js,
+ **/MathJax*.js,
+ **/fileinput.js,
+ **/fileinput.css,
+ **/jquery.dialogextend.js,
+ **/kurento-utils.js,
+ **/network.js
+ </packagingExcludes>
+ <warSourceExcludes>
+ **/raw-*.css,
+ **/raw-*.js,
+ **/uuid.js,
+ **/fabric.js,
+ **/MathJax*.js,
+ **/fileinput.js,
+ **/fileinput.css,
+ **/jquery.dialogextend.js,
+ **/kurento-utils.js,
+ **/network.js
+ </warSourceExcludes>
<filteringDeploymentDescriptors>true</filteringDeploymentDescriptors>
<webResources>
<webResource>
@@ -399,6 +423,18 @@
<includes>
<include>**</include>
</includes>
+ <excludes>
+ <exclude>**/raw-*.css</exclude>
+ <exclude>**/raw-*.js</exclude>
+ <exclude>**/uuid.js</exclude>
+ <exclude>**/fabric.js</exclude>
+ <exclude>**/MathJax*.js</exclude>
+ <exclude>**/fileinput.js</exclude>
+ <exclude>**/fileinput.css</exclude>
+ <exclude>**/jquery.dialogextend.js</exclude>
+ <exclude>**/kurento-utils.js</exclude>
+ <exclude>**/network.js</exclude>
+ </excludes>
<filtering>true</filtering>
</resource>
</resources>
@@ -423,6 +459,18 @@
<include>**/*.xml</include>
<include>**/*.properties</include>
</includes>
+ <excludes>
+ <exclude>**/raw-*.css</exclude>
+ <exclude>**/raw-*.js</exclude>
+ <exclude>**/uuid.js</exclude>
+ <exclude>**/fabric.js</exclude>
+ <exclude>**/MathJax*.js</exclude>
+ <exclude>**/fileinput.js</exclude>
+ <exclude>**/fileinput.css</exclude>
+ <exclude>**/jquery.dialogextend.js</exclude>
+ <exclude>**/kurento-utils.js</exclude>
+ <exclude>**/network.js</exclude>
+ </excludes>
</resource>
<resource>
<directory>${project.parent.basedir}/openmeetings-service/src/main/java</directory>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/nettest-base.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-nettest.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/room-base.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-room.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/settings-base.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-settings.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-manager.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-manager.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-util.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video-util.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video-util.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/video.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/raw-video.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/interview-area.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-interview-area.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-player.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/player.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-player.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-apointer.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-apointer.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-apointer.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-apointer.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-arrow.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-arrow.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-arrow.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-base.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-base.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-base.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-clipart.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-clipart.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/raw-tool-ellipse.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-ellipse.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-ellipse.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/raw-tool-line.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-line.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-line.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-math.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-math.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-math.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-math.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-paint.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-paint.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-paint.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-paint.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-pointer.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-pointer.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-pointer.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-pointer.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/raw-tool-rect.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-rect.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-rect.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-shape-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-shape-base.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-shape-base.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-shape-base.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-shape.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-shape.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-shape.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-shape.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-text.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-text.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-text.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-uline.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-uline.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-uline.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-uline.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-util.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-util.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/tool-util.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-tool-util.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-all.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-all.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-all.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-all.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/raw-wb-area.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-area.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-area.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/raw-wb-board.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/wb-board.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/room/wb/raw-wb-board.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
similarity index 99%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
index b1685e9..fbf6724 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/chat-base.js
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-chat.js
@@ -192,7 +192,7 @@ var Chat = function() {
}
function _addTab(id, label) {
if (!isInited()) {
- _reinit();
+ _reinit({});
}
if ($('#chat').length < 1 || $('#' + id).length) {
return;
@@ -353,7 +353,7 @@ var Chat = function() {
}
function _setRoomMode(_mode) {
roomMode = _mode;
- _reinit(allPrefix, roomPrefix);
+ _reinit({all: allPrefix, room: roomPrefix, sendOnEnter: sendOn === SEND_ENTER});
}
function _scrollDown(area) {
area.animate({
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/cssemoticons.js b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-cssemoticons.js
similarity index 100%
rename from openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/cssemoticons.js
rename to openmeetings-web/src/main/java/org/apache/openmeetings/web/user/chat/raw-cssemoticons.js
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java
index a68f64b..53e95f4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/util/upload/BootstrapFileUploadBehavior.java
@@ -30,9 +30,9 @@ import org.apache.wicket.request.resource.ResourceReference;
public class BootstrapFileUploadBehavior extends Behavior {
private static final long serialVersionUID = 1L;
private static final ResourceReference BOOTSTRAP_FILEINPUT_JS_REFERENCE
- = new JavaScriptResourceReference(BootstrapFileUploadBehavior.class, "fileinput.js");
+ = new JavaScriptResourceReference(BootstrapFileUploadBehavior.class, "omfileinput.js");
private static final ResourceReference BOOTSTRAP_FILEINPUT_CSS_REFERENCE
- = new CssResourceReference(BootstrapFileUploadBehavior.class, "fileinput.css");
+ = new CssResourceReference(BootstrapFileUploadBehavior.class, "omfileinput.css");
public static final BootstrapFileUploadBehavior INSTANCE = new BootstrapFileUploadBehavior();
private BootstrapFileUploadBehavior() {
diff --git a/openmeetings-web/src/main/webapp/css/activities.css b/openmeetings-web/src/main/webapp/css/raw-activities.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/activities.css
rename to openmeetings-web/src/main/webapp/css/raw-activities.css
diff --git a/openmeetings-web/src/main/webapp/css/admin.css b/openmeetings-web/src/main/webapp/css/raw-admin.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/admin.css
rename to openmeetings-web/src/main/webapp/css/raw-admin.css
diff --git a/openmeetings-web/src/main/webapp/css/calendar.css b/openmeetings-web/src/main/webapp/css/raw-calendar.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/calendar.css
rename to openmeetings-web/src/main/webapp/css/raw-calendar.css
diff --git a/openmeetings-web/src/main/webapp/css/chat.css b/openmeetings-web/src/main/webapp/css/raw-chat.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/chat.css
rename to openmeetings-web/src/main/webapp/css/raw-chat.css
diff --git a/openmeetings-web/src/main/webapp/css/cssemoticons.css b/openmeetings-web/src/main/webapp/css/raw-cssemoticons.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/cssemoticons.css
rename to openmeetings-web/src/main/webapp/css/raw-cssemoticons.css
diff --git a/openmeetings-web/src/main/webapp/css/general-rtl.css b/openmeetings-web/src/main/webapp/css/raw-general-rtl.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/general-rtl.css
rename to openmeetings-web/src/main/webapp/css/raw-general-rtl.css
diff --git a/openmeetings-web/src/main/webapp/css/general.css b/openmeetings-web/src/main/webapp/css/raw-general.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/general.css
rename to openmeetings-web/src/main/webapp/css/raw-general.css
diff --git a/openmeetings-web/src/main/webapp/css/menu.css b/openmeetings-web/src/main/webapp/css/raw-menu.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/menu.css
rename to openmeetings-web/src/main/webapp/css/raw-menu.css
diff --git a/openmeetings-web/src/main/webapp/css/nettest.css b/openmeetings-web/src/main/webapp/css/raw-nettest.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/nettest.css
rename to openmeetings-web/src/main/webapp/css/raw-nettest.css
diff --git a/openmeetings-web/src/main/webapp/css/room.css b/openmeetings-web/src/main/webapp/css/raw-room.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/room.css
rename to openmeetings-web/src/main/webapp/css/raw-room.css
diff --git a/openmeetings-web/src/main/webapp/css/tree.css b/openmeetings-web/src/main/webapp/css/raw-tree.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/tree.css
rename to openmeetings-web/src/main/webapp/css/raw-tree.css
diff --git a/openmeetings-web/src/main/webapp/css/wb.css b/openmeetings-web/src/main/webapp/css/raw-wb.css
similarity index 100%
rename from openmeetings-web/src/main/webapp/css/wb.css
rename to openmeetings-web/src/main/webapp/css/raw-wb.css