Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-07 22:45:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

changed hook triggers to window from body

Browse Source
This commit is contained in:
psychobunny
2014-02-02 15:10:37 -05:00
parent 3d61a1b15b
commit 3955ca560f
3 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
public/src/ajaxify.js
View File

@@ -37,8 +37,8 @@ var ajaxify = {};
$(window).off('scroll'); $(window).off('scroll');
$('body').trigger('action:ajaxify.start', { url: url }); $(window).trigger('action:ajaxify.start', { url: url });
$('body').trigger('action:ajaxifying', {url: url}); // Deprecated as of v0.4.0 $(window).trigger('action:ajaxifying', {url: url}); // Deprecated as of v0.4.0
if ($('#content').hasClass('ajaxifying')) { if ($('#content').hasClass('ajaxifying')) {
templates.cancelRequest(); templates.cancelRequest();
@@ -121,7 +121,7 @@ var ajaxify = {};
} }
app.refreshTitle(url); app.refreshTitle(url);
$('body').trigger('action:ajaxify.end', { url: url }); $(window).trigger('action:ajaxify.end', { url: url });
}, url); }, url);
return true; return true;

7
public/src/app.js
View File

@@ -9,7 +9,6 @@ var socket,
(function () { (function () {
var showWelcomeMessage = false; var showWelcomeMessage = false;
var body = $('body');
app.loadConfig = function() { app.loadConfig = function() {
$.ajax({ $.ajax({
@@ -42,7 +41,7 @@ var socket,
fields: ['username', 'picture', 'userslug'] fields: ['username', 'picture', 'userslug']
}, app.updateHeader); }, app.updateHeader);
body.trigger('action:connected'); $(window).trigger('action:connected');
}); });
socket.on('event:alert', function (data) { socket.on('event:alert', function (data) {
@@ -82,7 +81,7 @@ var socket,
app.enterRoom(room, true); app.enterRoom(room, true);
socket.emit('meta.reconnected'); socket.emit('meta.reconnected');
body.trigger('action:reconnected'); $(window).trigger('action:reconnected');
setTimeout(function() { setTimeout(function() {
reconnectEl.removeClass('active').addClass("hide"); reconnectEl.removeClass('active').addClass("hide");
@@ -95,7 +94,7 @@ var socket,
}); });
socket.on('event:disconnect', function() { socket.on('event:disconnect', function() {
body.trigger('action:disconnected'); $(window).trigger('action:disconnected');
socket.socket.connect(); socket.socket.connect();
}); });

2
public/src/forum/topic.js
View File

@@ -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) { if(data.url.indexOf('topic') === 0) {
$('.pagination-block a').off('click').on('click', function() { $('.pagination-block a').off('click').on('click', function() {