From 26d81ff8519de0576016eafc7d1de98cfc868a4c Mon Sep 17 00:00:00 2001
From: Amanda Ghassaei <amandaghassaei@gmail.com>
Date: Fri, 11 Sep 2015 17:08:01 -0400
Subject: [PATCH] small changes
---
js/SerialMonitor/SerialMonitorController.js | 6 +++++-
js/SerialMonitor/SerialMonitorView.js | 5 +++++
js/SerialMonitor/main.js | 1 +
3 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/js/SerialMonitor/SerialMonitorController.js b/js/SerialMonitor/SerialMonitorController.js
index e11c694d..91673efd 100644
--- a/js/SerialMonitor/SerialMonitorController.js
+++ b/js/SerialMonitor/SerialMonitorController.js
@@ -33,8 +33,12 @@ define(['jquery', 'underscore', 'backbone'], function($, _, Backbone){
onClose: function(){
var self = this;
setTimeout(function(){
- if (self.popup.closed) self.popup = null;
+ if (self.popup.closed) self.dumpPopup();
}, 100);//todo this is stupid, find an event that fires with window.closed == true
+ },
+
+ dumpPopup: function(){
+ this.popup = null;
}
});
diff --git a/js/SerialMonitor/SerialMonitorView.js b/js/SerialMonitor/SerialMonitorView.js
index 929e013a..40f3ddab 100644
--- a/js/SerialMonitor/SerialMonitorView.js
+++ b/js/SerialMonitor/SerialMonitorView.js
@@ -23,6 +23,7 @@ define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'text!SerialMoni
_.bindAll(this, "_onKeyUp");
$(document).bind('keyup', {}, this._onKeyUp);
+
this.listenTo(serialComm, "change:lastMessageSent", this._updateOutgoingMessage);
this.listenTo(serialComm, "change:baudRate change:portName", this.render);
this.listenTo(serialComm, "change:connected", function(){
@@ -38,6 +39,9 @@ define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'text!SerialMoni
if (e.keyCode == 38) $output.val(this.model.getPrevHistElem());
else if (e.keyCode == 40) $output.val(this.model.getNewerHistElem());
else if (e.keyCode == 13) this._sendMessage(e);
+
+
+ } else {
}
},
@@ -101,6 +105,7 @@ define(['jquery', 'underscore', 'commParentMenu', 'serialComm', 'text!SerialMoni
},
_close: function(){
+ this.userInitedReload = false;
window.close();
},
diff --git a/js/SerialMonitor/main.js b/js/SerialMonitor/main.js
index be1ca47e..d1bd5e11 100644
--- a/js/SerialMonitor/main.js
+++ b/js/SerialMonitor/main.js
@@ -39,6 +39,7 @@ require.config({
require(['serialMonitorView', 'serialMonitor', 'positionControlPanelView', 'serialComm'],
function(SerialMonitorView, serialMonitor, PositionControlPanelView, serialComm){
+
new SerialMonitorView({model: serialMonitor});
new PositionControlPanelView({model:serialComm});
});
\ No newline at end of file
--
GitLab