From 3f234e1bc0d516e08b39126c83bc83f48fd52090 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Thu, 8 Jan 2015 20:01:09 -0500
Subject: [PATCH] small fix
---
js/importSTL.js | 4 ++++
main.html | 8 ++++++++
2 files changed, 12 insertions(+)
diff --git a/js/importSTL.js b/js/importSTL.js
index e6b67c90..df5cfc29 100644
--- a/js/importSTL.js
+++ b/js/importSTL.js
@@ -2,6 +2,8 @@
* Created by aghassaei on 1/8/15.
*/
+//todo - put stl loading in background thread, allow scaling when loaded
+
$(function(){
threeMain = threeMain || {};
@@ -24,10 +26,12 @@ $(function(){
});
$("#uploadSTL").change(function() {
+ console.log("here");
var input = $(this),
numFiles = input.get(0).files ? input.get(0).files.length : 1,
label = input.val().replace(/\\/g, '/').replace(/.*\//, '');
input.trigger('fileselect', [numFiles, label, input.get(0).files]);
+ input.val("");
});
$('.btn-file :file').on('fileselect', function(event, numFiles, label, files) {
diff --git a/main.html b/main.html
index 8aefcaf5..feee32e2 100644
--- a/main.html
+++ b/main.html
@@ -49,6 +49,7 @@
<div class="collapse navbar-collapse" id="navbar-collapse-01">
<ul class="nav navbar-nav navbar-left">
<li><a data-menu-id="importGeometry" class="menuHoverControls" href="#">Import</a></li>
+ <li><a data-menu-id="element" class="menuHoverControls" href="#">Element</a></li>
<li><a data-menu-id="about" class="menuHoverControls" href="#">About</a></li>
<!--<li><a data-menu-id="controls1Menu" class="menuHoverControls" href="#">Controls1</a></li>-->
<!--<li><a data-menu-id="controls2Menu" class="menuHoverControls" href="#">Controls2</a></li>-->
@@ -92,6 +93,13 @@
</div> <!-- /.col-xs-3 -->
</div>
</div>
+<div id="element" class="row navMenu">
+ <div class="row demo-row">
+ <div class="col-xs-3">
+ afsdf
+ </div>
+ </div>
+</div>
<div id="about" class="row navMenu">
<div class="row demo-row">
<div class="col-xs-3">
--
GitLab