summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
Diffstat (limited to 'www')
-rwxr-xr-xwww/js/app.js1
-rw-r--r--www/templates/login.html3
2 files changed, 3 insertions, 1 deletions
diff --git a/www/js/app.js b/www/js/app.js
index 7df17a9d..13f1378a 100755
--- a/www/js/app.js
+++ b/www/js/app.js
@@ -925,6 +925,7 @@ angular.module('zmApp', [
d.resolve("Login Success");
$rootScope.$emit('auth-success', 'no auth');
+ return (d.promise);
}
diff --git a/www/templates/login.html b/www/templates/login.html
index 55c7befa..a6f409b2 100644
--- a/www/templates/login.html
+++ b/www/templates/login.html
@@ -33,7 +33,8 @@
<div ng-if="check.isUseAuth">
<label class="item item-input item-floating-label">
<span class="input-label">{{'kUserName'|translate}}</span>
- <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text" placeholder="{{'kUsername' | translate}}" ng-model="loginData.username">
+ <input autocapitalize="none" autocomplete="off" autocorrect="off" type="text"
+ placeholder="{{'kUserName' | translate}}" ng-model="loginData.username">
</label>
<label class="item item-input item-floating-label">
<span class="input-label">{{'kPassword' | translate}}</span>