Skip to content

Commit 6b68612

Browse files
BruceSherwoodBruceSherwood
committed
Address some http to https issues
1 parent 6b5ceda commit 6b68612

File tree

11 files changed

+29
-22
lines changed

11 files changed

+29
-22
lines changed

‎examples/DancingPendulums.js‎

Lines changed: 18 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,21 @@
1-
GlowScript 1.0
2-
/* Simulation of dancing pendulums.
1+
GlowScript 2.7 JavaScript
32

4-
Run the program and follow the link to the video for more explanation. */
3+
// Simulation of dancing pendulums.
4+
5+
// Run the program and follow the link to the video for more explanation. */
56

67
// David Scherer, August 2011
78

9+
function display_instructions() {
10+
var s = "In GlowScript programs:\n"
11+
s += " Rotate the camera by dragging with the right mouse button,\n or hold down the Ctrl key and drag.\n"
12+
s += " To zoom, drag with the left+right mouse buttons,\n or hold down the Alt/Option key and drag,\n or use the mouse wheel.\n"
13+
s += "Touch screen: pinch/extend to zoom, swipe or two-finger rotate."
14+
scene.title = s
15+
}
16+
17+
display_instructions()
18+
819
var pendulums = []
920

1021
var hinge = cylinder()
@@ -28,19 +39,15 @@ for(var i=0; i<15; i++) {
2839
pendulums.push(p)
2940
}
3041

31-
var link = $("<a/>").prop("href", "http://sciencedemonstrations.fas.harvard.edu/icb/icb.do?keyword=k16940&pageid=icb.page80863&pageContentId=icb.pagecontent341734&state=maximize&view=view.do&viewParam_name=indepth.html#a_icb_pagecontent341734")
32-
link.text("Based on this video")
33-
link.appendTo( $("<div/>").appendTo( canvas.container ) )
34-
35-
var start = performance.now()
42+
var start = new Date().getTime()
3643
while (true) {
37-
var t = (performance.now() - start)*.001
38-
scene.caption.text("t=" + t.toFixed(1))
44+
var t = (new Date().getTime() - start)*.001
45+
scene.caption = "t=" + t.toFixed(1)
3946
for(var i=0; i<pendulums.length; i++) {
4047
var p = pendulums[i]
4148
var theta = p.theta0 * cos( 2*pi*t/p.period )
4249
p.wire.axis = vec(sin(theta),-cos(theta),0)
4350
p.pos = p.wire.pos + p.wire.axis*p.wire.size.x
4451
}
45-
scene.waitfor("redraw",wait)
52+
scene.waitfor("redraw")
4653
}

‎ide/ide.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ $(function () {
10651065
// Look for mention of MathJax in program; don't import it if it's not used
10661066
var mathjax = ''
10671067
if (header.source.indexOf('MathJax') >= 0)
1068-
mathjax = '<script type="text/javascript" src="http://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML"></script>\n'
1068+
mathjax = '<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/mathjax/2.7.0/MathJax.js?config=TeX-MML-AM_CHTML"></script>\n'
10691069

10701070
var embedScript = window.glowscript_compile(header.source,
10711071
{lang: header.lang, version: header.version.substr(0,3), run: false})

‎ide/index.html‎

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

66
<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
77
<link type="text/css" href="css/redmond/IDE/jquery-ui.custom.css" rel="stylesheet" />
8-
<link href='http://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'>
8+
<link href='https://fonts.googleapis.com/css?family=Inconsolata' rel='stylesheet' type='text/css'>
99
<link type="text/css" href="css/ide.css" rel="stylesheet" />
1010

1111
<!-- Google Analytics -->

‎lib/ace/LICENSE‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ EXHIBIT A -Mozilla Public License.
439439
``The contents of this file are subject to the Mozilla Public License
440440
Version 1.1 (the "License"); you may not use this file except in
441441
compliance with the License. You may obtain a copy of the License at
442-
http://www.mozilla.org/MPL/
442+
https://www.mozilla.org/MPL/
443443

444444
Software distributed under the License is distributed on an "AS IS"
445445
basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the

‎lib/ace/ace.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1441,7 +1441,7 @@ var prepareString = "a"[0] != "a",
14411441
define('ace/lib/dom', ['ace_require', 'exports', 'module' ], function(ace_require, exports, module) {
14421442

14431443

1444-
var XHTML_NS = "http://www.w3.org/1999/xhtml";
1444+
var XHTML_NS = "https://www.w3.org/1999/xhtml";
14451445

14461446
exports.createElement = function(tag, ns) {
14471447
return document.createElementNS ?

‎lib/ace/mode-coffee.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* The contents of this file are subject to the Mozilla Public License Version
55
* 1.1 (the "License"); you may not use this file except in compliance with
66
* the License. You may obtain a copy of the License at
7-
* http://www.mozilla.org/MPL/
7+
* https://www.mozilla.org/MPL/
88
*
99
* Software distributed under the License is distributed on an "AS IS" basis,
1010
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

‎lib/ace/mode-javascript.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* The contents of this file are subject to the Mozilla Public License Version
55
* 1.1 (the "License"); you may not use this file except in compliance with
66
* the License. You may obtain a copy of the License at
7-
* http://www.mozilla.org/MPL/
7+
* https://www.mozilla.org/MPL/
88
*
99
* Software distributed under the License is distributed on an "AS IS" basis,
1010
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

‎lib/ace/mode-python.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* The contents of this file are subject to the Mozilla Public License Version
55
* 1.1 (the "License"); you may not use this file except in compliance with
66
* the License. You may obtain a copy of the License at
7-
* http://www.mozilla.org/MPL/
7+
* https://www.mozilla.org/MPL/
88
*
99
* Software distributed under the License is distributed on an "AS IS" basis,
1010
* WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License

‎lib/require.min.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎lib/webgl-utils.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,15 +81,15 @@ WebGLUtils = function () {
8181
*/
8282
var GET_A_WEBGL_BROWSER = '' +
8383
'This page requires a browser that supports WebGL.<br/>' +
84-
'<a href="http://get.webgl.org" target="_blank">Click here to upgrade your browser.</a>';
84+
'<a href="https://get.webgl.org" target="_blank">Click here to upgrade your browser.</a>';
8585

8686
/**
8787
* Mesasge for need better hardware
8888
* @type {string}
8989
*/
9090
var OTHER_PROBLEM = '' +
9191
"It doesn't appear your computer can support WebGL.<br/>" +
92-
'<a href="http://get.webgl.org/troubleshooting/" target="_blank">Click here for more information.</a>';
92+
'<a href="https://get.webgl.org/troubleshooting/" target="_blank">Click here for more information.</a>';
9393

9494
/**
9595
* Creates a webgl context. If creation fails it will

0 commit comments

Comments
 (0)