krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(auth): hacky fix to get around tabset hiding the surrounding

Browse Source 
authctrl scope (due to isolate scope)
This commit is contained in:
Tyler Renelle
2015-04-03 15:48:32 -06:00
parent 6b52e00b37
commit 7336d5bc23
2 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
website/public/js/controllers/authCtrl.js
View File

@@ -33,12 +33,12 @@ angular.module('habitrpg')
/*TODO highlight invalid inputs /*TODO highlight invalid inputs
we have this as a workaround for https://github.com/HabitRPG/habitrpg-mobile/issues/64 we have this as a workaround for https://github.com/HabitRPG/habitrpg-mobile/issues/64
*/ */
if ($scope.registrationForm.$invalid) { var scope = angular.element(document.getElementById('registrationForm')).scope();
return; if (scope.registrationForm.$invalid) return;
}
var url = ApiUrl.get() + "/api/v2/register"; var url = ApiUrl.get() + "/api/v2/register";
if($rootScope.selectedLanguage) url = url + '?lang=' + $rootScope.selectedLanguage.code; if($rootScope.selectedLanguage) url = url + '?lang=' + $rootScope.selectedLanguage.code;
$http.post(url, $scope.registerVals).success(function(data, status, headers, config) { $http.post(url, scope.registerVals).success(function(data, status, headers, config) {
runAuth(data.id, data.apiToken); runAuth(data.id, data.apiToken);
}).error(errorAlert); }).error(errorAlert);
}; };

7
website/views/static/login-modal.jade
View File

@@ -14,7 +14,7 @@ script(id='modals/login.html', type='text/ng-template')
hr hr
tabset(justified='true') tabset(justified='true')
tab(heading=env.t('login')) tab(heading=env.t('login'))
form(ng-submit='auth()', method='POST') form#login-tab(ng-submit='auth()', method='POST')
.form-group .form-group
input.form-control(type='text', ng-model='loginUsername', placeholder=env.t('username')+' or Email', name='username') input.form-control(type='text', ng-model='loginUsername', placeholder=env.t('username')+' or Email', name='username')
.form-group .form-group
@@ -47,8 +47,9 @@ script(id='modals/login.html', type='text/ng-template')
//span.help-inline {.errors.passwordReset} //span.help-inline {.errors.passwordReset}
.form-group .form-group
input.btn.btn-default(type='submit', value=env.t('submit')) input.btn.btn-default(type='submit', value=env.t('submit'))
tab(heading=env.t('register')) tab(heading=env.t('register'))
form(ng-submit='register()', name='registrationForm') form#registrationForm(ng-submit='register()', name='registrationForm')
.form-group .form-group
input.form-control(type='text', ng-model='registerVals.username', placeholder=env.t('username'), required) input.form-control(type='text', ng-model='registerVals.username', placeholder=env.t('username'), required)
.form-group .form-group
@@ -68,4 +69,4 @@ script(id='modals/login.html', type='text/ng-template')
a(href='/static/privacy' target='_blank')=env.t('privacy') a(href='/static/privacy' target='_blank')=env.t('privacy')
| . | .
.form-group .form-group
input.btn.btn-primary(type='submit', value=env.t('register')) input.btn.btn-primary(type='submit', ng-disabled='registrationForm.$invalid', value=env.t('register'))