Commit 3e65f7fc authored by Amanda Ghassaei's avatar Amanda Ghassaei

small changes

parent 077c6716
...@@ -63,7 +63,6 @@ ...@@ -63,7 +63,6 @@
</li> </li>
</ul> </ul>
</li> </li>
<li><a id="saveUserSettings" data-toggle="modal" data-target="#saveUserModel" href="#">Save User Settings...</a></li>
<li class="divider"></li> <li class="divider"></li>
<li><a id="exportSTL" href="#">Export STL</a></li> <li><a id="exportSTL" href="#">Export STL</a></li>
</ul> </ul>
...@@ -107,24 +106,6 @@ ...@@ -107,24 +106,6 @@
</div> </div>
</div> </div>
<div class="modal fade" id="saveUserModel" tabindex="-1" role="dialog" aria-labelledby="basicModal" aria-hidden="true">
<div class="modal-dialog modal-sm">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
<p class="modal-title" >Save User Settings</p>
</div>
<div class="modal-body">
<input id="saveUserFileName" type="text" value="User" placeholder="Enter file name" class="form-control filename">
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Cancel</button>
<button type="button" class="saveUser btn btn-primary">Save</button>
</div>
</div>
</div>
</div>
<div class="modal fade" id="genericModal" tabindex="-1" role="dialog" aria-labelledby="basicModal" aria-hidden="true"></div> <div class="modal fade" id="genericModal" tabindex="-1" role="dialog" aria-labelledby="basicModal" aria-hidden="true"></div>
<div id="menuWrapper"><div id="menuHeader"></div><div id="menuContent"></div></div> <div id="menuWrapper"><div id="menuHeader"></div><div id="menuContent"></div></div>
......
...@@ -90,6 +90,7 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s ...@@ -90,6 +90,7 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s
_setEditorHeight: function(){ _setEditorHeight: function(){
var $editor = $('#gcodeEditor'); var $editor = $('#gcodeEditor');
if($editor.position()=== undefined) return;//not rendered (bc user has not generated gcode yet)
var height = this.$el.height()-$editor.position().top; var height = this.$el.height()-$editor.position().top;
height = Math.max(height, 250); height = Math.max(height, 250);
$editor.css({height:height +"px"}); $editor.css({height:height +"px"});
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment