q3aql/webui-aria2
q3aql/webui-aria2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #417 from 4Oranges/master

Browse Source 
support config server connection config in uri
This commit is contained in:
hamza zia 2018-02-10 18:25:52 +08:00 committed by GitHub
commit c5f4ee2c3f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/init.js
View File

@ -27,7 +27,7 @@ function mergeTranslation(translation, base) {
return translation;
}
webui.config(['$translateProvider', function ($translateProvider) {
webui.config(function ($translateProvider, $locationProvider) {
$translateProvider
.translations('en_US', translations.en_US)
.translations('nl_NL', mergeTranslation(translations.nl_NL, translations.en_US))
@ -45,7 +45,12 @@ webui.config(['$translateProvider', function ($translateProvider) {
.translations('fa_IR', mergeTranslation(translations.fa_IR, translations.en_US))
.useSanitizeValueStrategy('escapeParameters')
.determinePreferredLanguage();
}]);
$locationProvider.html5Mode({
enabled: true,
requireBase: false
});
});
$(function() {
if (!String.prototype.startsWith) {

9
js/services/rpc/rpc.js
View File

@ -19,6 +19,15 @@ function(syscall, globalTimeout, alerts, utils, rootScope, uri, authconf, filter
// try at the start, so that it is presistant even when default authconf works
if(cookieConf) configurations.unshift(cookieConf);
if (uri.search().host) {
configurations.unshift(uri.search());
configurations[0].auth = {
token: configurations[0].token,
user: configurations[0].username,
pass: configurations[0].password
};
}
if (['http', 'https'].indexOf(uri.protocol()) != -1 && uri.host() != 'localhost') {
configurations.push({
host: uri.host(),