scratch – Diff between revs 40 and 41

Subversion Repositories:
Rev:
Only display areas with differencesIgnore whitespace
Rev 40 Rev 41
1 <!DOCTYPE html> 1 <!DOCTYPE html>
2 <html lang="en"> 2 <html lang="en">
3 <head> 3 <head>
4 <meta charset="utf-8"> 4 <meta charset="utf-8">
5 <meta http-equiv="X-UA-Compatible" content="IE=edge"> 5 <meta http-equiv="X-UA-Compatible" content="IE=edge">
6 <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" /> 6 <meta http-equiv="Cache-Control" content="no-cache, no-store, must-revalidate" />
7 <meta http-equiv="Pragma" content="no-cache" /> 7 <meta http-equiv="Pragma" content="no-cache" />
8 <meta http-equiv="Expires" content="0" /> 8 <meta http-equiv="Expires" content="0" />
9 <meta name="viewport" content="width=device-width, initial-scale=1"> 9 <meta name="viewport" content="width=device-width, initial-scale=1">
10 <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags --> 10 <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
11 <meta name="description" content="quick asset upload"> 11 <meta name="description" content="quick asset upload">
12 <meta name="author" content="Wizardry and Steamworks"> 12 <meta name="author" content="Wizardry and Steamworks">
13 <link rel="icon" href="favicon.ico"> 13 <link rel="icon" href="favicon.ico">
14   14  
15 <title>Quickload</title> 15 <title>Quickload</title>
16 16
17 <!-- Polyfill --> 17 <!-- Polyfill -->
18 <script src="js/polyfill/polyfill.min.js"></script> 18 <script src="js/polyfill/polyfill.min.js"></script>
19   19  
20 <!-- Bootstrap core CSS --> 20 <!-- Bootstrap core CSS -->
21 <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet"> 21 <link href="css/bootstrap/bootstrap.min.css" rel="stylesheet">
22   22  
23 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> 23 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
24 <link href="css/bootstrap/ie10-viewport-bug-workaround.css" rel="stylesheet"> 24 <link href="css/bootstrap/ie10-viewport-bug-workaround.css" rel="stylesheet">
25   25  
26 <!-- Just for debugging purposes. Don't actually copy these 2 lines! --> 26 <!-- Just for debugging purposes. Don't actually copy these 2 lines! -->
27 <!--[if lt IE 9]><script src="js/bootstrap/ie8-responsive-file-warning.js"></script><![endif]--> 27 <!--[if lt IE 9]><script src="js/bootstrap/ie8-responsive-file-warning.js"></script><![endif]-->
28 <script src="js/bootstrap/ie-emulation-modes-warning.js"></script> 28 <script src="js/bootstrap/ie-emulation-modes-warning.js"></script>
29   29  
30 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries --> 30 <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
31 <!--[if lt IE 9]> 31 <!--[if lt IE 9]>
32 <script src="js/bootstrap/html5shiv.min.js"></script> 32 <script src="js/bootstrap/html5shiv.min.js"></script>
33 <script src="js/bootstrap/respond.min.js"></script> 33 <script src="js/bootstrap/respond.min.js"></script>
34 <![endif]--> 34 <![endif]-->
35 35
36 <!-- Trumbowyg --> 36 <!-- Trumbowyg -->
37 <link href="css/trumbowyg/trumbowyg.min.css" rel="stylesheet"> 37 <link href="css/trumbowyg/trumbowyg.min.css" rel="stylesheet">
38 <!-- Local style --> 38 <!-- Local style -->
39 <link href="css/text/style.css" rel="stylesheet"> 39 <link href="css/text/style.css" rel="stylesheet">
40 </head> 40 </head>
41   41  
42 <body> 42 <body>
43   43  
44 <div class="container"> 44 <div class="container">
45   45  
46 <!-- Main component for a primary marketing message or call to action --> 46 <!-- Main component for a primary marketing message or call to action -->
47 <div class="jumbotron"> 47 <div class="jumbotron">
48 <h1>Quickload</h1> 48 <h1>Quickload</h1>
49 <p>Asset sharing platform.</p> 49 <p>Asset sharing platform.</p>
50 </div> 50 </div>
51 51
52 <ul class="nav nav-tabs"> 52 <ul class="nav nav-tabs">
53 <li><a href="index.html">Home</a></li> 53 <li><a href="index.html">Home</a></li>
54 <li><a href="files.html">Files</a></li> 54 <li><a href="files.html">Files</a></li>
55 <li class="active"><a href="#">Text</a></li> 55 <li class="active"><a href="#">Text</a></li>
56 </ul> 56 </ul>
57 57
58 <div class="panel panel-default"> 58 <div class="panel panel-default">
59 <div class="panel-heading"> 59 <div class="panel-heading">
60 <div class="form-group"> 60 <div class="form-group">
61 <div class="input-group"> 61 <div class="input-group">
62 <span class="input-group-btn"> 62 <span class="input-group-btn">
63 <button id="save" class="btn btn-default" type="button" data-toggle="tooltip" data-placement="auto" title="Generate link."> 63 <button id="save" class="btn btn-default" type="button" data-toggle="tooltip" data-placement="auto" title="Generate link.">
64 <i class="glyphicon glyphicon-globe"></i> 64 <i class="glyphicon glyphicon-share"></i>
65 </button> 65 </button>
66 </span> 66 </span>
67 <input id="URL" type="text" class="form-control" readonly> 67 <input id="URL" type="text" class="form-control" readonly>
68 <span class="input-group-btn"> 68 <span class="input-group-btn">
69 <button id="copy-url" class="btn btn-default" type="button" data-clipboard-target="#URL" data-toggle="tooltip" data-placement="auto" title="Copy to clipboard."><i class="glyphicon glyphicon-paperclip"></i></button> 69 <button id="copy-url" class="btn btn-default" type="button" data-clipboard-target="#URL" data-toggle="tooltip" data-placement="auto" title="Copy to clipboard."><i class="glyphicon glyphicon-paperclip"></i></button>
70 </span> 70 </span>
71 </div> 71 </div>
72 </div> 72 </div>
73 <form id="nick-form" role="form"> 73 <form id="nick-form" role="form">
74 <div class="form-group has-feedback"> 74 <div class="form-group has-feedback">
75 <div class="input-group"> 75 <div class="input-group">
76 <span class="input-group-btn"> 76 <span class="input-group-btn">
77 <button id="go" class="btn btn-default" type="button" data-toggle="tooltip" data-placement="auto" title="Load document."> 77 <button id="go" class="btn btn-default" type="button" data-toggle="tooltip" data-placement="auto" title="Load document.">
78 <i class="glyphicon glyphicon-play"></i> 78 <i class="glyphicon glyphicon-play"></i>
79 </button> 79 </button>
80 </span> 80 </span>
81 <span class="input-group-btn"> 81 <span class="input-group-btn">
82 <button id="reset" class="btn btn-default" type="button" data-toggle="tooltip" data-placement="auto" title="Reset document."> 82 <button id="reset" class="btn btn-default" type="button" data-toggle="tooltip" data-placement="auto" title="Reset document.">
83 <i class="glyphicon glyphicon-erase"></i> 83 <i class="glyphicon glyphicon-home"></i>
84 </button> 84 </button>
85 </span> 85 </span>
86 <input id="nick" type="text" class="form-control" pattern="^[A-Za-z0-9]{32}$" maxlength="32"> 86 <input id="nick" type="text" class="form-control" pattern="^[A-Za-z0-9]{32}$" maxlength="32">
87 <span class="input-group-btn"> 87 <span class="input-group-btn">
88 <button id="copy-nick" class="btn btn-default" type="button" data-clipboard-target="#nick" data-toggle="tooltip" data-placement="auto" title="Copy to clipboard."><i class="glyphicon glyphicon-paperclip"></i></button> 88 <button id="copy-nick" class="btn btn-default" type="button" data-clipboard-target="#nick" data-toggle="tooltip" data-placement="auto" title="Copy to clipboard."><i class="glyphicon glyphicon-paperclip"></i></button>
89 </span> 89 </span>
90 </div> 90 </div>
91 </div> 91 </div>
92 </form> 92 </form>
93 </div> 93 </div>
94 <div class="panel-body" id="editorpanel"> 94 <div class="panel-body" id="editorpanel">
95 <div id="trumbowyg" style="display: none; font-family: monospace;"> 95 <div id="trumbowyg" style="display: none; font-family: monospace;">
96 </div> 96 </div>
97 </div> 97 </div>
98 </div> 98 </div>
99   99  
100 </div> <!-- /container --> 100 </div> <!-- /container -->
101 101
102 <div id="footer"> 102 <div id="footer">
103 <div class="container"> 103 <div class="container">
104 <p class="text-muted credit">Copyright <i class="glyphicon glyphicon-copyright-mark"></i> 2017 <a href="http://grimore.org">Wizardry and Steamworks</a>.</p> 104 <p class="text-muted credit">Copyright <i class="glyphicon glyphicon-copyright-mark"></i> 2017 <a href="http://grimore.org">Wizardry and Steamworks</a>.</p>
105 </div> 105 </div>
106 </div> 106 </div>
107   107  
108 <script src="js/jquery/jquery.min.js"></script> 108 <script src="js/jquery/jquery.min.js"></script>
109 <script src="js/bootstrap/bootstrap.min.js"></script> 109 <script src="js/bootstrap/bootstrap.min.js"></script>
110 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug --> 110 <!-- IE10 viewport hack for Surface/desktop Windows 8 bug -->
111 <script src="js/bootstrap/ie10-viewport-bug-workaround.js"></script> 111 <script src="js/bootstrap/ie10-viewport-bug-workaround.js"></script>
112 112
113 <!-- Trumbowyg --> 113 <!-- Trumbowyg -->
114 <script src="js/trumbowyg/trumbowyg.min.js"></script> 114 <script src="js/trumbowyg/trumbowyg.min.js"></script>
115 <!-- Clipboard --> 115 <!-- Clipboard -->
116 <script src="js/clipboard/clipboard.min.js"></script> 116 <script src="js/clipboard/clipboard.min.js"></script>
117 <!-- Fingerprint 2 --> 117 <!-- Fingerprint 2 -->
118 <script src="js/fingerprintjs/fingerprint2.min.js"></script> 118 <script src="js/fingerprintjs/fingerprint2.min.js"></script>
119 <!-- js-cookie --> 119 <!-- js-cookie -->
120 <script src="js/jscookie/js.cookie.js"></script> 120 <script src="js/jscookie/js.cookie.js"></script>
121 <!-- Bootstrap Validator --> 121 <!-- Bootstrap Validator -->
122 <script src="js/validator/validator.min.js"></script> 122 <script src="js/validator/validator.min.js"></script>
123 <script> 123 <script>
124 $(document).ready(() => { 124 $(document).ready(() => {
125 // Attach the form validator. 125 // Attach the form validator.
126 $('#nick-form').validator({ 126 $('#nick-form').validator({
127 focus: false 127 focus: false
128 }); 128 });
129 129
130 // Get the fingerprint. 130 // Get the fingerprint.
131 new Fingerprint2().get((result, components) => { 131 new Fingerprint2().get((result, components) => {
132 // Set the nick as a cookie. 132 // Set the nick as a cookie.
133 const fingerprint = result; 133 const fingerprint = result;
134 var nick = Cookies.get('nick'); 134 var nick = Cookies.get('nick');
135 if(!nick || nick.length !== 32) 135 if(!nick || nick.length !== 32)
136 Cookies.set('nick', result, { path: '' }); 136 Cookies.set('nick', result, { path: '' });
137 else 137 else
138 result = nick; 138 result = nick;
139 139
140 // Set the nick. 140 // Set the nick.
141 $('#nick').val(result); 141 $('#nick').val(result);
142 new Clipboard('#copy-nick'); 142 new Clipboard('#copy-nick');
143 143
144 // Load the editor. 144 // Load the editor.
145 $('#trumbowyg').trumbowyg({ 145 $('#trumbowyg').trumbowyg({
146 autogrow: true, 146 autogrow: true,
147 disabled: true 147 disabled: true
148 }).on('tbwchange', () => { 148 }).on('tbwchange', () => {
149 $('#editor').trumbowyg('disable'); 149 $('#editor').trumbowyg('disable');
150 $.post('share-text.php', { 150 $.post('share-text.php', {
151 data: $('#trumbowyg').trumbowyg('html'), 151 data: $('#trumbowyg').trumbowyg('html'),
152 fingerprint: result, 152 fingerprint: result,
153 action: 'SAVE' 153 action: 'SAVE'
154 }).done((data) => { 154 }).done((data) => {
155 $('#trumbowyg').trumbowyg('enable'); 155 $('#trumbowyg').trumbowyg('enable');
156 }).fail(() => { 156 }).fail(() => {
157 $('#trumbowyg').trumbowyg('enable'); 157 $('#trumbowyg').trumbowyg('enable');
158 }); 158 });
159 }); 159 });
160 160
161 // Retrieve the contents of the shared file. 161 // Retrieve the contents of the shared file.
162 $.post('share-text.php', 162 $.post('share-text.php',
163 { 163 {
164 timestamp: window.performance.now(), 164 timestamp: window.performance.now(),
165 fingerprint: result, 165 fingerprint: result,
166 action: 'LOAD' 166 action: 'LOAD'
167 }).done((data) => {; 167 }).done((data) => {;
168 $('#trumbowyg') 168 $('#trumbowyg')
169 .trumbowyg('html', data); 169 .trumbowyg('html', data);
170 $('#trumbowyg').trumbowyg('enable'); 170 $('#trumbowyg').trumbowyg('enable');
171 $('#trumbowyg').show(); 171 $('#trumbowyg').show();
172 }).fail(() => { 172 }).fail(() => {
173 $('#trumbowyg').trumbowyg('enable'); 173 $('#trumbowyg').trumbowyg('enable');
174 $('#trumbowyg').show(); 174 $('#trumbowyg').show();
175 }); 175 });
176 176
177 // Enable the Clipboard button. 177 // Enable the Clipboard button.
178 new Clipboard('#copy-url'); 178 new Clipboard('#copy-url');
179 179
180 $('#save').click(() => { 180 $('#save').click(() => {
181 $('#editor').trumbowyg('disable'); 181 $('#editor').trumbowyg('disable');
182 182
183 var formData = new FormData(); 183 var formData = new FormData();
184 formData.append('file', new Blob( 184 formData.append('file', new Blob(
185 [ 185 [
186 $('#trumbowyg').trumbowyg('html') 186 $('#trumbowyg').trumbowyg('html')
187 ] 187 ]
188 ), 188 ),
189 '.html' 189 '.html'
190 ); 190 );
191 191
192 $.ajax({ 192 $.ajax({
193 url: 'upload-files.php', 193 url: 'upload-files.php',
194 type: 'POST', 194 type: 'POST',
195 data: formData, 195 data: formData,
196 // cache: false // FF 196 // cache: false // FF
197 processData: false, 197 processData: false,
198 contentType: false 198 contentType: false
199 }).done((data) => { 199 }).done((data) => {
200 $('#URL').val(data); 200 $('#URL').val(data);
201 $('#trumbowyg').trumbowyg('enable'); 201 $('#trumbowyg').trumbowyg('enable');
202 }).fail(() => { 202 }).fail(() => {
203 alert('failed'); 203 alert('failed');
204 $('#trumbowyg').trumbowyg('enable'); 204 $('#trumbowyg').trumbowyg('enable');
205 }); 205 });
206 }); 206 });
207 207
208 // When the user wants to assume a nickname. 208 // When the button is clicked, navigate to the fingerprint.
209 $('#go').click(() => { 209 $('#go').click(() => {
210 nick = $('#nick').val(); 210 nick = $('#nick').val();
211 if(!nick || nick.length != 32) 211 if(!nick || nick.length != 32)
212 return; 212 return;
213 Cookies.set('nick', nick, { path: '' }); 213 Cookies.set('nick', nick, { path: '' });
214 result = nick; 214 result = nick;
215 215
216 // Retrieve the contents of the shared file. 216 // Retrieve the contents of the shared file.
217 $.post('share-text.php', 217 $.post('share-text.php',
218 { 218 {
219 timestamp: window.performance.now(), 219 timestamp: window.performance.now(),
220 fingerprint: nick, 220 fingerprint: nick,
221 action: 'LOAD' 221 action: 'LOAD'
222 }).done((data) => {; 222 }).done((data) => {;
223 $('#trumbowyg') 223 $('#trumbowyg')
224 .trumbowyg('html', data); 224 .trumbowyg('html', data);
225 $('#trumbowyg').trumbowyg('enable'); 225 $('#trumbowyg').trumbowyg('enable');
226 $('#trumbowyg').show(); 226 $('#trumbowyg').show();
227 }).fail(() => { 227 }).fail(() => {
228 $('#trumbowyg').trumbowyg('enable'); 228 $('#trumbowyg').trumbowyg('enable');
229 $('#trumbowyg').show(); 229 $('#trumbowyg').show();
230 }); 230 });
231 }); 231 });
-   232
232 233 // When the form is submitted, naigate to the fingerprint.
233 $('#nick-form').submit((e) => { 234 $('#nick-form').submit((e) => {
234 e.preventDefault(); 235 e.preventDefault();
235 236
236 nick = $('#nick').val(); 237 nick = $('#nick').val();
237 if(!nick || nick.length != 32) 238 if(!nick || nick.length != 32)
238 return; 239 return;
239 Cookies.set('nick', nick, { path: '' }); 240 Cookies.set('nick', nick, { path: '' });
240 result = nick; 241 result = nick;
241 242
242 // Retrieve the contents of the shared file. 243 // Retrieve the contents of the shared file.
243 $.post('share-text.php', 244 $.post('share-text.php',
244 { 245 {
245 timestamp: window.performance.now(), 246 timestamp: window.performance.now(),
246 fingerprint: nick, 247 fingerprint: nick,
247 action: 'LOAD' 248 action: 'LOAD'
248 }).done((data) => {; 249 }).done((data) => {;
249 $('#trumbowyg') 250 $('#trumbowyg')
250 .trumbowyg('html', data); 251 .trumbowyg('html', data);
251 $('#trumbowyg').trumbowyg('enable'); 252 $('#trumbowyg').trumbowyg('enable');
252 $('#trumbowyg').show(); 253 $('#trumbowyg').show();
253 }).fail(() => { 254 }).fail(() => {
254 $('#trumbowyg').trumbowyg('enable'); 255 $('#trumbowyg').trumbowyg('enable');
255 $('#trumbowyg').show(); 256 $('#trumbowyg').show();
256 }); 257 });
257 }); 258 });
-   259
-   260 // While the nick is changing, navigate to the changed fingerprint.
-   261 $("#nick").on('input', () => {
-   262 nick = $('#nick').val();
-   263 if(!nick || nick.length != 32)
-   264 return;
-   265 Cookies.set('nick', nick, { path: '' });
-   266 result = nick;
-   267
-   268 // Retrieve the contents of the shared file.
-   269 $.post('share-text.php',
-   270 {
-   271 timestamp: window.performance.now(),
-   272 fingerprint: nick,
-   273 action: 'LOAD'
-   274 }).done((data) => {;
-   275 $('#trumbowyg')
-   276 .trumbowyg('html', data);
-   277 $('#trumbowyg').trumbowyg('enable');
-   278 $('#trumbowyg').show();
-   279 }).fail(() => {
-   280 $('#trumbowyg').trumbowyg('enable');
-   281 $('#trumbowyg').show();
-   282 });
-   283 });
-   284
258 285 // When the reset button is pressed, navigate to the fingerprint.
259 $('#reset').click(() => { 286 $('#reset').click(() => {
260 Cookies.set('nick', fingerprint, { path: '' }); 287 Cookies.set('nick', fingerprint, { path: '' });
261 $('#nick').val(fingerprint); 288 $('#nick').val(fingerprint);
262 result = fingerprint; 289 result = fingerprint;
263 290
264 // Retrieve the contents of the shared file. 291 // Retrieve the contents of the shared file.
265 $.post('share-text.php', 292 $.post('share-text.php',
266 { 293 {
267 timestamp: window.performance.now(), 294 timestamp: window.performance.now(),
268 fingerprint: fingerprint, 295 fingerprint: fingerprint,
269 action: 'LOAD' 296 action: 'LOAD'
270 }).done((data) => {; 297 }).done((data) => {;
271 $('#trumbowyg') 298 $('#trumbowyg')
272 .trumbowyg('html', data); 299 .trumbowyg('html', data);
273 $('#trumbowyg').trumbowyg('enable'); 300 $('#trumbowyg').trumbowyg('enable');
274 $('#trumbowyg').show(); 301 $('#trumbowyg').show();
275 }).fail(() => { 302 }).fail(() => {
276 $('#trumbowyg').trumbowyg('enable'); 303 $('#trumbowyg').trumbowyg('enable');
277 $('#trumbowyg').show(); 304 $('#trumbowyg').show();
278 }); 305 });
279 }); 306 });
280 }); 307 });
281 308
282 }); 309 });
283 </script> 310 </script>
284 </body> 311 </body>
285 </html> 312 </html>
286   313