diff --git a/.gitignore b/.gitignore index 478600f89f..c6ab6e2a8d 100644 --- a/.gitignore +++ b/.gitignore @@ -11,4 +11,7 @@ public/css/*.css *.swp Vagrantfile .vagrant -provision.sh \ No newline at end of file +provision.sh +*.komodoproject + +feeds/recent.rss diff --git a/README.md b/README.md index 2d3bab3918..fc4f0b468c 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,16 @@ - # NodeBB **NodeBB** is a robust Node.js driven forum built on a redis database. It is powered by web sockets, and is compatible down to IE8. * [NodeBB Homepage](http://www.nodebb.org/ "NodeBB") * [Demo & Meta Discussion](http://try.nodebb.org) +* [Wiki Guides](https://github.com/designcreateplay/NodeBB/wiki) - includes setup for other platforms * [Join us on IRC](https://kiwiirc.com/client/irc.freenode.net/nodebb) - #nodebb on Freenode * [Follow on Twitter](http://www.twitter.com/NodeBB/ "NodeBB Twitter") * [Like us on Facebook](http://www.facebook.com/NodeBB/ "NodeBB Facebook") ![NodeBB Main Category Listing](http://i.imgur.com/zffCFoh.png) -![NodeBB Topic Page](http://i.imgur.com/tcHW08M.png) +![NodeBB Topic Page](http://i.imgur.com/JihdcUa.png) ## How can I follow along/contribute? @@ -65,4 +65,4 @@ NodeBB can also be started with helper programs, such as `supervisor` and `forev ## Upgrading NodeBB -Detailed upgrade instructions are listed in [Upgrading NodeBB](https://github.com/designcreateplay/NodeBB/wiki/Upgrading-NodeBB) \ No newline at end of file +Detailed upgrade instructions are listed in [Upgrading NodeBB](https://github.com/designcreateplay/NodeBB/wiki/Upgrading-NodeBB) diff --git a/app.js b/app.js index 2a4fb645ec..395416adf6 100644 --- a/app.js +++ b/app.js @@ -55,7 +55,7 @@ winston.info(''); - if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('upgrade') && fs.existsSync(__dirname + '/config.json')) { + if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf.get('upgrade') && fs.existsSync(__dirname + '/config.json')) { // Load server-side configs nconf.file({ file: __dirname + '/config.json' @@ -64,6 +64,7 @@ nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path') + '/'); nconf.set('upload_url', nconf.get('url') + 'uploads/'); + nconf.set('base_dir', __dirname); winston.info('Initializing NodeBB v' + pkg.version + ', on port ' + nconf.get('port') + ', using Redis store at ' + nconf.get('redis:host') + ':' + nconf.get('redis:port') + '.'); winston.info('NodeBB instance bound to: ' + ((nconf.get('bind_address') === "0.0.0.0" || !nconf.get('bind_address')) ? 'Any address (0.0.0.0)' : nconf.get('bind_address'))); @@ -88,32 +89,45 @@ websockets = require('./src/websockets.js'), posts = require('./src/posts.js'), plugins = require('./src/plugins'), // Don't remove this - plugins initializes itself - Notifications = require('./src/notifications'); + Notifications = require('./src/notifications'), + Upgrade = require('./src/upgrade'); - websockets.init(SocketIO); + Upgrade.check(function(schema_ok) { + if (schema_ok || nconf.get('check-schema') === false) { + websockets.init(SocketIO); - global.templates = {}; - global.translator = translator; + global.templates = {}; + global.translator = translator; - translator.loadServer(); - - var customTemplates = meta.config['theme:templates'] ? path.join(__dirname, 'node_modules', meta.config['theme:id'], meta.config['theme:templates']) : false; + translator.loadServer(); - // todo: replace below with read directory code, derp. - templates.init([ - 'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index', - 'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext', - 'emails/header', 'emails/footer', + var customTemplates = meta.config['theme:templates'] ? path.join(__dirname, 'node_modules', meta.config['theme:id'], meta.config['theme:templates']) : false; - 'noscript/header', 'noscript/home', 'noscript/category', 'noscript/topic' - ], customTemplates); - + // todo: replace below with read directory code, derp. + templates.init([ + 'header', 'footer', 'logout', 'outgoing', 'admin/header', 'admin/footer', 'admin/index', + 'emails/reset', 'emails/reset_plaintext', 'emails/email_confirm', 'emails/email_confirm_plaintext', + 'emails/header', 'emails/footer', - templates.ready(webserver.init); + 'noscript/header', 'noscript/home', 'noscript/category', 'noscript/topic' + ], customTemplates); - Notifications.init(); + + plugins.ready(function() { + templates.ready(webserver.init); + }); + + Notifications.init(); + } else { + winston.warn('Your NodeBB schema is out-of-date. Please run the following command to bring your dataset up to spec:'); + winston.warn(' node app --upgrade'); + winston.warn('To ignore this error (not recommended):'); + winston.warn(' node app --no-check-schema') + process.exit(); + } + }); }); - } else if (nconf.get('setup') || !fs.existsSync(__dirname + '/config.json')) { + } else if (nconf.get('setup') || nconf.get('install') || !fs.existsSync(__dirname + '/config.json')) { // New install, ask setup questions if (nconf.get('setup')) { winston.info('NodeBB Setup Triggered via Command Line'); diff --git a/install/data/categories.json b/install/data/categories.json index 187ddcc3ff..43d394ab19 100644 --- a/install/data/categories.json +++ b/install/data/categories.json @@ -3,84 +3,84 @@ "name": "Announcements", "description": "Announcements regarding our community", "blockclass": "category-blue", - "icon" : "icon-bullhorn", + "icon" : "fa-bullhorn", "order": 1 }, { "name": "General Discussion", "description": "A place to talk about whateeeever you want", "blockclass": "category-blue", - "icon" : "icon-comment", + "icon" : "fa-comment", "order": 2 }, { "name": "NodeBB Development", "description": "NodeBB development news and announcements", "blockclass": "category-blue", - "icon" : "icon-github", + "icon" : "fa-github", "order": 3 }, { "name": "Blogs", "description": "Blog posts from individual members", "blockclass": "category-blue", - "icon" : "icon-pencil", + "icon" : "fa-pencil", "order": 4 }, { "name": "Feature Requests", "description": "Got a feature request you'd like to see? Give us a shout here.", "blockclass": "category-purple", - "icon" : "icon-lightbulb", + "icon" : "fa-lightbulb-o", "order": 5 }, { "name": "Bug Reports", "description": "Having trouble with NodeBB? Let us know...", "blockclass": "category-purple", - "icon" : "icon-cogs", + "icon" : "fa-cogs", "order": 6 }, { "name": "NodeBB Plugins", "description": "Enhance your NodeBB with plugins!", "blockclass": "category-purple", - "icon" : "icon-plus-sign", + "icon" : "fa-plus-square", "order": 7 }, { "name": "NodeBB Link Exchange", "description": "Link exchange", "blockclass": "category-purple", - "icon" : "icon-exchange", + "icon" : "fa-exchange", "order": 8 }, { "name": "News", "description": "News from around the world", "blockclass": "category-darkblue", - "icon" : "icon-globe", + "icon" : "fa-globe", "order": 9 }, { "name": "Movies", "description": "Discuss the latest movies here", "blockclass": "category-darkblue", - "icon" : "icon-film", + "icon" : "fa-film", "order": 10 }, { "name": "Games", "description": "Discuss the latest games here", "blockclass": "category-darkblue", - "icon" : "icon-screenshot", + "icon" : "fa-crosshairs", "order": 11 }, { "name": "Random", "description": "Anything and (almost) everything welcome!", "blockclass": "category-darkblue", - "icon" : "icon-beer", + "icon" : "fa-beer", "order": 12 } ] \ No newline at end of file diff --git a/nodebb b/nodebb index 3733935784..1b43292926 100755 --- a/nodebb +++ b/nodebb @@ -1,6 +1,6 @@ -#!/bin/bash +#!/bin/sh clear echo "Launching NodeBB in \"development\" mode." echo "To run the production build of NodeBB, please use \"forever\"." echo "More Information: https://github.com/designcreateplay/NodeBB/wiki/How-to-run-NodeBB" -NODE_ENV=development supervisor --extensions 'node|js|tpl' -- app $1 \ No newline at end of file +NODE_ENV=development supervisor --extensions 'node|js|tpl' -- app $1 diff --git a/package.json b/package.json index 1eeaf8e3f7..f7cd299f9c 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "nodebb", "license": "GPLv3 or later", "description": "NodeBB Forum", - "version": "0.0.7", + "version": "0.1.1", "homepage": "http://www.nodebb.org", "repository": { "type": "git", @@ -28,7 +28,7 @@ "less-middleware": "0.1.12", "marked": "0.2.8", "bcrypt": "0.7.5", - "async": "0.2.8", + "async": "~0.2.8", "node-imagemagick": "0.1.8", "gravatar": "1.0.6", "nconf": "~0.6.7", @@ -43,7 +43,7 @@ "nodebb-plugin-mentions": "~0.1.14", "nodebb-plugin-markdown": "~0.1.8", "nodebb-theme-vanilla": "designcreateplay/nodebb-theme-vanilla", - "nodebb-theme-cerulean": "0.0.6", + "nodebb-theme-cerulean": "0.0.10", "cron": "~1.0.1" }, "optionalDependencies": { diff --git a/public/logo.png b/public/logo.png new file mode 100644 index 0000000000..5284e59838 Binary files /dev/null and b/public/logo.png differ diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js index be38d66057..64c55691e2 100644 --- a/public/src/ajaxify.js +++ b/public/src/ajaxify.js @@ -1,5 +1,6 @@ -var ajaxify = {}; +"use strict"; +var ajaxify = {}; (function ($) { /*global app, templates, utils*/ @@ -23,8 +24,9 @@ var ajaxify = {}; window.onpopstate = function (event) { // "quiet": If set to true, will not call pushState - if (event !== null && event.state && event.state.url !== undefined) + if (event !== null && event.state && event.state.url !== undefined) { ajaxify.go(event.state.url, null, null, true); + } }; var pagination; @@ -32,10 +34,13 @@ var ajaxify = {}; ajaxify.go = function (url, callback, template, quiet) { // start: the following should be set like so: ajaxify.onchange(function(){}); where the code actually belongs $(window).off('scroll'); - app.enter_room('global'); + app.enterRoom('global'); pagination = pagination || document.getElementById('pagination'); - if (pagination) pagination.parentNode.style.display = 'none'; + if (pagination) { + pagination.parentNode.style.display = 'none'; + } + window.onscroll = null; // end @@ -62,37 +67,55 @@ var ajaxify = {}; } if (templates.is_available(tpl_url) && !templates.force_refresh(tpl_url)) { - if (quiet !== true) { - if (window.history && window.history.pushState) { - window.history.pushState({ - "url": url - }, url, RELATIVE_PATH + "/" + url); - } + if (window.history && window.history.pushState) { + window.history[!quiet ? 'pushState' : 'replaceState']({ + url: url + }, url, RELATIVE_PATH + '/' + url); + + $.ajax(RELATIVE_PATH + '/plugins/fireHook', { + type: 'PUT', + data: { + _csrf: $('#csrf_token').val(), + hook: 'page.load', + args: { + template: tpl_url, + url: url, + uid: app.uid + } + } + }); } translator.load(tpl_url); - jQuery('#footer, #content').fadeOut(100); + jQuery('#footer, #content').addClass('ajaxifying'); templates.flush(); templates.load_template(function () { exec_body_scripts(content); require(['forum/' + tpl_url], function(script) { - if (script && script.init) script.init(); + if (script && script.init) { + script.init(); + } }); if (callback) { callback(); } - app.process_page(); + app.processPage(); - jQuery('#content, #footer').stop(true, true).fadeIn(200, function () { - if (window.location.hash) - hash = window.location.hash; - if (hash) - app.scrollToPost(hash.substr(1)); - }); + jQuery('#content, #footer').stop(true, true).removeClass('ajaxifying'); + + if (window.location.hash) { + hash = window.location.hash; + } + + if (hash) { + require(['forum/topic'], function(topic) { + topic.scrollToPost(hash.substr(1)); + }); + } utils.refreshTitle(url); @@ -105,23 +128,27 @@ var ajaxify = {}; }; $('document').ready(function () { - if (!window.history || !window.history.pushState) return; // no ajaxification for old browsers + if (!window.history || !window.history.pushState) { + return; // no ajaxification for old browsers + } content = content || document.getElementById('content'); // Enhancing all anchors to ajaxify... $(document.body).on('click', 'a', function (e) { function hrefEmpty(href) { - return href == 'javascript:;' || href == window.location.href + "#" || href.slice(-1) === "#"; + return href === 'javascript:;' || href === window.location.href + "#" || href.slice(-1) === "#"; } - if (hrefEmpty(this.href) || this.target !== '' || this.protocol === 'javascript:') + if (hrefEmpty(this.href) || this.target !== '' || this.protocol === 'javascript:') { return; + } - if(!window.location.pathname.match(/\/(403|404)$/g)) + if(!window.location.pathname.match(/\/(403|404)$/g)) { app.previousUrl = window.location.href; + } - if (this.getAttribute('data-ajaxify') == 'false') { + if (this.getAttribute('data-ajaxify') === 'false') { return; } diff --git a/public/src/app.js b/public/src/app.js index 026c66496c..8f6d8ed433 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -47,7 +47,7 @@ var socket, socket.on('connect', function (data) { if (reconnecting) { - reconnectEl.html(' Connected!'); + reconnectEl.html(' Connected!'); reconnecting = false; setTimeout(function() { @@ -75,7 +75,7 @@ var socket, reconnecting = true; reconnectEl.addClass('active'); - reconnectEl.html(' Reconnecting...'); + reconnectEl.html(' Reconnecting...'); }); socket.on('api:user.get_online_users', function (users) { @@ -88,10 +88,10 @@ var socket, if (uid && jQuery.inArray(uid, users) !== -1) { el.find('i').remove(); - el.prepend(''); + el.prepend(''); } else { el.find('i').remove(); - el.prepend(''); + el.prepend(''); } el.processed = true; @@ -125,7 +125,7 @@ var socket, setTimeout(app.logout, 1000); }); - app.enter_room('global'); + app.enterRoom('global'); } }, async: false @@ -136,7 +136,7 @@ var socket, $.post(RELATIVE_PATH + '/logout', { _csrf: $('#csrf_token').val() }, function() { - window.location = RELATIVE_PATH + '/'; + window.location.href = RELATIVE_PATH + '/'; }); } @@ -186,43 +186,35 @@ var socket, clearTimeout(alert.attr('timeoutId')); startTimeout(alert, params.timeout); } else { - var div = document.createElement('div'), - button = document.createElement('button'), - strong = document.createElement('strong'), - p = document.createElement('p'); + var div = $('
'), + button = $(''), + strong = $('' + title + ''), + p = $('

' + params.message + '

'); - p.innerHTML = params.message; - strong.innerHTML = title; + div.append(button) + .append(strong) + .append(p); - div.className = "alert toaster-alert " + "alert-" + params.type; - - div.setAttribute('id', alert_id); - div.appendChild(button); - div.appendChild(strong); - div.appendChild(p); - - button.className = 'close'; - button.innerHTML = '×'; - button.onclick = function (ev) { - div.parentNode.removeChild(div); - } + button.on('click', function () { + div.remove(); + }); if (params.location == null) params.location = 'alert_window'; - jQuery('#' + params.location).prepend(jQuery(div).fadeIn('100')); + $('#' + params.location).prepend(div.fadeIn('100')); if (params.timeout) { startTimeout(div, params.timeout); } if (params.clickfn) { - div.onclick = function () { + div.on('click', function () { params.clickfn(); - jQuery(div).fadeOut(500, function () { - this.remove(); + div.fadeOut(500, function () { + $(this).remove(); }); - } + }); } } } @@ -251,22 +243,23 @@ var socket, }); } - app.current_room = null; - app.enter_room = function (room) { + app.currentRoom = null; + app.enterRoom = function (room) { if (socket) { - if (app.current_room === room) + if (app.currentRoom === room) { return; + } socket.emit('event:enter_room', { 'enter': room, - 'leave': app.current_room + 'leave': app.currentRoom }); - app.current_room = room; + app.currentRoom = room; } }; - app.populate_online_users = function () { + app.populateOnlineUsers = function () { var uids = []; jQuery('.post-row').each(function () { @@ -276,11 +269,9 @@ var socket, socket.emit('api:user.get_online_users', uids); } - app.process_page = function () { - app.populate_online_users(); - - var url = window.location.href, - parts = url.split('/'), + function highlightNavigationLink() { + var path = window.location.pathname, + parts = path.split('/'), active = parts[parts.length - 1]; jQuery('#main-nav li').removeClass('active'); @@ -295,10 +286,27 @@ var socket, } }); } + } + + app.createUserTooltips = function() { + $('img[title].teaser-pic,img[title].user-img').each(function() { + $(this).tooltip({ + placement: 'top', + title: $(this).attr('title') + }); + }); + } + + app.processPage = function () { + app.populateOnlineUsers(); + + highlightNavigationLink(); $('span.timeago').timeago(); $('.post-content img').addClass('img-responsive'); + app.createUserTooltips(); + setTimeout(function () { window.scrollTo(0, 1); // rehide address bar on mobile after page load completes. }, 100); @@ -331,6 +339,28 @@ var socket, } app.openChat = function (username, touid) { + if (username === app.username) { + app.alert({ + type: 'warning', + title: 'Invalid Chat', + message: "You can't chat with yourself!", + timeout: 5000 + }); + + return; + } + + if (!app.username) { + app.alert({ + type: 'danger', + title: 'Not Logged In', + message: 'Please log in to chat with ' + username + '', + timeout: 5000 + }); + + return; + } + require(['chat'], function (chat) { var chatModal; if (!chat.modalExists(touid)) { @@ -343,61 +373,6 @@ var socket, }); } - app.createNewPosts = function (data) { - if (data.posts[0].uid !== app.uid) { - data.posts[0].display_moderator_tools = 'none'; - } - - var html = templates.prepare(templates['topic'].blocks['posts']).parse(data); - translator.translate(html, function(translatedHTML) { - var uniqueid = new Date().getTime(), - tempContainer = jQuery('
') - .appendTo("#post-container") - .hide() - .append(translatedHTML) - .fadeIn('slow'); - - for (var x = 0, numPosts = data.posts.length; x < numPosts; x++) { - socket.emit('api:post.privileges', data.posts[x].pid); - } - - tempContainer.replaceWith(tempContainer.contents()); - infiniteLoaderActive = false; - - app.populate_online_users(); - app.addCommasToNumbers(); - $('span.timeago').timeago(); - $('.post-content img').addClass('img-responsive'); - }); - } - - app.infiniteLoaderActive = false; - - app.loadMorePosts = function (tid, callback) { - if (app.infiniteLoaderActive) - return; - app.infiniteLoaderActive = true; - - if ($('#loading-indicator').attr('done') === '0') - $('#loading-indicator').removeClass('hide'); - - socket.emit('api:topic.loadMore', { - tid: tid, - after: document.querySelectorAll('#post-container li[data-pid]').length - }, function (data) { - app.infiniteLoaderActive = false; - if (data.posts.length) { - $('#loading-indicator').attr('done', '0'); - app.createNewPosts(data); - } else { - $('#loading-indicator').attr('done', '1'); - } - $('#loading-indicator').addClass('hide'); - if (callback) - callback(data.posts); - }); - } - app.scrollToTop = function () { $('body,html').animate({ scrollTop: 0 @@ -410,43 +385,6 @@ var socket, }); } - app.scrollToPost = function (pid) { - - if (!pid) - return; - - var container = $(document.body), - scrollTo = $('#post_anchor_' + pid), - tid = $('#post-container').attr('data-tid'); - - function animateScroll() { - $('body,html').animate({ - scrollTop: scrollTo.offset().top - container.offset().top + container.scrollTop() - $('#header-menu').height() - }, 400); - //$('body,html').scrollTop(scrollTo.offset().top - container.offset().top + container.scrollTop() - $('#header-menu').height()); - } - - if (!scrollTo.length && tid) { - - var intervalID = setInterval(function () { - app.loadMorePosts(tid, function (posts) { - scrollTo = $('#post_anchor_' + pid); - - if (tid && scrollTo.length) { - animateScroll(); - } - - if (!posts.length || scrollTo.length) - clearInterval(intervalID); - }); - }, 100); - - } else if (tid) { - animateScroll(); - } - - } - jQuery('document').ready(function () { $('#search-form').on('submit', function () { var input = $(this).find('input'); diff --git a/public/src/forum/account.js b/public/src/forum/account.js index 82be082aeb..5056c2a26e 100644 --- a/public/src/forum/account.js +++ b/public/src/forum/account.js @@ -10,9 +10,10 @@ define(['forum/accountheader'], function(header) { $(document).ready(function() { var username = $('.account-username a').html(); - app.enter_room('user/' + theirid); + app.enterRoom('user/' + theirid); app.addCommasToNumbers(); + $('.user-recent-posts img').addClass('img-responsive'); var followBtn = $('#follow-btn'); var unfollowBtn = $('#unfollow-btn'); @@ -71,6 +72,7 @@ define(['forum/accountheader'], function(header) { socket.on('event:new_post', function(data) { var html = templates.prepare(templates['account'].blocks['posts']).parse(data); $('.user-recent-posts').prepend(html); + $('.user-recent-posts span.timeago').timeago(); }); }); @@ -81,10 +83,10 @@ define(['forum/accountheader'], function(header) { if (data.online) { onlineStatus.find('span span').text('online'); - onlineStatus.find('i').attr('class', 'icon-circle'); + onlineStatus.find('i').attr('class', 'fa fa-circle'); } else { onlineStatus.find('span span').text('offline'); - onlineStatus.find('i').attr('class', 'icon-circle-blank'); + onlineStatus.find('i').attr('class', 'fa fa-circle-o'); } }; diff --git a/public/src/forum/accountedit.js b/public/src/forum/accountedit.js index 530261c77d..912bb29b37 100644 --- a/public/src/forum/accountedit.js +++ b/public/src/forum/accountedit.js @@ -1,11 +1,13 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) { - var AccountEdit = {}; + var AccountEdit = {}, + gravatarPicture = '', + uploadedPicture = ''; AccountEdit.init = function() { header.init(); - var gravatarPicture = templates.get('gravatarpicture'); - var uploadedPicture = templates.get('uploadedpicture'); + gravatarPicture = templates.get('gravatarpicture'); + uploadedPicture = templates.get('uploadedpicture'); var selectedImageType = ''; @@ -50,14 +52,14 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) { }); $('#gravatar-box').on('click', function() { - $('#gravatar-box .icon-ok').show(); - $('#uploaded-box .icon-ok').hide(); + $('#gravatar-box .fa-check').show(); + $('#uploaded-box .fa-check').hide(); selectedImageType = 'gravatar'; }); $('#uploaded-box').on('click', function() { - $('#gravatar-box .icon-ok').hide(); - $('#uploaded-box .icon-ok').show(); + $('#gravatar-box .fa-check').hide(); + $('#uploaded-box .fa-check').show(); selectedImageType = 'uploaded'; }); @@ -194,31 +196,33 @@ define(['forum/accountheader', 'uploader'], function(header, uploader) { AccountEdit.updateImages = function() { var currentPicture = $('#user-current-picture').attr('src'); - var gravatarPicture = templates.get('gravatarpicture'); - var uploadedPicture = templates.get('uploadedpicture'); if (gravatarPicture) { $('#user-gravatar-picture').attr('src', gravatarPicture); $('#gravatar-box').show(); - } else + } else { $('#gravatar-box').hide(); + } if (uploadedPicture) { $('#user-uploaded-picture').attr('src', uploadedPicture); $('#uploaded-box').show(); - } else + } else { $('#uploaded-box').hide(); + } - if (currentPicture == gravatarPicture) - $('#gravatar-box .icon-ok').show(); - else - $('#gravatar-box .icon-ok').hide(); + if (currentPicture == gravatarPicture) { + $('#gravatar-box .fa-check').show(); + } else { + $('#gravatar-box .fa-check').hide(); + } - if (currentPicture == uploadedPicture) - $('#uploaded-box .icon-ok').show(); - else - $('#uploaded-box .icon-ok').hide(); + if (currentPicture == uploadedPicture) { + $('#uploaded-box .fa-check').show(); + } else { + $('#uploaded-box .fa-check').hide(); + } } return AccountEdit; diff --git a/public/src/forum/admin/categories.js b/public/src/forum/admin/categories.js index ce3f716312..c848378f75 100644 --- a/public/src/forum/admin/categories.js +++ b/public/src/forum/admin/categories.js @@ -18,7 +18,7 @@ define(function() { } function select_icon(el) { - var selected = el.attr('class').replace(' icon-2x', ''); + var selected = el.attr('class').replace(' fa-2x', ''); jQuery('#icons .selected').removeClass('selected'); if (selected) jQuery('#icons .' + selected).parent().addClass('selected'); @@ -27,9 +27,13 @@ define(function() { bootbox.confirm('

Select an icon.

' + document.getElementById('icons').innerHTML, function(confirm) { if (confirm) { var iconClass = jQuery('.bootbox .selected').children(':first').attr('class'); - el.attr('class', iconClass + ' icon-2x'); - el.val(iconClass); - el.attr('value', iconClass); + + el.attr('class', iconClass + ' fa-2x'); + + // remove the 'fa ' from the class name, just need the icon name itself + var categoryIconClass = iconClass.replace('fa ', ''); + el.val(categoryIconClass); + el.attr('value', categoryIconClass); modified(el); } @@ -77,7 +81,8 @@ define(function() { name: $('#inputName').val(), description: $('#inputDescription').val(), icon: $('#new-category-modal i').val(), - blockclass: $('#inputBlockclass').val() + bgColor: '#0059b2', + color: '#fff' }; socket.emit('api:admin.categories.create', category, function(err, data) { @@ -125,11 +130,7 @@ define(function() { select_icon($(this).find('i')); }); - jQuery('.blockclass').on('change', function(ev) { - update_blockclass(ev.target); - }); - - jQuery('.category_name, .category_description, .blockclass').on('change', function(ev) { + jQuery('.admin-categories form input').on('change', function(ev) { modified(ev.target); }); @@ -156,6 +157,21 @@ define(function() { return false; }); + // Colour Picker + $('[data-name="bgColor"], [data-name="color"]').each(function(idx, inputEl) { + var jinputEl = $(this), + previewEl = jinputEl.parents('[data-cid]').find('.preview-box'); + + jinputEl.ColorPicker({ + color: this.value || '#000', + onChange: function(hsb, hex) { + jinputEl.val('#' + hex); + if (inputEl.getAttribute('data-name') === 'bgColor') previewEl.css('background', '#' + hex); + else if (inputEl.getAttribute('data-name') === 'color') previewEl.css('color', '#' + hex); + modified(inputEl); + } + }); + }); }); }; diff --git a/public/src/forum/admin/groups.js b/public/src/forum/admin/groups.js index 8485263ce4..d6cf314171 100644 --- a/public/src/forum/admin/groups.js +++ b/public/src/forum/admin/groups.js @@ -45,10 +45,12 @@ define(function() { errorEl.html(errorText).removeClass('hide'); } else { - createModal.modal('hide'); errorEl.addClass('hide'); createNameEl.val(''); - ajaxify.go('admin/groups'); + createModal.on('hidden.bs.modal', function() { + ajaxify.go('admin/groups'); + }); + createModal.modal('hide'); } }); }); diff --git a/public/src/forum/admin/index.js b/public/src/forum/admin/index.js index 4b7008a541..c5cd4c413a 100644 --- a/public/src/forum/admin/index.js +++ b/public/src/forum/admin/index.js @@ -20,7 +20,7 @@ define(function() { document.getElementById('connections').innerHTML = total; }); - app.enter_room('admin'); + app.enterRoom('admin'); socket.emit('api:get_all_rooms'); }; diff --git a/public/src/forum/admin/plugins.js b/public/src/forum/admin/plugins.js index daa3e04eb2..ce2b510ff2 100644 --- a/public/src/forum/admin/plugins.js +++ b/public/src/forum/admin/plugins.js @@ -13,7 +13,7 @@ define(function() { socket.on('api:admin.plugins.toggle', function(status) { pluginTgl = document.querySelector('.plugins li[data-plugin-id="' + status.id + '"] button'); - pluginTgl.innerHTML = ' ' + (status.active ? 'Dea' : 'A') + 'ctivate'; + pluginTgl.innerHTML = ' ' + (status.active ? 'Dea' : 'A') + 'ctivate'; app.alert({ alert_id: 'plugin_toggled_' + status.id, diff --git a/public/src/forum/admin/settings.js b/public/src/forum/admin/settings.js index bbf04fef3e..6c75e6457a 100644 --- a/public/src/forum/admin/settings.js +++ b/public/src/forum/admin/settings.js @@ -38,6 +38,8 @@ define(['uploader'], function(uploader) { } } else if (fields[x].nodeName === 'TEXTAREA') { if (app.config[key]) fields[x].value = app.config[key]; + } else if (fields[x].nodeName === 'SELECT') { + if (app.config[key]) fields[x].value = app.config[key]; } } @@ -61,6 +63,8 @@ define(['uploader'], function(uploader) { } } else if (fields[x].nodeName === 'TEXTAREA') { value = fields[x].value; + } else if (fields[x].nodeName === 'SELECT') { + value = fields[x].value; } socket.emit('api:config.set', { diff --git a/public/src/forum/admin/topics.js b/public/src/forum/admin/topics.js index 77090bef3f..450e43d12a 100644 --- a/public/src/forum/admin/topics.js +++ b/public/src/forum/admin/topics.js @@ -42,10 +42,15 @@ define(function() { loadMoreEl.addEventListener('click', function() { if (this.className.indexOf('disabled') === -1) { - var topics = document.querySelectorAll('.topics li[data-tid]'), - lastTid = parseInt(topics[topics.length - 1].getAttribute('data-tid')); + var topics = document.querySelectorAll('.topics li[data-tid]'); - this.innerHTML = ' Retrieving topics'; + if(!topics.length) { + return; + } + + var lastTid = parseInt(topics[topics.length - 1].getAttribute('data-tid')); + + this.innerHTML = ' Retrieving topics'; socket.emit('api:admin.topics.getMore', { limit: 10, after: lastTid diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js index 6d41fb10b3..44504f021c 100644 --- a/public/src/forum/admin/users.js +++ b/public/src/forum/admin/users.js @@ -91,7 +91,7 @@ define(function() { timeoutId = setTimeout(function() { var username = $('#search-user').val(); - jQuery('.icon-spinner').removeClass('none'); + jQuery('.fa-spinner').removeClass('none'); socket.emit('api:admin.user.search', username); }, 250); @@ -108,7 +108,7 @@ define(function() { userListEl = document.querySelector('.users'); userListEl.innerHTML = html; - jQuery('.icon-spinner').addClass('none'); + jQuery('.fa-spinner').addClass('none'); if (data && data.length === 0) { $('#user-notfound-notify').html('User not found!') diff --git a/public/src/forum/category.js b/public/src/forum/category.js index dba77b74f9..b4c5a227ba 100644 --- a/public/src/forum/category.js +++ b/public/src/forum/category.js @@ -1,18 +1,17 @@ define(function () { - var Category = {}; + var Category = {}, + loadingMoreTopics = false; Category.init = function() { var cid = templates.get('category_id'), - room = 'category_' + cid, twitterEl = jQuery('#twitter-intent'), facebookEl = jQuery('#facebook-share'), googleEl = jQuery('#google-share'), twitter_url = templates.get('twitter-intent-url'), facebook_url = templates.get('facebook-share-url'), - google_url = templates.get('google-share-url'), - loadingMoreTopics = false; + google_url = templates.get('google-share-url'); - app.enter_room(room); + app.enterRoom('category_' + cid); twitterEl.on('click', function () { window.open(twitter_url, '_blank', 'width=550,height=420,scrollbars=no,status=no'); @@ -56,7 +55,7 @@ define(function () { li.setAttribute('data-pid', posts[i].pid); - li.innerHTML = '' + + li.innerHTML = '' + '' + ''+ posts[i].username + '' + '

' + @@ -69,6 +68,7 @@ define(function () { recent_replies.appendChild(frag); } $('#category_recent_replies span.timeago').timeago(); + app.createUserTooltips(); }); $(window).off('scroll').on('scroll', function (ev) { @@ -94,17 +94,20 @@ define(function () { if (numTopics > 0) { for (var x = 0; x < numTopics; x++) { - if ($(topics[x]).find('.icon-pushpin').length) + if ($(topics[x]).find('.fa-thumb-tack').length) { + if(x === numTopics - 1) { + topic.insertAfter(topics[x]); + } continue; + } topic.insertBefore(topics[x]); - topic.hide().fadeIn('slow'); break; } } else { container.append(topic); - topic.hide().fadeIn('slow'); } + topic.hide().fadeIn('slow'); socket.emit('api:categories.getRecentReplies', templates.get('category_id')); addActiveUser(data); @@ -144,6 +147,10 @@ define(function () { Category.loadMoreTopics = function(cid) { + if (loadingMoreTopics) { + return; + } + loadingMoreTopics = true; socket.emit('api:category.loadMore', { cid: cid, diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js index df9c52ac6f..22aaf69768 100644 --- a/public/src/forum/footer.js +++ b/public/src/forum/footer.js @@ -105,11 +105,14 @@ notifList.appendChild(notifFrag); - if (data.unread.length > 0) notifIcon.className = 'icon-circle active'; - else notifIcon.className = 'icon-circle-blank'; + if (data.unread.length > 0) { + notifIcon.className = 'fa fa-circle active'; + } else { + notifIcon.className = 'fa fa-circle-o'; + } socket.emit('api:notifications.mark_all_read', null, function() { - notifIcon.className = 'icon-circle-blank'; + notifIcon.className = 'fa fa-circle-o'; utils.refreshTitle(); }); }); @@ -136,7 +139,7 @@ }); socket.on('event:new_notification', function() { - document.querySelector('.notifications a i').className = 'icon-circle active'; + document.querySelector('.notifications a i').className = 'fa fa-circle active'; app.alert({ alert_id: 'new_notif', title: 'New notification', diff --git a/public/src/forum/login.js b/public/src/forum/login.js index 96e6c49e94..a414f39e4e 100644 --- a/public/src/forum/login.js +++ b/public/src/forum/login.js @@ -26,17 +26,23 @@ define(function() { '_csrf': $('#csrf-token').val() }; + $('#login').attr('disabled', 'disabled').html('Logging in...'); + $('#login-error-notify').hide(); + $.ajax({ type: "POST", url: RELATIVE_PATH + '/login', data: loginData, success: function(data, textStatus, jqXHR) { + if (!data.success) { $('#login-error-notify').show(); + $('#login').removeAttr('disabled').html('Login'); } else { - $('#login-error-notify').hide(); - - if(!app.previousUrl) { app.previousUrl = '/'; } + $('#login').html('Redirecting...'); + if(!app.previousUrl) { + app.previousUrl = '/'; + } if(app.previousUrl.indexOf('/reset/') != -1) window.location.replace(RELATIVE_PATH + "/?loggedin"); @@ -48,6 +54,7 @@ define(function() { }, error: function(data, textStatus, jqXHR) { $('#login-error-notify').show(); + $('#login').removeAttr('disabled').html('Login'); }, dataType: 'json', async: true, @@ -63,6 +70,12 @@ define(function() { }); document.querySelector('#content input').focus(); + + if(!config.emailSetup) + $('#reset-link').addClass('hide'); + else + $('#reset-link').removeClass('hide'); + }; return Login; diff --git a/public/src/forum/recent.js b/public/src/forum/recent.js index 50e53792a9..934a3e248b 100644 --- a/public/src/forum/recent.js +++ b/public/src/forum/recent.js @@ -8,7 +8,7 @@ define(function() { var active = ''; Recent.init = function() { - app.enter_room('recent_posts'); + app.enterRoom('recent_posts'); ajaxify.register_events([ 'event:new_topic', diff --git a/public/src/forum/register.js b/public/src/forum/register.js index 6270f0c14c..fb1959f5c5 100644 --- a/public/src/forum/register.js +++ b/public/src/forum/register.js @@ -12,7 +12,7 @@ define(function() { password_notify = $('#password-notify'), password_confirm_notify = $('#password-confirm-notify'), validationError = false, - successIcon = ''; + successIcon = ''; $('#referrer').val(app.previousUrl); @@ -151,7 +151,9 @@ define(function() { } register.on('click', function(e) { - if (validateForm()) e.preventDefault(); + if (validateForm()) { + e.preventDefault(); + } }); }; diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js index a55be43a53..0f3439aa81 100644 --- a/public/src/forum/topic.js +++ b/public/src/forum/topic.js @@ -1,5 +1,7 @@ define(function() { - var Topic = {}; + var Topic = {}, + infiniteLoaderActive = false; + Topic.init = function() { var expose_tools = templates.get('expose_tools'), @@ -17,16 +19,26 @@ define(function() { google_url = templates.get('google-share-url'); + function fixDeleteStateForPosts() { + var postEls = document.querySelectorAll('#post-container li[data-deleted]'); + for (var x = 0, numPosts = postEls.length; x < numPosts; x++) { + if (postEls[x].getAttribute('data-deleted') === '1') { + toggle_post_delete_state(postEls[x].getAttribute('data-pid')); + } + postEls[x].removeAttribute('data-deleted'); + } + } + + jQuery('document').ready(function() { app.addCommasToNumbers(); + app.enterRoom('topic_' + tid); - var room = 'topic_' + tid, - adminTools = document.getElementById('thread-tools'); - - app.enter_room(room); - + if($('#post-container .posts .post-row').length > 1) { + $('.topic-main-buttons').removeClass('hide').parent().removeClass('hide'); + } $('.twitter-share').on('click', function () { window.open(twitter_url, '_blank', 'width=550,height=420,scrollbars=no,status=no'); @@ -50,11 +62,10 @@ define(function() { if (expose_tools === '1') { var moveThreadModal = $('#move_thread_modal'); - - adminTools.style.visibility = 'inherit'; + $('.thread-tools').removeClass('hide'); // Add events to the thread tools - $('#delete_thread').on('click', function(e) { + $('.delete_thread').on('click', function(e) { if (thread_state.deleted !== '1') { bootbox.confirm('Are you sure you want to delete this thread?', function(confirm) { if (confirm) { @@ -73,7 +84,7 @@ define(function() { return false; }); - $('#lock_thread').on('click', function(e) { + $('.lock_thread').on('click', function(e) { if (thread_state.locked !== '1') { socket.emit('api:topic.lock', { tid: tid @@ -86,7 +97,7 @@ define(function() { return false; }); - $('#pin_thread').on('click', function(e) { + $('.pin_thread').on('click', function(e) { if (thread_state.pinned !== '1') { socket.emit('api:topic.pin', { tid: tid @@ -99,7 +110,7 @@ define(function() { return false; }); - $('#move_thread').on('click', function(e) { + $('.move_thread').on('click', function(e) { moveThreadModal.modal('show'); return false; }); @@ -109,7 +120,6 @@ define(function() { var loadingEl = document.getElementById('categories-loading'); if (loadingEl) { socket.once('api:categories.get', function(data) { - console.log(data); // Render categories var categoriesFrag = document.createDocumentFragment(), categoryEl = document.createElement('li'), @@ -125,8 +135,10 @@ define(function() { categoriesEl.className = 'category-list'; for (x = 0; x < numCategories; x++) { info = data.categories[x]; - categoryEl.className = info.blockclass + (info.disabled === '1' ? ' disabled' : ''); - categoryEl.innerHTML = ' ' + info.name; + categoryEl.style.background = info.bgColor; + categoryEl.style.color = info.color || '#fff'; + categoryEl.className = info.disabled === '1' ? ' disabled' : ''; + categoryEl.innerHTML = ' ' + info.name; categoryEl.setAttribute('data-cid', info.cid); categoriesFrag.appendChild(categoryEl.cloneNode(true)); } @@ -148,7 +160,7 @@ define(function() { commitEl.disabled = true; $(cancelEl).fadeOut(250); $(moveThreadModal).find('.modal-header button').fadeOut(250); - commitEl.innerHTML = 'Moving '; + commitEl.innerHTML = 'Moving '; socket.once('api:topic.move', function(data) { moveThreadModal.modal('hide'); @@ -182,15 +194,11 @@ define(function() { }); } - // Fix delete state for this thread's posts - var postEls = document.querySelectorAll('#post-container li[data-deleted]'); - for (var x = 0, numPosts = postEls.length; x < numPosts; x++) { - if (postEls[x].getAttribute('data-deleted') === '1') toggle_post_delete_state(postEls[x].getAttribute('data-pid')); - postEls[x].removeAttribute('data-deleted'); - } + fixDeleteStateForPosts(); + // Follow Thread State - var followEl = $('.main-post .follow'), + var followEl = $('.posts .follow'), set_follow_state = function(state, quiet) { if (state && !followEl.hasClass('btn-success')) { followEl.addClass('btn-success'); @@ -246,7 +254,7 @@ define(function() { var bookmark = localStorage.getItem('topic:' + tid + ':bookmark'); if(bookmark) { - app.scrollToPost(parseInt(bookmark, 10)); + Topic.scrollToPost(parseInt(bookmark, 10)); } $('#post-container').on('click', '.deleted', function(ev) { @@ -258,13 +266,15 @@ define(function() { $(window).off('scroll').on('scroll', function() { var bottom = ($(document).height() - $(window).height()) * 0.9; - if ($(window).scrollTop() > bottom && !app.infiniteLoaderActive && $('#post-container').children().length) { - app.loadMorePosts(tid); + if ($(window).scrollTop() > bottom && !infiniteLoaderActive && $('#post-container').children().length) { + loadMorePosts(tid, function(posts) { + fixDeleteStateForPosts(); + }); } }); } - var reply_fn = function() { + $('.topic').on('click', '.post_reply', function() { var selectionText = '', selection = window.getSelection() || document.getSelection(); @@ -278,9 +288,7 @@ define(function() { cmp.push(tid, null, null, selectionText.length > 0 ? selectionText + '\n\n' : ''); }); } - }; - $('#post-container').on('click', '.post_reply', reply_fn); - $('#post_reply').on('click', reply_fn); + }); $('#post-container').on('click', '.quote', function() { if (thread_state.locked !== '1') { @@ -304,15 +312,15 @@ define(function() { var uid = $(this).parents('li').attr('data-uid'); var element = $(this).find('i'); - if (element.attr('class') == 'icon-star-empty') { + if ($(element).hasClass('fa-star-o')) { socket.emit('api:posts.favourite', { pid: pid, - room_id: app.current_room + room_id: app.currentRoom }); } else { socket.emit('api:posts.unfavourite', { pid: pid, - room_id: app.current_room + room_id: app.currentRoom }); } }); @@ -327,7 +335,7 @@ define(function() { $('#post-container').delegate('.edit', 'click', function(e) { var pid = $(this).parents('li').attr('data-pid'), - main = $(this).parents('.main-post'); + main = $(this).parents('.posts'); require(['composer'], function(cmp) { cmp.push(null, null, pid); @@ -341,13 +349,25 @@ define(function() { confirmDel = confirm((deleteAction ? 'Delete' : 'Restore') + ' this post?'); if (confirmDel) { - deleteAction ? + if(deleteAction) { socket.emit('api:posts.delete', { - pid: pid - }) : - socket.emit('api:posts.restore', { - pid: pid + pid: pid, + tid: tid + }, function(err) { + if(err) { + return app.alertError('Can\'t delete post!'); + } }); + } else { + socket.emit('api:posts.restore', { + pid: pid, + tid: tid + }, function(err) { + if(err) { + return app.alertError('Can\'t restore post!'); + } + }); + } } }); @@ -355,9 +375,6 @@ define(function() { var username = $(this).parents('li.row').attr('data-username'); var touid = $(this).parents('li.row').attr('data-uid'); - if (username === app.username || !app.username) - return; - app.openChat(username, touid); }); @@ -381,12 +398,15 @@ define(function() { var userLink = $('').append(userIcon); userLink.attr('data-uid', uid); + var div = $('

'); + div.append(userLink); + userLink.tooltip({ - placement: 'left', + placement: 'top', title: username }); - return userLink; + return div; } } @@ -428,7 +448,7 @@ define(function() { activeEl.find('.anonymous-box').remove(); if(anonymousCount || remainingUsers) { - var anonLink = $(''); + var anonLink = $('
'); activeEl.append(anonLink); var title = ''; @@ -440,12 +460,12 @@ define(function() { title = anonymousCount + ' guest(s)'; anonLink.tooltip({ - placement: 'left', + placement: 'top', title: title }); } } - app.populate_online_users(); + app.populateOnlineUsers(); }); socket.on('event:rep_up', function(data) { @@ -456,7 +476,7 @@ define(function() { adjust_rep(-1, data.pid, data.uid); }); - socket.on('event:new_post', app.createNewPosts); + socket.on('event:new_post', createNewPosts); socket.on('event:topic_deleted', function(data) { if (data.tid === tid && data.status === 'ok') { @@ -523,7 +543,7 @@ define(function() { if (data.status === 'ok' && data.pid) { var favEl = document.querySelector('.post_rep_' + data.pid).nextSibling; if (favEl) { - favEl.className = 'icon-star'; + favEl.className = 'fa fa-star'; $(favEl).parent().addClass('btn-warning'); } } @@ -533,18 +553,22 @@ define(function() { if (data.status === 'ok' && data.pid) { var favEl = document.querySelector('.post_rep_' + data.pid).nextSibling; if (favEl) { - favEl.className = 'icon-star-empty'; + favEl.className = 'fa fa-star-o'; $(favEl).parent().removeClass('btn-warning'); } } }); socket.on('event:post_deleted', function(data) { - if (data.pid) toggle_post_delete_state(data.pid, true); + if (data.pid) { + toggle_post_delete_state(data.pid); + } }); socket.on('event:post_restored', function(data) { - if (data.pid) toggle_post_delete_state(data.pid, true); + if (data.pid) { + toggle_post_delete_state(data.pid); + } }); socket.on('api:post.privileges', function(privileges) { @@ -566,21 +590,21 @@ define(function() { } function set_locked_state(locked, alert) { - var threadReplyBtn = document.getElementById('post_reply'), + var threadReplyBtn = $('.topic-main-buttons .post_reply'), postReplyBtns = document.querySelectorAll('#post-container .post_reply'), quoteBtns = document.querySelectorAll('#post-container .quote'), editBtns = document.querySelectorAll('#post-container .edit'), deleteBtns = document.querySelectorAll('#post-container .delete'), numPosts = document.querySelectorAll('#post_container li[data-pid]').length, - lockThreadEl = document.getElementById('lock_thread'), + lockThreadEl = $('.lock_thread'), x; if (locked === true) { - lockThreadEl.innerHTML = ' Unlock Thread'; - threadReplyBtn.disabled = true; - threadReplyBtn.innerHTML = 'Locked '; + lockThreadEl.html(' Unlock Thread'); + threadReplyBtn.attr('disabled', true); + threadReplyBtn.html('Locked '); for (x = 0; x < numPosts; x++) { - postReplyBtns[x].innerHTML = 'Locked '; + postReplyBtns[x].innerHTML = 'Locked '; quoteBtns[x].style.display = 'none'; editBtns[x].style.display = 'none'; deleteBtns[x].style.display = 'none'; @@ -598,11 +622,11 @@ define(function() { thread_state.locked = '1'; } else { - lockThreadEl.innerHTML = ' Lock Thread'; - threadReplyBtn.disabled = false; - threadReplyBtn.innerHTML = 'Reply'; + lockThreadEl.html(' Lock Thread'); + threadReplyBtn.attr('disabled', false); + threadReplyBtn.html('Reply'); for (x = 0; x < numPosts; x++) { - postReplyBtns[x].innerHTML = 'Reply '; + postReplyBtns[x].innerHTML = 'Reply '; quoteBtns[x].style.display = 'inline-block'; editBtns[x].style.display = 'inline-block'; deleteBtns[x].style.display = 'inline-block'; @@ -623,13 +647,14 @@ define(function() { } function set_delete_state(deleted) { - var deleteThreadEl = document.getElementById('delete_thread'), - deleteTextEl = deleteThreadEl.getElementsByTagName('span')[0], + var deleteThreadEl = $('.delete_thread'), + deleteTextEl = $('.delete_thread span'), + //deleteThreadEl.getElementsByTagName('span')[0], threadEl = $('#post-container'), deleteNotice = document.getElementById('thread-deleted') || document.createElement('div'); if (deleted) { - deleteTextEl.innerHTML = ' Restore Thread'; + deleteTextEl.html(' Restore Thread'); threadEl.addClass('deleted'); // Spawn a 'deleted' notice at the top of the page @@ -640,7 +665,7 @@ define(function() { thread_state.deleted = '1'; } else { - deleteTextEl.innerHTML = ' Delete Thread'; + deleteTextEl.html(' Delete Thread'); threadEl.removeClass('deleted'); deleteNotice.parentNode.removeChild(deleteNotice); @@ -649,10 +674,10 @@ define(function() { } function set_pinned_state(pinned, alert) { - var pinEl = document.getElementById('pin_thread'); + var pinEl = $('.pin_thread'); if (pinned) { - pinEl.innerHTML = ' Unpin Thread'; + pinEl.html(' Unpin Thread'); if (alert) { app.alert({ 'alert_id': 'thread_pin', @@ -665,7 +690,7 @@ define(function() { thread_state.pinned = '1'; } else { - pinEl.innerHTML = ' Pin Thread'; + pinEl.html(' Pin Thread'); if (alert) { app.alert({ 'alert_id': 'thread_pin', @@ -702,6 +727,7 @@ define(function() { } else { postEl.toggleClass('none'); } + updatePostCount(); }); socket.emit('api:post.privileges', pid); } @@ -740,8 +766,8 @@ define(function() { - var postAuthorImage, mobileAuthorOverlay, pagination; - var postcount = templates.get('postcount'); + var pagination; + Topic.postCount = templates.get('postcount'); function updateHeader() { if (pagination == null) { @@ -752,10 +778,6 @@ define(function() { app.scrollToBottom(); }); } - - jQuery('.mobile-author-overlay').css('bottom', '0px'); - postAuthorImage = postAuthorImage || document.getElementById('mobile-author-image'); - mobileAuthorOverlay = mobileAuthorOverlay || document.getElementById('mobile-author-overlay'); pagination = pagination || document.getElementById('pagination'); pagination.parentNode.style.display = 'block'; @@ -764,18 +786,16 @@ define(function() { var scrollTop = jQuery(window).scrollTop(); var scrollBottom = scrollTop + windowHeight; - if (scrollTop < 50 && postcount > 1) { + if (scrollTop < 50 && Topic.postCount > 1) { localStorage.removeItem("topic:" + tid + ":bookmark"); - postAuthorImage.src = (jQuery('.main-post .avatar img').attr('src')); - mobileAuthorOverlay.innerHTML = 'Posted by ' + jQuery('.main-post').attr('data-username') + ', ' + jQuery('.main-post').find('.relativeTimeAgo').html(); - pagination.innerHTML = '0 out of ' + postcount; + pagination.innerHTML = '0 out of ' + Topic.postCount; return; } var count = 0, smallestNonNegative = 0; - jQuery('.sub-posts').each(function() { + jQuery('.posts > .post-row').each(function() { count++; this.postnumber = count; @@ -794,15 +814,13 @@ define(function() { smallestNonNegative = Number.MAX_VALUE; } - pagination.innerHTML = this.postnumber + ' out of ' + postcount; - postAuthorImage.src = (jQuery(this).find('.profile-image-block img').attr('src')); - mobileAuthorOverlay.innerHTML = 'Posted by ' + jQuery(this).attr('data-username') + ', ' + jQuery(this).find('.relativeTimeAgo').html(); + pagination.innerHTML = this.postnumber + ' out of ' + Topic.postCount; } }); setTimeout(function() { if (scrollTop + windowHeight == jQuery(document).height()) { - pagination.innerHTML = postcount + ' out of ' + postcount; + pagination.innerHTML = Topic.postCount + ' out of ' + Topic.postCount; } }, 100); } @@ -811,5 +829,142 @@ define(function() { window.onload = updateHeader; }; + Topic.scrollToPost = function(pid) { + if (!pid) { + return; + } + + var container = $(document.body), + scrollTo = $('#post_anchor_' + pid), + tid = $('#post-container').attr('data-tid'); + + function animateScroll() { + $('body,html').animate({ + scrollTop: scrollTo.offset().top - container.offset().top + container.scrollTop() - $('#header-menu').height() + }, 400); + } + + if (!scrollTo.length && tid) { + + var intervalID = setInterval(function () { + loadMorePosts(tid, function (posts) { + scrollTo = $('#post_anchor_' + pid); + + if (tid && scrollTo.length) { + animateScroll(); + } + + if (!posts.length || scrollTo.length) + clearInterval(intervalID); + }); + }, 100); + + } else if (tid) { + animateScroll(); + } + } + + function createNewPosts(data, infiniteLoaded) { + if(!data || (data.posts && !data.posts.length)) + return; + + if (data.posts[0].uid !== app.uid) { + data.posts[0].display_moderator_tools = 'none'; + } + + function removeAlreadyAddedPosts() { + data.posts = data.posts.filter(function(post) { + return $('#post-container li[data-pid="' + post.pid +'"]').length === 0; + }); + } + + function findInsertionPoint() { + var after = null, + firstPid = data.posts[0].pid; + $('#post-container li[data-pid]').each(function() { + if(parseInt(firstPid, 10) > parseInt($(this).attr('data-pid'), 10)) { + after = $(this); + if(after.hasClass('posts')) { + after = after.next(); + } + } else { + return false; + } + }); + return after; + } + + removeAlreadyAddedPosts(); + if(!data.posts.length) { + return; + } + + var insertAfter = findInsertionPoint(); + + var html = templates.prepare(templates['topic'].blocks['posts']).parse(data); + var regexp = new RegExp("[\\s\\S]*", 'g'); + html = html.replace(regexp, ''); + + translator.translate(html, function(translatedHTML) { + var translated = $(translatedHTML); + + if(!infiniteLoaded) { + translated.removeClass('infiniteloaded'); + } + + translated.insertAfter(insertAfter) + .hide() + .fadeIn('slow'); + + for (var x = 0, numPosts = data.posts.length; x < numPosts; x++) { + socket.emit('api:post.privileges', data.posts[x].pid); + } + + infiniteLoaderActive = false; + + app.populateOnlineUsers(); + app.addCommasToNumbers(); + $('span.timeago').timeago(); + $('.post-content img').addClass('img-responsive'); + updatePostCount(); + }); + } + + function updatePostCount() { + Topic.postCount = $('#post-container li[data-pid]:not(.deleted)').length; + $('#topic-post-count').html(Topic.postCount); + } + + function loadMorePosts(tid, callback) { + var indicatorEl = $('.loading-indicator'); + + if (infiniteLoaderActive) { + return; + } + + infiniteLoaderActive = true; + + if (indicatorEl.attr('done') === '0') { + indicatorEl.fadeIn(); + } + + socket.emit('api:topic.loadMore', { + tid: tid, + after: $('#post-container .post-row.infiniteloaded').length + }, function (data) { + infiniteLoaderActive = false; + if (data.posts.length) { + indicatorEl.attr('done', '0'); + createNewPosts(data, true); + } else { + indicatorEl.attr('done', '1'); + } + indicatorEl.fadeOut(); + if (callback) { + callback(data.posts); + } + }); + } + return Topic; }); \ No newline at end of file diff --git a/public/src/forum/unread.js b/public/src/forum/unread.js index a80939f917..6dd8ae270c 100644 --- a/public/src/forum/unread.js +++ b/public/src/forum/unread.js @@ -1,9 +1,8 @@ define(function() { - var Unread = {}; + var Unread = {}, + loadingMoreTopics = false; Unread.init = function() { - var loadingMoreTopics = false; - app.enter_room('recent_posts'); ajaxify.register_events([ @@ -109,8 +108,9 @@ define(function() { }); - if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20) + if ($("body").height() <= $(window).height() && $('#topics-container').children().length >= 20) { $('#load-more-btn').show(); + } $('#load-more-btn').on('click', function() { loadMoreTopics(); diff --git a/public/src/forum/users.js b/public/src/forum/users.js index 33f6220243..8df4fb5e89 100644 --- a/public/src/forum/users.js +++ b/public/src/forum/users.js @@ -36,7 +36,7 @@ define(function() { var username = $('#search-user').val(); if (username == '') { - jQuery('#user-notfound-notify').html(''); + jQuery('#user-notfound-notify').html(''); jQuery('#user-notfound-notify').parent().removeClass('btn-warning label-warning btn-success label-success'); return; } @@ -44,7 +44,7 @@ define(function() { if (lastSearch === username) return; lastSearch = username; - jQuery('#user-notfound-notify').html(''); + jQuery('#user-notfound-notify').html(''); setTimeout(function() { socket.emit('api:admin.user.search', username); diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js index dae501565d..3858c1a379 100644 --- a/public/src/modules/composer.js +++ b/public/src/modules/composer.js @@ -114,19 +114,19 @@ define(['taskbar'], function(taskbar) { '' + '
' + '
' + - '' + - '' + - '' + - '' + + '' + + '' + + '' + + '' + '
' + '
' + '' + '
Drag and Drop Images Here
'+ '
' + '
' + - '' + - '' + - '' + + '' + + '' + + '' + '
' + '
' + ''; @@ -210,13 +210,17 @@ define(['taskbar'], function(taskbar) { 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) { - case 'icon-bold': + case 'fa fa-bold': if (selectionStart === selectionEnd) { // Nothing selected - postContentEl.value = postContentEl.value + '**bolded text**'; - postContentEl.selectionStart = cursorEnd+2; - postContentEl.selectionEnd = postContentEl.value.length - 2; + insertIntoInput(postContentEl, "**bolded text**"); } else { // Text selected postContentEl.value = postContentEl.value.slice(0, selectionStart) + '**' + postContentEl.value.slice(selectionStart, selectionEnd) + '**' + postContentEl.value.slice(selectionEnd); @@ -224,12 +228,10 @@ define(['taskbar'], function(taskbar) { postContentEl.selectionEnd = selectionEnd + 2; } break; - case 'icon-italic': + case 'fa fa-italic': if (selectionStart === selectionEnd) { // Nothing selected - postContentEl.value = postContentEl.value + '*italicised text*'; - postContentEl.selectionStart = cursorEnd+1; - postContentEl.selectionEnd = postContentEl.value.length - 1; + insertIntoInput(postContentEl, "*italicised text*"); } else { // Text selected postContentEl.value = postContentEl.value.slice(0, selectionStart) + '*' + postContentEl.value.slice(selectionStart, selectionEnd) + '*' + postContentEl.value.slice(selectionEnd); @@ -237,18 +239,14 @@ define(['taskbar'], function(taskbar) { postContentEl.selectionEnd = selectionEnd + 1; } break; - case 'icon-list': + case 'fa fa-list': // Nothing selected - postContentEl.value = postContentEl.value + "\n\n* list item"; - postContentEl.selectionStart = cursorEnd+4; - postContentEl.selectionEnd = postContentEl.value.length; + insertIntoInput(postContentEl, "\n\n* list item"); break; - case 'icon-link': + case 'fa fa-link': if (selectionStart === selectionEnd) { // Nothing selected - postContentEl.value = postContentEl.value + '[link text](link url)'; - postContentEl.selectionStart = cursorEnd+12; - postContentEl.selectionEnd = postContentEl.value.length - 1; + insertIntoInput(postContentEl, "[link text](link url)"); } else { // Text selected postContentEl.value = postContentEl.value.slice(0, selectionStart) + '[' + postContentEl.value.slice(selectionStart, selectionEnd) + '](link url)' + postContentEl.value.slice(selectionEnd); @@ -258,6 +256,7 @@ define(['taskbar'], function(taskbar) { break; } }); + window.addEventListener('resize', function() { if (composer.active !== undefined) composer.reposition(composer.active); }); diff --git a/public/src/modules/mobileMenu.js b/public/src/modules/mobileMenu.js index e1479dd03b..39a5283202 100644 --- a/public/src/modules/mobileMenu.js +++ b/public/src/modules/mobileMenu.js @@ -40,7 +40,7 @@ define(function() { var category = categories[i]; - image.className = category.icon + ' icon-3x'; + image.className = category.icon + ' fa-3x'; name.innerHTML = '
' + category.name; icon.appendChild(image); icon.appendChild(name); @@ -82,7 +82,7 @@ define(function() { cmp.push(0, cid); }); }; - postBtn.children[0].className = 'icon-plus icon-2x'; + postBtn.children[0].className = 'fa fa-plus fa-2x'; } else if (tid) { postBtn.style.display = 'inline-block'; postBtn.onclick = function() { @@ -90,7 +90,7 @@ define(function() { cmp.push(tid); }); }; - postBtn.children[0].className = 'icon-reply icon-2x' + postBtn.children[0].className = 'fa fa-reply fa-2x' } else { postBtn.style.display = 'none'; } diff --git a/public/src/templates.js b/public/src/templates.js index bd3f376ca8..44083d1589 100644 --- a/public/src/templates.js +++ b/public/src/templates.js @@ -91,7 +91,7 @@ } else { getTemplates(__dirname + '/../templates'); } - + } function loadClient() { @@ -235,11 +235,11 @@ } function makeRegex(block) { - return new RegExp("[\\s\\S]*", 'g'); + return new RegExp("[\\s\\S]*", 'g'); } function makeConditionalRegex(block) { - return new RegExp("[\\s\\S]*", 'g'); + return new RegExp("[\\s\\S]*", 'g'); } function getBlock(regex, block, template) { @@ -248,22 +248,12 @@ if (self.blocks && block !== undefined) self.blocks[block] = data[0]; - data = data[0] - .replace("", "") - .replace("", ""); - - return data; - } - - function getConditionalBlock(regex, block, template) { - data = template.match(regex); - if (data == null) return; - - if (self.blocks && block !== undefined) self.blocks[block] = data[0]; + var begin = new RegExp("(\r\n)*(\r\n)*", "g"), + end = new RegExp("(\r\n)*(\r\n)*", "g"), data = data[0] - .replace("", "") - .replace("", ""); + .replace(begin, "") + .replace(end, ""); return data; } @@ -275,7 +265,7 @@ var template = this.html, regex, block; - return (function parse(data, namespace, template) { + return (function parse(data, namespace, template, blockInfo) { if (!data || data.length == 0) { template = ''; } @@ -302,7 +292,7 @@ result = ""; do { - result += parse(data[d][i], namespace, block); + result += parse(data[d][i], namespace, block, {iterator: i, total: numblocks}); } while (i++ < numblocks); namespace = namespace.replace(d + '.', ''); @@ -317,14 +307,39 @@ block = parse(data[d], namespace, block); template = setBlock(regex, block, template); } else { - var conditional = makeConditionalRegex(d), - block = getConditionalBlock(conditional, namespace, template); - - if (block && !data[d]) { - template = template.replace(conditional, ''); + function checkConditional(key, value) { + var conditional = makeConditionalRegex(key), + conditionalBlock = conditional.exec(template); + + if (conditionalBlock !== null) { + conditionalBlock = conditionalBlock[0].split(//); + + if (conditionalBlock[1]) { + // there is an else statement + if (!value) { + template = template.replace(conditional, conditionalBlock[1]); + } else { + template = template.replace(conditional, conditionalBlock[0]); + } + + } else { + // regular if + if (!value) { + template = template.replace(conditional, ''); + } + } + } } - + checkConditional(namespace + d, data[d]); + checkConditional('!' + namespace + d, !data[d]); + + if (blockInfo) { + checkConditional('@first', blockInfo.iterator === 0); + checkConditional('@last', blockInfo.iterator === blockInfo.total); + } + + template = replace(namespace + d, data[d], template); } } diff --git a/public/src/utils.js b/public/src/utils.js index c6cf66d80a..f9e9c2d8d6 100644 --- a/public/src/utils.js +++ b/public/src/utils.js @@ -181,7 +181,7 @@ document.title = (numNotifications > 0 ? '(' + numNotifications + ') ' : '') + title; notificationIcon = notificationIcon || document.querySelector('.notifications a i'); if (numNotifications > 0 && notificationIcon) { - notificationIcon.className = 'icon-circle active'; + notificationIcon.className = 'fa fa-circle active'; } }); diff --git a/public/templates/account.tpl b/public/templates/account.tpl index 5c7678f10c..6d5335ac42 100644 --- a/public/templates/account.tpl +++ b/public/templates/account.tpl @@ -13,7 +13,7 @@
- offline + offline
banned @@ -27,7 +27,7 @@