Fixed some merge bugs
parent
19dc238f06
commit
f7334ef65f
|
@ -298,11 +298,7 @@ function PrinterStateViewModel(loginStateViewModel) {
|
||||||
|
|
||||||
self.print = function() {
|
self.print = function() {
|
||||||
var printAction = function() {
|
var printAction = function() {
|
||||||
$.ajax({
|
self._jobCommand("start");
|
||||||
url: AJAX_BASEURL + "control/print",
|
|
||||||
type: "POST",
|
|
||||||
dataType: "json"
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (self.isPaused()) {
|
if (self.isPaused()) {
|
||||||
|
@ -316,19 +312,19 @@ function PrinterStateViewModel(loginStateViewModel) {
|
||||||
}
|
}
|
||||||
|
|
||||||
self.pause = function() {
|
self.pause = function() {
|
||||||
$("#job_pause").button("toggle");
|
self._jobCommand("pause");
|
||||||
$.ajax({
|
|
||||||
url: AJAX_BASEURL + "control/pause",
|
|
||||||
type: "POST",
|
|
||||||
dataType: "json"
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
self.cancel = function() {
|
self.cancel = function() {
|
||||||
|
self._jobCommand("cancel");
|
||||||
|
}
|
||||||
|
|
||||||
|
self._jobCommand = function(command) {
|
||||||
$.ajax({
|
$.ajax({
|
||||||
url: AJAX_BASEURL + "control/cancel",
|
url: AJAX_BASEURL + "control/job",
|
||||||
type: "POST",
|
type: "POST",
|
||||||
dataType: "json"
|
dataType: "json",
|
||||||
|
data: {command: command}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1733,7 +1729,7 @@ $(function() {
|
||||||
var settingsViewModel = new SettingsViewModel(loginStateViewModel, usersViewModel);
|
var settingsViewModel = new SettingsViewModel(loginStateViewModel, usersViewModel);
|
||||||
var appearanceViewModel = new AppearanceViewModel(settingsViewModel);
|
var appearanceViewModel = new AppearanceViewModel(settingsViewModel);
|
||||||
var temperatureViewModel = new TemperatureViewModel(loginStateViewModel, settingsViewModel);
|
var temperatureViewModel = new TemperatureViewModel(loginStateViewModel, settingsViewModel);
|
||||||
var controlViewModel = new ControlsViewModel(loginStateViewModel);
|
var controlViewModel = new ControlViewModel(loginStateViewModel);
|
||||||
var terminalViewModel = new TerminalViewModel(loginStateViewModel);
|
var terminalViewModel = new TerminalViewModel(loginStateViewModel);
|
||||||
var gcodeFilesViewModel = new GcodeFilesViewModel(loginStateViewModel);
|
var gcodeFilesViewModel = new GcodeFilesViewModel(loginStateViewModel);
|
||||||
var timelapseViewModel = new TimelapseViewModel(loginStateViewModel);
|
var timelapseViewModel = new TimelapseViewModel(loginStateViewModel);
|
||||||
|
|
|
@ -119,7 +119,7 @@
|
||||||
<div class="bar" id="job_progressBar" data-bind="style: { width: progress() + '%' }"></div>
|
<div class="bar" id="job_progressBar" data-bind="style: { width: progress() + '%' }"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="row-fluid print-control">
|
<div class="row-fluid print-control" style="display: none;" data-bind="visible: loginState.isUser">
|
||||||
<button class="btn btn-primary span4" data-bind="click: print, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser(), css: {'btn-danger': isPaused()}" id="job_print"><i class="icon-white" data-bind="css: {'icon-print': !isPaused(), 'icon-undo': isPaused()}"></i> <span data-bind="text: (isPaused() ? 'Restart' : 'Print')">Print</span></button>
|
<button class="btn btn-primary span4" data-bind="click: print, enable: isOperational() && isReady() && !isPrinting() && loginState.isUser(), css: {'btn-danger': isPaused()}" id="job_print"><i class="icon-white" data-bind="css: {'icon-print': !isPaused(), 'icon-undo': isPaused()}"></i> <span data-bind="text: (isPaused() ? 'Restart' : 'Print')">Print</span></button>
|
||||||
<button class="btn span4" id="job_pause" data-bind="click: pause, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser(), css: {active: isPaused()}"><i class="icon-pause"></i> <span>Pause</span></button>
|
<button class="btn span4" id="job_pause" data-bind="click: pause, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser(), css: {active: isPaused()}"><i class="icon-pause"></i> <span>Pause</span></button>
|
||||||
<button class="btn span4" id="job_cancel" data-bind="click: cancel, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser()"><i class="icon-stop"></i> Cancel</button>
|
<button class="btn span4" id="job_cancel" data-bind="click: cancel, enable: isOperational() && (isPrinting() || isPaused()) && loginState.isUser()"><i class="icon-stop"></i> Cancel</button>
|
||||||
|
|
Loading…
Reference in New Issue