From 818c542fe51a785ef7ca3d10d6dbcf660b1754ad Mon Sep 17 00:00:00 2001
From: amandaghassaei <amandaghassaei@gmail.com>
Date: Tue, 6 Jun 2017 14:27:46 -0400
Subject: [PATCH] eod
---
assets/Bases/frogBase.svg | 4 ++--
js/globals.js | 2 +-
js/importer.js | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/assets/Bases/frogBase.svg b/assets/Bases/frogBase.svg
index adeba01..0d7c2d0 100644
--- a/assets/Bases/frogBase.svg
+++ b/assets/Bases/frogBase.svg
@@ -28,14 +28,14 @@
<line fill="none" stroke="#FF0000" stroke-miterlimit="10" x1="1742.4" y1="2001.6" x2="1440" y2="1296"/>
<line fill="none" stroke="#FF0000" stroke-miterlimit="10" x1="2145.6" y1="1598.4" x2="1440" y2="1296"/>
<line fill="none" stroke="#FF0000" stroke-miterlimit="10" x1="2145.6" y1="993.6" x2="1440" y2="1296"/>
-<line fill="none" stroke="#0000FF" stroke-miterlimit="10" enable-background="new " x1="432" y1="288" x2="2448" y2="2304"/>
+<line fill="none" stroke="#0000FF" stroke-miterlimit="10" x1="432" y1="288" x2="2448" y2="2304"/>
<line opacity="0.5" fill="none" stroke="#0000FF" stroke-miterlimit="10" enable-background="new " x1="864" y1="1296" x2="2016" y2="1296"/>
<line opacity="0.5" fill="none" stroke="#0000FF" stroke-miterlimit="10" enable-background="new " x1="1440" y1="720" x2="1440" y2="1872"/>
<line opacity="0.5" fill="none" stroke="#0000FF" stroke-miterlimit="10" enable-background="new " x1="864" y1="1296" x2="432" y2="1296"/>
<line opacity="0.5" fill="none" stroke="#0000FF" stroke-miterlimit="10" enable-background="new " x1="2016" y1="1296" x2="2448" y2="1296"/>
<line opacity="0.5" fill="none" stroke="#0000FF" stroke-miterlimit="10" enable-background="new " x1="1440" y1="720" x2="1440" y2="288"/>
<line opacity="0.5" fill="none" stroke="#0000FF" stroke-miterlimit="10" enable-background="new " x1="1440" y1="1872" x2="1440" y2="2304"/>
-<line fill="none" stroke="#0000FF" stroke-miterlimit="10" enable-background="new " x1="432" y1="2304" x2="2448" y2="288"/>
+<line fill="none" stroke="#0000FF" stroke-miterlimit="10" x1="432" y1="2304" x2="2448" y2="288"/>
<line fill="none" stroke="#0000FF" stroke-miterlimit="10" x1="1137.6" y1="590.4" x2="1137.6" y2="288"/>
<line fill="none" stroke="#0000FF" stroke-miterlimit="10" x1="1742.4" y1="590.4" x2="1742.4" y2="288"/>
<line fill="none" stroke="#0000FF" stroke-miterlimit="10" x1="2145.6" y1="993.6" x2="2448" y2="993.6"/>
diff --git a/js/globals.js b/js/globals.js
index d7779cc..aec02f2 100755
--- a/js/globals.js
+++ b/js/globals.js
@@ -123,7 +123,7 @@ function initGlobals(){
return (isMobile.Android() || isMobile.BlackBerry() || isMobile.iOS() || isMobile.Opera() || isMobile.Windows());
}
};
- if(isMobile.any()) _globals.dynamicSimVisible = false;
+ // if(isMobile.any()) _globals.dynamicSimVisible = false;//todo throw error
_globals.threeView = initThreeView(_globals);
_globals.controls = initControls(_globals);
diff --git a/js/importer.js b/js/importer.js
index 28a750a..dc8e4d9 100755
--- a/js/importer.js
+++ b/js/importer.js
@@ -5,6 +5,8 @@
function initImporter(globals){
+ var reader = new FileReader();
+
function importDemoFile(url){
var extension = url.split(".");
var name = extension[extension.length-2].split("/");
@@ -35,7 +37,7 @@ function initImporter(globals){
var extension = file.name.split(".");
var name = extension[0];
extension = extension[extension.length - 1];
- var reader = new FileReader();
+
$(e.target).val("");
if (extension == "txt") {
--
GitLab