胡斌 / srs

转到一个项目
Toggle navigation Toggle navigation pinning
winlin
5cec9679 1 parent c51842aa

refine the index. refine the parse_query_string, add user_query object to result

内嵌 并排对比
正在显示 10 个修改的文件 包含 28 行增加 和 12 行删除
@@ -8,6 +8,7 @@ @@ -8,6 +8,7 @@
8 <script type="text/javascript" src="js/bootstrap.min.js"></script> 8 <script type="text/javascript" src="js/bootstrap.min.js"></script>
9 <script type="text/javascript" src="js/swfobject.js"></script> 9 <script type="text/javascript" src="js/swfobject.js"></script>
10 <script type="text/javascript" src="js/srs.page.js"></script> 10 <script type="text/javascript" src="js/srs.page.js"></script>
  11 + <script type="text/javascript" src="js/srs.utility.js"></script>
11 <style> 12 <style>
12 body{ 13 body{
13 padding-top: 55px; 14 padding-top: 55px;
@@ -17,10 +18,19 @@ @@ -17,10 +18,19 @@
17 $(function(){ 18 $(function(){
18 update_nav(); 19 update_nav();
19 20
20 - // direct to the default vhost for players.  
21 - var query = "" + window.location.search;  
22 - query = query.substr(1);  
23 - window.location.href = "srs_chat.html?" + "vhost=" + srs_get_player_vhost() + "&" + query; 21 + var query = parse_query_string();
  22 + var url = "srs_chat.html?vhost=" + srs_get_player_vhost();
  23 +
  24 + for (var key in query.user_query) {
  25 + if (key == "vhost") {
  26 + continue;
  27 + }
  28 + url += "&" + key + "=" + query[key];
  29 + }
  30 +
  31 + setTimeout(function(){
  32 + window.location.href = url;
  33 + }, 100);
24 }); 34 });
25 </script> 35 </script>
26 </head> 36 </head>
@@ -28,7 +38,7 @@ @@ -28,7 +38,7 @@
28 <div class="navbar navbar-fixed-top"> 38 <div class="navbar navbar-fixed-top">
29 <div class="navbar-inner"> 39 <div class="navbar-inner">
30 <div class="container"> 40 <div class="container">
31 - <a class="brand" href="index.html">SRS</a> 41 + <a id="srs_index" class="brand" href="#">SRS</a>
32 <div class="nav-collapse collapse"> 42 <div class="nav-collapse collapse">
33 <ul class="nav"> 43 <ul class="nav">
34 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li> 44 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
@@ -31,6 +31,7 @@ function srs_get_player_chat_vhost(src_vhost) { return (src_vhost != srs_get_pla @@ -31,6 +31,7 @@ function srs_get_player_chat_vhost(src_vhost) { return (src_vhost != srs_get_pla
31 * update the navigator, add same query string. 31 * update the navigator, add same query string.
32 */ 32 */
33 function update_nav() { 33 function update_nav() {
  34 + $("#srs_index").attr("href", "index.html" + window.location.search);
34 $("#nav_srs_player").attr("href", "srs_player.html" + window.location.search); 35 $("#nav_srs_player").attr("href", "srs_player.html" + window.location.search);
35 $("#nav_srs_publisher").attr("href", "srs_publisher.html" + window.location.search); 36 $("#nav_srs_publisher").attr("href", "srs_publisher.html" + window.location.search);
36 $("#nav_srs_chat").attr("href", "srs_chat.html" + window.location.search); 37 $("#nav_srs_chat").attr("href", "srs_chat.html" + window.location.search);
@@ -17,6 +17,7 @@ function padding(number, length, prefix) { @@ -17,6 +17,7 @@ function padding(number, length, prefix) {
17 function parse_query_string(){ 17 function parse_query_string(){
18 var obj = {}; 18 var obj = {};
19 19
  20 + // add the uri object.
20 // parse the host(hostname:http_port), pathname(dir/filename) 21 // parse the host(hostname:http_port), pathname(dir/filename)
21 obj.host = window.location.host; 22 obj.host = window.location.host;
22 obj.hostname = window.location.hostname; 23 obj.hostname = window.location.hostname;
@@ -30,6 +31,9 @@ function parse_query_string(){ @@ -30,6 +31,9 @@ function parse_query_string(){
30 obj.filename = obj.pathname.substr(obj.pathname.lastIndexOf("/")); 31 obj.filename = obj.pathname.substr(obj.pathname.lastIndexOf("/"));
31 } 32 }
32 33
  34 + // pure user query object.
  35 + obj.user_query = {};
  36 +
33 // parse the query string. 37 // parse the query string.
34 var query_string = String(window.location.search).replace(" ", "").split("?")[1]; 38 var query_string = String(window.location.search).replace(" ", "").split("?")[1];
35 if(query_string == undefined){ 39 if(query_string == undefined){
@@ -40,6 +44,7 @@ function parse_query_string(){ @@ -40,6 +44,7 @@ function parse_query_string(){
40 $(queries).each(function(){ 44 $(queries).each(function(){
41 var query = this.split("="); 45 var query = this.split("=");
42 obj[query[0]] = query[1]; 46 obj[query[0]] = query[1];
  47 + obj.user_query[query[0]] = query[1];
43 }); 48 });
44 49
45 return obj; 50 return obj;
@@ -82,7 +82,7 @@ @@ -82,7 +82,7 @@
82 <div class="navbar navbar-fixed-top"> 82 <div class="navbar navbar-fixed-top">
83 <div class="navbar-inner"> 83 <div class="navbar-inner">
84 <div class="container"> 84 <div class="container">
85 - <a class="brand" href="index.html">SRS</a> 85 + <a id="srs_index" class="brand" href="#">SRS</a>
86 <div class="nav-collapse collapse"> 86 <div class="nav-collapse collapse">
87 <ul class="nav"> 87 <ul class="nav">
88 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li> 88 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
@@ -78,7 +78,7 @@ @@ -78,7 +78,7 @@
78 <div class="navbar navbar-fixed-top"> 78 <div class="navbar navbar-fixed-top">
79 <div class="navbar-inner"> 79 <div class="navbar-inner">
80 <div class="container"> 80 <div class="container">
81 - <a class="brand" href="index.html">SRS</a> 81 + <a id="srs_index" class="brand" href="#">SRS</a>
82 <div class="nav-collapse collapse"> 82 <div class="nav-collapse collapse">
83 <ul class="nav"> 83 <ul class="nav">
84 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li> 84 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
@@ -28,7 +28,7 @@ @@ -28,7 +28,7 @@
28 <div class="navbar navbar-fixed-top"> 28 <div class="navbar navbar-fixed-top">
29 <div class="navbar-inner"> 29 <div class="navbar-inner">
30 <div class="container"> 30 <div class="container">
31 - <a class="brand" href="index.html">SRS</a> 31 + <a id="srs_index" class="brand" href="#">SRS</a>
32 <div class="nav-collapse collapse"> 32 <div class="nav-collapse collapse">
33 <ul class="nav"> 33 <ul class="nav">
34 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li> 34 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
@@ -546,7 +546,7 @@ @@ -546,7 +546,7 @@
546 <div class="navbar navbar-fixed-top"> 546 <div class="navbar navbar-fixed-top">
547 <div class="navbar-inner"> 547 <div class="navbar-inner">
548 <div class="container"> 548 <div class="container">
549 - <a class="brand" href="index.html">SRS</a> 549 + <a id="srs_index" class="brand" href="#">SRS</a>
550 <div class="nav-collapse collapse"> 550 <div class="nav-collapse collapse">
551 <ul class="nav"> 551 <ul class="nav">
552 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li> 552 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
@@ -269,7 +269,7 @@ @@ -269,7 +269,7 @@
269 <div class="navbar navbar-fixed-top"> 269 <div class="navbar navbar-fixed-top">
270 <div class="navbar-inner"> 270 <div class="navbar-inner">
271 <div class="container"> 271 <div class="container">
272 - <a class="brand" href="index.html">SRS</a> 272 + <a id="srs_index" class="brand" href="#">SRS</a>
273 <div class="nav-collapse collapse"> 273 <div class="nav-collapse collapse">
274 <ul class="nav"> 274 <ul class="nav">
275 <li class="active"><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li> 275 <li class="active"><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
@@ -214,7 +214,7 @@ @@ -214,7 +214,7 @@
214 <div class="navbar navbar-fixed-top"> 214 <div class="navbar navbar-fixed-top">
215 <div class="navbar-inner"> 215 <div class="navbar-inner">
216 <div class="container"> 216 <div class="container">
217 - <a class="brand" href="index.html">SRS</a> 217 + <a id="srs_index" class="brand" href="#">SRS</a>
218 <div class="nav-collapse collapse"> 218 <div class="nav-collapse collapse">
219 <ul class="nav"> 219 <ul class="nav">
220 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li> 220 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 <div class="navbar navbar-fixed-top"> 24 <div class="navbar navbar-fixed-top">
25 <div class="navbar-inner"> 25 <div class="navbar-inner">
26 <div class="container"> 26 <div class="container">
27 - <a class="brand" href="index.html">SRS</a> 27 + <a id="srs_index" class="brand" href="#">SRS</a>
28 <div class="nav-collapse collapse"> 28 <div class="nav-collapse collapse">
29 <ul class="nav"> 29 <ul class="nav">
30 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li> 30 <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>