summaryrefslogtreecommitdiffstats
path: root/js/build/app.js
diff options
context:
space:
mode:
Diffstat (limited to 'js/build/app.js')
-rw-r--r--js/build/app.js14
1 files changed, 14 insertions, 0 deletions
diff --git a/js/build/app.js b/js/build/app.js
index 7bdab048d..1368a17c1 100644
--- a/js/build/app.js
+++ b/js/build/app.js
@@ -453,6 +453,8 @@ app.controller('NavigationController',
FeedResource.create(feed.url, feed.folderId, undefined)
.then(function (data) {
Publisher.publishAll(data);
+
+ // load created feed
$location.path('/items/feeds/' + data.id);
});
} else {
@@ -484,6 +486,10 @@ app.controller('NavigationController',
var reload = false;
var feed = FeedResource.getById(feedId);
+ if (feed.folderId === folderId) {
+ return;
+ }
+
if (this.isFolderActive(feed.folderId) ||
this.isFolderActive(folderId)) {
reload = true;
@@ -1553,6 +1559,14 @@ app.directive('newsDraggable', function () {
} else {
elem.draggable();
}
+
+ attr.$observe('newsDraggableDisable', function (value) {
+ if (value === 'true') {
+ elem.draggable('disable');
+ } else {
+ elem.draggable('enable');
+ }
+ });
};
});
app.directive('newsDroppable', ["$rootScope", function ($rootScope) {