summaryrefslogtreecommitdiff
path: root/timelinejs.module
diff options
context:
space:
mode:
authorSilvio <silvio@socioambiental.org>2012-08-02 17:14:28 -0300
committerSilvio <silvio@socioambiental.org>2012-08-02 17:14:28 -0300
commit53454451a84938723f399a4dd0ced569a5b9fa28 (patch)
tree96780e66f607c2f93b4d475b1695d5e3cb710050 /timelinejs.module
parent71bc401f1da3c4220ee1edf21e743e3a9f560d01 (diff)
downloadtimelinejs-53454451a84938723f399a4dd0ced569a5b9fa28.tar.gz
timelinejs-53454451a84938723f399a4dd0ced569a5b9fa28.tar.bz2
Adding embed and image fields into the timeline
Diffstat (limited to 'timelinejs.module')
-rw-r--r--timelinejs.module11
1 files changed, 5 insertions, 6 deletions
diff --git a/timelinejs.module b/timelinejs.module
index da6023f..2e79b4e 100644
--- a/timelinejs.module
+++ b/timelinejs.module
@@ -90,9 +90,9 @@ function timelinejs_load_events($nid) {
*/
function timelinejs_json($nid) {
// Sanitization and basic data.
- $nid = (int) $nid;
- $node = node_load($nid);
- $nodes = timelinejs_load_events($nid);
+ $nid = (int) $nid;
+ $timeline = node_load($nid);
+ $nodes = timelinejs_load_events($nid);
foreach ($nodes as $node) {
$items[] = node_load($node->entity_id);
@@ -103,10 +103,9 @@ function timelinejs_json($nid) {
$events = implode(',', $output);
}
- // TODO
$text = $media = NULL;
- $headline = $node->title;
- $date = $node->field_data['und']['0']['value'];
+ $headline = $timeline->title;
+ $date = $timeline->field_data['und']['0']['value'];
print theme('timelinejs_json', array(
'headline' => $headline,