summaryrefslogtreecommitdiffstats
path: root/core
diff options
context:
space:
mode:
authorMorris Jobke <hey@morrisjobke.de>2014-06-13 16:03:13 +0200
committerMorris Jobke <hey@morrisjobke.de>2014-06-13 16:03:13 +0200
commitebbf2283099215ca06914b0c4c62423de2ceb2e2 (patch)
tree38de9f45ab65257064c5cd03a264aa4c74d7f6c1 /core
parenta53cfcb9d1ca3f77dcebac9bd584bb1992aac815 (diff)
downloadnextcloud-server-ebbf2283099215ca06914b0c4c62423de2ceb2e2.tar.gz
nextcloud-server-ebbf2283099215ca06914b0c4c62423de2ceb2e2.zip
remove whitespace at end of line
Diffstat (limited to 'core')
-rw-r--r--core/js/lostpassword.js28
1 files changed, 14 insertions, 14 deletions
diff --git a/core/js/lostpassword.js b/core/js/lostpassword.js
index bec4f98b9f5..ad221cb30fc 100644
--- a/core/js/lostpassword.js
+++ b/core/js/lostpassword.js
@@ -3,7 +3,7 @@ OC.Lostpassword = {
sendErrorMsg : t('core', 'Couldn\'t send reset email. Please contact your administrator.'),
sendSuccessMsg : t('core', 'The link to reset your password has been sent to your email. If you do not receive it within a reasonable amount of time, check your spam/junk folders.<br>If it is not there ask your local administrator.'),
-
+
encryptedMsg : t('core', "Your files are encrypted. If you haven't enabled the recovery key, there will be no way to get your data back after your password is reset.<br />If you are not sure what to do, please contact your administrator before you continue. <br />Do you really want to continue?")
+ ('<br /><input type="checkbox" id="encrypted-continue" value="Yes" />')
+ '<label for="encrypted-continue">'
@@ -12,9 +12,9 @@ OC.Lostpassword = {
+ '<a id="lost-password-encryption" href>'
+ t('core', 'Reset password')
+ '</a>',
-
+
resetErrorMsg : t('core', 'Password can not be changed. Please contact your administrator.'),
-
+
init : function() {
if ($('#lost-password-encryption').length){
$('#lost-password-encryption').click(OC.Lostpassword.sendLink);
@@ -23,7 +23,7 @@ OC.Lostpassword = {
}
$('#reset-password #submit').click(OC.Lostpassword.resetPassword);
},
-
+
sendLink : function(event){
event.preventDefault();
if (!$('#user').val().length){
@@ -39,10 +39,10 @@ OC.Lostpassword = {
);
}
},
-
+
sendLinkDone : function(result){
var sendErrorMsg;
-
+
if (result && result.status === 'success'){
OC.Lostpassword.sendLinkSuccess();
} else {
@@ -54,21 +54,21 @@ OC.Lostpassword = {
OC.Lostpassword.sendLinkError(sendErrorMsg);
}
},
-
+
sendLinkSuccess : function(msg){
var node = OC.Lostpassword.getSendStatusNode();
// update is the better success message styling
node.addClass('update').css({width:'auto'});
node.html(OC.Lostpassword.sendSuccessMsg);
},
-
+
sendLinkError : function(msg){
var node = OC.Lostpassword.getSendStatusNode();
node.addClass('warning');
node.html(msg);
OC.Lostpassword.init();
},
-
+
getSendStatusNode : function(){
if (!$('#lost-password').length){
$('<p id="lost-password"></p>').insertBefore($('#remember_login'));
@@ -77,7 +77,7 @@ OC.Lostpassword = {
}
return $('#lost-password');
},
-
+
resetPassword : function(event){
event.preventDefault();
if ($('#password').val()){
@@ -90,7 +90,7 @@ OC.Lostpassword = {
);
}
},
-
+
resetDone : function(result){
var resetErrorMsg;
if (result && result.status === 'success'){
@@ -113,17 +113,17 @@ OC.Lostpassword = {
OC.Lostpassword.resetError(resetErrorMsg);
}
},
-
+
redirect : function(msg){
window.location = OC.webroot;
},
-
+
resetError : function(msg){
var node = OC.Lostpassword.getResetStatusNode();
node.addClass('warning');
node.html(msg);
},
-
+
getResetStatusNode : function (){
if (!$('#lost-password').length){
$('<p id="lost-password"></p>').insertAfter($('#submit'));