Skip to content

Commit

Permalink
#1341:
Browse files Browse the repository at this point in the history 
* move all javascript external libraries into include/lib
* move all css into include/css/
* move all icons into include/icons/

git-svn-id: https://xpra.org/svn/Xpra/trunk@14195 3bb7dfac-3a0b-4e04-842a-767bc560f471
  • Loading branch information
@totaam
totaam committed Oct 19, 2016
1 parent a5c1e6c commit 0c10672
Show file tree
Hide file tree
Showing 27 changed files with 919 additions and 895 deletions.
2 changes: 1 addition & 1 deletion src/html5/connect.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico">
<link rel="icon" type="image/png" href="/favicon.png">

<script type="text/javascript" src="include/jquery.min.js"></script>
<script type="text/javascript" src="include/lib/jquery.min.js"></script>
</head>

<body>
Expand Down
0 src/html5/include/spinner.css → src/html5/css/spinner.css
View file
File renamed without changes.
0 src/html5/include/close.png → src/html5/icons/close.png
View file
File renamed without changes
0 src/html5/include/maximize.png → src/html5/icons/maximize.png
View file
File renamed without changes
0 src/html5/include/minimize.png → src/html5/icons/minimize.png
View file
File renamed without changes
0 src/html5/include/noicon.png → src/html5/icons/noicon.png
View file
File renamed without changes
872 changes: 0 additions & 872 deletions src/html5/include/broadway/Decoder.js
View file

This file was deleted.

0 src/html5/include/aurora/aurora-xpra.js → src/html5/include/lib/aurora/aurora-xpra.js
View file
File renamed without changes.
0 src/html5/include/aurora/aurora.js → src/html5/include/lib/aurora/aurora.js
View file
File renamed without changes.
0 src/html5/include/aurora/mp3.js → src/html5/include/lib/aurora/mp3.js
View file
File renamed without changes.
0 src/html5/include/bencode.js → src/html5/include/lib/bencode.js
View file
File renamed without changes.
0 src/html5/include/broadway/AUTHORS → src/html5/include/lib/broadway/AUTHORS
View file
File renamed without changes.
896 changes: 896 additions & 0 deletions src/html5/include/lib/broadway/Decoder.js
View file

Large diffs are not rendered by default.

0 src/html5/include/broadway/LICENSE → src/html5/include/lib/broadway/LICENSE
View file
File renamed without changes.
0 src/html5/include/deflate.min.js → src/html5/include/lib/deflate.min.js
View file
File renamed without changes.
0 src/html5/include/forge.min.js → src/html5/include/lib/forge.min.js
View file
File renamed without changes.
0 src/html5/include/inflate.min.js → src/html5/include/lib/inflate.min.js
View file
File renamed without changes.
0 src/html5/include/jquery.min.js → src/html5/include/lib/jquery.min.js
View file
File renamed without changes.
0 ...5/include/jquery.throttle-debounce.min.js → ...clude/lib/jquery.throttle-debounce.min.js
View file
File renamed without changes.
0 src/html5/include/jqueryui.min.js → src/html5/include/lib/jqueryui.min.js
View file
File renamed without changes.
0 src/html5/include/lz4.min.js → src/html5/include/lib/lz4.min.js
View file
File renamed without changes.
0 src/html5/include/websock.js → src/html5/include/lib/websock.js
View file
File renamed without changes.
0 src/html5/include/wsworker_check.js → src/html5/include/lib/wsworker_check.js
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion src/html5/include/xpra_client.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ XpraClient.prototype.connect = function(host, port, ssl) {
console.log("we have webworker support");
// spawn worker that checks for a websocket
var me = this;
var worker = new Worker('include/wsworker_check.js');
var worker = new Worker('include/lib/wsworker_check.js');
worker.addEventListener('message', function(e) {
var data = e.data;
switch (data['result']) {
Expand Down
10 changes: 5 additions & 5 deletions src/html5/include/xpra_protocol.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -331,11 +331,11 @@ If we are in a web worker, set up an instance of the protocol
if (!(typeof window == "object" && typeof document == "object" && window.document === document)) {
// some required imports
// worker imports are relative to worker script path
importScripts('websock.js',
'bencode.js',
'inflate.min.js',
'lz4.min.js',
'forge.min.js');
importScripts('lib/websock.js',
'lib/bencode.js',
'lib/inflate.min.js',
'lib/lz4.min.js',
'lib/forge.min.js');
// make protocol instance
var protocol = new XpraProtocol();
// we create a custom packet handler which posts packet as a message
Expand Down
6 changes: 3 additions & 3 deletions src/html5/include/xpra_window.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,11 +105,11 @@ function XpraWindow(client, canvas_state, wid, x, y, w, h, metadata, override_re
if(!this.override_redirect) {
// create header
jQuery(this.div).prepend('<div id="head' + String(wid) + '" class="windowhead"> '+
'<span class="windowicon"><img src="include/noicon.png" id="windowicon' + String(wid) + '" /></span> '+
'<span class="windowicon"><img src="../icons/noicon.png" id="windowicon' + String(wid) + '" /></span> '+
'<span class="windowtitle" id="title' + String(wid) + '">' + this.title + '</span> '+
'<span class="windowbuttons"> '+
'<span id="maximize' + String(wid) + '"><img src="include/maximize.png" /></span> '+
'<span id="close' + String(wid) + '"><img src="include/close.png" /></span> '+
'<span id="maximize' + String(wid) + '"><img src="../icons/maximize.png" /></span> '+
'<span id="close' + String(wid) + '"><img src="../icons/close.png" /></span> '+
'</span></div>');
// make draggable
jQuery(this.div).draggable({
Expand Down
26 changes: 13 additions & 13 deletions src/html5/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,25 +138,25 @@
.ui-resizable-ne { cursor: ne-resize; width: 9px; height: 9px; right: -5px; top: -5px;}
</style>

<link rel="stylesheet" href="include/spinner.css">
<link rel="stylesheet" href="include/css/spinner.css">

<script type="text/javascript" src="include/jquery.min.js"></script>
<script type="text/javascript" src="include/jqueryui.min.js"></script>
<script type="text/javascript" src="include/jquery.throttle-debounce.min.js"></script>
<script type="text/javascript" src="include/lib/jquery.min.js"></script>
<script type="text/javascript" src="include/lib/jqueryui.min.js"></script>
<script type="text/javascript" src="include/lib/jquery.throttle-debounce.min.js"></script>

<script type="text/javascript" src="include/websock.js"></script>
<script type="text/javascript" src="include/bencode.js"></script>
<script type="text/javascript" src="include/inflate.min.js"></script>
<script type="text/javascript" src="include/lz4.min.js"></script>
<script type="text/javascript" src="include/lib/websock.js"></script>
<script type="text/javascript" src="include/lib/bencode.js"></script>
<script type="text/javascript" src="include/lib/inflate.min.js"></script>
<script type="text/javascript" src="include/lib/lz4.min.js"></script>
<script type="text/javascript" src="include/keycodes.js"></script>

<script type="text/javascript" src="include/broadway/Decoder.js"></script>
<script type="text/javascript" src="include/lib/broadway/Decoder.js"></script>

<script type="text/javascript" src="include/aurora/aurora.js"></script>
<script type="text/javascript" src="include/aurora/aurora-xpra.js"></script>
<script type="text/javascript" src="include/aurora/mp3.js"></script>
<script type="text/javascript" src="include/lib/aurora/aurora.js"></script>
<script type="text/javascript" src="include/lib/aurora/aurora-xpra.js"></script>
<script type="text/javascript" src="include/lib/aurora/mp3.js"></script>

<script type="text/javascript" src="include/forge.min.js"></script>
<script type="text/javascript" src="include/lib/forge.min.js"></script>

<script type="text/javascript" src="include/xpra_client.js"></script>
<script type="text/javascript" src="include/xpra_protocol.js"></script>
Expand Down

0 comments on commit 0c10672

Please sign in to comment.