From f2066e46dd3fc5157b3cdfaeb40be04a24629320 Mon Sep 17 00:00:00 2001 From: James Allen Date: Wed, 9 Jul 2014 14:53:30 +0100 Subject: [PATCH] Use Angular 1.30 and only update emails on blur --- services/web/app/views/layout.jade | 2 +- services/web/app/views/user/login.jade | 3 ++- services/web/app/views/user/register.jade | 3 ++- services/web/app/views/user/settings.jade | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/services/web/app/views/layout.jade b/services/web/app/views/layout.jade index 576e0d8d76..8895daa487 100644 --- a/services/web/app/views/layout.jade +++ b/services/web/app/views/layout.jade @@ -31,7 +31,7 @@ html(itemscope, itemtype='http://schema.org/Product') window.csrfToken = "#{csrfToken}"; script(src="//ajax.googleapis.com/ajax/libs/jquery/1.11.1/jquery.min.js") - script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.2.19/angular.min.js") + script(src="//ajax.googleapis.com/ajax/libs/angularjs/1.3.0-beta.14/angular.min.js") body - if(typeof(suppressNavbar) == "undefined") diff --git a/services/web/app/views/user/login.jade b/services/web/app/views/user/login.jade index c078be6bd7..cc3d3b099b 100644 --- a/services/web/app/views/user/login.jade +++ b/services/web/app/views/user/login.jade @@ -18,7 +18,8 @@ block content name='email', required, placeholder='email@example.com', - ng-model="email" + ng-model="email", + ng-model-options="{ updateOn: 'blur' }" ) span.small.text-primary(ng-show="loginForm.email.$invalid && loginForm.email.$dirty") | Must be an email address diff --git a/services/web/app/views/user/register.jade b/services/web/app/views/user/register.jade index 878deb5a39..ed180047f3 100644 --- a/services/web/app/views/user/register.jade +++ b/services/web/app/views/user/register.jade @@ -30,7 +30,8 @@ block content placeholder="email@example.com" required, ng-model="email", - ng-init="email = #{JSON.stringify(new_email)}" + ng-init="email = #{JSON.stringify(new_email)}", + ng-model-options="{ updateOn: 'blur' }" ) span.small.text-primary(ng-show="registerForm.email.$invalid && registerForm.email.$dirty") | Must be an email address diff --git a/services/web/app/views/user/settings.jade b/services/web/app/views/user/settings.jade index 2bb78064b5..c30a377713 100644 --- a/services/web/app/views/user/settings.jade +++ b/services/web/app/views/user/settings.jade @@ -27,7 +27,8 @@ block content placeholder="email@example.com" required, ng-model="email", - ng-init="email = #{JSON.stringify(user.email)}" + ng-init="email = #{JSON.stringify(user.email)}", + ng-model-options="{ updateOn: 'blur' }" ) span.small.text-primary(ng-show="settingsForm.email.$invalid && settingsForm.email.$dirty") | Must be an email address