mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "use a simple function - OC.Encryption is already defined - fixes #15707" 

This reverts commit c1a60a2349.
This commit is contained in:
Thomas Müller 2015-04-17 18:02:00 +02:00
parent a255866a93
commit 0ca6398aa3
1 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
apps/encryption/js/encryption.js
View File

@ -5,27 +5,37 @@
* See the COPYING-README file.
*/
/**
* @namespace
* @memberOf OC
*/
OC.Encryption= {
MIGRATION_OPEN: 0,
MIGRATION_COMPLETED: 1,
MIGRATION_IN_PROGRESS: -1,
function displayEncryptionWarning () {
if (!OC.Notification.isHidden()) {
return;
}
displayEncryptionWarning: function () {
$.get(
OC.generateUrl('/apps/encryption/ajax/getStatus'),
function( result ) {
if (result.status === "success") {
OC.Notification.show(result.data.message);
}
if (!OC.Notification.isHidden()) {
return;
}
);
}
$.get(
OC.generateUrl('/apps/encryption/ajax/getStatus')
, function( result ) {
if (result.status === "success") {
OC.Notification.show(result.data.message);
}
}
);
}
};
$(document).ready(function() {
// wait for other apps/extensions to register their event handlers and file actions
// in the "ready" clause
_.defer(function() {
displayEncryptionWarning();
OC.Encryption.displayEncryptionWarning();
});
});