pingu_98/MrDraw
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

code cleanup

Browse source
This commit is contained in:
Teja 2015-07-09 17:02:58 +02:00
parent c1567b6742
commit f842809db8
1 changed files with 1 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
src/octoprint/static/js/app/viewmodels/terminal.js
View file

@ -1,51 +1,3 @@
//<<<<<<< HEAD
//function TerminalViewModel(loginStateViewModel, settingsViewModel) {
//
//
//
// self.fromHistoryData = function(data) {
// self._processStateData(data.state);
// self._processHistoryLogData(data.logs);
// };
//
// self._processCurrentLogData = function(data) {
// if (!self.log)
// self.log = [];
// self.log = self.log.concat(data);
// self.log = self.log.slice(-300);
// self.updateOutput();
// };
//
// self._processHistoryLogData = function(data) {
// self.log = data;
// self.updateOutput();
// };
//
//
// self.updateOutput = function() {
// if (!self.log)
// return;
//
// var output = "";
// for (var i = 0; i < self.log.length; i++) {
// if (self.filterRegex !== undefined && self.log[i].match(self.filterRegex)) continue;
// output += self.log[i] + "\n";
// }
//
// var container = $("#terminal-output");
// container.text(output);
//
// if (self.autoscrollEnabled()) {
// container.scrollTop(container[0].scrollHeight - container.height())
// }
// };
//
//=======
$(function() {
function TerminalViewModel(parameters) {
var self = this;
@ -182,7 +134,7 @@ $(function() {
self.scrollToEnd();
}
};
self.toggleAutoscroll = function() {
self.autoscrollEnabled(!self.autoscrollEnabled());
};
@ -232,7 +184,6 @@ $(function() {
};
self.fakeAck = function() {
//>>>>>>> upstream/maintenance
$.ajax({
url: API_BASEURL + "connection",
type: "POST",