jfinn
/
jitsi_corner8
关注 1
点赞 0
派生 0
代码 工单 0 合并请求 0 版本发布 0 百科 动态
浏览代码

Moves all static content/files in a new folder. 

Also clears debian package from including *.js files from source roote folder, files which were not used.
j8
damencho 8 年前
父节点
989161159d
当前提交
1d7da21e48
共有 11 个文件被更改，包括 17 次插入 和 14 次删除
合并视图 显示文件统计
  1. 3
    3
      conference.js
  2. 2
    1
      debian/jitsi-meet-web.install
  3. 1
    1
      doc/debian/jitsi-meet/jitsi-meet.example
  4. 2
    0
      doc/debian/jitsi-meet/jitsi-meet.example-apache
  5. 1
    1
      index.html
  6. 2
    2
      static/404.html
  7. 2
    2
      static/authError.html
  8. 2
    2
      static/close.html
  9. 0
    0
      static/close.js
  10. 2
    2
      static/close2.html
  11. 0
    0
      static/utils.js

+ 3
- 3
conference.js 查看文件

252 
         // save whether current user is guest or not, before navigating
 252 
         // save whether current user is guest or not, before navigating
253 
         // to close page
 253 
         // to close page
254 
         window.sessionStorage.setItem('guest', APP.tokenData.isGuest);
 254 
         window.sessionStorage.setItem('guest', APP.tokenData.isGuest);
255 
-        assignWindowLocationPathname(
256 
-                options.feedbackSubmitted ? "close.html" : "close2.html");
255 
+        assignWindowLocationPathname('static/'
256 
+                + (options.feedbackSubmitted ? "close.html" : "close2.html"));
257 
         return;
 257 
         return;
258 
     }
 258 
     }
259
259
402 
         case ConferenceErrors.NOT_ALLOWED_ERROR:
 402 
         case ConferenceErrors.NOT_ALLOWED_ERROR:
403 
             {
 403 
             {
404 
                 // let's show some auth not allowed page
 404 
                 // let's show some auth not allowed page
405 
-                assignWindowLocationPathname('authError.html');
405 
+                assignWindowLocationPathname('static/authError.html');
406 
             }
 406 
             }
407 
             break;
 407 
             break;
408
408

+ 2
- 1
debian/jitsi-meet-web.install 查看文件

1 
-*.js					/usr/share/jitsi-meet/
1 
+interface_config.js		/usr/share/jitsi-meet/
2 
+logging_config.js		/usr/share/jitsi-meet/
2 
 *.json					/usr/share/jitsi-meet/
 3 
 *.json					/usr/share/jitsi-meet/
3 
 *.html					/usr/share/jitsi-meet/
 4 
 *.html					/usr/share/jitsi-meet/
4 
 *.ico					/usr/share/jitsi-meet/
 5 
 *.ico					/usr/share/jitsi-meet/

+ 1
- 1
doc/debian/jitsi-meet/jitsi-meet.example 查看文件

20
20
21 
     root /usr/share/jitsi-meet;
 21 
     root /usr/share/jitsi-meet;
22 
     index index.html index.htm;
 22 
     index index.html index.htm;
23 
-    error_page 404 /404.html;
23 
+    error_page 404 /static/404.html;
24
24
25 
     location /config.js {
 25 
     location /config.js {
26 
         alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;
 26 
         alias /etc/jitsi/meet/jitsi-meet.example.com-config.js;

+ 2
- 0
doc/debian/jitsi-meet/jitsi-meet.example-apache 查看文件

29 
     Allow from all
 29 
     Allow from all
30 
   </Directory>
 30 
   </Directory>
31
31
32 
+  ErrorDocument 404 /static/404.html
33 
+
32 
   Alias "/config.js" "/etc/jitsi/meet/jitsi-meet.example.com-config.js"
 34 
   Alias "/config.js" "/etc/jitsi/meet/jitsi-meet.example.com-config.js"
33 
   <Location /config.js>
 35 
   <Location /config.js>
34 
     Require all granted
 36 
     Require all granted

+ 1
- 1
index.html 查看文件

127 
             'error', loadErrHandler, true /* capture phase type of listener */);
 127 
             'error', loadErrHandler, true /* capture phase type of listener */);
128 
     </script>
 128 
     </script>
129 
     <script><!--#include virtual="/config.js" --></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
 129 
     <script><!--#include virtual="/config.js" --></script><!-- adapt to your needs, i.e. set hosts and bosh path -->
130 
-    <script src="utils.js?v=1"></script>
130 
+    <script src="static/utils.js?v=1"></script>
131 
     <!--#include virtual="connection_optimization/connection_optimization.html" -->
 131 
     <!--#include virtual="connection_optimization/connection_optimization.html" -->
132 
     <script src="connection_optimization/do_external_connect.js?v=1"></script>
 132 
     <script src="connection_optimization/do_external_connect.js?v=1"></script>
133 
     <script><!--#include virtual="/interface_config.js" --></script>
 133 
     <script><!--#include virtual="/interface_config.js" --></script>

404.html → static/404.html 查看文件

1 
 <html>
 1 
 <html>
2 
 <head>
 2 
 <head>
3 
-    <link rel="stylesheet" href="css/all.css"/>
4 
-    <!--#include virtual="title.html" -->
3 
+    <link rel="stylesheet" href="../css/all.css"/>
4 
+    <!--#include virtual="/title.html" -->
5 
 </head>
 5 
 </head>
6 
 <body>
 6 
 <body>
7 
     <div class="error_page">
 7 
     <div class="error_page">

authError.html → static/authError.html 查看文件

1 
 <html>
 1 
 <html>
2 
 <head>
 2 
 <head>
3 
-    <link rel="stylesheet" href="css/all.css"/>
4 
-    <!--#include virtual="title.html" -->
3 
+    <link rel="stylesheet" href="../css/all.css"/>
4 
+    <!--#include virtual="/title.html" -->
5 
 </head>
 5 
 </head>
6 
 <body>
 6 
 <body>
7 
     <div class="redirectPageMessage">Sorry! You are not allowed to be here :(</div>
 7 
     <div class="redirectPageMessage">Sorry! You are not allowed to be here :(</div>

close.html → static/close.html 查看文件

1 
 <html>
 1 
 <html>
2 
 <head>
 2 
 <head>
3 
-    <link rel="stylesheet" href="css/all.css"/>
4 
-    <!--#include virtual="title.html" -->
3 
+    <link rel="stylesheet" href="../css/all.css"/>
4 
+    <!--#include virtual="/title.html" -->
5 
     <script><!--#include virtual="/interface_config.js" --></script>
 5 
     <script><!--#include virtual="/interface_config.js" --></script>
6 
     <script src="close.js"></script>
 6 
     <script src="close.js"></script>
7 
 </head>
 7 
 </head>

close.js → static/close.js 查看文件


close2.html → static/close2.html 查看文件

1 
 <html>
 1 
 <html>
2 
 <head>
 2 
 <head>
3 
-    <link rel="stylesheet" href="css/all.css"/>
4 
-    <!--#include virtual="title.html" -->
3 
+    <link rel="stylesheet" href="../css/all.css"/>
4 
+    <!--#include virtual="/title.html" -->
5 
     <script><!--#include virtual="/interface_config.js" --></script>
 5 
     <script><!--#include virtual="/interface_config.js" --></script>
6 
     <script src="close.js"></script>
 6 
     <script src="close.js"></script>
7 
 </head>
 7 
 </head>

utils.js → static/utils.js 查看文件


撰写 预览
正在加载...
取消
保存