diff options
| -rw-r--r-- | css/news.css | 4 | ||||
| -rw-r--r-- | js/menu.js | 6 |
2 files changed, 10 insertions, 0 deletions
diff --git a/css/news.css b/css/news.css index c3719c0fe..bbcb5bddf 100644 --- a/css/news.css +++ b/css/news.css @@ -101,10 +101,14 @@ div.add_parentfolder { } .dnd_over > ul { + -moz-transition: padding-bottom 500ms ease 0s; + transition: padding-bottom 500ms ease 0s; padding-bottom: 2.5em! important; } #feeds > ul ul.dnd_over { + -moz-transition: padding-bottom 500ms ease 0s; + transition: padding-bottom 500ms ease 0s; padding-bottom: 2.5em !important; } diff --git a/js/menu.js b/js/menu.js index c2e4598dd..468273fe8 100644 --- a/js/menu.js +++ b/js/menu.js @@ -875,6 +875,12 @@ var News = News || {}; var feedId = parseInt($dragged.data('id')); var folderId = parseInt($dropped.data('id')); + var fromFolderId = parseInt($dragged.parent().data('id')); + + // ignore when dragged to the same folder + if(folderId === fromFolderId){ + return; + } if($dropped.hasClass(self._menuNodeTypeToClass(MenuNodeType.Folder))){ $dropped.children('ul').append($dragged[0]); |