From 666fb76bfc8eaa5d0bea7b96b71fd72e6734209c Mon Sep 17 00:00:00 2001 From: danielgrippi Date: Fri, 13 May 2011 22:27:08 -0700 Subject: [PATCH] login as its own js file. accounted for the autofil state --- app/views/sessions/new.haml | 46 ++-------------------------------- config/assets.yml | 2 ++ public/javascripts/login.js | 50 +++++++++++++++++++++++++++++++++++++ 3 files changed, 54 insertions(+), 44 deletions(-) create mode 100644 public/javascripts/login.js diff --git a/app/views/sessions/new.haml b/app/views/sessions/new.haml index 9dea73bce..5799b1bd2 100644 --- a/app/views/sessions/new.haml +++ b/app/views/sessions/new.haml @@ -3,54 +3,12 @@ -# the COPYRIGHT file. = content_for :head do + = include_javascripts :login + :css header{ display:none; } footer{ position: absolute; bottom: 6px; } - :javascript - jQuery.fn.center = function () { - this.css("position","absolute"); - this.css("top", ( $(window).height() - this.height() ) / 2+$(window).scrollTop() + "px"); - this.css("left", ( $(window).width() - this.width() ) / 2+$(window).scrollLeft() + "px"); - return this; - } - - $(document).ready( function(){ - - var username = $("#user_username"), - password = $("#user_password"), - forgotPass = $("#forgot_password_link"), - controls = $("#controls"); - - $("#login").center(); - $(window).resize(function(){ - $("#login").center(); - }); - - username.focus(); - $("form").submit(function(){ - $('#asterisk').addClass('rideSpinners'); - forgotPass.addClass('hidden'); - controls.addClass('hidden'); - }); - - $(document).keydown(function(){ - if($('#user_username').val() != "" && $('#user_password').val() != ""){ - controls.removeClass('hidden'); - }else{ - controls.addClass('hidden'); - } - }); - - password - .focus(function(){ - forgotPass.removeClass('hidden'); - }) - .blur(function(){ - forgotPass.addClass('hidden'); - }); - }); - .container{:style => 'text-align:center;'} #login %p diff --git a/config/assets.yml b/config/assets.yml index 0b7d8a1d0..635149437 100644 --- a/config/assets.yml +++ b/config/assets.yml @@ -37,6 +37,8 @@ javascripts: - public/javascripts/stream.js - public/javascripts/content-updater.js - public/javascripts/search.js + login: + - public/javascripts/login.js mobile: - public/javascripts/vendor/jquery152.min.js - public/javascripts/custom-mobile-scripting.js diff --git a/public/javascripts/login.js b/public/javascripts/login.js new file mode 100644 index 000000000..8f5c8297d --- /dev/null +++ b/public/javascripts/login.js @@ -0,0 +1,50 @@ +jQuery.fn.center = function () { + this.css("position","absolute"); + this.css("top", ( $(window).height() - this.height() ) / 2+$(window).scrollTop() + "px"); + this.css("left", ( $(window).width() - this.width() ) / 2+$(window).scrollLeft() + "px"); + return this; +} + +$(document).ready( function(){ + var username = $("#user_username"), + password = $("#user_password"), + forgotPass = $("#forgot_password_link"), + controls = $("#controls"); + + var contentFilled = function(){ + return($('#user_username').val() != "" && $('#user_password').val() != ""); + } + + $("#login").center(); + $(window).resize(function(){ + $("#login").center(); + }); + + username.focus(); + $("form").submit(function(){ + $('#asterisk').addClass('rideSpinners'); + forgotPass.addClass('hidden'); + controls.addClass('hidden'); + }); + + $(document).keydown(function(){ + if(contentFilled()){ + controls.removeClass('hidden'); + }else{ + controls.addClass('hidden'); + } + }); + + if(contentFilled()){ + controls.removeClass('hidden'); + } + + password + .focus(function(){ + forgotPass.removeClass('hidden'); + }) + .blur(function(){ + forgotPass.addClass('hidden'); + }); +}); +