Merge branch 'master' of ssh://git.indexdata.com:222/home/git/private/mkws

diff --git a/examples/htdocs/jasmine-pp2.html b/examples/htdocs/jasmine-pp2.html
index c2ed5f0..ced0a8c 100644 (file)
--- a/examples/htdocs/jasmine-pp2.html
+++ b/examples/htdocs/jasmine-pp2.html
@@ -13,7 +13,7 @@
        "show_record_url": false // URLs not configured for pp2
       };
     </script>
-    <script type="text/javascript" src="//code.jquery.com/jquery-1.4.4.min.js"></script>
+    <script type="text/javascript" src="//code.jquery.com/jquery-1.6.4.min.js"></script>
     <script type="text/javascript" src="tools/htdocs/pz2.js"></script>
     <script type="text/javascript" src="tools/htdocs/handlebars-v1.1.2.js"></script>
     <script type="text/javascript" src="tools/htdocs/jquery.json-2.4.js"></script>

diff --git a/examples/htdocs/popup.html b/examples/htdocs/popup.html
index 6ba491e..61b4362 100644 (file)
--- a/examples/htdocs/popup.html
+++ b/examples/htdocs/popup.html
@@ -18,7 +18,7 @@
     <script type="text/javascript" src="//code.jquery.com/jquery-1.10.0.min.js"></script>
     <script type="text/javascript" src="//jquery-json.googlecode.com/files/jquery.json-2.4.js"></script>
     <!-- legacy libs for testing
-    <script type="text/javascript" src="//code.jquery.com/jquery-1.4.4.min.js"></script>
+    <script type="text/javascript" src="//code.jquery.com/jquery-1.6.4.min.js"></script>
     <script src="//code.jquery.com/ui/1.8.0/jquery-ui.min.js"></script>
     -->
 

diff --git a/tools/htdocs/mkws.js b/tools/htdocs/mkws.js
index 6c014f8..b735cf6 100644 (file)
--- a/tools/htdocs/mkws.js
+++ b/tools/htdocs/mkws.js
@@ -271,7 +271,8 @@ function team($, teamName) {
                      renderSummary(hit),
                      '</div>');
            if (hit.recid == m_curDetRecId) {
-               html.push(renderDetails(m_curDetRecData));
+               if (m_curDetRecData)
+                   html.push(renderDetails(m_curDetRecData));
            }
        }
        results.html(html.join(''));