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

removed duplicate id in topic template, closed #84, where opening a couple threads caused the reply window to load multiple times

Browse Source
v1.18.x
Julian Lam 12 years ago
parent d4a0b3d05a
commit 0e854119c6
3 changed files with 147 additions and 143 deletions
Show Stats Download Patch File Download Diff File

28
public/src/forum/topic.js
Unescape Escape View File

@ -221,21 +221,23 @@
}); });
}); });
$('#content').on('click', '.post_reply', function() { var reply_fn = function() {
var selectionText = '', var selectionText = '',
selection = window.getSelection() || document.getSelection(); selection = window.getSelection() || document.getSelection();
if ($(selection.baseNode).parents('.post-content').length > 0) { if ($(selection.baseNode).parents('.post-content').length > 0) {
var snippet = selection.toString(); var snippet = selection.toString();
if (snippet.length > 0) selectionText = '> ' + snippet.replace(/\n/g, '\n> '); if (snippet.length > 0) selectionText = '> ' + snippet.replace(/\n/g, '\n> ');
} }
if (thread_state.locked !== '1') { if (thread_state.locked !== '1') {
require(['composer'], function(cmp) { require(['composer'], function(cmp) {
cmp.push(tid, null, null, selectionText + '\n\n'); cmp.push(tid, null, null, selectionText + '\n\n');
}); });
} }
}); };
$('.post-container').on('click', '.post_reply', reply_fn);
$('#post_reply').on('click', reply_fn);
$('.post-container').on('click', '.quote', function() { $('.post-container').on('click', '.quote', function() {
if (thread_state.locked !== '1') { if (thread_state.locked !== '1') {

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

@ -8,140 +8,142 @@ define(['taskbar'], function(taskbar) {
}; };
composer.init = function() { composer.init = function() {
// Create the fixed bottom bar if (!composer.initialized) {
var taskbar = document.getElementById('taskbar'); // Create the fixed bottom bar
var taskbar = document.getElementById('taskbar');
composer.postContainer = document.createElement('div');
composer.postContainer.className = 'post-window row-fluid'; composer.postContainer = document.createElement('div');
composer.postContainer.innerHTML = '<div class="span10 offset1">' + composer.postContainer.className = 'post-window row-fluid';
'<input type="text" tabIndex="1" placeholder="Enter your topic title here..." />' + composer.postContainer.innerHTML = '<div class="span10 offset1">' +
'<div class="btn-toolbar">' + '<input type="text" tabIndex="1" placeholder="Enter your topic title here..." />' +
'<div class="btn-group formatting-bar">' + '<div class="btn-toolbar">' +
'<span class="btn btn-link" tabindex="-1"><i class="icon-bold"></i></span>' + '<div class="btn-group formatting-bar">' +
'<span class="btn btn-link" tabindex="-1"><i class="icon-italic"></i></span>' + '<span class="btn btn-link" tabindex="-1"><i class="icon-bold"></i></span>' +
'<span class="btn btn-link" tabindex="-1"><i class="icon-list"></i></span>' + '<span class="btn btn-link" tabindex="-1"><i class="icon-italic"></i></span>' +
'<span class="btn btn-link" tabindex="-1"><i class="icon-link"></i></span>' + '<span class="btn btn-link" tabindex="-1"><i class="icon-list"></i></span>' +
'<span class="btn btn-link" tabindex="-1"><i class="icon-link"></i></span>' +
'</div>' +
'<div class="btn-group action-bar" style="float: right; margin-right: -12px">' +
'<button data-action="post" class="btn" tabIndex="3"><i class="icon-ok"></i> Submit</button>' +
'<button data-action="minimize" class="btn hidden-phone" tabIndex="4"><i class="icon-download-alt"></i> Minimize</button>' +
'<button class="btn" data-action="discard" tabIndex="5"><i class="icon-remove"></i> Discard</button>' +
'</div>' +
'</div>' + '</div>' +
'<div class="btn-group action-bar" style="float: right; margin-right: -12px">' + '<textarea tabIndex="2"></textarea>' +
'<button data-action="post" class="btn" tabIndex="3"><i class="icon-ok"></i> Submit</button>' + '</div>';
'<button data-action="minimize" class="btn hidden-phone" tabIndex="4"><i class="icon-download-alt"></i> Minimize</button>' +
'<button class="btn" data-action="discard" tabIndex="5"><i class="icon-remove"></i> Discard</button>' + document.body.insertBefore(composer.postContainer, taskbar);
'</div>' +
'</div>' + socket.on('api:composer.push', function(threadData) {
'<textarea tabIndex="2"></textarea>' + if (!threadData.error) {
'</div>'; var uuid = utils.generateUUID();
document.body.insertBefore(composer.postContainer, taskbar); composer.taskbar.push('composer', uuid, {
title: (!threadData.cid ? (threadData.title || '') : 'New Topic'),
socket.on('api:composer.push', function(threadData) { icon: threadData.picture
if (!threadData.error) { });
var uuid = utils.generateUUID();
composer.posts[uuid] = {
composer.taskbar.push('composer', uuid, { tid: threadData.tid,
title: (!threadData.cid ? (threadData.title || '') : 'New Topic'), cid: threadData.cid,
icon: threadData.picture pid: threadData.pid,
}); title: threadData.title || '',
body: threadData.body || ''
composer.posts[uuid] = { };
tid: threadData.tid, composer.load(uuid);
cid: threadData.cid, } else {
pid: threadData.pid, app.alert({
title: threadData.title || '', type: 'error',
body: threadData.body || '' timeout: 5000,
}; alert_id: 'post_error',
composer.load(uuid); title: 'Please Log In to Post',
} else { message: 'Posting is currently restricted to registered members only, click here to log in',
app.alert({ clickfn: function() {
type: 'error', ajaxify.go('login');
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) { socket.on('api:composer.editCheck', function(editCheck) {
if (editCheck.titleEditable === true) composer.postContainer.querySelector('input').readOnly = false; if (editCheck.titleEditable === true) composer.postContainer.querySelector('input').readOnly = false;
}); });
// Post Window events // Post Window events
var jPostContainer = $(composer.postContainer), var jPostContainer = $(composer.postContainer),
postContentEl = composer.postContainer.querySelector('textarea') postContentEl = composer.postContainer.querySelector('textarea')
jPostContainer.on('change', 'input, textarea', function() { jPostContainer.on('change', 'input, textarea', function() {
var uuid = $(this).parents('.post-window')[0].getAttribute('data-uuid'); var uuid = $(this).parents('.post-window')[0].getAttribute('data-uuid');
if (this.nodeName === 'INPUT') composer.posts[uuid].title = this.value; if (this.nodeName === 'INPUT') composer.posts[uuid].title = this.value;
else if (this.nodeName === 'TEXTAREA') composer.posts[uuid].body = this.value; else if (this.nodeName === 'TEXTAREA') composer.posts[uuid].body = this.value;
}); });
jPostContainer.on('click', '.action-bar button', function() { jPostContainer.on('click', '.action-bar button', function() {
var action = this.getAttribute('data-action'), var action = this.getAttribute('data-action'),
uuid = $(this).parents('.post-window').attr('data-uuid'); uuid = $(this).parents('.post-window').attr('data-uuid');
switch(action) { switch(action) {
case 'post': composer.post(uuid); break; case 'post': composer.post(uuid); break;
case 'minimize': composer.minimize(uuid); break; case 'minimize': composer.minimize(uuid); break;
case 'discard': composer.discard(uuid); break; case 'discard': composer.discard(uuid); break;
} }
}); });
jPostContainer.on('click', '.formatting-bar span', function() { jPostContainer.on('click', '.formatting-bar span', function() {
var iconClass = this.querySelector('i').className, var iconClass = this.querySelector('i').className,
cursorEnd = postContentEl.value.length, cursorEnd = postContentEl.value.length,
selectionStart = postContentEl.selectionStart, selectionStart = postContentEl.selectionStart,
selectionEnd = postContentEl.selectionEnd, selectionEnd = postContentEl.selectionEnd,
selectionLength = selectionEnd - selectionStart; selectionLength = selectionEnd - selectionStart;
switch(iconClass) { switch(iconClass) {
case 'icon-bold': case 'icon-bold':
if (selectionStart === selectionEnd) { if (selectionStart === selectionEnd) {
// Nothing selected // Nothing selected
postContentEl.value = postContentEl.value + '**bolded text**'; postContentEl.value = postContentEl.value + '**bolded text**';
postContentEl.selectionStart = cursorEnd+2; postContentEl.selectionStart = cursorEnd+2;
postContentEl.selectionEnd = postContentEl.value.length - 2; postContentEl.selectionEnd = postContentEl.value.length - 2;
} else { } else {
// Text selected // Text selected
postContentEl.value = postContentEl.value.slice(0, selectionStart) + '**' + postContentEl.value.slice(selectionStart, selectionEnd) + '**' + postContentEl.value.slice(selectionEnd); postContentEl.value = postContentEl.value.slice(0, selectionStart) + '**' + postContentEl.value.slice(selectionStart, selectionEnd) + '**' + postContentEl.value.slice(selectionEnd);
postContentEl.selectionStart = selectionStart + 2; postContentEl.selectionStart = selectionStart + 2;
postContentEl.selectionEnd = selectionEnd + 2; postContentEl.selectionEnd = selectionEnd + 2;
} }
break; break;
case 'icon-italic': case 'icon-italic':
if (selectionStart === selectionEnd) { if (selectionStart === selectionEnd) {
// Nothing selected // Nothing selected
postContentEl.value = postContentEl.value + '*italicised text*'; postContentEl.value = postContentEl.value + '*italicised text*';
postContentEl.selectionStart = cursorEnd+1; postContentEl.selectionStart = cursorEnd+1;
postContentEl.selectionEnd = postContentEl.value.length - 1; postContentEl.selectionEnd = postContentEl.value.length - 1;
} else { } else {
// Text selected // Text selected
postContentEl.value = postContentEl.value.slice(0, selectionStart) + '*' + postContentEl.value.slice(selectionStart, selectionEnd) + '*' + postContentEl.value.slice(selectionEnd); postContentEl.value = postContentEl.value.slice(0, selectionStart) + '*' + postContentEl.value.slice(selectionStart, selectionEnd) + '*' + postContentEl.value.slice(selectionEnd);
postContentEl.selectionStart = selectionStart + 1; postContentEl.selectionStart = selectionStart + 1;
postContentEl.selectionEnd = selectionEnd + 1; postContentEl.selectionEnd = selectionEnd + 1;
} }
break; break;
case 'icon-list': case 'icon-list':
// Nothing selected
postContentEl.value = postContentEl.value + "\n\n* list item";
postContentEl.selectionStart = cursorEnd+4;
postContentEl.selectionEnd = postContentEl.value.length;
break;
case 'icon-link':
if (selectionStart === selectionEnd) {
// Nothing selected // Nothing selected
postContentEl.value = postContentEl.value + '[link text](link url)'; postContentEl.value = postContentEl.value + "\n\n* list item";
postContentEl.selectionStart = cursorEnd+12; postContentEl.selectionStart = cursorEnd+4;
postContentEl.selectionEnd = postContentEl.value.length - 1; postContentEl.selectionEnd = postContentEl.value.length;
} else { break;
// Text selected case 'icon-link':
postContentEl.value = postContentEl.value.slice(0, selectionStart) + '[' + postContentEl.value.slice(selectionStart, selectionEnd) + '](link url)' + postContentEl.value.slice(selectionEnd); if (selectionStart === selectionEnd) {
postContentEl.selectionStart = selectionStart + selectionLength + 3; // Nothing selected
postContentEl.selectionEnd = selectionEnd + 11; postContentEl.value = postContentEl.value + '[link text](link url)';
} postContentEl.selectionStart = cursorEnd+12;
break; postContentEl.selectionEnd = postContentEl.value.length - 1;
} } else {
}); // Text selected
postContentEl.value = postContentEl.value.slice(0, selectionStart) + '[' + postContentEl.value.slice(selectionStart, selectionEnd) + '](link url)' + postContentEl.value.slice(selectionEnd);
postContentEl.selectionStart = selectionStart + selectionLength + 3;
postContentEl.selectionEnd = selectionEnd + 11;
}
break;
}
});
composer.initialized = true; composer.initialized = true;
}
} }
composer.push = function(tid, cid, pid, text) { composer.push = function(tid, cid, pid, text) {

2
public/templates/topic.tpl
Unescape Escape View File

@ -48,7 +48,7 @@
<button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn" type="button"> <button id="favs_{main_posts.pid}_{main_posts.uid}" class="favourite btn" type="button">
<span>Favourite</span> <span>Favourite</span>
<span class="post_rep_{main_posts.pid}">{main_posts.post_rep} </span><i class="{main_posts.fav_star_class}"></i></button> <span class="post_rep_{main_posts.pid}">{main_posts.post_rep} </span><i class="{main_posts.fav_star_class}"></i></button>
<button id="post_reply" class="btn btn-primary btn post_reply hidden-phone" type="button">Reply <i class="icon-reply"></i></button> <button class="btn btn-primary btn post_reply hidden-phone" type="button">Reply <i class="icon-reply"></i></button>
</div> </div>
<div style="clear:both; margin-bottom: 10px;"></div> <div style="clear:both; margin-bottom: 10px;"></div>

Write Preview
Loading…
Cancel
Save