From 0393ac5a6f05ff86f4bebd3ddec06b20e9402ff5 Mon Sep 17 00:00:00 2001 From: lfortin Date: Sun, 19 Dec 2010 00:15:00 -0500 Subject: [PATCH] more JS formatting --- public/javascripts/aspect-edit.js | 7 ++++--- public/javascripts/contact-list.js | 8 ++++---- public/javascripts/custom-mobile-scripting.js | 4 ++-- public/javascripts/photo-show.js | 2 +- public/javascripts/rails.js | 1 - public/javascripts/validation.js | 4 +++- 6 files changed, 14 insertions(+), 12 deletions(-) diff --git a/public/javascripts/aspect-edit.js b/public/javascripts/aspect-edit.js index 46087146d..5481e1fec 100644 --- a/public/javascripts/aspect-edit.js +++ b/public/javascripts/aspect-edit.js @@ -101,9 +101,10 @@ var AspectEdit = { $.ajax({ type: "POST", url: "/aspects/remove_from_aspect", - data:{ - 'person_id' : person_id, - 'aspect_id' : person.attr('data-aspect_id') } + data: { + 'person_id': person_id, + 'aspect_id': person.attr('data-aspect_id') + } }); } person.fadeOut(400, function() { diff --git a/public/javascripts/contact-list.js b/public/javascripts/contact-list.js index 4c5405380..18bbc1360 100644 --- a/public/javascripts/contact-list.js +++ b/public/javascripts/contact-list.js @@ -14,8 +14,8 @@ $(document).ready(function() { $("li", list).each( function() { var element = $(this); - if( !element.text().match(query) ){ - if( !element.hasClass('invis') ){ + if( !element.text().match(query) ) { + if( !element.hasClass('invis') ) { element.addClass('invis').fadeOut(100); } } else { @@ -40,8 +40,8 @@ $(document).ready(function() { } } - $(".aspect_badge[guid='"+json['aspect_id']+"']", ".aspects").remove(); - $(this).parent().html(json['button_html']); + $(".aspect_badge[guid='" + json.aspect_id + "']", ".aspects").remove(); + $(this).parent().html(json.button_html); $(this).fadeTo(200,1); }); diff --git a/public/javascripts/custom-mobile-scripting.js b/public/javascripts/custom-mobile-scripting.js index 1bd9eec42..1ee6cbcf9 100644 --- a/public/javascripts/custom-mobile-scripting.js +++ b/public/javascripts/custom-mobile-scripting.js @@ -5,7 +5,7 @@ $(document).bind("mobileinit", function() { $.extend($.mobile, { - ajaxLinksEnabled : false, - ajaxFormsEnabled : false + ajaxLinksEnabled: false, + ajaxFormsEnabled: false }); }); diff --git a/public/javascripts/photo-show.js b/public/javascripts/photo-show.js index f076b8907..084ba6560 100644 --- a/public/javascripts/photo-show.js +++ b/public/javascripts/photo-show.js @@ -26,7 +26,7 @@ $(document).ready(function() { $('.edit_photo').bind('ajax:success', function(data, json, xhr) { json = $.parseJSON(json); - $(".edit_photo input[type='text']").val(json['photo']['caption']); + $(".edit_photo input[type='text']").val(json.photo.caption); $("#caption").html(json.photo.caption); $("#show_photo").find("img").fadeTo(200,1); $("#photo_spinner").hide(); diff --git a/public/javascripts/rails.js b/public/javascripts/rails.js index 443173f16..247c3ca60 100644 --- a/public/javascripts/rails.js +++ b/public/javascripts/rails.js @@ -1,7 +1,6 @@ /* Clear form plugin - called using $("elem").clearForm(); */ $.fn.clearForm = function() { return this.each(function() { - var type = this.type, tag = this.tagName.toLowerCase(); if ($(this).is('form')) { return $(':input', this).clearForm(); } diff --git a/public/javascripts/validation.js b/public/javascripts/validation.js index 097edb334..e932e49db 100644 --- a/public/javascripts/validation.js +++ b/public/javascripts/validation.js @@ -22,7 +22,9 @@ var Validation = { } }, emailKeypress: function(evt) { - if(evt.keyCode === 0) { return; } + if(evt.keyCode === 0) { + return; + } if(!Validation.rules.email.characters.test(this.value + String.fromCharCode(evt.keyCode))) { $('#user_email').css('border-color', '#8B0000'); } else {