Address browser change in use of prompt()

Author: BruceSherwood

GlowScriptOfffline3.2.zip

@@ -27,7 +27,7 @@
 shader_file = "\n".join(shader_file)
 open("lib/glow/shaders.gen.js", "wb").write(shader_file)
 
-version = "3.1"
+version = "3.2"
 # TODO: Extract this information from run.js
 
 glowscript_libraries = {

GlowScriptOffline/glowscript_libraries/RScompiler.3.1.min.js renamed to GlowScriptOffline/glowscript_libraries/RScompiler.3.2.min.js

@@ -50,23 +50,19 @@ for example, GlowScript version 2.2 uses the same verdir value as 2.1 for jquery
 In untrusted/run.js, update choice of jquery library.
 Add to css/redmond a folder with the new name if necessary (sometimes no change is needed)
 
+In ide/templates/index.html change "V e r s i o n   X.Y" appropriately, and at the end of
+the file update the package/symbols version.
+
+There is a jquery version reference in untrusted/run.html.
+
 Modify build_original.py and lib/glow/property.js to have version = "0.4" and
-   run it to create the final packages for 0.4.  
-Then change build_original.py and lib/glow/property.js to have version = "0.5dev" and save build_original.py, 
-so that the 0.4 package doesn't get overwritten by accident.
+   run it to create the final packages for 0.4.   
+since the IDE doesn't yet dynamically load symbols based on the version header.
 
 There is a Glowscript program in build-tools/Symbols.js which you need to copy into (presumably local) 
 glowscript and run to compile the symbols.  
 You have to copy and paste the results into the appropriate file (package/symbols.X.Y.min.js).
-You also have to make a change at the end of ide/templates/index.html to point to the new Symbols file, 
-since the IDE doesn't yet dynamically load symbols based on the version header.
-
-Also change "G l o w S c r i p t   X.Y" appropriately in ide/index.html.
-
-There is a jquery version reference in untrusted/run.html.
-
-There is a reference to version number in ide/api.py upgradeProgram().
-Not clear that this is ever used.
+You also have to make a change at the end of ide/templates/index.html to point to the new Symbols file.
 
 At some point hopefully the build process will be more automated 
 (using node to run this and other javascript parts locally).
@@ -95,10 +91,6 @@ If okay, go to https://console.cloud.google.com/appengine/versions?project=glows
        but this is no longer relevant; exported files now reference glowscript.org.
 *********************************************************************************************
 
-Note that at this point property.js should have version 0.5dev.
-
-If using the graphical Google App Engine launcher, click "Deploy" to upload the new version.
-
 After July 30, 2020, the graphical Google App Engine launcher will not work, and one must
 use the gcloud machinery in a terminal. See www.glowscript.org/docs/GlowScriptDocs/local.html
 for instructions on installing gcloud. To deploy the new version, in a terminal cd to the

GlowScriptOffline/glowscript_libraries/RSrun.3.1.min.js renamed to GlowScriptOffline/glowscript_libraries/RSrun.3.2.min.js

@@ -72,7 +72,7 @@ $(function () {
         }
     }
 
-    parseVersionHeader.defaultVersion = "3.1"
+    parseVersionHeader.defaultVersion = "3.2"
     parseVersionHeader.defaultHeader = "GlowScript " + parseVersionHeader.defaultVersion+' VPython'
     parseVersionHeader.errorMessage = "GlowScript " + parseVersionHeader.defaultVersion
     // Map each version that can be loaded to a packaged version (usually itself), or "unpackaged" if it is the current development version
@@ -97,6 +97,7 @@ $(function () {
         "2.9": "2.9",
         "3.0": "3.0",
         "3.1": "3.1",
+        "3.2": "3.2",
         "0.4dev" : "0.4",
         "0.5dev" : "0.5",
         "0.6dev" : "0.6",
@@ -115,7 +116,8 @@ $(function () {
         "2.9dev" : "2.9",
         "3.0dev" : "3.0",
         "3.1dev" : "3.1",
-        "3.2dev" : "unpackaged"
+        "3.1dev" : "3.2",
+        "3.3dev" : "unpackaged"
     }
 
     /******** Functions to talk to the API on the server ***********/

GlowScriptOffline/glowscript_libraries/compiler.3.1.min.js

@@ -40,7 +40,7 @@
 
     <div class="header">
     <div class="headerInner">
-        <h2>glowscript.org</h2>
+        <h2>VPython in the browser</h2>
     </div>
     </div>
 
@@ -52,9 +52,9 @@ <h2>glowscript.org</h2>
 
         <img src="../docs/VPythonDocs/images/cover.jpg" width="226" height="240" class="right">
 
-        <p>GlowScript is an easy-to-use, powerful environment for creating 3D animations and publishing them on the web.  
-        Here at glowscript.org, you can write and run GlowScript programs right in your browser, store them in the 
-        cloud for free, and easily share them with others.</p>
+        <p>VPython is an easy-to-use, powerful environment for creating 3D animations.
+        Here at glowscript.org, you can write and run VPython programs right in your browser, store them in the 
+        cloud for free, and easily share them with others. You can also use VPython with installed Python: see <a href=https:vpython.org>vpython.org</a>.</p>
 
         </div>
 
@@ -75,7 +75,7 @@ <h2>glowscript.org</h2>
 
     <div id="footerWrap"> 
     <div id="footerInner">
-    <h2>G l o w S c r i p t&nbsp;&nbsp; 3.0</h2>
+    <h2>V e r s i o n&nbsp;&nbsp; 3.2</h2>
         <a href="/#/user/GlowScriptDemos/folder/Examples/" target="_blank">Example programs</a> |
         <a href="https://groups.google.com/forum/?fromgroups#!forum/glowscript-users" target="_blank">Forum</a>
         </div>
@@ -328,7 +328,7 @@ <h2>G l o w S c r i p t&nbsp;&nbsp; 3.0</h2>
 <script type="text/javascript" language="javascript" src="lib/editor.js"></script>
 <script type="text/javascript" language="javascript" src="lib/ace/mode-javascript.js"></script>
 <script type="text/javascript" language="javascript" src="lib/ace/mode-python.js"></script>
-<script type="text/javascript" language="javascript" src="package/symbols.3.1.min.js"></script>
+<script type="text/javascript" language="javascript" src="package/symbols.3.2.min.js"></script>
 <script type="text/javascript" language="javascript" src="ide.js"></script>
 
 </body>

GlowScriptOffline/glowscript_libraries/compiler.3.2.min.js

@@ -1196,12 +1196,29 @@ where compile() was called, in untrusted/run.js.
 		program = program.replace(new RegExp(string_insert, 'g'), '')
 
 		if (loadfonts) { // if text object is in user program
-        	var s = "scene = canvas();\n"
-            var sc = program.indexOf(s) + s.length
+        	let s = "scene = canvas();\n"
+            let sc = program.indexOf(s) + s.length
         	s = "    fontloading();\n    await waitforfonts();\n"  // wait for font files
             program = program.slice(0,sc)+s+program.slice(sc,program.length)
 		}
 
+		// October 2021: Safari gives a CORS error when attempting to call input() in primitives.js,
+		// and it looks like Chrome will also start doing this. For now (version 3.1), we leave the
+		// copy of input() in primitives.js, to cater to existing exported programs that call input(),
+		// though those exported programs will eventually break, lacking the copy we now insert into
+		// exported code.
+		if (program.indexOf('input') >= 0) { // if user code invokes input(), insert the function:
+        	let s = "scene = canvas();\n"
+            let sc = program.indexOf(s) + s.length
+			s = "\n    function input(arg) {\n"
+			s += "    	arg = arg || {}\n"
+			s += "    	if (arg.prompt !== undefined && arg.prompt != '') return prompt(arg.prompt)\n"
+			s += "    	else if (typeof arg === 'string') return prompt(arg)\n"
+			s += "    	else return prompt()\n"
+			s += "    }\n"
+            program = program.slice(0,sc)+s+program.slice(sc,program.length)
+		}
+
         // var p = program.split('\n')
 		// for (var i=0; i<p.length; i++) console.log(i, p[i])
 		// console.log('fcts', fcts)

GlowScriptOffline/glowscript_libraries/glow.3.1.min.js renamed to GlowScriptOffline/glowscript_libraries/glow.3.2.min.js

@@ -2857,13 +2857,6 @@
 	    }
 		return cwtext
 	}
-
-	function input(arg) { // mimics Python input function
-		arg = arg || {}
-		if (arg.prompt !== undefined && arg.prompt != '') return prompt(arg.prompt)
-		else if (toType(arg) == 'string' ) return prompt(arg)
-		else return prompt()
-	}
 
 	var mathfunctions = ["e", "E", "abs", "sqrt", "sin", "cos", "tan", "asin", "acos", "atan", "atan2",
 		"exp", "log", "pow", "pi", "ceil", "floor", "round", "random","factorial", "combin", "radians", "degrees"]
@@ -3277,7 +3270,6 @@
         button: button,
         slider: slider,
 		menu: menu,
-		input: input,
     }
 
     Export(exports)

GlowScriptOffline/glowscript_libraries/symbols.3.2.min.js

@@ -1,7 +1,7 @@
 ;(function () {
     "use strict";
 
-    var glowscript = { version: "3.1" }
+    var glowscript = { version: "3.2" }
 
     // GlowScript uses lots of javascript properties (Object.defineProperty) with getters and setters
     // This is an attempt to create a more declarative syntax for declaring an object with lots of properties