external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

fix bug of identify the truevision camera

Browse source
This commit is contained in:
winlin 2013-12-25 22:18:05 +08:00
parent ec5e33f3bc
commit 7b2f9d59a2
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/research/players/js/srs.page.js
View file

@ -162,7 +162,7 @@ function srs_initialize_codec_page(
}
}
// optional: select the first matched.
matchs = ["turevision", "integrated"];
matchs = ["truevision", "integrated"];
for (var i = 0; i < cameras.length; i++) {
for (var j = 0; j < matchs.length; j++) {
if (cameras[i].toLowerCase().indexOf(matchs[j]) >= 0) {

5
trunk/research/players/srs_chat.html
View file

@ -294,6 +294,7 @@
$(obj).find("#chat_player").attr("id", "rp_" + chat.id); // for specifed player: $("#rp_" + chat_id)
$(obj).find("#chat_player_raw").attr("id", "rp_raw_" + chat.id); // for specifed player: $("#rp_raw_" + chat_id)
$(obj).find("#user_name").text(chat.username);
$(obj).find("#user_player_url").attr("href", chat.url);
$(obj).find("#join_date").text(chat.join_date_str);
$(obj).find("#collapseM").attr("id", "collapse_" + global_chat_user_id);
$(obj).find("#headerN").attr("href", "#collapse_" + global_chat_user_id);
@ -588,7 +589,9 @@
<span id="headerN" class="accordion-toggle" data-toggle="collapse" href="#collapseN">
<strong>[<a href="#"><span id="user_name">XX</span></a>]</strong>
<strong>加入时间</strong>[<span id="join_date"></span>]
<img src="img/tooltip.png"/>
<a id="user_player_url" href="#" data-toggle="tooltip" data-placement="top" title="">
播放地址<img src="img/tooltip.png"/>
</a>
</span>
</div>
<div id="collapseM" class="accordion-body collapse in">