|
|
@ -663,31 +663,32 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout', |
|
|
|
//If host is specified here the dedicated port field is disabled
|
|
|
|
//If host is specified here the dedicated port field is disabled
|
|
|
|
|
|
|
|
|
|
|
|
var parts; |
|
|
|
var parts; |
|
|
|
|
|
|
|
$rootScope.hostInvalid = false; |
|
|
|
|
|
|
|
|
|
|
|
//host
|
|
|
|
//host
|
|
|
|
var regexHost = /^([^:\/]*|\[.*\])$/; |
|
|
|
var regexHost = /^([^:\/]*|\[.*\])$/; |
|
|
|
var regexHostPort = /^([^:]*|\[.*\]):(\d+)$/; |
|
|
|
var regexHostPort = /^([^:]*|\[.*\]):(\d+)$/; |
|
|
|
var regexHostPortPath = /^([^:]*|\[.*\]):(\d*)\/(.+)$/; |
|
|
|
var regexHostPortPath = /^([^:]*|\[.*\]):(\d*)\/(.+)$/; |
|
|
|
if((parts = regexHost.exec(settings.host)) !== null) |
|
|
|
if((parts = regexHost.exec(settings.host)) !== null) { |
|
|
|
{ |
|
|
|
|
|
|
|
settings.hostOnly = parts[1]; |
|
|
|
settings.hostOnly = parts[1]; |
|
|
|
$rootScope.portDisabled = false; |
|
|
|
$rootScope.portDisabled = false; |
|
|
|
} |
|
|
|
} |
|
|
|
//host:port
|
|
|
|
//host:port
|
|
|
|
else if((parts = regexHostPort.exec(settings.host)) !== null) |
|
|
|
else if((parts = regexHostPort.exec(settings.host)) !== null) { |
|
|
|
{ |
|
|
|
|
|
|
|
settings.hostOnly = parts[1]; |
|
|
|
settings.hostOnly = parts[1]; |
|
|
|
settings.port = parts[2]; |
|
|
|
settings.port = parts[2]; |
|
|
|
$rootScope.portDisabled = true; |
|
|
|
$rootScope.portDisabled = true; |
|
|
|
} |
|
|
|
} |
|
|
|
//host:port/path
|
|
|
|
//host:port/path
|
|
|
|
else if((parts = regexHostPortPath.exec(settings.host)) !== null) |
|
|
|
else if((parts = regexHostPortPath.exec(settings.host)) !== null) { |
|
|
|
{ |
|
|
|
|
|
|
|
settings.hostOnly = parts[1]; |
|
|
|
settings.hostOnly = parts[1]; |
|
|
|
settings.port = parts[2]; |
|
|
|
settings.port = parts[2]; |
|
|
|
settings.path = parts[3]; |
|
|
|
settings.path = parts[3]; |
|
|
|
$rootScope.portDisabled = true; |
|
|
|
$rootScope.portDisabled = true; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
else { |
|
|
|
|
|
|
|
$rootScope.hostInvalid = true; |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
}; |
|
|
|
}; |
|
|
|
|
|
|
|
|
|
|
|