harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pass all network page vars to the client to build ajax queries, change timeago variable names so as not to conflict with item timers.

Browse Source
This commit is contained in:
friendica 2012-07-23 16:47:35 -07:00
parent d4ee086806
commit d8e79061d6
4 changed files with 53 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
js/main.js
View File

@ -698,23 +698,23 @@ function previewTheme(elm) {
$(document).ready(function() {
jQuery.timeago.settings.strings = {
prefixAgo: t01,
prefixFromNow: t02,
suffixAgo: t03,
suffixFromNow: t04,
seconds: t05,
minute: t06,
minutes: t07,
hour: t08,
hours: t09,
day: t10,
days: t11,
month: t12,
months: t13,
year: t14,
years: t15,
wordSeparator: t16,
numbers: t17
prefixAgo: tago01,
prefixFromNow: tago02,
suffixAgo: tago03,
suffixFromNow: tago04,
seconds: tago05,
minute: tago06,
minutes: tago07,
hour: tago08,
hours: tago09,
day: tago10,
days: tago11,
month: tago12,
months: tago13,
year: tago14,
years: tago15,
wordSeparator: tago16,
numbers: tago17
};

20
mod/network.php
View File

@ -501,6 +501,7 @@ function network_content(&$a, $update = 0) {
$a->page['htmlhead'] .= "<script>\r\n"
. "var network_cmd = " . '"' . $a->get_baseurl() . '/network/' . '"' . ";\r\n"
. "var network_uid = " . ((local_user()) ? local_user() : 0) . ";\r\n"
. "var network_gid = " . (($gid) ? $gid : 0) . ";\r\n"
. "var network_cid = " . (($_GET['cid']) ? $_GET['cid'] : 0) . ";\r\n"
. "var network_cmin = " . (($_GET['cmin']) ? $_GET['cmin'] : 0) . ";\r\n"
@ -510,16 +511,31 @@ function network_content(&$a, $update = 0) {
. "var network_conv = " . (($_GET['conv']) ? $_GET['conv'] : 0) . ";\r\n"
. "var network_spam = " . (($_GET['spam']) ? $_GET['spam'] : 0) . ";\r\n"
. "var network_new = " . (($nouveau) ? $nouveau : 0) . ";\r\n"
. "var network_page = " . (($a->pager['page'] != 1) ? $a->pager['page'] : 1) . ";\r\n"
. 'var network_search = "' . $_GET['search'] . '"' . ";\r\n"
. 'var network_order = "' . $_GET['order'] . '"' . ";\r\n"
. 'var network_file = "' . $_GET['file'] . '"' . ";\r\n"
. 'var network_date_end = "' . $datequery . '"' . ";\r\n"
. 'var network_date_start = "' . $datequery2 . '"' . ";\r\n"
. 'var network_dend = "' . $datequery . '"' . ";\r\n"
. 'var network_dbegin = "' . $datequery2 . '"' . ";\r\n"
. 'function buildCmd() { var bCmd = network_cmd + "?f=" ;
if(network_uid) bCmd = bCmd + "&p=" + network_uid;
if(network_cmin) bCmd = bCmd + "&cmin=" + network_cmin;
if(network_cmax) bCmd = bCmd + "&cmax=" + network_cmax;
if(network_gid) { bCmd = bCmd + "&gid=" + network_gid; } else
if(network_cid) { bCmd = bCmd + "&cid=" + network_cid; }
if(network_star) bCmd = bCmd + "&star=" + network_star;
if(network_liked) bCmd = bCmd + "&liked=" + network_liked;
if(network_conv) bCmd = bCmd + "&conv=" + network_conv;
if(network_spam) bCmd = bCmd + "&spam=" + network_spam;
if(network_new) bCmd = bCmd + "&new=" + network_new;
if(network_search) bCmd = bCmd + "&search=" + network_search;
if(network_file) bCmd = bCmd + "&file=" + network_file;
if(network_dend) bCmd = bCmd + "&dend=" + network_dend;
if(network_dbegin) bCmd = bCmd + "&dbegin=" + network_dbegin;
if(network_page != 1) bCmd = bCmd + "&page=" + network_page;
return(bCmd);
}'

2
version.inc
View File

@ -1 +1 @@
2012-07-22.23
2012-07-23.24

34
view/head.tpl
View File

@ -107,23 +107,23 @@
// jquery.timeago localisations
var t01 = $t01 ;
var t02 = $t02 ;
var t03 = "$t03" ;
var t04 = "$t04" ;
var t05 = "$t05" ;
var t06 = "$t06" ;
var t07 = "$t07" ;
var t08 = "$t08" ;
var t09 = "$t09" ;
var t10 = "$t10" ;
var t11 = "$t11" ;
var t12 = "$t12" ;
var t13 = "$t13" ;
var t14 = "$t14" ;
var t15 = "$t15" ;
var t16 = "$t16" ;
var t17 = $t17 ;
var tago01 = $t01 ;
var tago02 = $t02 ;
var tago03 = "$t03" ;
var tago04 = "$t04" ;
var tago05 = "$t05" ;
var tago06 = "$t06" ;
var tago07 = "$t07" ;
var tago08 = "$t08" ;
var tago09 = "$t09" ;
var tago10 = "$t10" ;
var tago11 = "$t11" ;
var tago12 = "$t12" ;
var tago13 = "$t13" ;
var tago14 = "$t14" ;
var tago15 = "$t15" ;
var tago16 = "$t16" ;
var tago17 = $t17 ;
</script>