diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2012-08-30 20:50:44 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2012-09-01 00:31:38 +0200 |
commit | eef8993cce0f989c32a12733ceaabfa96baa9127 (patch) | |
tree | 57fb2344f0c07c1ad368a4a8fe5d6c966bf9891b /js/news.js | |
parent | be192931ce450ea6c5310bf858517ef391a2a2b3 (diff) |
added missing methods and javadoc
Diffstat (limited to 'js/news.js')
-rw-r--r-- | js/news.js | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/js/news.js b/js/news.js index 79e33b3ec..00bdc02b3 100644 --- a/js/news.js +++ b/js/news.js @@ -652,43 +652,6 @@ function bindItemEventListeners(){ } -<<<<<<< HEAD -$(document).ready(function(){ - News.Feed.activeFeedId = parseInt($('#rightcontent').data('id')); - $('#feeds .subscriptions,#feeds .starred').click(function() { - News.Feed.load($(this).attr('data-id')); - }); - - /* first run script begins */ - $('#browsebtn_firstrun, #cloudbtn_firstrun, #importbtn_firstrun').hide(); - - /* first run script ends */ - - $('#addfeed').click(function() { - News.UI.overview('#addfeed_dialog','feeddialog.php'); - }); - - - $('#addfolder').click(function() { - News.UI.overview('#addfolder_dialog','folderdialog.php'); - }); - - $('#addfeedfolder').click(function(event) { - News.DropDownMenu.fade($(this).children('ul')); - event.stopPropagation(); - }); - - $('#settingsbtn').on('click keydown', function() { - try { - OC.appSettings({appid:'news', loadJS:true, cache:false}); - } catch(e) { - alert(e); - } - }); -======= ->>>>>>> reduced html in menu, restyled it, used new menu.js to bind events on menu and provide methods, made drag and drop work - - /** * Marks an item as read which is called by the timeout * @param item the dom item |