forked from GNUsocial/gnu-social
Load notice data using javascript from the html on the page instead of writing json representations of the notices on each page
Clicking on a geo link pops up a map (round 2)
This commit is contained in:
@@ -122,4 +122,63 @@ class AllmapAction extends OwnerDesignAction
|
||||
'class' => 'gray smallmap',
|
||||
'style' => "width: 100%; height: 400px"));
|
||||
}
|
||||
}
|
||||
|
||||
function showScripts()
|
||||
{
|
||||
parent::showScripts();
|
||||
$cur = common_current_user();
|
||||
if (!empty($cur) && $cur->id == $this->user->id) {
|
||||
$notice = $this->user->noticeInbox(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
|
||||
} else {
|
||||
$notice = $this->user->noticesWithFriends(($this->page-1)*NOTICES_PER_PAGE, NOTICES_PER_PAGE + 1);
|
||||
}
|
||||
|
||||
$jsonArray = array();
|
||||
|
||||
while ($notice->fetch()) {
|
||||
if (!empty($notice->lat) && !empty($notice->lon)) {
|
||||
$jsonNotice = $this->noticeAsJson($notice);
|
||||
$jsonArray[] = $jsonNotice;
|
||||
}
|
||||
}
|
||||
|
||||
$this->elementStart('script', array('type' => 'text/javascript'));
|
||||
$this->raw('/*<![CDATA[*/'); // XHTML compat for Safari
|
||||
$this->raw('var _notices = ' . json_encode($jsonArray).'; ');
|
||||
$this->raw('showMapstraction($("#map_canvas"),_notices);');
|
||||
$this->raw('/*]]>*/'); // XHTML compat for Safari
|
||||
$this->elementEnd('script');
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
function noticeAsJson($notice)
|
||||
{
|
||||
// FIXME: this code should be abstracted to a neutral third
|
||||
// party, like Notice::asJson(). I'm not sure of the ethics
|
||||
// of refactoring from within a plugin, so I'm just abusing
|
||||
// the ApiAction method. Don't do this unless you're me!
|
||||
|
||||
require_once(INSTALLDIR.'/lib/api.php');
|
||||
|
||||
$act = new ApiAction('/dev/null');
|
||||
|
||||
$arr = $act->twitterStatusArray($notice, true);
|
||||
$arr['url'] = $notice->bestUrl();
|
||||
$arr['html'] = $notice->rendered;
|
||||
$arr['source'] = $arr['source'];
|
||||
|
||||
if (!empty($notice->reply_to)) {
|
||||
$reply_to = Notice::staticGet('id', $notice->reply_to);
|
||||
if (!empty($reply_to)) {
|
||||
$arr['in_reply_to_status_url'] = $reply_to->bestUrl();
|
||||
}
|
||||
$reply_to = null;
|
||||
}
|
||||
|
||||
$profile = $notice->getProfile();
|
||||
$arr['user']['profile_url'] = $profile->profileurl;
|
||||
|
||||
return $arr;
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user