aboutsummaryrefslogtreecommitdiffstats
path: root/settings/js
diff options
context:
space:
mode:
Diffstat (limited to 'settings/js')
-rw-r--r--settings/js/apps.js12
-rw-r--r--settings/js/personal.js4
2 files changed, 14 insertions, 2 deletions
diff --git a/settings/js/apps.js b/settings/js/apps.js
index e2f882c6fec..12d09ac69db 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -28,10 +28,18 @@ $(document).ready(function(){
var active=$(this).data('active');
if(app){
if(active){
- $.post(OC.filePath('settings','ajax','disableapp.php'),{appid:app});
+ $.post(OC.filePath('settings','ajax','disableapp.php'),{appid:app},function(result){
+ if(!result || result.status!='success'){
+ OC.dialogs.alert('Error','Error while disabling app');
+ }
+ },'json');
$('#leftcontent li[data-id="'+app+'"]').removeClass('active');
}else{
- $.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app});
+ $.post(OC.filePath('settings','ajax','enableapp.php'),{appid:app},function(result){
+ if(!result || result.status!='success'){
+ OC.dialogs.alert('Error','Error while enabling app');
+ }
+ },'json');
$('#leftcontent li[data-id="'+app+'"]').addClass('active');
}
active=!active;
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 8108da433c8..77d103c53b6 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -33,7 +33,11 @@ $(document).ready(function(){
});
$('#lostpassword #email').blur(function(event){
+ if ($(this).val() == this.defaultValue){
+ return;
+ }
event.preventDefault();
+ this.defaultValue = $(this).val();
OC.msg.startSaving('#lostpassword .msg');
var post = $( "#lostpassword" ).serialize();
$.post( 'ajax/lostpassword.php', post, function(data){