hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactored composer so that it uses a different div for each instance, closes #575

Browse Source
v1.18.x
Baris Soner Usakli 11 years ago
parent 07f1e0bcb5
commit f29b375ed4
2 changed files with 363 additions and 339 deletions
Show Stats Download Patch File Download Diff File

685
public/src/modules/composer.js
Unescape Escape View File

@ -1,381 +1,294 @@
define(['taskbar'], function(taskbar) { define(['taskbar'], function(taskbar) {
var composer = { var composer = {
initialized: false,
active: undefined, active: undefined,
taskbar: taskbar, taskbar: taskbar,
posts: {}, posts: {}
postContainer: undefined,
}; };
function createImagePlaceholder(img) { composer.push = function(tid, cid, pid, text) {
var text = $('.post-window textarea').val(),
textarea = $('.post-window textarea'),
imgText = "!["+img.name+"](uploading...)",
uuid = $('.post-window .imagedrop').parents('[data-uuid]').attr('data-uuid');
text += imgText;
textarea.val(text + " ");
if(!composer.posts[uuid].uploadsInProgress) {
composer.posts[uuid].uploadsInProgress = [];
}
composer.posts[uuid].uploadsInProgress.push(1);
socket.emit("api:posts.uploadImage", img, function(err, data) { socket.emit('api:composer.push', {
if(err) { tid: tid, // Replying
return app.alertError(err.message); cid: cid, // Posting
pid: pid, // Editing
body: text // Predefined text
}, function(threadData) {
if(threadData.error) {
app.alert({
type: 'danger',
timeout: 5000,
alert_id: 'post_error',
title: 'Please Log In to Post',
message: 'Posting is currently restricted to registered members only, click here to log in',
clickfn: function() {
ajaxify.go('login');
}
});
return;
} }
var currentText = textarea.val();
imgText = "!["+data.name+"](uploading...)";
if(!err)
textarea.val(currentText.replace(imgText, "!["+data.name+"]("+data.url+")"));
else
textarea.val(currentText.replace(imgText, "!["+data.name+"](upload error)"));
composer.posts[uuid].uploadsInProgress.pop();
});
}
function loadFile(file) { var uuid = utils.generateUUID();
var reader = new FileReader(),
dropDiv = $('.post-window .imagedrop');
$(reader).on('loadend', function(e) { composer.taskbar.push('composer', uuid, {
var bin = this.result; title: (!threadData.cid ? (threadData.title || '') : 'New Topic'),
bin = bin.split(',')[1]; icon: threadData.picture
});
var img = { composer.posts[uuid] = {
name: file.name, tid: threadData.tid,
data: bin cid: threadData.cid,
pid: threadData.pid,
title: threadData.title || '',
body: threadData.body || '',
modified: false
}; };
createImagePlaceholder(img); composer.load(uuid);
dropDiv.hide();
}); });
}
reader.readAsDataURL(file); composer.load = function(post_uuid) {
if($('#cmp-uuid-' + post_uuid).length) {
composer.activateReposition(post_uuid);
} else {
composer.createNewComposer(post_uuid);
}
} }
function initializeFileReader() { composer.createNewComposer = function(post_uuid) {
jQuery.event.props.push( "dataTransfer" );
var draggingDocument = false; templates.preload_template('composer', function() {
if(window.FileReader) { var composerTemplate = templates['composer'].parse({});
var drop = $('.post-window .imagedrop'), composerTemplate = $(composerTemplate);
textarea = $('.post-window textarea');
$(document).on('dragstart', function(e) { composerTemplate.attr('id', 'cmp-uuid-' + post_uuid);
draggingDocument = true;
}).on('dragend', function(e) {
draggingDocument = false;
});
textarea.on('dragenter', function(e) { $(document.body).append(composerTemplate);
if(draggingDocument) {
return;
}
drop.css('top', textarea.position().top + 'px');
drop.show();
drop.on('dragleave', function(ev) { composer.activateReposition(post_uuid);
drop.hide();
drop.off('dragleave');
});
});
function cancel(e) { var postContainer = $(composerTemplate[0]);
e.preventDefault();
return false;
}
drop.on('dragover', cancel); if(config.imgurClientIDSet) {
drop.on('dragenter', cancel); initializeFileReader(post_uuid);
}
drop.on('drop', function(e) { var postData = composer.posts[post_uuid],
e.preventDefault(); titleEl = postContainer.find('.title'),
var uuid = drop.parents('[data-uuid]').attr('data-uuid'), bodyEl = postContainer.find('textarea');
dt = e.dataTransfer,
files = dt.files; if (parseInt(postData.tid) > 0) {
titleEl.val('Replying to: ' + postData.title);
titleEl.prop('readOnly', true);
} else if (parseInt(postData.pid) > 0) {
titleEl.val(postData.title);
titleEl.prop('readOnly', true);
socket.emit('api:composer.editCheck', postData.pid, function(editCheck) {
if (editCheck.titleEditable) {
postContainer.find('input').prop('readonly', false);
}
});
} else {
titleEl.val(postData.title);
titleEl.prop('readOnly', false);
}
for (var i=0; i<files.length; i++) { bodyEl.val(postData.body);
loadFile(files[i]);
}
if(!files.length) postContainer.on('change', 'input, textarea', function() {
drop.hide(); composer.posts[post_uuid].modified = true;
return false;
}); });
}
}
composer.init = function() { postContainer.on('click', '.action-bar button', function() {
if (!composer.initialized) { var action = $(this).attr('data-action');
templates.preload_template('composer', function() {
$(document.body).append(templates['composer'].parse({}));
composer.postContainer = $('.composer')[0];
if(config.imgurClientIDSet) { switch(action) {
initializeFileReader(); case 'post':
composer.post(post_uuid);
break;
case 'discard':
if (composer.posts[post_uuid].modified) {
bootbox.confirm('Are you sure you wish to discard this post?', function(discard) {
if (discard) {
composer.discard(post_uuid);
}
});
} else {
composer.discard(post_uuid);
}
break;
} }
});
socket.on('api:composer.push', function(threadData) { postContainer.on('click', '.formatting-bar span', function() {
if (!threadData.error) { var postContentEl = postContainer.find('textarea'),
var uuid = utils.generateUUID(); iconClass = $(this).find('i').attr('class'),
cursorEnd = postContentEl.val().length,
composer.taskbar.push('composer', uuid, { selectionStart = postContentEl[0].selectionStart,
title: (!threadData.cid ? (threadData.title || '') : 'New Topic'), selectionEnd = postContentEl[0].selectionEnd,
icon: threadData.picture selectionLength = selectionEnd - selectionStart;
});
composer.posts[uuid] = {
tid: threadData.tid,
cid: threadData.cid,
pid: threadData.pid,
title: threadData.title || '',
body: threadData.body || '',
modified: false
};
composer.load(uuid);
} else {
app.alert({
type: 'danger',
timeout: 5000,
alert_id: 'post_error',
title: 'Please Log In to Post',
message: 'Posting is currently restricted to registered members only, click here to log in',
clickfn: function() {
ajaxify.go('login');
}
});
}
});
socket.on('api:composer.editCheck', function(editCheck) {
if (editCheck.titleEditable === true) composer.postContainer.querySelector('input').readOnly = false;
});
// Post Window events
var jPostContainer = $(composer.postContainer),
postContentEl = composer.postContainer.querySelector('textarea'),
resizeEl = jPostContainer.find('.resizer');
jPostContainer.on('change', 'input, textarea', function() {
var uuid = $(this).parents('.composer').attr('data-uuid');
if (this.nodeName === 'INPUT') composer.posts[uuid].title = this.value;
else if (this.nodeName === 'TEXTAREA') composer.posts[uuid].body = this.value;
// Mark this post window as having been changed
composer.posts[uuid].modified = true;
});
jPostContainer.on('click', '.action-bar button', function() { function insertIntoInput(element, value) {
var action = this.getAttribute('data-action'), var start = postContentEl[0].selectionStart;
uuid = $(this).parents('.composer').attr('data-uuid'); element.val(element.val().slice(0, start) + value + element.val().slice(start, element.val().length));
switch(action) { postContentEl[0].selectionStart = postContentEl[0].selectionEnd = start + value.length;
case 'post': composer.post(uuid); break; }
case 'discard':
if (composer.posts[uuid].modified) {
bootbox.confirm('Are you sure you wish to discard this post?', function(discard) {
if (discard) composer.discard(uuid);
});
} else {
composer.discard(uuid);
}
break;
}
});
jPostContainer.on('click', '.formatting-bar span', function() {
var iconClass = this.querySelector('i').className,
cursorEnd = postContentEl.value.length,
selectionStart = postContentEl.selectionStart,
selectionEnd = postContentEl.selectionEnd,
selectionLength = selectionEnd - selectionStart;
function insertIntoInput(element, value) {
var start = postContentEl.selectionStart;
element.value = element.value.slice(0, start) + value + element.value.slice(start, element.value.length);
postContentEl.selectionStart = postContentEl.selectionEnd = start + value.length;
}
switch(iconClass) { switch(iconClass) {
case 'fa fa-bold': case 'fa fa-bold':
if (selectionStart === selectionEnd) { if (selectionStart === selectionEnd) {
// Nothing selected
insertIntoInput(postContentEl, "**bolded text**");
} else {
// Text selected
postContentEl.value = postContentEl.value.slice(0, selectionStart) + '**' + postContentEl.value.slice(selectionStart, selectionEnd) + '**' + postContentEl.value.slice(selectionEnd);
postContentEl.selectionStart = selectionStart + 2;
postContentEl.selectionEnd = selectionEnd + 2;
}
break;
case 'fa fa-italic':
if (selectionStart === selectionEnd) {
// Nothing selected
insertIntoInput(postContentEl, "*italicised text*");
} else {
// Text selected
postContentEl.value = postContentEl.value.slice(0, selectionStart) + '*' + postContentEl.value.slice(selectionStart, selectionEnd) + '*' + postContentEl.value.slice(selectionEnd);
postContentEl.selectionStart = selectionStart + 1;
postContentEl.selectionEnd = selectionEnd + 1;
}
break;
case 'fa fa-list':
// Nothing selected // Nothing selected
insertIntoInput(postContentEl, "\n\n* list item"); insertIntoInput(postContentEl, "**bolded text**");
break; } else {
case 'fa fa-link': // Text selected
if (selectionStart === selectionEnd) { postContentEl.val(postContentEl.val().slice(0, selectionStart) + '**' + postContentEl.val().slice(selectionStart, selectionEnd) + '**' + postContentEl.val().slice(selectionEnd));
// Nothing selected postContentEl[0].selectionStart = selectionStart + 2;
insertIntoInput(postContentEl, "[link text](link url)"); postContentEl[0].selectionEnd = selectionEnd + 2;
} else { }
// Text selected break;
postContentEl.value = postContentEl.value.slice(0, selectionStart) + '[' + postContentEl.value.slice(selectionStart, selectionEnd) + '](link url)' + postContentEl.value.slice(selectionEnd); case 'fa fa-italic':
postContentEl.selectionStart = selectionStart + selectionLength + 3; if (selectionStart === selectionEnd) {
postContentEl.selectionEnd = selectionEnd + 11; // Nothing selected
} insertIntoInput(postContentEl, "*italicised text*");
break; } else {
} // Text selected
}); postContentEl.val(postContentEl.val().slice(0, selectionStart) + '*' + postContentEl.val().slice(selectionStart, selectionEnd) + '*' + postContentEl.val().slice(selectionEnd));
postContentEl[0].selectionStart = selectionStart + 1;
postContentEl[0].selectionEnd = selectionEnd + 1;
}
break;
case 'fa fa-list':
// Nothing selected
insertIntoInput(postContentEl, "\n\n* list item");
break;
case 'fa fa-link':
if (selectionStart === selectionEnd) {
// Nothing selected
insertIntoInput(postContentEl, "[link text](link url)");
} else {
// Text selected
postContentEl.val(postContentEl.val().slice(0, selectionStart) + '[' + postContentEl.val().slice(selectionStart, selectionEnd) + '](link url)' + postContentEl.val().slice(selectionEnd));
postContentEl[0].selectionStart = selectionStart + selectionLength + 3;
postContentEl[0].selectionEnd = selectionEnd + 11;
}
break;
}
});
var resizeActive = false, var resizeActive = false,
resizeCenterX = 0, resizeCenterX = 0,
resizeOffset = 0, resizeOffset = 0,
resizeAction = function(e) { resizeAction = function(e) {
if (resizeActive) { if (resizeActive) {
position = (e.clientX + resizeOffset); position = (e.clientX + resizeOffset);
if (Math.abs(position - resizeSnaps.half) <= 15) { if (Math.abs(position - resizeSnaps.half) <= 15) {
// Half snap // Half snap
jPostContainer.css('width', resizeSnaps.half); postContainer.css('width', resizeSnaps.half);
resizeSavePosition(resizeSnaps.half); resizeSavePosition(resizeSnaps.half);
} else if (Math.abs(position - resizeSnaps.none) <= 30) { } else if (Math.abs(position - resizeSnaps.none) <= 30) {
// Minimize snap // Minimize snap
jPostContainer.css('width', bodyRect.width - resizeSnaps.none + 15); postContainer.css('width', bodyRect.width - resizeSnaps.none + 15);
resizeSavePosition(resizeSnaps.none); resizeSavePosition(resizeSnaps.none);
} else if (position <= 30) { } else if (position <= 30) {
// Full snap // Full snap
jPostContainer.css('width', bodyRect.width - 15); postContainer.css('width', bodyRect.width - 15);
resizeSavePosition(bodyRect.width - 15); resizeSavePosition(bodyRect.width - 15);
} else { } else {
// OH SNAP, NO SNAPS! // OH SNAP, NO SNAPS!
jPostContainer.css('width', bodyRect.width - position); postContainer.css('width', bodyRect.width - position);
resizeSavePosition(bodyRect.width - position); resizeSavePosition(bodyRect.width - position);
}
} }
}, }
resizeSavePosition = function(px) { },
var percentage = px/bodyRect.width; resizeSavePosition = function(px) {
localStorage.setItem('composer:resizePercentage', percentage); var percentage = px/bodyRect.width;
}, localStorage.setItem('composer:resizePercentage', percentage);
resizeSnaps = { },
none: 0, resizeSnaps = {
half: 0, none: 0,
full: 0 half: 0,
}, full: 0
resizeRect, bodyRect; },
resizeRect, bodyRect;
resizeEl
.on('mousedown', function(e) { var resizeEl = postContainer.find('.resizer');
bodyRect = document.body.getBoundingClientRect();
resizeRect = resizeEl[0].getBoundingClientRect(); resizeEl
resizeCenterX = resizeRect.left + (resizeRect.width/2); .on('mousedown', function(e) {
resizeOffset = resizeCenterX - e.clientX; bodyRect = document.body.getBoundingClientRect();
resizeSnaps.half = bodyRect.width / 2; resizeRect = resizeEl[0].getBoundingClientRect();
resizeSnaps.none = bodyRect.width; resizeCenterX = resizeRect.left + (resizeRect.width/2);
resizeActive = true; resizeOffset = resizeCenterX - e.clientX;
resizeSnaps.half = bodyRect.width / 2;
$(document.body).on('mousemove', resizeAction); resizeSnaps.none = bodyRect.width;
}) resizeActive = true;
.on('mouseup', function() {
resizeActive = false; $(document.body).on('mousemove', resizeAction);
$(document.body).off('mousemove', resizeAction); })
}); .on('mouseup', function() {
resizeActive = false;
window.addEventListener('resize', function() { $(document.body).off('mousemove', resizeAction);
if (composer.active !== undefined) composer.reposition(composer.active);
}); });
composer.initialized = true; window.addEventListener('resize', function() {
if (composer.active !== undefined) {
composer.activateReposition(composer.active);
}
}); });
} });
} }
composer.push = function(tid, cid, pid, text) { composer.activateReposition = function(post_uuid) {
if (!composer.initialized) {
var args = arguments; if(composer.active && composer.active !== post_uuid) {
setTimeout(function() { composer.minimize(composer.active);
composer.push.apply(composer, args);
}, 500);
} else {
socket.emit('api:composer.push', {
tid: tid, // Replying
cid: cid, // Posting
pid: pid, // Editing
body: text // Predefined text
});
} }
}
composer.load = function(post_uuid) { var percentage = localStorage.getItem('composer:resizePercentage'),
var post_data = composer.posts[post_uuid], bodyRect = document.body.getBoundingClientRect(),
titleEl = composer.postContainer.querySelector('input'), postContainer = $('#cmp-uuid-' + post_uuid);
bodyEl = composer.postContainer.querySelector('textarea');
composer.reposition(post_uuid);
composer.active = post_uuid; composer.active = post_uuid;
composer.postContainer.setAttribute('data-uuid', post_uuid); if (percentage) {
if (parseInt(post_data.tid) > 0) { if (bodyRect.width >= 768) {
titleEl.value = 'Replying to: ' + post_data.title; postContainer.css('width', Math.floor(bodyRect.width * percentage) + 'px');
titleEl.readOnly = true; } else {
} else if (parseInt(post_data.pid) > 0) { postContainer.css('width', '100%');
titleEl.value = post_data.title; }
titleEl.readOnly = true;
socket.emit('api:composer.editCheck', post_data.pid);
} else {
titleEl.value = post_data.title;
titleEl.readOnly = false;
} }
bodyEl.value = post_data.body;
postContainer.css('visibility', 'visible');
// Direct user focus to the correct element composer.focusElements(post_uuid);
if ((parseInt(post_data.tid) || parseInt(post_data.pid)) > 0) {
bodyEl.focus();
bodyEl.selectionStart = bodyEl.value.length;
bodyEl.selectionEnd = bodyEl.value.length;
} else if (parseInt(post_data.cid) > 0) {
titleEl.focus();
}
} }
composer.reposition = function(post_uuid) { composer.focusElements = function(post_uuid) {
// Resize the composer to the saved size var postContainer = $('#cmp-uuid-' + post_uuid),
var percentage = localStorage.getItem('composer:resizePercentage'), postData = composer.posts[post_uuid],
bodyRect = document.body.getBoundingClientRect(); titleEl = postContainer.find('.title'),
bodyEl = postContainer.find('textarea');
if (percentage) { if ((parseInt(postData.tid) || parseInt(postData.pid)) > 0) {
if (bodyRect.width >= 768) { bodyEl.focus();
composer.postContainer.style.width = Math.floor(bodyRect.width * percentage) + 'px'; bodyEl.selectionStart = bodyEl.val().length;
} else { bodyEl.selectionEnd = bodyEl.val().length;
composer.postContainer.style.width = '100%'; } else if (parseInt(postData.cid) > 0) {
} titleEl.focus();
} }
composer.postContainer.style.visibility = 'visible';
} }
composer.post = function(post_uuid) { composer.post = function(post_uuid) {
// Check title and post length
var postData = composer.posts[post_uuid], var postData = composer.posts[post_uuid],
titleEl = composer.postContainer.querySelector('input'), postContainer = $('#cmp-uuid-' + post_uuid),
bodyEl = composer.postContainer.querySelector('textarea'); titleEl = postContainer.find('.title'),
bodyEl = postContainer.find('textarea');
titleEl.value = titleEl.value.trim(); titleEl.val(titleEl.val().trim());
bodyEl.value = bodyEl.value.trim(); bodyEl.val(bodyEl.val().trim());
if(postData.uploadsInProgress && postData.uploadsInProgress.length) { if(postData.uploadsInProgress && postData.uploadsInProgress.length) {
return app.alert({ return app.alert({
@ -387,7 +300,7 @@ define(['taskbar'], function(taskbar) {
}); });
} }
if (titleEl.value.length < config.minimumTitleLength) { if (titleEl.val().length < config.minimumTitleLength) {
return app.alert({ return app.alert({
type: 'danger', type: 'danger',
timeout: 2000, timeout: 2000,
@ -397,7 +310,7 @@ define(['taskbar'], function(taskbar) {
}); });
} }
if (bodyEl.value.length < config.minimumPostLength) { if (bodyEl.val().length < config.minimumPostLength) {
return app.alert({ return app.alert({
type: 'danger', type: 'danger',
timeout: 2000, timeout: 2000,
@ -410,20 +323,20 @@ define(['taskbar'], function(taskbar) {
// Still here? Let's post. // Still here? Let's post.
if (parseInt(postData.cid) > 0) { if (parseInt(postData.cid) > 0) {
socket.emit('api:topics.post', { socket.emit('api:topics.post', {
'title' : titleEl.value, 'title' : titleEl.val(),
'content' : bodyEl.value, 'content' : bodyEl.val(),
'category_id' : postData.cid 'category_id' : postData.cid
}); });
} else if (parseInt(postData.tid) > 0) { } else if (parseInt(postData.tid) > 0) {
socket.emit('api:posts.reply', { socket.emit('api:posts.reply', {
'topic_id' : postData.tid, 'topic_id' : postData.tid,
'content' : bodyEl.value 'content' : bodyEl.val()
}); });
} else if (parseInt(postData.pid) > 0) { } else if (parseInt(postData.pid) > 0) {
socket.emit('api:posts.edit', { socket.emit('api:posts.edit', {
pid: postData.pid, pid: postData.pid,
content: bodyEl.value, content: bodyEl.val(),
title: titleEl.value title: titleEl.val()
}); });
} }
@ -432,20 +345,130 @@ define(['taskbar'], function(taskbar) {
composer.discard = function(post_uuid) { composer.discard = function(post_uuid) {
if (composer.posts[post_uuid]) { if (composer.posts[post_uuid]) {
$(composer.postContainer).find('.imagedrop').hide(); $('#cmp-uuid-' + post_uuid).remove();
delete composer.posts[post_uuid]; delete composer.posts[post_uuid];
composer.minimize(); composer.active = undefined;
taskbar.discard('composer', post_uuid); taskbar.discard('composer', post_uuid);
} }
} }
composer.minimize = function(uuid) { composer.minimize = function(post_uuid) {
composer.postContainer.style.visibility = 'hidden'; var postContainer = $('#cmp-uuid-' + post_uuid);
postContainer.css('visibility', 'hidden');
composer.active = undefined; composer.active = undefined;
taskbar.minimize('composer', uuid); taskbar.minimize('composer', post_uuid);
} }
composer.init(); function initializeFileReader(post_uuid) {
if(jQuery.event.props.indexOf('dataTransfer') === -1) {
jQuery.event.props.push('dataTransfer');
}
var draggingDocument = false;
if(window.FileReader) {
var postContainer = $('#cmp-uuid-' + post_uuid),
drop = postContainer.find('.imagedrop'),
textarea = postContainer.find('textarea');
$(document).off('dragstart').on('dragstart', function(e) {
draggingDocument = true;
}).off('dragend').on('dragend', function(e) {
draggingDocument = false;
});
textarea.on('dragenter', function(e) {
if(draggingDocument) {
return;
}
drop.css('top', textarea.position().top + 'px');
drop.css('height', textarea.height());
drop.css('line-height', textarea.height() + 'px');
drop.show();
drop.on('dragleave', function(ev) {
drop.hide();
drop.off('dragleave');
});
});
function cancel(e) {
e.preventDefault();
return false;
}
drop.on('dragover', cancel);
drop.on('dragenter', cancel);
drop.on('drop', function(e) {
e.preventDefault();
var dt = e.dataTransfer,
files = dt.files;
for (var i=0; i<files.length; i++) {
loadFile(post_uuid, files[i]);
}
if(!files.length) {
drop.hide();
}
return false;
});
}
}
function loadFile(post_uuid, file) {
var reader = new FileReader(),
dropDiv = $('#cmp-uuid-' + post_uuid).find('.imagedrop');
$(reader).on('loadend', function(e) {
var bin = this.result;
bin = bin.split(',')[1];
var img = {
name: file.name,
data: bin
};
createImagePlaceholder(post_uuid, img);
dropDiv.hide();
});
reader.readAsDataURL(file);
}
function createImagePlaceholder(post_uuid, img) {
var postContainer = $('#cmp-uuid-' + post_uuid),
textarea = postContainer.find('textarea'),
text = textarea.val(),
imgText = "![" + img.name + "](uploading...)";
text += imgText;
textarea.val(text + " ");
if(!composer.posts[post_uuid].uploadsInProgress) {
composer.posts[post_uuid].uploadsInProgress = [];
}
composer.posts[post_uuid].uploadsInProgress.push(1);
socket.emit("api:posts.uploadImage", img, function(err, data) {
if(err) {
return app.alertError(err.message);
}
var currentText = textarea.val();
imgText = "![" + data.name + "](uploading...)";
if(!err) {
textarea.val(currentText.replace(imgText, "![" + data.name + "](" + data.url + ")"));
} else {
textarea.val(currentText.replace(imgText, "![" + data.name + "](upload error)"));
}
composer.posts[post_uuid].uploadsInProgress.pop();
});
}
return { return {
push: composer.push, push: composer.push,

17
src/websockets.js
Unescape Escape View File

@ -799,14 +799,15 @@ websockets.init = function(io) {
meta.configs.remove(key); meta.configs.remove(key);
}); });
socket.on('api:composer.push', function(data) { socket.on('api:composer.push', function(data, callback) {
if (parseInt(uid, 10) > 0 || parseInt(meta.config.allowGuestPosting, 10) === 1) { if (parseInt(uid, 10) > 0 || parseInt(meta.config.allowGuestPosting, 10) === 1) {
if (parseInt(data.tid) > 0) { if (parseInt(data.tid) > 0) {
topics.getTopicData(data.tid, function(err, topicData) { topics.getTopicData(data.tid, function(err, topicData) {
if (data.body) if (data.body) {
topicData.body = data.body; topicData.body = data.body;
}
socket.emit('api:composer.push', { callback({
tid: data.tid, tid: data.tid,
title: topicData.title, title: topicData.title,
body: topicData.body body: topicData.body
@ -815,7 +816,7 @@ websockets.init = function(io) {
} else if (parseInt(data.cid) > 0) { } else if (parseInt(data.cid) > 0) {
user.getUserFields(uid, ['username', 'picture'], function(err, userData) { user.getUserFields(uid, ['username', 'picture'], function(err, userData) {
if (!err && userData) { if (!err && userData) {
socket.emit('api:composer.push', { callback({
tid: 0, tid: 0,
cid: data.cid, cid: data.cid,
username: userData.username, username: userData.username,
@ -836,7 +837,7 @@ websockets.init = function(io) {
}); });
} }
], function(err, results) { ], function(err, results) {
socket.emit('api:composer.push', { callback({
title: results[1], title: results[1],
pid: data.pid, pid: data.pid,
body: results[0].content body: results[0].content
@ -844,16 +845,16 @@ websockets.init = function(io) {
}); });
} }
} else { } else {
socket.emit('api:composer.push', { callback({
error: 'no-uid' error: 'no-uid'
}); });
} }
}); });
socket.on('api:composer.editCheck', function(pid) { socket.on('api:composer.editCheck', function(pid, callback) {
posts.getPostField(pid, 'tid', function(err, tid) { posts.getPostField(pid, 'tid', function(err, tid) {
postTools.isMain(pid, tid, function(err, isMain) { postTools.isMain(pid, tid, function(err, isMain) {
socket.emit('api:composer.editCheck', { callback({
titleEditable: isMain titleEditable: isMain
}); });
}) })

Write Preview
Loading…
Cancel
Save