summaryrefslogtreecommitdiffstats
path: root/js/news.js
diff options
context:
space:
mode:
authorBernhard Posselt <nukeawhale@gmail.com>2012-08-14 17:35:51 +0200
committerBernhard Posselt <nukeawhale@gmail.com>2012-08-14 17:35:51 +0200
commit9bcaa424d04ec85f75f6e86dbdc04205e01c4fd5 (patch)
treec0ea1bc95f19b1557d11edec0e81e0cec3bfb4e8 /js/news.js
parent37c64c824cfc2e8a7fe14b0763c107498275f2df (diff)
reload the page after adding the first feed
Diffstat (limited to 'js/news.js')
-rw-r--r--js/news.js42
1 files changed, 21 insertions, 21 deletions
diff --git a/js/news.js b/js/news.js
index 90b3da7cf..71626b0c6 100644
--- a/js/news.js
+++ b/js/news.js
@@ -22,7 +22,7 @@ News={
},
UI: {
overview:function(dialogtype, dialogfile){
- if($(dialogtype).dialog('isOpen') == true){
+ if($(dialogtype).dialog('isOpen') == true){
$(dialogtype).dialog('moveToTop');
}else{
$('#dialog_holder').load(OC.filePath('news', 'ajax', dialogfile), function(jsondata){
@@ -65,11 +65,7 @@ News={
$('.collapsable_container[data-id="' + folderid + '"] > ul').append(jsondata.data.listfolder);
setupFeedList();
transformCollapsableTrigger();
- //OC.dialogs.confirm(t('news', 'Do you want to add another folder?'), t('news', 'Folder added!'), function(answer) {
- // if(!answer) {
- $('#addfolder_dialog').dialog('destroy').remove();
- // }
- //});
+ $('#addfolder_dialog').dialog('destroy').remove();
} else {
OC.dialogs.alert(jsondata.data.message, t('news', 'Error'));
}
@@ -124,23 +120,27 @@ News={
data: { 'feedurl': feedurl, 'folderid': folderid },
dataType: "json",
success: function(jsondata){
- if(jsondata.status == 'success'){
- $('.collapsable_container[data-id="' + folderid + '"] > ul').append(jsondata.data.listfeed);
- setupFeedList();
- News.Feed.load(jsondata.data.feedid);
-
- OC.dialogs.confirm(t('news', 'Do you want to add another feed?'), t('news', 'Feed added!'), function(answer) {
- if(!answer) {
- $('#addfeed_dialog').dialog('destroy').remove();
- $('ul.accordion').before(jsondata.data.part_newfeed);
- }
- });
+ if($('#firstrun').length > 0){
+ window.location.reload();
} else {
- OC.dialogs.alert(jsondata.data.message, t('news', 'Error'));
+ if(jsondata.status == 'success'){
+ $('.collapsable_container[data-id="' + folderid + '"] > ul').append(jsondata.data.listfeed);
+ setupFeedList();
+ News.Feed.load(jsondata.data.feedid);
+
+ OC.dialogs.confirm(t('news', 'Do you want to add another feed?'), t('news', 'Feed added!'), function(answer) {
+ if(!answer) {
+ $('#addfeed_dialog').dialog('destroy').remove();
+ $('ul.accordion').before(jsondata.data.part_newfeed);
+ }
+ });
+ } else {
+ OC.dialogs.alert(jsondata.data.message, t('news', 'Error'));
+ }
+ $("#feed_add_url").val('');
+ $(button).attr("disabled", false);
+ $(button).prop('value', t('news', 'Add feed'));
}
- $("#feed_add_url").val('');
- $(button).attr("disabled", false);
- $(button).prop('value', t('news', 'Add feed'));
},
error: function(xhr) {
OC.dialogs.alert(t('news', 'Error while parsing the feed'), t('news', 'Fatal Error'));