Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
elphel-web-393
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Elphel
elphel-web-393
Commits
4e97989e
Commit
4e97989e
authored
May 11, 2018
by
Oleg Dzhimiev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
default addr == location.host
parent
2ab69a0f
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
3 deletions
+11
-3
multicam.js
src/multicam/multicam.js
+11
-3
No files found.
src/multicam/multicam.js
View file @
4e97989e
...
@@ -56,18 +56,25 @@ $(function(){
...
@@ -56,18 +56,25 @@ $(function(){
});
});
function
parseURL
(){
function
parseURL
(){
var
ips_str
=
location
.
host
;
var
parameters
=
location
.
href
.
replace
(
/
\?
/ig
,
"&"
).
split
(
"&"
);
var
parameters
=
location
.
href
.
replace
(
/
\?
/ig
,
"&"
).
split
(
"&"
);
for
(
var
i
=
0
;
i
<
parameters
.
length
;
i
++
)
parameters
[
i
]
=
parameters
[
i
].
split
(
"="
);
for
(
var
i
=
0
;
i
<
parameters
.
length
;
i
++
)
parameters
[
i
]
=
parameters
[
i
].
split
(
"="
);
for
(
var
i
=
1
;
i
<
parameters
.
length
;
i
++
)
{
for
(
var
i
=
1
;
i
<
parameters
.
length
;
i
++
)
{
switch
(
parameters
[
i
][
0
])
{
switch
(
parameters
[
i
][
0
])
{
case
"ip"
:
case
"ip"
:
ips_from_url
=
true
;
//
ips_from_url = true;
ips_str
=
parameters
[
i
][
1
];
ips_str
=
parameters
[
i
][
1
];
ips_str
=
ips_str
.
replace
(
/,|;/gm
,
'
\
n'
);
ips_str
=
ips_str
.
replace
(
/,|;/gm
,
'
\
n'
);
addrs_str2ips
(
ips_str
);
break
;
break
;
}
}
}
}
// force url
addrs_str2ips
(
ips_str
);
ips_from_url
=
true
;
}
}
function
init
(){
function
init
(){
...
@@ -112,6 +119,8 @@ function init(){
...
@@ -112,6 +119,8 @@ function init(){
left
:
$
(
"#settings"
).
find
(
"table"
).
width
()
+
10
left
:
$
(
"#settings"
).
find
(
"table"
).
width
()
+
10
});
});
init_test_button
();
}
}
function
init2
(){
function
init2
(){
...
@@ -439,7 +448,6 @@ function init3(index){
...
@@ -439,7 +448,6 @@ function init3(index){
$
(
"#display_status"
).
find
(
"tr[ip=
\
'"
+
cam
.
ip
+
"
\
']"
).
html
(
$
(
status_str
));
$
(
"#display_status"
).
find
(
"tr[ip=
\
'"
+
cam
.
ip
+
"
\
']"
).
html
(
$
(
status_str
));
init_test_button
();
}
}
function
init_test_button
(){
function
init_test_button
(){
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment