Browse Source

Removes brand.js

j8
hristoterezov 10 years ago
parent
commit
cbb3b78d9a
5 changed files with 6 additions and 11 deletions
  1. 2
    2
      app.js
  2. 0
    4
      brand.js
  3. 0
    1
      config.js
  4. 2
    3
      index.html
  5. 2
    1
      interface_config.js

+ 2
- 2
app.js View File

@@ -1142,7 +1142,7 @@ function getCameraVideoSize(videoWidth,
1142 1142
 }
1143 1143
 
1144 1144
 $(document).ready(function () {
1145
-    document.title = brand.appName;
1145
+    document.title = interfaceConfig.APP_NAME;
1146 1146
     if(APIConnector.isEnabled())
1147 1147
         APIConnector.init();
1148 1148
 
@@ -1153,7 +1153,7 @@ $(document).ready(function () {
1153 1153
         $("#videoconference_page").hide();
1154 1154
         $("#domain_name").text(
1155 1155
                 window.location.protocol + "//" + window.location.host + "/");
1156
-        $("span[name='appName']").text(brand.appName);
1156
+        $("span[name='appName']").text(interfaceConfig.APP_NAME);
1157 1157
 
1158 1158
         if (interfaceConfig.SHOW_JITSI_WATERMARK) {
1159 1159
             var leftWatermarkDiv

+ 0
- 4
brand.js View File

@@ -1,4 +0,0 @@
1
-var brand =
2
-{
3
-    appName: "Jitsi Meet"
4
-}

+ 0
- 1
config.js View File

@@ -27,5 +27,4 @@ var config = {
27 27
     enableRecording: false,
28 28
     enableWelcomePage: false,
29 29
     enableSimulcast: false,
30
-    isBrand: false
31 30
 };

+ 2
- 3
index.html View File

@@ -28,13 +28,12 @@
28 28
     <script src="libs/rayo.js?v=1"></script>
29 29
     <script src="libs/tooltip.js?v=1"></script><!-- bootstrap tooltip lib -->
30 30
     <script src="libs/popover.js?v=1"></script><!-- bootstrap tooltip lib -->
31
-    <script src="interface_config.js?v=2"></script>
32
-    <script src="brand.js?v=1"></script>
31
+    <script src="interface_config.js?v=3"></script>
33 32
     <script src="muc.js?v=16"></script><!-- simple MUC library -->
34 33
     <script src="estos_log.js?v=2"></script><!-- simple stanza logger -->
35 34
     <script src="desktopsharing.js?v=3"></script><!-- desktop sharing -->
36 35
     <script src="data_channels.js?v=3"></script><!-- data channels -->
37
-    <script src="app.js?v=19"></script><!-- application logic -->
36
+    <script src="app.js?v=20"></script><!-- application logic -->
38 37
     <script src="commands.js?v=1"></script><!-- application logic -->
39 38
     <script src="chat.js?v=13"></script><!-- chat logic -->
40 39
     <script src="contact_list.js?v=5"></script><!-- contact list logic -->

+ 2
- 1
interface_config.js View File

@@ -11,5 +11,6 @@ var interfaceConfig = {
11 11
     SHOW_BRAND_WATERMARK: false,
12 12
     BRAND_WATERMARK_LINK: "",
13 13
     SHOW_POWERED_BY: false,
14
-    GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true
14
+    GENERATE_ROOMNAMES_ON_WELCOME_PAGE: true,
15
+    APP_NAME: "Jitsi Meet"
15 16
 };

Loading…
Cancel
Save