From 5cec96793183c3dcc2643e5996bae45528911c3c Mon Sep 17 00:00:00 2001
From: winlin <winlin@vip.126.com>
Date: Thu, 26 Dec 2013 13:31:52 +0800
Subject: [PATCH] refine the index. refine the parse_query_string, add
 user_query object to result

---
 trunk/research/players/index.html         | 20 +++++++++++++++-----
 trunk/research/players/js/srs.page.js     |  1 +
 trunk/research/players/js/srs.utility.js  |  5 +++++
 trunk/research/players/jwplayer6.html     |  2 +-
 trunk/research/players/osmf.html          |  2 +-
 trunk/research/players/srs_bwt.html       |  2 +-
 trunk/research/players/srs_chat.html      |  2 +-
 trunk/research/players/srs_player.html    |  2 +-
 trunk/research/players/srs_publisher.html |  2 +-
 trunk/research/players/vlc.html           |  2 +-
 10 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/trunk/research/players/index.html b/trunk/research/players/index.html
index c13f06e73..ee2b2687c 100755
--- a/trunk/research/players/index.html
+++ b/trunk/research/players/index.html
@@ -8,6 +8,7 @@
     <script type="text/javascript" src="js/bootstrap.min.js"></script>
     <script type="text/javascript" src="js/swfobject.js"></script>
     <script type="text/javascript" src="js/srs.page.js"></script>
+    <script type="text/javascript" src="js/srs.utility.js"></script>
     <style>
         body{
             padding-top: 55px;
@@ -17,10 +18,19 @@
         $(function(){
             update_nav();
             
-            // direct to the default vhost for players.
-            var query = "" + window.location.search;
-            query = query.substr(1);
-            window.location.href = "srs_chat.html?" + "vhost=" + srs_get_player_vhost() + "&" + query;
+            var query = parse_query_string();
+            var url = "srs_chat.html?vhost=" + srs_get_player_vhost();
+            
+            for (var key in query.user_query) {
+                if (key == "vhost") {
+                    continue;
+                }
+                url += "&" + key + "=" + query[key];
+            }
+            
+            setTimeout(function(){
+                window.location.href = url;
+            }, 100);
         });
     </script>
 </head>
@@ -28,7 +38,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/js/srs.page.js b/trunk/research/players/js/srs.page.js
index 165b8d8b7..067ebca55 100755
--- a/trunk/research/players/js/srs.page.js
+++ b/trunk/research/players/js/srs.page.js
@@ -31,6 +31,7 @@ function srs_get_player_chat_vhost(src_vhost) { return (src_vhost != srs_get_pla
 * update the navigator, add same query string.
 */
 function update_nav() {
+    $("#srs_index").attr("href", "index.html" + window.location.search);
     $("#nav_srs_player").attr("href", "srs_player.html" + window.location.search);
     $("#nav_srs_publisher").attr("href", "srs_publisher.html" + window.location.search);
     $("#nav_srs_chat").attr("href", "srs_chat.html" + window.location.search);
diff --git a/trunk/research/players/js/srs.utility.js b/trunk/research/players/js/srs.utility.js
index 1f2bb1eeb..e3886cc77 100755
--- a/trunk/research/players/js/srs.utility.js
+++ b/trunk/research/players/js/srs.utility.js
@@ -17,6 +17,7 @@ function padding(number, length, prefix) {
 function parse_query_string(){
     var obj = {};
     
+    // add the uri object.
     // parse the host(hostname:http_port), pathname(dir/filename)
     obj.host = window.location.host;
     obj.hostname = window.location.hostname;
@@ -30,6 +31,9 @@ function parse_query_string(){
         obj.filename = obj.pathname.substr(obj.pathname.lastIndexOf("/"));
     }
     
+    // pure user query object.
+    obj.user_query = {};
+    
     // parse the query string.
     var query_string = String(window.location.search).replace(" ", "").split("?")[1];
     if(query_string == undefined){
@@ -40,6 +44,7 @@ function parse_query_string(){
     $(queries).each(function(){
         var query = this.split("=");
         obj[query[0]] = query[1];
+        obj.user_query[query[0]] = query[1];
     });
     
     return obj;
diff --git a/trunk/research/players/jwplayer6.html b/trunk/research/players/jwplayer6.html
index 91eebbf82..d95272ab7 100755
--- a/trunk/research/players/jwplayer6.html
+++ b/trunk/research/players/jwplayer6.html
@@ -82,7 +82,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/osmf.html b/trunk/research/players/osmf.html
index 9a4244e74..379e5ef0c 100755
--- a/trunk/research/players/osmf.html
+++ b/trunk/research/players/osmf.html
@@ -78,7 +78,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/srs_bwt.html b/trunk/research/players/srs_bwt.html
index 095c910b7..e12b64c58 100755
--- a/trunk/research/players/srs_bwt.html
+++ b/trunk/research/players/srs_bwt.html
@@ -28,7 +28,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/srs_chat.html b/trunk/research/players/srs_chat.html
index 804f7efa5..4a4276557 100755
--- a/trunk/research/players/srs_chat.html
+++ b/trunk/research/players/srs_chat.html
@@ -546,7 +546,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/srs_player.html b/trunk/research/players/srs_player.html
index 77afeb482..268fae69f 100755
--- a/trunk/research/players/srs_player.html
+++ b/trunk/research/players/srs_player.html
@@ -269,7 +269,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li class="active"><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/srs_publisher.html b/trunk/research/players/srs_publisher.html
index 3f90e8983..2e2f0323f 100755
--- a/trunk/research/players/srs_publisher.html
+++ b/trunk/research/players/srs_publisher.html
@@ -214,7 +214,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>
diff --git a/trunk/research/players/vlc.html b/trunk/research/players/vlc.html
index 2cd976676..18e7561dd 100755
--- a/trunk/research/players/vlc.html
+++ b/trunk/research/players/vlc.html
@@ -24,7 +24,7 @@
 <div class="navbar navbar-fixed-top">
     <div class="navbar-inner">
         <div class="container">
-        <a class="brand" href="index.html">SRS</a>
+            <a id="srs_index" class="brand" href="#">SRS</a>
             <div class="nav-collapse collapse">
                 <ul class="nav">
                     <li><a id="nav_srs_player" href="srs_player.html">SRS播放器</a></li>