Revert "use a simple function - OC.Encryption is already defined - fixes #15707"
This reverts commit c1a60a2349
.
This commit is contained in:
parent
a255866a93
commit
0ca6398aa3
|
@ -5,27 +5,37 @@
|
||||||
* See the COPYING-README file.
|
* 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()) {
|
displayEncryptionWarning: function () {
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$.get(
|
if (!OC.Notification.isHidden()) {
|
||||||
OC.generateUrl('/apps/encryption/ajax/getStatus'),
|
return;
|
||||||
function( result ) {
|
|
||||||
if (result.status === "success") {
|
|
||||||
OC.Notification.show(result.data.message);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
);
|
|
||||||
}
|
$.get(
|
||||||
|
OC.generateUrl('/apps/encryption/ajax/getStatus')
|
||||||
|
, function( result ) {
|
||||||
|
if (result.status === "success") {
|
||||||
|
OC.Notification.show(result.data.message);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
// wait for other apps/extensions to register their event handlers and file actions
|
// wait for other apps/extensions to register their event handlers and file actions
|
||||||
// in the "ready" clause
|
// in the "ready" clause
|
||||||
_.defer(function() {
|
_.defer(function() {
|
||||||
displayEncryptionWarning();
|
OC.Encryption.displayEncryptionWarning();
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue