diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2012-08-16 13:17:24 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2012-08-16 13:17:24 +0200 |
commit | d6fd252bb449ef134518ae64226a3de2a09578b2 (patch) | |
tree | 21399f0ebdc46a789955df37032af494798e5f8f /js/news.js | |
parent | 00198b753ddb362348a7b2e998a9238d8238cb46 (diff) |
added more logic to the serverside moving feed into folder
Diffstat (limited to 'js/news.js')
-rw-r--r-- | js/news.js | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/js/news.js b/js/news.js index 1c89fcc61..fcf00632f 100644 --- a/js/news.js +++ b/js/news.js @@ -344,28 +344,28 @@ News={ } }); }, - moveToFolder:function(folder, item){ + moveToFolder:function(folder, feed){ var folderId = $(folder).data('id'); - var itemId = $(item).data('id'); - if($(item).parent().parent().data('id') == folderId){ + var feedId = $(feed).data('id'); + if($(feed).parent().parent().data('id') == folderId){ // FIXME uncomment the return and remove the following lines // in the if part to prevent dropping in the same folder // return; folderId = 0; - $('#feeds > ul').append(item); + $('#feeds > ul').append(feed); } else { - $(folder).children('ul').append(item); + $(folder).children('ul').append(feed); } transformCollapsableTrigger(); data = { folderId: folderId, - itemId: itemId + feedId: feedId }; $.post(OC.filePath('news', 'ajax', 'movefeedtofolder.php'), data, function(jsondata){ if(jsondata.status != 'success'){ - OC.dialogs.alert(t('news', 'Error while saving the item in a folder'), t('news', 'Error')); + OC.dialogs.alert(t('news', 'Error while saving the feed in a folder'), t('news', 'Error')); window.location.reload(); } }); |