From 0a4775092a293513511e5dabd798497b3354cf36 Mon Sep 17 00:00:00 2001 From: Ivan Kuchin Date: Mon, 29 Oct 2012 23:34:14 +0100 Subject: [PATCH] using coffeescript interpolations --- public/javascripts/application.coffee | 10 +++++----- public/javascripts/application.js | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/public/javascripts/application.coffee b/public/javascripts/application.coffee index b950969..687b0ad 100644 --- a/public/javascripts/application.coffee +++ b/public/javascripts/application.coffee @@ -95,7 +95,7 @@ class MailCatcher url: '/messages/' + id type: 'DELETE' success: => - messageRow = $('#messages tbody tr[data-message-id="'+id+'"]') + messageRow = $("#messages tbody tr[data-message-id='#{id}']") switchTo = messageRow.next()?.data('message-id') || messageRow.prev()?.data('message-id') messageRow.remove() if switchTo @@ -198,12 +198,12 @@ class MailCatcher id ||= $('#messages tr.selected').attr 'data-message-id' if id? - $('#messages tbody tr:not([data-message-id="'+id+'"])').removeClass 'selected' - messageRow = $('#messages tbody tr[data-message-id="'+id+'"]') + $("#messages tbody tr:not([data-message-id='#{id}'])").removeClass 'selected' + messageRow = $("#messages tbody tr[data-message-id='#{id}']") messageRow.addClass 'selected' @scrollToRow(messageRow) - $.getJSON '/messages/' + id + '.json', (message) => + $.getJSON "/messages/#{id}.json", (message) => $('#message .metadata dd.created_at').text @formatDate message.created_at $('#message .metadata dd.from').text message.sender $('#message .metadata dd.to').text (message.recipients || []).join(', ') @@ -212,7 +212,7 @@ class MailCatcher $el = $(el) format = $el.attr 'data-message-format' if $.inArray(format, message.formats) >= 0 - $el.find('a').attr('href', '/messages/' + id + '.' + format) + $el.find('a').attr('href', "/messages/#{id}.#{format}") $el.show() else $el.hide() diff --git a/public/javascripts/application.js b/public/javascripts/application.js index 4e79ab5..ff8a822 100644 --- a/public/javascripts/application.js +++ b/public/javascripts/application.js @@ -131,7 +131,7 @@ type: 'DELETE', success: function() { var messageRow, switchTo, _ref, _ref1; - messageRow = $('#messages tbody tr[data-message-id="' + id + '"]'); + messageRow = $("#messages tbody tr[data-message-id='" + id + "']"); switchTo = ((_ref = messageRow.next()) != null ? _ref.data('message-id') : void 0) || ((_ref1 = messageRow.prev()) != null ? _ref1.data('message-id') : void 0); messageRow.remove(); if (switchTo) { @@ -270,11 +270,11 @@ if ((id != null ? id.id : void 0) != null) id = id.id; id || (id = $('#messages tr.selected').attr('data-message-id')); if (id != null) { - $('#messages tbody tr:not([data-message-id="' + id + '"])').removeClass('selected'); - messageRow = $('#messages tbody tr[data-message-id="' + id + '"]'); + $("#messages tbody tr:not([data-message-id='" + id + "'])").removeClass('selected'); + messageRow = $("#messages tbody tr[data-message-id='" + id + "']"); messageRow.addClass('selected'); this.scrollToRow(messageRow); - return $.getJSON('/messages/' + id + '.json', function(message) { + return $.getJSON("/messages/" + id + ".json", function(message) { var $ul; $('#message .metadata dd.created_at').text(_this.formatDate(message.created_at)); $('#message .metadata dd.from').text(message.sender); @@ -285,7 +285,7 @@ $el = $(el); format = $el.attr('data-message-format'); if ($.inArray(format, message.formats) >= 0) { - $el.find('a').attr('href', '/messages/' + id + '.' + format); + $el.find('a').attr('href', "/messages/" + id + "." + format); return $el.show(); } else { return $el.hide();