Commit aafa25ae authored by Amanda Ghassaei's avatar Amanda Ghassaei
Browse files

eod

parent 576f52d1
...@@ -89,12 +89,20 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s ...@@ -89,12 +89,20 @@ define(['jquery', 'underscore', 'menuParent', 'serialComm', 'commPlist', 'text!s
if (highlighterHeight != desiredHeight) $editor.scrollTop($editor.scrollTop()+highlighterHeight-desiredHeight); if (highlighterHeight != desiredHeight) $editor.scrollTop($editor.scrollTop()+highlighterHeight-desiredHeight);
}, },
_setEditorHeight: function(){
var $editor = $('#gcodeEditor');
var height = this.$el.height()-$editor.position().top;
height = Math.max(height, 250);
$editor.css({height:height +"px"});
},
_makeTemplateJSON: function(){ _makeTemplateJSON: function(){
return _.extend(serialComm.toJSON(), commPlist, cam.toJSON(), camPlist, {nextLine:this.nextLine}); return _.extend(serialComm.toJSON(), commPlist, cam.toJSON(), camPlist, {nextLine:this.nextLine});
}, },
_render: function(){ _render: function(){
if (serialComm.get("lastMessageReceived") === null) $("#incomingSerialMessage").hide(); if (serialComm.get("lastMessageReceived") === null) $("#incomingSerialMessage").hide();
this._setEditorHeight();
this._drawGcodeHighlighter(this.nextLine); this._drawGcodeHighlighter(this.nextLine);
}, },
......
Supports Markdown
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