From 3955ca560f9ca626654f0a26dddd32910c8136c1 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sun, 2 Feb 2014 15:10:37 -0500 Subject: [PATCH 1/2] changed hook triggers to window from body --- public/src/ajaxify.js | 6 +++--- public/src/app.js | 7 +++---- public/src/forum/topic.js | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index d633e9688c..ef60865826 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -37,8 +37,8 @@ var ajaxify = {}; $(window).off('scroll'); - $('body').trigger('action:ajaxify.start', { url: url }); - $('body').trigger('action:ajaxifying', {url: url}); // Deprecated as of v0.4.0 + $(window).trigger('action:ajaxify.start', { url: url }); + $(window).trigger('action:ajaxifying', {url: url}); // Deprecated as of v0.4.0 if ($('#content').hasClass('ajaxifying')) { templates.cancelRequest(); @@ -121,7 +121,7 @@ var ajaxify = {}; } app.refreshTitle(url); - $('body').trigger('action:ajaxify.end', { url: url }); + $(window).trigger('action:ajaxify.end', { url: url }); }, url); return true; diff --git a/public/src/app.js b/public/src/app.js index 30916fbca5..50f181a99e 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -9,7 +9,6 @@ var socket, (function () { var showWelcomeMessage = false; - var body = $('body'); app.loadConfig = function() { $.ajax({ @@ -42,7 +41,7 @@ var socket, fields: ['username', 'picture', 'userslug'] }, app.updateHeader); - body.trigger('action:connected'); + $(window).trigger('action:connected'); }); socket.on('event:alert', function (data) { @@ -82,7 +81,7 @@ var socket, app.enterRoom(room, true); socket.emit('meta.reconnected'); - body.trigger('action:reconnected'); + $(window).trigger('action:reconnected'); setTimeout(function() { reconnectEl.removeClass('active').addClass("hide"); @@ -95,7 +94,7 @@ var socket, }); socket.on('event:disconnect', function() { - body.trigger('action:disconnected'); + $(window).trigger('action:disconnected'); socket.socket.connect(); }); diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index 597bbad79f..f877870b1e 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -8,7 +8,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) { } } - $('body').on('action:ajaxifying', function(ev, data) { + $(window).on('action:ajaxifying', function(ev, data) { if(data.url.indexOf('topic') === 0) { $('.pagination-block a').off('click').on('click', function() { From a53c35f0716a132ecafcaeb18aa462784e0bd5eb Mon Sep 17 00:00:00 2001 From: psychobunny Date: Sun, 2 Feb 2014 15:11:33 -0500 Subject: [PATCH 2/2] added back 'body' trigger - to be deprecated in 0.4x --- public/src/ajaxify.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index ef60865826..00637a61bb 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -38,7 +38,7 @@ var ajaxify = {}; $(window).off('scroll'); $(window).trigger('action:ajaxify.start', { url: url }); - $(window).trigger('action:ajaxifying', {url: url}); // Deprecated as of v0.4.0 + $('body').trigger('action:ajaxifying', {url: url}); // Deprecated as of v0.4.0 if ($('#content').hasClass('ajaxifying')) { templates.cancelRequest();