From 3e65f7fc084b2b0785845ad8036702eb4b4fc9d7 Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 18 Sep 2015 22:11:13 -0400
Subject: [PATCH] small changes
---
index.html | 19 -------------------
js/menus/SendMenuView.js | 1 +
2 files changed, 1 insertion(+), 19 deletions(-)
diff --git a/index.html b/index.html
index cff601b8..477e8c5a 100644
--- a/index.html
+++ b/index.html
@@ -63,7 +63,6 @@
</li>
</ul>
</li>
- <li><a id="saveUserSettings" data-toggle="modal" data-target="#saveUserModel" href="#">Save User Settings...</a></li>
<li class="divider"></li>
<li><a id="exportSTL" href="#">Export STL</a></li>
</ul>
@@ -107,24 +106,6 @@
</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">×</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 id="menuWrapper"><div id="menuHeader"></div><div id="menuContent"></div></div>
diff --git a/js/menus/SendMenuView.js b/js/menus/SendMenuView.js
index 6a270efb..85a50f13 100644
--- a/js/menus/SendMenuView.js
+++ b/js/menus/SendMenuView.js
@@ -90,6 +90,7 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s
_setEditorHeight: function(){
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;
height = Math.max(height, 250);
$editor.css({height:height +"px"});
--
GitLab