1
0
Fork 0

fix like/dislike refresh on photos/display items

This commit is contained in:
Friendika 2010-11-02 22:21:49 -07:00
parent 07b78e9d1c
commit 98a508532f
7 changed files with 27 additions and 2 deletions

View file

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View file

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.1 KiB

View file

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

View file

@ -16,7 +16,7 @@
document.getElementById(theID).style.display = "none" document.getElementById(theID).style.display = "none"
} }
var src = null; var src = null;
var prev = null; var prev = null;
var livetime = null; var livetime = null;
@ -24,6 +24,7 @@
var stopped = false; var stopped = false;
var timer = null; var timer = null;
var pr = 0; var pr = 0;
var liking = 0;
$(document).ready(function() { $(document).ready(function() {
$.ajaxSetup({cache: false}); $.ajaxSetup({cache: false});
@ -49,6 +50,18 @@
if($('#live-network').length) { src = 'network'; liveUpdate(); } if($('#live-network').length) { src = 'network'; liveUpdate(); }
if($('#live-profile').length) { src = 'profile'; liveUpdate(); } if($('#live-profile').length) { src = 'profile'; liveUpdate(); }
if($('#live-display').length) {
if(liking) {
liking = 0;
window.location.href=window.location.href
}
}
if($('#live-photos').length) {
if(liking) {
liking = 0;
window.location.href=window.location.href
}
}
if(! stopped) { if(! stopped) {
$.get("ping",function(data) { $.get("ping",function(data) {
@ -135,6 +148,7 @@
$.get('like/' + ident.toString() + '?verb=' + verb ); $.get('like/' + ident.toString() + '?verb=' + verb );
if(timer) clearTimeout(timer); if(timer) clearTimeout(timer);
timer = setTimeout(NavUpdate,3000); timer = setTimeout(NavUpdate,3000);
liking = 1;
} }
function getPosition(e) { function getPosition(e) {

View file

@ -3,6 +3,8 @@
function display_content(&$a) { function display_content(&$a) {
$o = '<div id="live-display"></div>' . "\r\n";
require_once('mod/profile.php'); require_once('mod/profile.php');
profile_init($a); profile_init($a);
@ -100,6 +102,7 @@ function display_content(&$a) {
); );
$cmnt_tpl = load_view_file('view/comment_item.tpl'); $cmnt_tpl = load_view_file('view/comment_item.tpl');
$like_tpl = load_view_file('view/like.tpl'); $like_tpl = load_view_file('view/like.tpl');
$tpl = load_view_file('view/wall_item.tpl'); $tpl = load_view_file('view/wall_item.tpl');
@ -112,6 +115,13 @@ function display_content(&$a) {
if(count($r)) { if(count($r)) {
if((local_user()) && (local_user() == $a->profile['uid'])) {
q("UPDATE `item` SET `unseen` = 0
WHERE `parent` = %d AND `unseen` = 1",
intval($r[0]['parent'])
);
}
foreach($r as $item) { foreach($r as $item) {
like_puller($a,$item,$alike,'like'); like_puller($a,$item,$alike,'like');
like_puller($a,$item,$dlike,'dislike'); like_puller($a,$item,$dlike,'dislike');

View file

@ -16,7 +16,7 @@ function home_content(&$a) {
$o = ''; $o = '';
if(! (x($a->page,'footer'))) if(! (x($a->page,'footer')))
$a->page['footer'] = ''; $a->page['footer'] = '';
$a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://friendika.com\" name=\"mistpark\" >friendika</a></div>"; $a->page['footer'] .= "<div class=\"powered\" >Powered by <a href=\"http://friendika.com\" title=\"friendika\" >friendika</a></div>";
$o .= '<h1>Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '</h1>'; $o .= '<h1>Welcome' . ((x($a->config,'sitename')) ? " to {$a->config['sitename']}" : "" ) . '</h1>';
if(file_exists('home.html')) if(file_exists('home.html'))
$o .= file_get_contents('home.html'); $o .= file_get_contents('home.html');

View file

@ -665,6 +665,7 @@ function photos_content(&$a) {
require_once('security.php'); require_once('security.php');
require_once('bbcode.php'); require_once('bbcode.php');
$o = '<div id="live-display"></div>' . "\r\n";
// fetch image, item containing image, then comments // fetch image, item containing image, then comments
$ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' $ph = q("SELECT * FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'