Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-22 16:30:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/designcreateplay/NodeBB

Browse Source
This commit is contained in:
Baris Soner Usakli
2013-07-05 12:50:11 -04:00
parent 4c33cee051 c41e204a58
commit 7be2baa1a7
3 changed files with 59 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
public/src/ajaxify.js
View File

@@ -52,7 +52,6 @@ var ajaxify = {};
templates.load_template(function() {
exec_body_scripts(content);
ajaxify.enable();
if (callback) {
callback();
}
@@ -67,21 +66,8 @@ var ajaxify = {};
return false;
}
ajaxify.enable = function() {
$('a').unbind('click', ajaxify.onclick).bind('click', ajaxify.onclick);
}
ajaxify.onclick = function(ev) {
if (this.href == window.location.href + "#") return;
var url = this.href.replace(rootUrl +'/', '');
if (this.target !== '') return;
if (!ev.ctrlKey && ev.which === 1) {
if (ajaxify.go(url)) {
ev.preventDefault();
}
}
}
$('document').ready(function() {
@@ -89,7 +75,19 @@ var ajaxify = {};
content = content || document.getElementById('content');
ajaxify.enable();
// Enhancing all anchors to ajaxify...
$(document.body).on('click', 'a', function(e) {
if (this.href == window.location.href + "#") return;
var url = this.href.replace(rootUrl +'/', '');
if (this.target !== '') return;
if (!e.ctrlKey && e.which === 1) {
if (ajaxify.go(url)) {
e.preventDefault();
}
}
});
});

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

@@ -25,8 +25,8 @@
adminTools = document.getElementById('thread-tools');
app.enter_room(room);
set_up_posts();
// Resetting thread state
if (thread_state.locked === '1') set_locked_state(true);
if (thread_state.deleted === '1') set_delete_state(true);
if (thread_state.pinned === '1') set_pinned_state(true);
@@ -221,6 +221,46 @@
});
});
$('.container').on('click', '.post_reply', function() {
if (thread_state.locked !== '1') {
require(['composer'], function(cmp) {
cmp.push(tid);
});
}
});
$('.post-container').on('click', '.quote', function() {
if (thread_state.locked !== '1') {
var pid = $(this).parents('li').attr('data-pid');
socket.once('api:posts.getRawPost', function(data) {
quoted = '> ' + data.post.replace(/\n/g, '\n> ') + '\n\n';
require(['composer'], function(cmp) {
cmp.push(tid, null, null, quoted);
});
});
socket.emit('api:posts.getRawPost', { pid: pid });
}
});
$('.post-container').on('click', '.favourite', function() {
var ids = this.id.replace('favs_', '').split('_'),
pid = ids[0],
uid = ids[1];
if (thread_state.locked !== '1') {
var element = $(this).find('i');
if(element.attr('class') == 'icon-star-empty') {
element.attr('class', 'icon-star');
socket.emit('api:posts.favourite', {pid: pid, room_id: app.current_room});
}
else {
element.attr('class', 'icon-star-empty');
socket.emit('api:posts.unfavourite', {pid: pid, room_id: app.current_room});
}
}
});
$('.post-container').delegate('.edit', 'click', function(e) {
var pid = ($(this).attr('id') || $(this.parentNode).attr('id')).split('_')[1];
@@ -316,7 +356,6 @@
socket.emit('api:post.privileges', data.posts[x].pid);
}
set_up_posts(uniqueid);
tempContainer.replaceWith(tempContainer.contents());
infiniteLoaderActive = false;
@@ -416,53 +455,6 @@
user_rep.html(utotal+ ' ');
}
function set_up_posts(div) {
if (div == null) div = '';
else div = '#' + div;
jQuery(div + ' .post_reply').click(function() {
if (thread_state.locked !== '1') {
require(['composer'], function(cmp) {
cmp.push(tid);
});
}
});
jQuery(div + ' .quote').click(function() {
if (thread_state.locked !== '1') {
var pid = $(this).parents('li').attr('data-pid');
socket.once('api:posts.getRawPost', function(data) {
quoted = '> ' + data.post.replace(/\n/g, '\n> ') + '\n\n';
require(['composer'], function(cmp) {
cmp.push(tid, null, null, quoted);
});
});
socket.emit('api:posts.getRawPost', { pid: pid });
}
});
jQuery(div + ' .favourite').click(function() {
var ids = this.id.replace('favs_', '').split('_'),
pid = ids[0],
uid = ids[1];
if (thread_state.locked !== '1') {
var element = $(this).find('i');
if(element.attr('class') == 'icon-star-empty') {
element.attr('class', 'icon-star');
socket.emit('api:posts.favourite', {pid: pid, room_id: app.current_room});
}
else {
element.attr('class', 'icon-star-empty');
socket.emit('api:posts.unfavourite', {pid: pid, room_id: app.current_room});
}
}
});
}
function set_locked_state(locked, alert) {
var threadReplyBtn = document.getElementById('post_reply'),
postReplyBtns = document.querySelectorAll('#post-container .post_reply'),

8
src/webserver.js
View File

@@ -284,7 +284,7 @@ var express = require('express'),
});
break;
default :
res.json({});
res.json(404, { error: 'unrecognized API endpoint' });
break;
}
}
@@ -300,7 +300,7 @@ var express = require('express'),
if(data)
res.send(data);
else
res.send("Category doesn't exist!");
res.send(404, "Category doesn't exist!");
});
});
@@ -309,7 +309,7 @@ var express = require('express'),
if(data)
res.send(data);
else
res.send("Topic doesn't exist!");
res.send(404, "Topic doesn't exist!");
});
});
@@ -318,7 +318,7 @@ var express = require('express'),
if(data)
res.send(data);
else
res.send("Post doesn't exist!");
res.send(404, "Post doesn't exist!");
});
});