diff --git a/js/importSTL.js b/js/importSTL.js index e6b67c90375164bddab6843b4ed95548374ad885..df5cfc2956a7d91ced8b7a7d2c3a13a946dc2a96 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 8aefcaf59c4b400be2a74fc46b491aa59072e333..feee32e2ac298239f1a8836104db2b23042ca38b 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">