wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cache stream state in localStorage

Browse Source
This commit is contained in:
Hannes Mannerheim 2015-09-21 22:46:15 +02:00
parent 903ca469a9
commit ded70bec07
3 changed files with 22 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
js/dom-functions.js
View File

@ -508,7 +508,11 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess
} }
// remember state of old stream (including profile card) // remember state of old stream (including profile card)
window.oldStreams[window.currentStream] = $('#feed').siblings('.profile-card').outerHTML() + $('#feed').outerHTML(); if(typeof window.currentStreamObject != 'undefined') {
localStorageObjectCache_STORE('streamState',window.currentStreamObject.path, $('#feed').siblings('.profile-card').outerHTML() + $('#feed').outerHTML());
}
// window.oldStreams[window.currentStream] = $('#feed').siblings('.profile-card').outerHTML() + $('#feed').outerHTML();
// halt interval that checks for new queets // halt interval that checks for new queets
window.clearInterval(checkForNewQueetsInterval); window.clearInterval(checkForNewQueetsInterval);
@ -537,24 +541,35 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess
} }
// if we have a saved copy of this stream, show it immediately (but it is replaced when stream finishes to load later) // if we have a saved copy of this stream, show it immediately (but it is replaced when stream finishes to load later)
if(typeof window.oldStreams[window.currentStream] != "undefined") { var haveOldStreamState = localStorageObjectCache_GET('streamState',window.currentStreamObject.path);
if(haveOldStreamState) {
$('.profile-card,.hover-card,.hover-card-caret').remove(); $('.profile-card,.hover-card,.hover-card-caret').remove();
$('#feed').remove(); $('#feed').remove();
$('#user-container').after(window.oldStreams[window.currentStream]); $('#user-container').after(haveOldStreamState);
$('.profile-card').css('display','none'); $('.profile-card').css('display','none');
$('#feed').css('display','none'); $('#feed').css('display','none');
$('.profile-card').show(); $('.profile-card').show();
$('#feed').show(); $('#feed').show();
$('#feed-body').removeAttr('data-end-reached');
$('#feed-header-inner h2').css('opacity','0.2'); $('#feed-header-inner h2').css('opacity','0.2');
$('#feed-header-inner h2').animate({opacity:'1'},1000); $('#feed-header-inner h2').animate({opacity:'1'},1000);
// set location bar from stream // set location bar from stream
if(setLocation) { if(setLocation) {
setUrlFromStream(streamObject); setUrlFromStream(streamObject);
setLocation = false; // don't set location twice if we've already set it here
} }
// also mark this stream as the current stream immediately, if a saved copy exists // also mark this stream as the current stream immediately, if a saved copy exists
addStreamToHistoryMenuAndMarkAsCurrent(streamObject); addStreamToHistoryMenuAndMarkAsCurrent(streamObject);
// maybe do something
if(typeof actionOnSuccess == 'function') {
actionOnSuccess();
// don't invoke actionOnSuccess later if we already invoked it here
actionOnSuccess = false;
}
} }
// otherwise we fade out and wait for stream to load // otherwise we fade out and wait for stream to load
else { else {
@ -655,6 +670,7 @@ function setNewCurrentStream(streamObject,setLocation,fallbackId,actionOnSuccess
$('#new-queets-bar').parent().addClass('hidden'); document.title = window.siteTitle; // hide new queets bar if it's visible there $('#new-queets-bar').parent().addClass('hidden'); document.title = window.siteTitle; // hide new queets bar if it's visible there
addToFeed(queet_data, false,'visible'); // add stream items to feed element addToFeed(queet_data, false,'visible'); // add stream items to feed element
$('#feed').animate({opacity:'1'},150); // fade in $('#feed').animate({opacity:'1'},150); // fade in
$('#feed-body').removeAttr('data-end-reached');
$('body').removeClass('loading-older');$('body').removeClass('loading-newer'); $('body').removeClass('loading-older');$('body').removeClass('loading-newer');
$('html,body').scrollTop(0); // scroll to top $('html,body').scrollTop(0); // scroll to top

5
js/misc-functions.js
View File

@ -197,7 +197,8 @@ function checkLocalStorage() {
'languageData', 'languageData',
'fullQueetHtml', 'fullQueetHtml',
'selectedLanguage', 'selectedLanguage',
'queetBoxInput' 'queetBoxInput',
'streamState'
]; ];
var thisDataType = k.substring(0,k.indexOf('-')); var thisDataType = k.substring(0,k.indexOf('-'));
if($.inArray(thisDataType, validDataTypes) == -1 || k.indexOf('-') == -1) { if($.inArray(thisDataType, validDataTypes) == -1 || k.indexOf('-') == -1) {
@ -350,7 +351,7 @@ function cacheSyntaxHighlightingGroups() {
· ·
· User array cache · User array cache
· ·
· Stored in window.userArrayCache as instance_url/nickname · Stored in localStorage with unique key like instance_url/nickname
· with protocol (http:// or https://) trimmed off, e.g. "quitter.se/hannes2peer" · with protocol (http:// or https://) trimmed off, e.g. "quitter.se/hannes2peer"
· ·
· · · · · · · · · */ · · · · · · · · · */

1
js/qvitter.js
View File

@ -917,7 +917,6 @@ function doLogin(streamObjectToSet) {
$('#settingslink .dropdown-toggle').fadeIn('slow'); $('#settingslink .dropdown-toggle').fadeIn('slow');
$('#top-compose').fadeIn('slow'); $('#top-compose').fadeIn('slow');
$('input#nickname').blur(); $('input#nickname').blur();
remove_spinner();
}); });
} }