jinql
/
webssh
mirror of https://github.com/huashengdun/webssh
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Support passing an encoding by url

static
Sheng 2019-05-19 20:06:07 +08:00
parent d8256d8f3f
commit 34af59a1c9
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
webssh/static/js/main.js
View File

@ -314,12 +314,20 @@ jQuery(function($){
console.log('Set encoding to ' + encoding); console.log('Set encoding to ' + encoding);
} catch (RangeError) { } catch (RangeError) {
console.log('Unknown encoding ' + new_encoding); console.log('Unknown encoding ' + new_encoding);
return false;
} }
} }
} }
wssh.set_encoding = set_encoding; wssh.set_encoding = set_encoding;
if (url_opts_data.encoding) {
if (set_encoding(url_opts_data.encoding) === false) {
set_encoding(msg.encoding); set_encoding(msg.encoding);
}
} else {
set_encoding(msg.encoding);
}
wssh.geometry = function() { wssh.geometry = function() {
@ -677,7 +685,7 @@ jQuery(function($){
restore_items(fields); restore_items(fields);
initialize_map(fields.concat(['password']), url_form_data); initialize_map(fields.concat(['password']), url_form_data);
initialize_map(['bgcolor', 'title'], url_opts_data); initialize_map(['bgcolor', 'title', 'encoding'], url_opts_data);
parse_url_data( parse_url_data(
decode_uri(window.location.search.substring(1)) + '&' + decode_uri(window.location.hash.substring(1)), decode_uri(window.location.search.substring(1)) + '&' + decode_uri(window.location.hash.substring(1)),