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

Spinner on add folder & scroll to new folder

Browse source
This commit is contained in:
Gina Häußge 2016-07-04 16:04:25 +02:00
parent aacb07091e
commit 2c1b36b922
2 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/octoprint/static/js/app/viewmodels/files.js
View file

@ -59,12 +59,14 @@ $(function() {
self.localTarget = undefined;
self.sdTarget = undefined;
self._uploadInProgress = false;
self.ignoreUpdatedFilesEvent = false;
self.addingFolder = ko.observable(false);
self.addFolderDialog = undefined;
self.addFolderName = ko.observable(undefined);
self.enableAddFolder = ko.computed(function() {
return self.loginState.isUser() && self.addFolderName() && self.addFolderName().trim() != "";
self.enableAddFolder = ko.pureComputed(function() {
return self.loginState.isUser() && self.addFolderName() && self.addFolderName().trim() != "" && !self.addingFolder();
});
self.allItems = ko.observable(undefined);
@ -301,9 +303,25 @@ $(function() {
// "local" only for now since we only support local and sdcard,
// and sdcard doesn't support creating folders...
OctoPrint.files.createFolder("local", name, self.currentPath())
.done(function() {
self.addFolderDialog.modal("hide");
var location = "local";
self.ignoreUpdatedFilesEvent = true;
self.addingFolder(true);
OctoPrint.files.createFolder(location, name, self.currentPath())
.done(function(data) {
self.requestData(data.folder.name, data.folder.origin)
.done(function() {
self.addFolderDialog.modal("hide");
})
.always(function() {
self.addingFolder(false);
});
})
.fail(function() {
self.addingFolder(false);
})
.always(function() {
self.ignoreUpdatedFilesEvent = false;
});
};
@ -685,7 +703,7 @@ $(function() {
};
self.onEventUpdatedFiles = function(payload) {
if (self._uploadInProgress) {
if (self.ignoreUpdatedFilesEvent) {
return;
}
@ -772,7 +790,7 @@ $(function() {
};
self._handleUploadStart = function(e, data) {
self._uploadInProgress = true;
self.ignoreUpdatedFilesEvent = true;
return true;
};
@ -818,11 +836,7 @@ $(function() {
};
self._handleUploadAlways = function(e, data) {
self._uploadInProgress = false;
};
self._handleUploadAlways = function(e, data) {
self._uploadInProgress = false;
self.ignoreUpdatedFilesEvent = false;
};
self._handleUploadProgress = function(e, data) {

2
src/octoprint/templates/dialogs/files.jinja2
View file

@ -16,6 +16,6 @@
</div>
<div class="modal-footer">
<a href="#" class="btn" data-dismiss="modal" aria-hidden="true">{{ _('Cancel') }}</a>
<a href="#" class="btn btn-primary" data-bind="click: function() { if ($root.enableAddFolder()) { $root.addFolder() } }, enabled: $root.enableAddFolder(), css: {disabled: !$root.enableAddFolder()}">{{ _('Create') }}</a>
<a href="#" class="btn btn-primary" data-bind="click: function() { if ($root.enableAddFolder()) { $root.addFolder() } }, enabled: $root.enableAddFolder(), css: {disabled: !$root.enableAddFolder()}"><i class="icon-spinner icon-spin" data-bind="visible: addingFolder"></i> {{ _('Create') }}</a>
</div>
</div>