[LNT] r305721 - Fixup prefixes in more cases

Mon Jun 19 10:58:09 PDT 2017

Author: cmatthews
Date: Mon Jun 19 12:58:09 2017
New Revision: 305721

URL: http://llvm.org/viewvc/llvm-project?rev=305721&view=rev
Log:
Fixup prefixes in more cases

Safari has become more picky about URLs. Strip double slashes from the
global base URL. As well, remove prefix, it is no longer used.

Modified:
    lnt/trunk/lnt/server/ui/static/lnt_graph.js
    lnt/trunk/lnt/server/ui/templates/layout.html
    lnt/trunk/lnt/server/ui/templates/v4_regression_detail.html

Modified: lnt/trunk/lnt/server/ui/static/lnt_graph.js
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/static/lnt_graph.js?rev=305721&r1=305720&r2=305721&view=diff
==============================================================================

--- lnt/trunk/lnt/server/ui/static/lnt_graph.js (original)
+++ lnt/trunk/lnt/server/ui/static/lnt_graph.js Mon Jun 19 12:58:09 2017
@@ -375,12 +375,12 @@ function add_data_to_graph(URL, index, m
 }
 
 
-function init_axis(prefix_url) {
+function init_axis() {
     "use strict";
     function onlyUnique(value, index, self) {
         return self.indexOf(value) === index;
     }
-    prefix = prefix_url;
+
     var metrics = $('.metric').map(function () {
         return $(this).text();
     }).get();

Modified: lnt/trunk/lnt/server/ui/templates/layout.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/layout.html?rev=305721&r1=305720&r2=305721&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/layout.html (original)
+++ lnt/trunk/lnt/server/ui/templates/layout.html Mon Jun 19 12:58:09 2017
@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8"/>
 
-    <script>var lnt_url_base="{{ url_for('index', _external=True) }}";</script>
+    <script>var lnt_url_base="{{ url_for('index', _external=True) }}".replace(/\/$/, "");</script>
     <link href="{{ url_for('.static', filename='bootstrap/css/bootstrap.min.css')
                 }}" rel="stylesheet" media="screen"/>
     <link href="{{ url_for('.static', filename='bootstrap/css/bootstrap-responsive.min.css')

Modified: lnt/trunk/lnt/server/ui/templates/v4_regression_detail.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_regression_detail.html?rev=305721&r1=305720&r2=305721&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_regression_detail.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_regression_detail.html Mon Jun 19 12:58:09 2017
@@ -302,7 +302,7 @@ $(document).ready( function () {
       
     register_checkboxes();
 
-    init_axis("{{base_url}}");
+    init_axis();
 
     /* Only check boxes if we don't have lots of regressions. */
     if ({{check_all}}) {


