Toggle navigation
Toggle navigation
This project
Loading...
Sign in
fe
/
yohobuywap-node
·
Commits
Go to a project
GitLab
Go to group
Project
Activity
Files
Commits
Pipelines
0
Builds
0
Graphs
Milestones
Issues
0
Merge Requests
0
Members
Labels
Wiki
Forks
Network
Create a new issue
Download as
Plain Diff
Browse Files
Authored by
zzzzzzz
2016-09-06 10:16:58 +0800
Commit
572b4c68ffada49472175b3cb0b53ecf01ee401e
2 parents
7991d97a
986842c2
Merge branch 'hotfix/live' of git.yoho.cn:fe/yohobuywap-node into hotfix/live
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
1 deletions
public/js/activity/live/yoho_live_detail_main.js
public/js/activity/live/yoho_live_detail_main.js
View file @
572b4c6
...
...
@@ -284,9 +284,11 @@ function get_websocket_server(type) {
var
arr
=
data
.
data
[
0
].
split
(
':'
);
var
ip
=
arr
[
0
];
var
port
=
arr
[
1
];
var
protocol
=
location
.
protocol
===
'https:'
?
'wss'
:
'ws'
if
(
is_live
)
{
ip
=
'ws://'
+
ip
;
ip
=
protocol
+
'://'
+
ip
;
link_to_websocket_server
(
ip
,
port
);
}
}
...
...
Please
register
or
login
to post a comment