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

Merge remote-tracking branch 'daprice/master' into devel

master
Gina Häußge 2013-03-16 00:28:37 +01:00
parent 4b8260b933 088253e564
commit e08783c8bf
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1345,16 +1345,16 @@ function ItemListHelper(listType, supportedSorting, supportedFilters, defaultSor
var currentSorting = self.currentSorting(); var currentSorting = self.currentSorting();
if (currentSorting !== undefined) if (currentSorting !== undefined)
localStorage[self.listType]["currentSorting"] = currentSorting; localStorage[self.listType + "." + "currentSorting"] = currentSorting;
else else
localStorage[self.listType]["currentSorting"] = undefined; localStorage[self.listType + "." + "currentSorting"] = undefined;
} }
self._loadCurrentSortingFromLocalStorage = function() { self._loadCurrentSortingFromLocalStorage = function() {
self._initializeLocalStorage(); self._initializeLocalStorage();
if (_.contains(_.keys(supportedSorting), localStorage[self.listType]["currentSorting"])) if (_.contains(_.keys(supportedSorting), localStorage[self.listType + "." + "currentSorting"]))
self.currentSorting(localStorage[self.listType]["currentSorting"]); self.currentSorting(localStorage[self.listType + "." + "currentSorting"]);
else else
self.currentSorting(defaultSorting); self.currentSorting(defaultSorting);
} }
@ -1363,23 +1363,21 @@ function ItemListHelper(listType, supportedSorting, supportedFilters, defaultSor
self._initializeLocalStorage(); self._initializeLocalStorage();
var filters = _.intersection(_.keys(self.supportedFilters), self.currentFilters()); var filters = _.intersection(_.keys(self.supportedFilters), self.currentFilters());
localStorage[self.listType]["currentFilters"] = filters; localStorage[self.listType + "." + "currentFilters"] = JSON.stringify(filters);
} }
self._loadCurrentFiltersFromLocalStorage = function() { self._loadCurrentFiltersFromLocalStorage = function() {
self._initializeLocalStorage(); self._initializeLocalStorage();
self.currentFilters(_.intersection(_.keys(self.supportedFilters), localStorage[self.listType, "currentFilters"])); self.currentFilters(_.intersection(_.keys(self.supportedFilters), JSON.parse(localStorage[self.listType + "." + "currentFilters"])));
} }
self._initializeLocalStorage = function() { self._initializeLocalStorage = function() {
if (localStorage[self.listType] !== undefined) if (localStorage[self.listType + "." + "currentSorting"] !== undefined && localStorage[self.listType + "." + "currentFilters"] !== undefined && JSON.parse(localStorage[self.listType + "." + "currentFilters"]) instanceof Array)
return; return;
localStorage[self.listType] = { localStorage[self.listType + "." + "currentSorting"] = self.defaultSorting;
"currentSorting": self.defaultSorting, localStorage[self.listType + "." + "currentFilters"] = JSON.stringify(self.defaultFilters);
"currentFilters": self.defaultFilters
}
} }
self._loadCurrentFiltersFromLocalStorage(); self._loadCurrentFiltersFromLocalStorage();
@ -1434,6 +1432,12 @@ $(function() {
webcamViewModel, webcamViewModel,
gcodeViewModel gcodeViewModel
); );
//work around a stupid iOS6 bug where ajax requests get cached and only work once, as described at http://stackoverflow.com/questions/12506897/is-safari-on-ios-6-caching-ajax-results
$.ajaxSetup({
type: 'POST',
headers: { "cache-control": "no-cache" }
});
//~~ Show settings - to ensure centered //~~ Show settings - to ensure centered
$('#navbar_show_settings').click(function() { $('#navbar_show_settings').click(function() {