additional_js fix

rajatthareja · Oct 21, 2017 · 9459129 · 9459129
1 parent b46a8ed
commit 9459129
Show file tree

Hide file tree

Showing 8 changed files with 599 additions and 599 deletions.
diff --git a/docs/index.html b/docs/index.html
diff --git a/template/html_report.erb b/template/html_report.erb
@@ -7,7 +7,7 @@
 <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
 <link href="https://cdn.datatables.net/1.10.16/css/jquery.dataTables.min.css" rel="stylesheet">
 <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.min.css" media="screen,projection"/>
-<link href="https://cdn.rawgit.com/rajatthareja/ReportBuilder/770f5c65792926ef8318e95238ed0ef44addbec8/css/report.builder.min.css" rel="stylesheet">
+<link href="https://cdn.rawgit.com/rajatthareja/ReportBuilder/b46a8edda4da2bdcd3470087512724ed0449b201/css/report.builder.min.css" rel="stylesheet">
 <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 <%if options[:additional_css]%>
       <%if options[:additional_css] =~ /^http(|s):\/\/.*\.css$/%>
@@ -342,9 +342,9 @@ $(document).ready(function () {
   <%end%><%end%>
 });
 </script>
-<script type="text/javascript" src="https://cdn.rawgit.com/rajatthareja/ReportBuilder/770f5c65792926ef8318e95238ed0ef44addbec8/js/report.builder.min.js"></script>
+<script type="text/javascript" src="https://cdn.rawgit.com/rajatthareja/ReportBuilder/b46a8edda4da2bdcd3470087512724ed0449b201/js/report.builder.min.js"></script>
 <%if options[:additional_js]%>
-    <%if options[:additional_js] =~ /^http(|s):\/\/.*\.css$/%>
+    <%if options[:additional_js] =~ /^http(|s):\/\/.*\.js$/%>
         <script src="<%=options[:additional_js]%>"></script>
     <%else%>
         <script type="text/javascript">

diff --git a/testing/fixtures/combined.html b/testing/fixtures/combined.html