design change fix
This commit is contained in:
parent
3d7113bf62
commit
b292a273d8
|
@ -110,9 +110,6 @@ class QvitterAction extends ApiAction
|
||||||
<title><?php print $sitetitle; ?></title>
|
<title><?php print $sitetitle; ?></title>
|
||||||
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0">
|
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=0">
|
||||||
<style>
|
|
||||||
|
|
||||||
</style>
|
|
||||||
<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/qvitter.css?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/css/qvitter.css')); ?>" />
|
<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/qvitter.css?changed=<?php print date('YmdHis',filemtime(QVITTERDIR.'/css/qvitter.css')); ?>" />
|
||||||
<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/jquery.minicolors.css" />
|
<link rel="stylesheet" type="text/css" href="<?php print $qvitterpath; ?>css/jquery.minicolors.css" />
|
||||||
<link rel="shortcut icon" type="image/x-icon" href="<?php print $qvitterpath; ?><?php print QvitterPlugin::settings("favicon"); ?>">
|
<link rel="shortcut icon" type="image/x-icon" href="<?php print $qvitterpath; ?><?php print QvitterPlugin::settings("favicon"); ?>">
|
||||||
|
|
|
@ -579,7 +579,6 @@ function setNewCurrentStream(stream,actionOnSuccess,setLocation) {
|
||||||
var h2FeedHeader = streamHeader;
|
var h2FeedHeader = streamHeader;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
// 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") {
|
if(typeof window.oldStreams[window.currentStream] != "undefined") {
|
||||||
$('.profile-card').remove();
|
$('.profile-card').remove();
|
||||||
|
@ -594,11 +593,7 @@ function setNewCurrentStream(stream,actionOnSuccess,setLocation) {
|
||||||
|
|
||||||
// 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(streamHeader, defaultStreamName);
|
addStreamToHistoryMenuAndMarkAsCurrent(streamHeader, defaultStreamName);
|
||||||
|
|
||||||
// and change design immediately
|
|
||||||
changeDesign(window.oldStreamsDesigns[theUserOrGroupThisStreamBelongsTo(window.currentStream)]);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// otherwise we fade out and wait for stream to load
|
// otherwise we fade out and wait for stream to load
|
||||||
else {
|
else {
|
||||||
// fade out
|
// fade out
|
||||||
|
@ -609,6 +604,15 @@ function setNewCurrentStream(stream,actionOnSuccess,setLocation) {
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// change design immediately to either cached design or logged in user's
|
||||||
|
if(typeof window.oldStreamsDesigns[theUserOrGroupThisStreamBelongsTo(window.currentStream)] != 'undefined') {
|
||||||
|
changeDesign(window.oldStreamsDesigns[theUserOrGroupThisStreamBelongsTo(window.currentStream)]);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
changeDesign({backgroundimage:window.loggedIn.background_image, backgroundcolor:window.loggedIn.backgroundcolor, linkcolor:window.loggedIn.linkcolor});
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
// for these streams we want a user array in the header to build a profile card
|
// for these streams we want a user array in the header to build a profile card
|
||||||
var addUserArray = '';
|
var addUserArray = '';
|
||||||
if(stream.substring(0,23) == 'statuses/followers.json'
|
if(stream.substring(0,23) == 'statuses/followers.json'
|
||||||
|
@ -627,9 +631,6 @@ function setNewCurrentStream(stream,actionOnSuccess,setLocation) {
|
||||||
// while waiting for this data user might have changed stream, so only proceed if current stream still is this one
|
// while waiting for this data user might have changed stream, so only proceed if current stream still is this one
|
||||||
if(window.currentStream == stream) {
|
if(window.currentStream == stream) {
|
||||||
|
|
||||||
// change design
|
|
||||||
changeDesign({backgroundimage:window.loggedIn.background_image, backgroundcolor:window.loggedIn.backgroundcolor, linkcolor:window.loggedIn.linkcolor});
|
|
||||||
|
|
||||||
// show group profile card if this is a group stream
|
// show group profile card if this is a group stream
|
||||||
if(stream.substring(0,26) == 'statusnet/groups/timeline/'
|
if(stream.substring(0,26) == 'statusnet/groups/timeline/'
|
||||||
|| stream.substring(0,28) == 'statusnet/groups/membership/'
|
|| stream.substring(0,28) == 'statusnet/groups/membership/'
|
||||||
|
|
Loading…
Reference in New Issue
Block a user