* Treat https as web address in Open webpage dialog

* do not reset JS and PY on *.ggt load git-svn-id: http://www.geogebra.org/svn/trunk/geogebra@15071 23ce0884-8a58-47d3-bc5c-ddf1cd5b9f9e
Serabe · Jan 18, 2012 · 058f4cc · 058f4cc
1 parent dff7918
commit 058f4cc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/desktop/geogebra/gui/dialog/InputDialogOpenURL.java b/desktop/geogebra/gui/dialog/InputDialogOpenURL.java
@@ -18,7 +18,7 @@ public InputDialogOpenURL(Application app) {
 		// check if there's a string starting http:// already on the clipboard
 		// (quite likely!!)
 		String clipboardString = app.getStringFromClipboard();
-		if (clipboardString != null && (clipboardString.startsWith("http://") || clipboardString.startsWith("www")))
+		if (clipboardString != null && (clipboardString.startsWith("http://") || clipboardString.startsWith("https://") || clipboardString.startsWith("www")))
 			initString = clipboardString;
 
 		createGUI(app.getMenu("OpenWebpage"), app.getMenu("EnterAppletAddress"), false, DEFAULT_COLUMNS, 1, false, false, true, false, false, false, true);

diff --git a/desktop/geogebra/io/MyXMLio.java b/desktop/geogebra/io/MyXMLio.java
@@ -242,9 +242,9 @@ private final void readZip(ZipInputStream zip, boolean isGGTfile)
 		if (!isGGTfile && xmlFileBuffer != null) {
 			processXMLBuffer(xmlFileBuffer, !macroXMLfound, isGGTfile);
 		}
-		if(!javaScriptFound)
+		if(!javaScriptFound && !isGGTfile)
 			kernel.resetLibraryJavaScript();
-		if(!pythonFound)
+		if(!pythonFound && !isGGTfile)
 			kernel.resetLibraryPythonScript();
 		if (!(macroXMLfound || xmlFound))
 			throw new Exception("No XML data found in file.");