clone new items in menu from mock objects

3 files changed, 44 insertions, 12 deletions

diff --git a/templates/part.feeds.php b/templates/part.feeds.php
index b3dc598fa..b06488e26 100644
--- a/templates/part.feeds.php
+++ b/templates/part.feeds.php
@@ -56,4 +56,13 @@ $starredCount = $itemMapper->countEveryItemByStatus(OCA\News\StatusFlag::IMPORTA
 </li>
 
 <?php
+	// provide mock feed and folder elements for js menu
+	$mockFolder = new OCP\Template("news", "part.listfolder");
+	$mockFolder->assign('mock', true);
+	$mockFolder->printpage();
+
+	$mockFolder = new OCP\Template("news", "part.listfeed");
+	$mockFolder->assign('mock', true);
+	$mockFolder->printpage();
+
 	print_collection_list($allfeeds);
diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php
index c8d468675..b20cc52b9 100644
--- a/templates/part.listfeed.php
+++ b/templates/part.listfeed.php
@@ -2,16 +2,26 @@
 
 $l = new OC_l10n('news');
 
-$feed = isset($_['feed']) ? $_['feed'] : null;
-$unreadItemsCount = isset($_['unreadItemsCount']) ? $_['unreadItemsCount'] : null;
-
-$favicon = $feed->getFavicon();
-if ($favicon == null) {
+if(isset($_['mock'])){
+    $feedTitle = '';
+    $feedId = -1;
+    $unreadItemsCount = -1;
     $favicon = OCP\Util::imagePath('core', 'actions/public.svg');
+} else {
+    $feed = isset($_['feed']) ? $_['feed'] : null;
+    $feedTitle = htmlspecialchars_decode($feed->getTitle());
+    $feedId =  $feed->getId();
+    $unreadItemsCount = isset($_['unreadItemsCount']) ? $_['unreadItemsCount'] : null;
+    $favicon = $feed->getFavicon();
+    if ($favicon == null) {
+        $favicon = OCP\Util::imagePath('core', 'actions/public.svg');
+    }
 }
 
-echo '<li class="feed" data-id="' . $feed->getId() . '">';
-    echo '<a style="background-image: url(' . $favicon . ');" href="#" class="title">' . htmlspecialchars_decode($feed->getTitle()) .'</a>';
+$mockClass = isset($_['mock']) ? 'mock' : '';
+
+echo '<li class="feed ' . $mockClass . '" data-id="' . $feedId . '">';
+    echo '<a style="background-image: url(' . $favicon . ');" href="#" class="title">' . $feedTitle .'</a>';
 	echo '<span class="unread_items_counter">' . $unreadItemsCount . '</span>';
     echo '<span class="buttons">';
         echo '<button class="svg action feeds_delete" title="' . $l->t('Delete feed') . '"></button>';
diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php
index 0f02198f1..cf6a1c5e1 100644
--- a/templates/part.listfolder.php
+++ b/templates/part.listfolder.php
@@ -1,15 +1,28 @@
 <?php
 
-$folder = isset($_['folder']) ? $_['folder'] : null;
-
 $l = new OC_l10n('news');
 
-echo '<li class="folder open" data-id="' . $folder->getId() . '">';
+if(isset($_['mock'])){
+	$folderId = -1;
+	$folderName = '';
+} else {
+	$folder = isset($_['folder']) ? $_['folder'] : null;	
+	$folderId = $folder->getId();
+	$folderName = $folder->getName();
+}
+
+$mockClass = isset($_['mock']) ? 'mock' : '';
+
+echo '<li class="folder open ' . $mockClass . '" data-id="' . $folderId . '">';
 	echo '<button class="collapsable_trigger" title="' . $l->t('Collapse') . '"></button>';
-	echo '<a href="#" class="title">' . $folder->getName() .	'</a>';
+	echo '<a href="#" class="title">' . $folderName .	'</a>';
 	echo '<span class="buttons">';
 		echo '<button class="svg action feeds_delete" title="' . $l->t('Delete folder') . '"></button>';
 		echo '<button class="svg action feeds_edit" title="' . $l->t('Rename folder') . '"></button>';
 		echo '<button class="svg action feeds_markread" title="' . $l->t('Mark all read') . '"></button>';
 	echo '</span>';
-	echo '<ul data-id="' . $folder->getId() . '">';
\ No newline at end of file
+	echo '<ul data-id="' . $folderId . '">';
+
+if(isset($_['mock'])){
+	echo '</ul>';
+}
\ No newline at end of file