diff options
| -rw-r--r-- | ajax/createfeed.php | 2 | ||||
| -rw-r--r-- | js/news.js | 19 |
2 files changed, 18 insertions, 3 deletions
diff --git a/ajax/createfeed.php b/ajax/createfeed.php index d1c15fb4b..35a403278 100644 --- a/ajax/createfeed.php +++ b/ajax/createfeed.php @@ -28,7 +28,7 @@ $l = OC_L10N::get('news'); if(!$feedid) { OCP\JSON::error(array('data' => array('message' => $l->t('Error adding folder.')))); - OCP\Util::writeLog('news','ajax/newfeed.php: Error adding feed: '.$_POST['feedurl'], OCP\Util::ERROR); + OCP\Util::writeLog('news','ajax/createfeed.php: Error adding feed: '.$_POST['feedurl'], OCP\Util::ERROR); exit(); } diff --git a/js/news.js b/js/news.js index f3f65a258..deda59b18 100644 --- a/js/news.js +++ b/js/news.js @@ -47,6 +47,10 @@ News={ return false; } + $(button).attr("disabled", true); + //translation here!!! + $(button).prop('value', 'Adding...'); + var folderid = $('#folder_parentfolder').find(':input[name="folderid"]').val(); var url; @@ -60,6 +64,10 @@ News={ } else { OC.dialogs.alert(jsondata.data.message, t('news', 'Error')); } + $("#folder_add_name").val(''); + $(button).attr("disabled", false); + //translation here!!! + $(button).prop('value', 'Add folder'); }); }, delete:function(folderid) { @@ -89,6 +97,10 @@ News={ return false; } + $(button).attr("disabled", true); + //translation here!!! + $(button).prop('value', 'Adding...'); + var folderid = $('#feed_parentfolder').find(':input[name="folderid"]').val(); var url; @@ -97,12 +109,15 @@ News={ $.post(url, { feedurl: feedurl, folderid: folderid }, function(jsondata){ if(jsondata.status == 'success'){ - //$(button).closest('tr').prev().html(jsondata.page).show().next().remove(); OC.dialogs.alert(jsondata.data.message, t('news', 'Success!')); } else { OC.dialogs.alert(jsondata.data.message, t('news', 'Error')); } - }); + $("#feed_add_url").val(''); + $(button).attr("disabled", false); + //translation here!!! + $(button).prop('value', 'Add feed'); + }); }, delete:function(feedid) { $('#feeds_delete').tipsy('hide'); |