wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove duplicated definition and move OC.msg to js/js.js

Browse source 
Fix issue #7166
This commit is contained in:
Joas Schilling 2014-02-19 10:20:52 +01:00
parent 8387cd8ae3
commit fdb0d2067f
4 changed files with 28 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
apps/files_encryption/js/settings-admin.js
View file

@ -7,28 +7,6 @@
* See the COPYING-README file.
*/
OC.msg={
startSaving:function(selector){
$(selector)
.html( t('settings', 'Saving...') )
.removeClass('success')
.removeClass('error')
.stop(true, true)
.show();
},
finishedSaving:function(selector, data){
if( data.status === "success" ){
$(selector).html( data.data.message )
.addClass('success')
.stop(true, true)
.delay(3000)
.fadeOut(900);
}else{
$(selector).html( data.data.message ).addClass('error');
}
}
};
$(document).ready(function(){
// Trigger ajax on recoveryAdmin status change
var enabledStatus = $('#adminEnableRecovery').val();

28
core/js/js.js
View file

@ -467,6 +467,34 @@ OC.search.lastResults={};
OC.addStyle.loaded=[];
OC.addScript.loaded=[];
OC.msg={
startSaving:function(selector, message){
OC.msg.startAction(selector, t('settings', 'Saving...'));
},
finishedSaving:function(selector, data){
OC.msg.finishedAction(selector, data);
},
startAction:function(selector, message){
$(selector)
.html( message )
.removeClass('success')
.removeClass('error')
.stop(true, true)
.show();
},
finishedAction:function(selector, data){
if( data.status === "success" ){
$(selector).html( data.data.message )
.addClass('success')
.stop(true, true)
.delay(3000)
.fadeOut(900);
}else{
$(selector).html( data.data.message ).addClass('error');
}
}
};
OC.Notification={
queuedNotifications: [],
getDefaultNotificationFunction: null,

22
settings/js/admin.js
View file

@ -51,25 +51,3 @@ $(document).ready(function(){
});
});
});
OC.msg={
startSaving:function(selector){
$(selector)
.html( t('settings', 'Saving...') )
.removeClass('success')
.removeClass('error')
.stop(true, true)
.show();
},
finishedSaving:function(selector, data){
if( data.status === "success" ){
$(selector).html( data.data.message )
.addClass('success')
.stop(true, true)
.delay(3000)
.fadeOut(900);
}else{
$(selector).html( data.data.message ).addClass('error');
}
}
};

22
settings/js/personal.js
View file

@ -313,25 +313,3 @@ OC.Encryption.msg={
}
}
};
OC.msg={
startSaving:function(selector){
$(selector)
.html( t('settings', 'Saving...') )
.removeClass('success')
.removeClass('error')
.stop(true, true)
.show();
},
finishedSaving:function(selector, data){
if( data.status === "success" ){
$(selector).html( data.data.message )
.addClass('success')
.stop(true, true)
.delay(3000)
.fadeOut(900);
}else{
$(selector).html( data.data.message ).addClass('error');
}
}
};