tcjlj/ZeroOmega
1
0
Fork 0
mirror of https://github.com/zero-peak/ZeroOmega.git synced 2025-01-22 15:08:12 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix a few compatibility issue with upgrade. Fix #81, #80

Browse Source
This commit is contained in:
FelisCatus 2014-12-20 12:47:31 +08:00
parent c4c8971b8e
commit bcce56320c
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
omega-pac/src/profiles.coffee
View File

@ -50,8 +50,10 @@ module.exports = exports =
parseHostPort: (str, scheme) -> parseHostPort: (str, scheme) ->
sep = str.lastIndexOf(':') sep = str.lastIndexOf(':')
return if sep < 0
port = parseInt(str.substr(sep + 1)) || 80 port = parseInt(str.substr(sep + 1)) || 80
host = str.substr(0, sep) host = str.substr(0, sep)
return unless host
return { return {
scheme: scheme scheme: scheme
host: host host: host

8
omega-target-chromium-extension/src/upgrade.coffee
View File

@ -158,6 +158,14 @@ module.exports = (oldOptions, i18n) ->
switch rule['patternType'] switch rule['patternType']
when 'wildcard' when 'wildcard'
pattern = rule['urlPattern'] pattern = rule['urlPattern']
if pattern[0] == '@'
pattern = pattern.substring(1)
else
if pattern.indexOf('://') <= 0 and pattern[0] != '*'
pattern = '*' + pattern
if pattern[pattern.length - 1] != '*'
pattern += '*'
host = OmegaPac.Conditions.urlWildcard2HostWildcard(pattern) host = OmegaPac.Conditions.urlWildcard2HostWildcard(pattern)
if host if host
conditionType: 'HostWildcardCondition' conditionType: 'HostWildcardCondition'