From d3921f1f2b9cbe94390458fbc92a7232dfe76edf Mon Sep 17 00:00:00 2001 From: Fabian Rodriguez Date: Sat, 4 Jan 2014 18:04:56 -0200 Subject: [PATCH] #live is no longer supported, use on instead --- app/assets/javascripts/app/app.js | 2 +- app/assets/javascripts/app/views/hovercard_view.js | 6 +++--- app/assets/javascripts/aspect-edit-pane.js | 4 ++-- app/assets/javascripts/contact-list.js | 2 +- app/assets/javascripts/inbox.js | 11 ++--------- app/assets/javascripts/mobile.js | 2 +- app/assets/javascripts/view.js | 8 ++++---- 7 files changed, 14 insertions(+), 21 deletions(-) diff --git a/app/assets/javascripts/app/app.js b/app/assets/javascripts/app/app.js index 04f93abb9..07ad66910 100644 --- a/app/assets/javascripts/app/app.js +++ b/app/assets/javascripts/app/app.js @@ -88,7 +88,7 @@ var app = { Backbone.history.start({pushState: true}); // there's probably a better way to do this... - $("a[rel=backbone]").live("click", function(evt){ + $(document).on("click", "a[rel=backbone]", function(evt){ evt.preventDefault(); var link = $(this); diff --git a/app/assets/javascripts/app/views/hovercard_view.js b/app/assets/javascripts/app/views/hovercard_view.js index 89d76cd3f..c32014a71 100644 --- a/app/assets/javascripts/app/views/hovercard_view.js +++ b/app/assets/javascripts/app/views/hovercard_view.js @@ -3,9 +3,9 @@ app.views.Hovercard = Backbone.View.extend({ el: '#hovercard_container', initialize: function() { - $('.hovercardable') - .live('mouseenter', _.bind(this._mouseenterHandler, this)) - .live('mouseleave', _.bind(this._mouseleaveHandler, this)); + $(document) + .on('mouseenter', '.hovercardable', _.bind(this._mouseenterHandler, this)) + .on('mouseleave', '.hovercardable', _.bind(this._mouseleaveHandler, this)); this.show_me = false; diff --git a/app/assets/javascripts/aspect-edit-pane.js b/app/assets/javascripts/aspect-edit-pane.js index 01b15896a..aeaa196e0 100644 --- a/app/assets/javascripts/aspect-edit-pane.js +++ b/app/assets/javascripts/aspect-edit-pane.js @@ -17,11 +17,11 @@ function updatePageAspectName( an_id, new_name) { } $(document).ready(function() { - $('#rename_aspect_link').live('click', function(){ + $('#aspect_name_title').on('click', '#rename_aspect_link', function(){ toggleAspectTitle(); }); - $('form.edit_aspect').live('ajax:success', function(evt, data, status, xhr) { + $(document).on('ajax:success', 'form.edit_aspect', function(evt, data, status, xhr) { updateAspectName(data['name']); updatePageAspectName( data['id'], data['name'] ); toggleAspectTitle(); diff --git a/app/assets/javascripts/contact-list.js b/app/assets/javascripts/contact-list.js index 17700a851..5d8785a6e 100644 --- a/app/assets/javascripts/contact-list.js +++ b/app/assets/javascripts/contact-list.js @@ -5,7 +5,7 @@ var List = { initialize: function() { - $(".contact_list_search").live("keyup", function(e) { + $(document).on("keyup", ".contact_list_search", function(e) { var search = $(this); var list = $(".contacts", ".searchable"); var query = new RegExp(search.val(),'i'); diff --git a/app/assets/javascripts/inbox.js b/app/assets/javascripts/inbox.js index 905e033cc..3ab0c4cf5 100644 --- a/app/assets/javascripts/inbox.js +++ b/app/assets/javascripts/inbox.js @@ -28,13 +28,13 @@ $(document).ready(function(){ function(){ $(this).find('.participants').slideDown('300'); }, - + function(){ $(this).find('.participants').slideUp('300'); } ); - $('.conversation-wrapper').live('click', function(){ + $(document).on('click', '.conversation-wrapper', function(){ var conversation_path = $(this).data('conversation-path'); $.getScript(conversation_path, function() { @@ -101,11 +101,4 @@ $(document).ready(function(){ $(document).ajaxError(function(e,xhr,opt){ if (xhr.status == 404) { $('a.next_page').remove(); } }); - - $('#reply_to_conversation').live('click', function(evt) { - evt.preventDefault(); - $('html, body').animate({scrollTop:$(window).height()}, 'medium', function(){ - $('#message_text').focus(); - }); - }); }); diff --git a/app/assets/javascripts/mobile.js b/app/assets/javascripts/mobile.js index 4e7d84450..0ba372480 100644 --- a/app/assets/javascripts/mobile.js +++ b/app/assets/javascripts/mobile.js @@ -217,7 +217,7 @@ $(document).ready(function(){ form.remove(); }); - $(".new_comment").live("submit", function(evt){ + $(document).on("submit", ".new_comment", function(evt){ evt.preventDefault(); var form = $(this); diff --git a/app/assets/javascripts/view.js b/app/assets/javascripts/view.js index 2e9cdf3d2..6e7d7f9ec 100644 --- a/app/assets/javascripts/view.js +++ b/app/assets/javascripts/view.js @@ -20,8 +20,8 @@ var View = { .keypress(this.search.keyPress); /* Dropdowns */ - $(this.dropdowns.selector) - .live('click', this.dropdowns.click); + $(document) + .on('click', this.dropdowns.selector, this.dropdowns.click); /* Avatars */ $(this.avatars.selector).error(this.avatars.fallback); @@ -45,7 +45,7 @@ var View = { }); }; - $('form[data-remote]').live('ajax:success', function (e) { + $(document).on('ajax:success', 'form[data-remote]', function (e) { $(this).clearForm(); $(this).focusout(); }); @@ -73,7 +73,7 @@ var View = { }); /* facebox 'done' buttons */ - $("*[rel*=close]").live('click', function(){ $.facebox.close(); }); + $(document).on('click', "*[rel*=close]", function(){ $.facebox.close(); }); /* notification routing */ $("#notification").delegate('.hard_object_link', 'click', function(evt){