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

templates bugfix - now supports multiple conditionals of the same variable; added data-favourited button and deprecated reliance on BS3

Browse Source
This commit is contained in:
psychobunny
2013-11-28 17:14:04 -05:00
parent 168052bf45
commit 48e36e3c31
3 changed files with 27 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -291,8 +291,7 @@ define(function() {
var pid = $(this).parents('li').attr('data-pid');
var uid = $(this).parents('li').attr('data-uid');
var element = $(this).find('i');
if ($(element).hasClass('fa-star-o')) {
if ($(this).attr('data-favourited') == 'false') {
socket.emit('api:posts.favourite', {
pid: pid,
room_id: app.currentRoom
@@ -542,7 +541,9 @@ define(function() {
var favEl = document.querySelector('.post_rep_' + data.pid).nextSibling;
if (favEl) {
favEl.className = 'fa fa-star';
$(favEl).parent().addClass('btn-warning');
$(favEl).parent()
.addClass('btn-warning')
.attr('data-favourited', true);
}
}
});
@@ -552,7 +553,9 @@ define(function() {
var favEl = document.querySelector('.post_rep_' + data.pid).nextSibling;
if (favEl) {
favEl.className = 'fa fa-star-o';
$(favEl).parent().removeClass('btn-warning');
$(favEl).parent()
.removeClass('btn-warning')
.attr('data-favourited', false);
}
}
});

20
public/src/templates.js
View File

@@ -241,7 +241,7 @@
}
function makeConditionalRegex(block) {
return new RegExp("<!--[\\s]*IF " + block + "[\\s]*-->[\\s\\S]*<!--[\\s]*ENDIF " + block + "[\\s]*-->", 'g');
return new RegExp("<!--[\\s]*IF " + block + "[\\s]*-->([\\s\\S]*?)<!--[\\s]*ENDIF " + block + "[\\s]*-->", 'g');
}
function getBlock(regex, block, template) {
@@ -311,23 +311,24 @@
} else {
function checkConditional(key, value) {
var conditional = makeConditionalRegex(key),
conditionalBlock = conditional.exec(template);
matches = template.match(conditional);
if (conditionalBlock !== null) {
conditionalBlock = conditionalBlock[0].split(/<!-- ELSE -->/);
if (matches !== null) {
for (var i = 0, ii = matches.length; i < ii; i++) {
var conditionalBlock = matches[i].split(/<!-- ELSE -->/);
if (conditionalBlock[1]) {
// there is an else statement
if (!value) {
template = template.replace(conditional, conditionalBlock[1]);
template = template.replace(matches[i], conditionalBlock[1]);
} else {
template = template.replace(conditional, conditionalBlock[0]);
template = template.replace(matches[i], conditionalBlock[0]);
}
} else {
// regular if
// regular if statement
if (!value) {
template = template.replace(conditional, '');
template = template.replace(matches[i], '');
}
}
}
}
@@ -341,7 +342,6 @@
checkConditional('@last', blockInfo.iterator === blockInfo.total);
}
template = replace(namespace + d, data[d], template);
}
}

5
public/templates/topic.tpl
View File

@@ -66,12 +66,9 @@
<div class="btn-group">
<button class="btn btn-sm btn-default follow main-post" type="button" title="Be notified of new replies in this topic"><i class="fa fa-eye"></i></button>
<button class="favourite btn btn-sm btn-default <!-- IF posts.favourited --> btn-warning <!-- ENDIF posts.favourited -->" type="button">
<button data-favourited="{posts.favourited}" class="favourite btn btn-sm btn-default <!-- IF posts.favourited --> btn-warning <!-- ENDIF posts.favourited -->" type="button">
<span class="favourite-text">[[topic:favourite]]</span>
<span class="post_rep_{posts.pid}">{posts.reputation} </span>
<!-- IF posts.favourited -->
<i class="fa fa-star"></i>
<!-- ELSE -->