From 62585aa445dbc81468334a9ffd089ed21426cf03 Mon Sep 17 00:00:00 2001 From: lfortin Date: Sun, 2 Jan 2011 19:41:20 -0500 Subject: [PATCH] more JS formatting --- public/javascripts/contact-list.js | 4 ++-- public/javascripts/photo-show.js | 4 ++-- public/javascripts/view.js | 2 +- public/javascripts/web-socket-receiver.js | 8 +++++--- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/public/javascripts/contact-list.js b/public/javascripts/contact-list.js index 18bbc1360..2f0041a06 100644 --- a/public/javascripts/contact-list.js +++ b/public/javascripts/contact-list.js @@ -60,8 +60,8 @@ $(document).ready(function() { $("#no_contacts").fadeOut(200); } - $(".badges").prepend(json['badge_html']); - $(this).parent().html(json['button_html']); + $(".badges").prepend(json.badge_html); + $(this).parent().html(json.button_html); $(this).fadeTo(200,1); }); diff --git a/public/javascripts/photo-show.js b/public/javascripts/photo-show.js index 1c2541278..c64e9ceae 100644 --- a/public/javascripts/photo-show.js +++ b/public/javascripts/photo-show.js @@ -9,7 +9,7 @@ $(document).ready(function() { $("#edit_photo_toggle").bind('click', function(evt) { evt.preventDefault(); $("#photo_edit_options").toggle(); - $(".edit_photo input[type='text']").first().focus(); + $(".edit_photo input:text").first().focus(); }); $('.edit_photo').bind('ajax:loading', function(data, json, xhr) { @@ -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: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/view.js b/public/javascripts/view.js index 2ca2b533a..49d0a182e 100644 --- a/public/javascripts/view.js +++ b/public/javascripts/view.js @@ -5,7 +5,7 @@ var View = { initialize: function() { /* Buttons */ - $("input[type='submit']").addClass("button"); + $("input:submit").addClass("button"); /* Tooltips */ this.tooltips.bindAll(); diff --git a/public/javascripts/web-socket-receiver.js b/public/javascripts/web-socket-receiver.js index e6c826cc7..579742c35 100644 --- a/public/javascripts/web-socket-receiver.js +++ b/public/javascripts/web-socket-receiver.js @@ -4,7 +4,9 @@ var WebSocketReceiver = { //Attach onmessage to websocket ws.onmessage = WSR.onMessage; - ws.onclose = function() { WSR.debug("socket closed"); }; + ws.onclose = function() { + WSR.debug("socket closed"); + }; ws.onopen = function() { ws.send(location.pathname); WSR.debug("connected..."); @@ -140,7 +142,7 @@ var WebSocketReceiver = { onPageForAspects: function(aspectIds) { if(location.pathname == '/aspects' && WebSocketReceiver.onPageOne()) { - return true + return true; } var found = false; $.each(aspectIds, function(index, value) { @@ -152,7 +154,7 @@ var WebSocketReceiver = { }, onPageForAspect: function(aspectId) { - return (location.href.indexOf(aspectId) != -1 ) + return (location.href.indexOf(aspectId) != -1 ); }, onPageOne: function() {