Skip to content

Implementation of Issue #133 #134

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Implementation of Issue #133 #134

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5ef2bd
Fixed static localhost and redirect
manulaiko Dec 20, 2016
e8fa50b
Fixed static localhost
manulaiko Dec 20, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions lib/browser-plus-view.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ class BrowserPlusView extends View
else
localhostPattern = ///^
(http://)?
localhost
([a-zA-Z0-9]*)
///i
if url.search(localhostPattern) < 0 and url.indexOf('.') < 0
url = "http://www.google.com/search?as_q=#{url}"
Expand All @@ -337,8 +337,8 @@ class BrowserPlusView extends View
url = url.replace(/\\/g,"/")
else
url = URL.format(urls)
else if url.indexOf('localhost') isnt -1
url = url.replace(localhostPattern,'http://127.0.0.1')
#else if url.indexOf('localhost') isnt -1
# url = url.replace(localhostPattern,'http://127.0.0.1')
else
urls.protocol = 'http'
url = URL.format(urls)
Expand Down
4 changes: 2 additions & 2 deletions lib/browser-plus.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ module.exports = BrowserPlus =
url.indexOf('browser-plus~') is 0 )
localhostPattern = ///^
(http://)?
localhost
([a-zA-Z0-9]*)
///i
return false unless BrowserPlusModel.checkUrl(url)
# check if it need to be open in same window
Expand All @@ -61,7 +61,7 @@ module.exports = BrowserPlus =
pane.activateItem(editor)
return editor

url = url.replace(localhostPattern,'http://127.0.0.1')
#url = url.replace(localhostPattern,'http://127.0.0.1')
new BrowserPlusModel {browserPlus:@,url:url,opt:opt}

# Events subscribed to in atom's system can be easily cleaned up with a CompositeDisposable
Expand Down