port to ES5, fix unread count going into minus

4 files changed, 9 insertions, 15 deletions

diff --git a/templates/index.php b/templates/index.php
index 259e9f3b4..f84709571 100644
--- a/templates/index.php
+++ b/templates/index.php
@@ -1,6 +1,6 @@
 <?php
 script('news', [
-    'vendor/traceur-runtime/traceur-runtime.min',
+    'vendor/es6-shim/es6-shim.min',
     'vendor/angular/angular.min',
     'vendor/angular-route/angular-route.min',
     'vendor/angular-sanitize/angular-sanitize.min',
diff --git a/templates/part.content.php b/templates/part.content.php
index b28d0deb2..c0e54def1 100644
--- a/templates/part.content.php
+++ b/templates/part.content.php
@@ -15,11 +15,7 @@
                     <li class="title"
                         title="{{ item.title }}"
                         ng-style="{ backgroundImage: 'url(' + Content.getFeed(item.feedId).faviconLink + ')'}">
-                        <h1>
-                            <a target="_blank" >
-                                {{ item.title }}
-                            </a>
-                        </h1>
+                        <h1>{{ item.title }}</h1>
                     </li>
                     <li ng-click="Content.toggleStar(item.id)" class="util" news-stop-propagation>
                         <button class="star svg" ng-class="{'starred': item.starred}" title="<?php p($l->t('Star')); ?>"></button>
@@ -41,12 +37,10 @@
             <div class="article">
 
                 <div class="subtitle">
-                    <span class="author" ng-show="item.author"><?php p($l->t('by')) ?> {{ item.author }}</span>
-                    <?php p($l->t('from')) ?> <a ng-href="#/items/feeds/{{ item.feedId }}">{{ Content.getFeed(item.feedId).title }}</a>
                     <time class="date" class="date" title="{{ item.pubDate*1000|date:'yyyy-MM-dd HH:mm:ss' }}"
-                        datetime="{{ item.pubDate*1000|date:'yyyy-MM-ddTHH:mm:ssZ' }}">
-                        {{ Content.getRelativeDate(item.pubDate) }}
-                    </time>
+                        datetime="{{ item.pubDate*1000|date:'yyyy-MM-ddTHH:mm:ssZ' }}">{{ Content.getRelativeDate(item.pubDate) }}</time>,
+                    <span class="author" ng-show="item.author"><?php p($l->t('by')) ?> {{ item.author }}</span>
+                    <!--<?php p($l->t('from')) ?> <a ng-href="#/items/feeds/{{ item.feedId }}">{{ Content.getFeed(item.feedId).title }}</a>-->
                 </div>
 
                 <div class="enclosure" ng-if="item.enclosureLink">
diff --git a/templates/part.navigation.feed.php b/templates/part.navigation.feed.php
index be3b09372..7b20f3aed 100644
--- a/templates/part.navigation.feed.php
+++ b/templates/part.navigation.feed.php
@@ -54,7 +54,7 @@
          ng-show="feed.id && !feed.editing && !feed.error && !feed.deleted">
         <ul>
             <li class="app-navigation-entry-utils-counter"
-                ng-show="feed.id && Navigation.getUnreadCount(feed.id) > 0">
+                ng-show="feed.id && Navigation.getFeedUnreadCount(feed.id) > 0">
                 {{ Navigation.getFeedUnreadCount(feed.id) | unreadCountFormatter }}
             </li>
             <li class="app-navigation-entry-utils-menu-button">
@@ -72,7 +72,7 @@
             <li><button ng-click="Navigation.deleteFeed(feed)"
                         class="icon-delete"
                         title="<?php p($l->t('Delete website')); ?>"></button></li>
-            <li><button ng-show="Navigation.getUnreadCount(feed.id) > 0"
+            <li><button ng-show="Navigation.getFeedUnreadCount(feed.id) > 0"
                         class="icon-checkmark"
                         title="<?php p($l->t('Read all')); ?>"></button></li>
         </ul>
diff --git a/templates/part.navigation.folder.php b/templates/part.navigation.folder.php
index 2895ed94a..6ae33be95 100644
--- a/templates/part.navigation.folder.php
+++ b/templates/part.navigation.folder.php
@@ -43,7 +43,7 @@
 
 
         <span class="unread-counter"
-            ng-show="Navigation.getUnreadCount(folder.id) > 0 && !folder.editing">
+            ng-show="Navigation.getFolderUnreadCount(folder.id) > 0 && !folder.editing">
             {{ Navigation.getFolderUnreadCount(folder.id) | unreadCountFormatter }}
         </span>
 
@@ -55,7 +55,7 @@
                 oc-tooltip></button>
 
         <button class="svg action mark-read-icon"
-                ng-show="Navigation.getUnreadCount(folder.id) > 0 && folder.id && !folder.editing"
+                ng-show="Navigation.getFolderUnreadCount(folder.id) > 0 && folder.id && !folder.editing"
                 ng-click="Navigation.markRead(folder.id)"
                 title="<?php p($l->t('Mark read')); ?>"
                 oc-tooltip></button>