diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2012-08-11 00:19:15 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2012-08-11 00:19:15 +0200 |
| commit | 5428fc01006eeae43249800f68e19107e4d3d870 (patch) | |
| tree | 4824f8abb50d77932e5dd12da3151829814e056e | |
| parent | fb8f2c25502f4ad708cf85f239570f340a64c721 (diff) | |
fixed bug that would cause the itemheader to disappear when a different feed is loaded
| -rw-r--r-- | ajax/loadfeed.php | 5 | ||||
| -rw-r--r-- | js/news.js | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/ajax/loadfeed.php b/ajax/loadfeed.php index 40c873e2b..992e65019 100644 --- a/ajax/loadfeed.php +++ b/ajax/loadfeed.php @@ -25,6 +25,11 @@ $tmpl_items = new OCP\Template("news", "part.items"); $tmpl_items->assign('feedid', $feedid); $part_items = $tmpl_items->fetchPage(); +$tmpl_items_header = new OCP\Template("news", "part.items.header"); +$tmpl_items_header->assign('feedid', $feedid); +$items_header = $tmpl_items_header->fetchPage(); + OCP\JSON::success(array('data' => array( 'message' => $l->t('Feed loaded!'), + 'items_header' => $items_header, 'part_items' => $part_items ))); diff --git a/js/news.js b/js/news.js index 8ff46ed82..ebbf126a1 100644 --- a/js/news.js +++ b/js/news.js @@ -206,7 +206,7 @@ News={ var rightcontent = $('div.rightcontent'); rightcontent.empty(); rightcontent.attr('data-id', feedid); - rightcontent.html(jsondata.data.part_items); + rightcontent.html(jsondata.data.items_header + jsondata.data.part_items); $('li#selected_feed').attr('id', ''); $('li.feed[data-id="' + feedid + '"]').attr('id', 'selected_feed'); |