Skip to content

Commit 751223f

Browse files
committed
load google jsapi with protocol relative url; fixes #4536
Change-Id: I50de8d8cdd8f66a7d9fb7b3f8e7305b40fefd215 Reviewed-on: https://gerrit.instructure.com/3655 Tested-by: Hudson <hudson@instructure.com> Reviewed-by: Bracken Mosbacker <bracken@instructure.com>
1 parent f624d59 commit 751223f

5 files changed

Lines changed: 6 additions & 6 deletions

File tree

app/views/accounts/old_statistics.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ var pageViewData = <%= raw @account.page_view_data.to_json %>;
4747
<% end %>
4848
<% js_block do %>
4949
<!--Load the GOOGLE AJAX API-->
50-
<script type="text/javascript" src="<%= request.protocol %>www.google.com/jsapi"></script>
50+
<script type="text/javascript" src="//www.google.com/jsapi"></script>
5151

5252
<script type="text/javascript">
5353
google.load('visualization', '1', {'packages':['annotatedtimeline']});

app/views/accounts/statistics.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,4 +142,4 @@
142142
</div>
143143

144144
<!--Load the GOOGLE AJAX API-->
145-
<script type="text/javascript" src="<%= request.protocol %>www.google.com/jsapi"></script>
145+
<script type="text/javascript" src="//www.google.com/jsapi"></script>

app/views/accounts/statistics_page_views.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535

3636
<% js_block do %>
3737
<!--Load the GOOGLE AJAX API-->
38-
<script type="text/javascript" src="<%= request.protocol %>www.google.com/jsapi"></script>
38+
<script type="text/javascript" src="//www.google.com/jsapi"></script>
3939

4040
<script type="text/javascript">
4141
$(document).ready(function() {

app/views/courses/statistics.html.erb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@
163163

164164
<% js_block do %>
165165
<!--Load the GOOGLE AJAX API-->
166-
<script type="text/javascript" src="http://www.google.com/jsapi"></script>
166+
<script type="text/javascript" src="//www.google.com/jsapi"></script>
167167

168168
<script type="text/javascript">
169169
var pageViewData = <%= raw @context.page_view_data(:dates => [1.month.ago, 1.second.ago]).to_json %>;
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<div style="max-height: 400px; min-height: 100px; overflow: auto; width: 400px; display: none;" id="cse_holder">
22
<div id="cse" style="width: 380px;">Loading</div>
3-
<script src="http://www.google.com/jsapi" type="text/javascript"></script>
3+
<script src="//www.google.com/jsapi" type="text/javascript"></script>
44
<script type="text/javascript">
55
google.load('search', '1', {language : 'en'});
66
google.setOnLoadCallback(function() {
@@ -10,5 +10,5 @@
1010
customSearchControl.execute($("title").text());
1111
}, true);
1212
</script>
13-
<link rel="stylesheet" href="http://www.google.com/cse/style/look/greensky.css" type="text/css" />
13+
<link rel="stylesheet" href="//www.google.com/cse/style/look/greensky.css" type="text/css" />
1414
</div>

0 commit comments

Comments
 (0)