diff options
| author | Alessandro Cosentino <cosenal@gmail.com> | 2012-07-24 15:59:20 -0400 |
|---|---|---|
| committer | Alessandro Cosentino <cosenal@gmail.com> | 2012-07-24 15:59:20 -0400 |
| commit | da51c810f74bdc642445503d75395ded6f234ebc (patch) | |
| tree | 9a2c78d46ffd4ca10b4763fa1132a897dd898c10 /js | |
| parent | 2da0f24f174666dcf17f4c26a447cfd396284dcf (diff) | |
conform to the new app setting policy
Diffstat (limited to 'js')
| -rw-r--r-- | js/news.js | 18 | ||||
| -rw-r--r-- | js/settings.js | 46 |
2 files changed, 17 insertions, 47 deletions
diff --git a/js/news.js b/js/news.js index e0945661d..5766bfa7f 100644 --- a/js/news.js +++ b/js/news.js @@ -40,6 +40,18 @@ News={ }); } return false; + }, + cloudFileSelected:function(path){ + $.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),{'path':path,'id':Contacts.UI.Card.id},function(jsondata){ + if(jsondata.status == 'success'){ + //alert(jsondata.data.page); + Contacts.UI.Card.editPhoto(jsondata.data.id, jsondata.data.tmp) + $('#edit_photo_dialog_img').html(jsondata.data.page); + } + else{ + OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error')); + } + }); } }, Folder: { @@ -222,9 +234,13 @@ $(document).ready(function(){ News.UI.overview('#import_dialog', 'importdialog.php'); }); + $('#cloudbtn').click(function() { + OC.dialogs.filepicker(t('news', 'Select file'), News.UI.cloudFileSelected, false, '', true); + }); + setupFeedList(); - var updateInterval = 10000; //how often the feeds should update (in msec) + var updateInterval = 500000; //how often the feeds should update (in msec) setInterval('News.Feed.updateAll()', updateInterval); }); diff --git a/js/settings.js b/js/settings.js deleted file mode 100644 index 9e0d3fe66..000000000 --- a/js/settings.js +++ /dev/null @@ -1,46 +0,0 @@ -NewsSettings={ - UI: { - overview:function(dialogtype, dialogfile){ - if($(dialogtype).dialog('isOpen') == true){ - $(dialogtype).dialog('moveToTop'); - }else{ - $('#dialog_holder').load(OC.filePath('news', 'ajax', dialogfile), function(jsondata){ - if(jsondata.status != 'error'){ - $(dialogtype).dialog({ - dialogClass:'dialog', - minWidth: 600, - close: function(event, ui) { - $(this).dialog('destroy').remove(); - } - }).css('overflow','visible'); - } else { - alert(jsondata.data.message); - } - }); - } - return false; - }, - cloudFileSelected:function(path){ -// $.getJSON(OC.filePath('contacts', 'ajax', 'oc_photo.php'),{'path':path,'id':Contacts.UI.Card.id},function(jsondata){ -// if(jsondata.status == 'success'){ -// //alert(jsondata.data.page); -// Contacts.UI.Card.editPhoto(jsondata.data.id, jsondata.data.tmp) -// $('#edit_photo_dialog_img').html(jsondata.data.page); -// } -// else{ -// OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error')); -// } -// }); - } - }, -} -$(document).ready(function(){ - - $('#settings').click(function() { - NewsSettings.UI.overview('#import_dialog', 'importdialog.php'); - }); - - //OC.dialogs.filepicker(t('news', 'Select file'), NewsSettings.cloudFileSelected, false, '', true); -}); - - |