mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-03 23:17:43 +02:00
Code Issues Releases Wiki Activity

Mithril 2 Update (#23)

Browse Source 
Update for Mithril 2
This commit is contained in:
Alexander Skvortsov
2020-09-23 22:54:48 -04:00
committed by GitHub
parent 619796b102
commit 9307cf17b3
1 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
extensions/pusher/js/src/forum/index.js
View File

@@ -8,31 +8,29 @@ import IndexPage from 'flarum/components/IndexPage';
import Button from 'flarum/components/Button'; import Button from 'flarum/components/Button';
app.initializers.add('flarum-pusher', () => { app.initializers.add('flarum-pusher', () => {
const loadPusher = m.deferred(); const loadPusher = new Promise((resolve) => {
$.getScript('//cdn.jsdelivr.net/npm/pusher-js@3.0.0/dist/pusher.min.js', () => {
$.getScript('//cdn.jsdelivr.net/npm/pusher-js@3.0.0/dist/pusher.min.js', () => { const socket = new Pusher(app.forum.attribute('pusherKey'), {
const socket = new Pusher(app.forum.attribute('pusherKey'), { authEndpoint: app.forum.attribute('apiUrl') + '/pusher/auth',
authEndpoint: app.forum.attribute('apiUrl') + '/pusher/auth', cluster: app.forum.attribute('pusherCluster'),
cluster: app.forum.attribute('pusherCluster'), auth: {
auth: { headers: {
headers: { 'X-CSRF-Token': app.session.csrfToken
'X-CSRF-Token': app.session.csrfToken }
} }
} });
});
loadPusher.resolve({ return resolve({
main: socket.subscribe('public'), main: socket.subscribe('public'),
user: app.session.user ? socket.subscribe('private-user' + app.session.user.id()) : null user: app.session.user ? socket.subscribe('private-user' + app.session.user.id()) : null
});
}); });
}); });
app.pusher = loadPusher.promise; app.pusher = loadPusher;
app.pushedUpdates = []; app.pushedUpdates = [];
extend(DiscussionList.prototype, 'config', function(x, isInitialized, context) { extend(DiscussionList.prototype, 'oncreate', function() {
if (isInitialized) return;
app.pusher.then(channels => { app.pusher.then(channels => {
channels.main.bind('newPost', data => { channels.main.bind('newPost', data => {
const params = app.discussions.getParams(); const params = app.discussions.getParams();
@@ -57,8 +55,12 @@ app.initializers.add('flarum-pusher', () => {
} }
} }
}); });
});
});
extend(context, 'onunload', () => channels.main.unbind('newPost')); extend(DiscussionList.prototype, 'onremove', function () {
app.pusher.then(channels => {
channels.main.unbind('newPost');
}); });
}); });
@@ -105,9 +107,7 @@ app.initializers.add('flarum-pusher', () => {
m.redraw(); m.redraw();
}); });
extend(DiscussionPage.prototype, 'config', function(x, isInitialized, context) { extend(DiscussionPage.prototype, 'oncreate', function() {
if (isInitialized) return;
app.pusher.then(channels => { app.pusher.then(channels => {
channels.main.bind('newPost', data => { channels.main.bind('newPost', data => {
const id = String(data.discussionId); const id = String(data.discussionId);
@@ -126,8 +126,12 @@ app.initializers.add('flarum-pusher', () => {
}); });
} }
}); });
});
});
extend(context, 'onunload', () => channels.main.unbind('newPost')); extend(DiscussionPage.prototype, 'onremove', function () {
app.pusher.then(channels => {
channels.main.unbind('newPost')
}); });
}); });