Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
our_own_cloud_project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
die_coolen_jungs
our_own_cloud_project
Commits
0ca6398a
Commit
0ca6398a
authored
10 years ago
by
Thomas Müller
Browse files
Options
Downloads
Patches
Plain Diff
Revert "use a simple function - OC.Encryption is already defined - fixes #15707"
This reverts commit
c1a60a23
.
parent
a255866a
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
apps/encryption/js/encryption.js
+23
-13
23 additions, 13 deletions
apps/encryption/js/encryption.js
with
23 additions
and
13 deletions
apps/encryption/js/encryption.js
+
23
−
13
View file @
0ca6398a
...
...
@@ -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
();
});
});
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment