q3k
/
OctoPrint
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'daprice-sorting_persistence' into devel 

Conflicts:
	octoprint/static/js/ui.js
master
Gina Häußge 2013-03-03 19:38:26 +01:00
parent 98a7c3d8b8 eecb19ecf6
commit dae1c0367a
1 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
octoprint/static/js/ui.js
View File

@ -686,6 +686,15 @@ function GcodeFilesViewModel() {
self.currentPage = ko.observable(0);
self.currentSorting = ko.observable("name");
self.currentFilters = ko.observableArray([]);
if( localStorage["currentSorting"] )
self.currentSorting( localStorage["currentSorting"] );
if( localStorage["filterPrinted"] == 1 ) {
var filters = self.currentFilters();
filters.push("printed");
self.currentFilters(_.uniq(filters));
}
self.paginatedFiles = ko.dependentObservable(function() {
if (self.files() == undefined) {
@ -806,6 +815,7 @@ function GcodeFilesViewModel() {
return;
self.currentSorting(sorting);
localStorage["currentSorting"] = self.currentSorting(); //store setting in local storage
self.changePage(0);
self._updateFiles();
}
@ -825,6 +835,7 @@ function GcodeFilesViewModel() {
var filters = self.currentFilters();
filters.push(filter);
self.currentFilters(_.uniq(filters));
localStorage["filterPrinted"] = 1;
self._updateFiles();
}
@ -833,6 +844,7 @@ function GcodeFilesViewModel() {
return;
self.currentFilters(_.without(self.currentFilters(), filter));
localStorage["filterPrinted"] = 0;
self._updateFiles();
}