diff options
| -rw-r--r-- | js/build/app.js | 18 | ||||
| -rw-r--r-- | js/directive/NewsRouteReload.js | 26 | ||||
| -rw-r--r-- | templates/part.feed.starred.php | 2 | ||||
| -rw-r--r-- | templates/part.feed.unread.php | 4 | ||||
| -rw-r--r-- | templates/part.listfeed.php | 3 | ||||
| -rw-r--r-- | templates/part.listfolder.php | 3 |
6 files changed, 5 insertions, 51 deletions
diff --git a/js/build/app.js b/js/build/app.js index 31214d632..81b92d4d0 100644 --- a/js/build/app.js +++ b/js/build/app.js @@ -1635,24 +1635,6 @@ var $__build_47_app__ = function () { }); }; }); - app.directive('newsRouteReload', [ - '$location', - '$route', - function ($location, $route) { - 'use strict'; - return { - restrict: 'A', - scope: { 'ngHref': '@' }, - link: function (scope, elem, attrs) { - elem.click(function () { - if ($location.path() === attrs.ngHref.substring(1)) { - $route.reload(); - } - }); - } - }; - } - ]); app.directive('newsScroll', [ '$timeout', function ($timeout) { diff --git a/js/directive/NewsRouteReload.js b/js/directive/NewsRouteReload.js deleted file mode 100644 index 01cfa525c..000000000 --- a/js/directive/NewsRouteReload.js +++ /dev/null @@ -1,26 +0,0 @@ -/** - * ownCloud - News - * - * This file is licensed under the Affero General Public License version 3 or - * later. See the COPYING file. - * - * @author Bernhard Posselt <dev@bernhard-posselt.com> - * @copyright Bernhard Posselt 2014 - */ -app.directive('newsRouteReload', ($location, $route) => { - 'use strict'; - - return { - restrict: 'A', - scope: { - 'ngHref': '@' - }, - link: (scope, elem, attrs) => { - elem.click(() => { - if ($location.path() === attrs.ngHref.substring(1)) { - $route.reload(); - } - }); - } - }; -});
\ No newline at end of file diff --git a/templates/part.feed.starred.php b/templates/part.feed.starred.php index 69eae6e78..2cae5ced8 100644 --- a/templates/part.feed.starred.php +++ b/templates/part.feed.starred.php @@ -3,7 +3,7 @@ unread: Navigation.getStarredCount() > 0 }" class="starred"> - <a class="starred-icon" ng-href="#/items/starred" news-route-reload> + <a class="starred-icon" ng-href="#/items/starred/"> <?php p($l->t('Starred')) ?> </a> <span class="utils"> diff --git a/templates/part.feed.unread.php b/templates/part.feed.unread.php index d55eb258e..7381d68d7 100644 --- a/templates/part.feed.unread.php +++ b/templates/part.feed.unread.php @@ -3,11 +3,11 @@ unread: Navigation.getUnreadCount() > 0 }"> - <a class="rss-icon" ng-href="#/items" news-route-reload ng-if="!Navigation.isShowAll()"> + <a class="rss-icon" ng-href="#/items/" ng-if="!Navigation.isShowAll()"> <?php p($l->t('Unread articles'))?> </a> - <a class="rss-icon" ng-href="#/items" news-route-reload ng-if="Navigation.isShowAll()"> + <a class="rss-icon" ng-href="#/items/" ng-if="Navigation.isShowAll()"> <?php p($l->t('All articles'))?> </a> diff --git a/templates/part.listfeed.php b/templates/part.listfeed.php index 6aecd720e..4024db31b 100644 --- a/templates/part.listfeed.php +++ b/templates/part.listfeed.php @@ -37,8 +37,7 @@ 'problem-icon': feed.error }" ng-hide="feed.editing" - ng-href="#/items/feeds/{{ feed.id }}" - news-route-reload + ng-href="#/items/feeds/{{ feed.id }}/" class="title" title="{{ feed.title }}"> diff --git a/templates/part.listfolder.php b/templates/part.listfolder.php index 874ef0a27..23f46c4ef 100644 --- a/templates/part.listfolder.php +++ b/templates/part.listfolder.php @@ -29,8 +29,7 @@ </button> </div> - <a ng-href="#/items/folders/{{ folder.id }}" - news-route-reload + <a ng-href="#/items/folders/{{ folder.id }}/" class="title folder-icon" ng-hide="folder.editing" ng-class="{ |