+[](https://david-dm.org/designcreateplay/nodebb)
+[](https://codeclimate.com/github/designcreateplay/NodeBB)
+
**NodeBB Forum Software** is powered by Node.js and built on a Redis database. It utilizes web sockets for instant interactions and real-time notifications. NodeBB is compatible down to IE8 and has many modern features out of the box such as social network integration and streaming discussions.
* [Get NodeBB](http://www.nodebb.org/ "NodeBB")
@@ -11,7 +14,7 @@
* [Get Plugins](http://community.nodebb.org/category/7/nodebb-plugins "NodeBB Plugins")
* [Get Themes](http://community.nodebb.org/category/10/nodebb-themes "NodeBB Themes")
-## Screenshots
+## Screenshots
[
](http://i.imgur.com/FLOUuIq.png) [
](http://i.imgur.com/Ud1LrfI.png) [
](http://i.imgur.com/ZC8W39a.png) [
](http://i.imgur.com/o90kVPi.png) [
](http://i.imgur.com/AaRRrU2.png) [
](http://i.imgur.com/LmHtPho.png) [
](http://i.imgur.com/paiJPJk.jpg) [
](http://i.imgur.com/ZfavPHD.png)
diff --git a/app.js b/app.js
index 57cb4dcc02..ec15115694 100644
--- a/app.js
+++ b/app.js
@@ -80,10 +80,9 @@ if (!nconf.get('help') && !nconf.get('setup') && !nconf.get('install') && !nconf
reset();
} else {
displayHelp();
-};
-
+}
-function start() {
+function loadConfig() {
nconf.file({
file: configFile
});
@@ -92,17 +91,23 @@ function start() {
themes_path: path.join(__dirname, 'node_modules')
});
+ // Ensure themes_path is a full filepath
+ nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
+}
+
+
+function start() {
+ loadConfig();
+
nconf.set('url', nconf.get('base_url') + (nconf.get('use_port') ? ':' + nconf.get('port') : '') + nconf.get('relative_path'));
nconf.set('upload_url', path.join(path.sep, nconf.get('relative_path'), 'uploads', path.sep));
nconf.set('base_dir', __dirname);
- // Ensure themes_path is a full filepath
- nconf.set('themes_path', path.resolve(__dirname, nconf.get('themes_path')));
-
winston.info('Time: ' + new Date());
winston.info('Initializing NodeBB v' + pkg.version);
winston.info('* using configuration stored in: ' + configFile);
- winston.info('* using ' + nconf.get('database') +' store at ' + nconf.get(nconf.get('database') + ':host') + ':' + nconf.get(nconf.get('database') + ':port'));
+ var host = nconf.get(nconf.get('database') + ':host');
+ winston.info('* using ' + nconf.get('database') +' store at ' + host + (host.indexOf('/') === -1 ? ':' + nconf.get(nconf.get('database') + ':port') : ''));
winston.info('* using themes stored in: ' + nconf.get('themes_path'));
if (process.env.NODE_ENV === 'development') {
@@ -148,7 +153,7 @@ function start() {
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')
+ winston.warn(' node app --no-check-schema');
process.exit();
}
});
@@ -157,16 +162,14 @@ function start() {
}
function setup() {
+ loadConfig();
+
if (nconf.get('setup')) {
winston.info('NodeBB Setup Triggered via Command Line');
} else {
winston.warn('Configuration not found, starting NodeBB setup');
}
- nconf.file({
- file: __dirname + '/config.json'
- });
-
var install = require('./src/install');
winston.info('Welcome to NodeBB!');
@@ -185,9 +188,7 @@ function setup() {
}
function upgrade() {
- nconf.file({
- file: __dirname + '/config.json'
- });
+ loadConfig();
var meta = require('./src/meta');
@@ -199,9 +200,7 @@ function upgrade() {
}
function reset() {
- nconf.file({
- file: __dirname + '/config.json'
- });
+ loadConfig();
var meta = require('./src/meta'),
db = require('./src/database'),
@@ -232,7 +231,7 @@ function reset() {
winston.info("Successfully reset theme to Vanilla and disabled all plugins.");
}
- process.exit();
+ process.exit();
});
});
});
diff --git a/loader.js b/loader.js
new file mode 100644
index 0000000000..2ab9be2715
--- /dev/null
+++ b/loader.js
@@ -0,0 +1,76 @@
+"use strict";
+
+var nconf = require('nconf'),
+ fs = require('fs'),
+ pidFilePath = __dirname + '/pidfile',
+ start = function() {
+ var fork = require('child_process').fork,
+ nbb_start = function() {
+ nbb = fork('./app', process.argv.slice(2), {
+ env: {
+ 'NODE_ENV': process.env.NODE_ENV
+ }
+ });
+
+ nbb.on('message', function(cmd) {
+ if (cmd === 'nodebb:restart') {
+ nbb_restart();
+ }
+ });
+ },
+ nbb_stop = function() {
+ nbb.kill();
+ if (fs.existsSync(pidFilePath)) {
+ var pid = parseInt(fs.readFileSync(pidFilePath, { encoding: 'utf-8' }), 10);
+ if (process.pid === pid) {
+ fs.unlinkSync(pidFilePath);
+ }
+ }
+ },
+ nbb_restart = function() {
+ nbb.on('exit', function() {
+ nbb_start();
+ });
+ nbb.kill();
+ };
+
+ process.on('SIGINT', nbb_stop);
+ process.on('SIGTERM', nbb_stop);
+ process.on('SIGHUP', nbb_restart);
+
+ nbb_start();
+ },
+ nbb;
+
+nconf.argv();
+
+// Start the daemon!
+if (nconf.get('d')) {
+ // Check for a still-active NodeBB process
+ if (fs.existsSync(pidFilePath)) {
+ try {
+ var pid = fs.readFileSync(pidFilePath, { encoding: 'utf-8' });
+ process.kill(pid, 0);
+ console.log('\n Error: Another NodeBB is already running!');
+ process.exit();
+ } catch (e) {
+ fs.unlinkSync(pidFilePath);
+ }
+ }
+
+ // Initialise logging streams
+ var outputStream = fs.createWriteStream(__dirname + '/logs/output.log');
+ outputStream.on('open', function(fd) {
+ // Daemonize
+ require('daemon')({
+ stdout: fd
+ });
+
+ // Write its pid to a pidfile
+ fs.writeFile(__dirname + '/pidfile', process.pid);
+
+ start();
+ });
+} else {
+ start();
+}
\ No newline at end of file
diff --git a/logs/.gitignore b/logs/.gitignore
new file mode 100644
index 0000000000..397b4a7624
--- /dev/null
+++ b/logs/.gitignore
@@ -0,0 +1 @@
+*.log
diff --git a/nodebb b/nodebb
index e514db0051..26ec782725 100755
--- a/nodebb
+++ b/nodebb
@@ -6,31 +6,50 @@
case "$1" in
start)
- node app "$@"
+ echo "Starting NodeBB";
+ echo " \"./nodebb stop\" to stop the NodeBB server";
+ echo " \"./nodebb log\" to view server output";
+ echo "" > ./logs/output.log;
+ node loader -d "$@"
+ ;;
+
+ stop)
+ echo "Stopping NodeBB. Goodbye!";
+ kill `cat pidfile`;
+ ;;
+
+ reload|restart)
+ echo "Restarting NodeBB.";
+ kill -1 `cat pidfile`;
+ ;;
+
+ log)
+ clear;
+ tail -F ./logs/output.log;
;;
upgrade)
npm install
ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm install
ls -d node_modules/nodebb* | xargs -n1 basename | xargs npm update
- node app --upgrade
+ node loader --upgrade
touch package.json
echo -e "\n\e[00;32mNodeBB Dependencies up-to-date!\e[00;00m";
;;
setup)
- node app --setup
+ node loader --setup
;;
- reset)
- node app --reset
- ;;
+ reset)
+ node loader --reset
+ ;;
dev)
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 node app "$@"
+ NODE_ENV=development node loader "$@"
;;
watch)
@@ -40,32 +59,21 @@ case "$1" in
NODE_ENV=development supervisor -q --extensions 'node|js|tpl' -- app "$@"
;;
- # language)
- # case "$2" in
- # check)
- # node app --language="check"
- # ;;
-
- # *)
- # echo "Language Settings"
- # echo $"Usage: $0 language {check}"
- # echo ''
- # column -s ' ' -t <<< '
- # check Compare language files against the /en directory
- # '
- # ;;
- # esac
- # ;;
-
*)
echo "Welcome to NodeBB"
- echo $"Usage: $0 {start|dev|watch|upgrade}"
+ echo $"Usage: $0 {start|stop|reload|restart|log|setup|reset|upgrade|dev|watch}"
echo ''
column -s ' ' -t <<< '
- start Start NodeBB in production mode
- dev Start NodeBB in development mode
- watch Start NodeBB in development mode and watch for changes
+ start Start the NodeBB server
+ stop Stops the NodeBB server
+ reload Restarts NodeBB
+ restart Restarts NodeBB
+ log Opens the logging interface (useful for debugging)
+ setup Runs the NodeBB setup script
+ reset Disables all plugins, restores the default theme.
upgrade Run NodeBB upgrade scripts, ensure packages are up-to-date
+ dev Start NodeBB in interactive development mode
+ watch Start NodeBB in development mode and watch for changes
'
exit 1
esac
diff --git a/package.json b/package.json
index f35c875dc3..79d2d26c33 100644
--- a/package.json
+++ b/package.json
@@ -10,6 +10,8 @@
},
"main": "app.js",
"scripts": {
+ "start": "./nodebb start",
+ "stop": "./nodebb stop",
"test": "mocha ./tests"
},
"dependencies": {
@@ -21,7 +23,7 @@
"less-middleware": "0.1.12",
"marked": "0.2.8",
"async": "~0.2.8",
- "node-imagemagick": "0.1.8",
+ "gm": "1.14.2",
"gravatar": "1.0.6",
"nconf": "~0.6.7",
"sitemap": "~0.7.1",
@@ -30,7 +32,7 @@
"rss": "~0.2.0",
"prompt": "~0.2.11",
"uglify-js": "~2.4.0",
- "validator": "~3.2.1",
+ "validator": "^3.4.0",
"cron": "~1.0.1",
"semver": "~2.2.1",
"string": "~1.7.0",
@@ -38,11 +40,14 @@
"socket.io-wildcard": "~0.1.1",
"bcryptjs": "~0.7.10",
"nodebb-plugin-mentions": "~0.4",
- "nodebb-plugin-markdown": "~0.3",
+ "nodebb-plugin-markdown": "~0.4",
"nodebb-widget-essentials": "~0.0",
"nodebb-theme-vanilla": "~0.0.14",
"nodebb-theme-cerulean": "~0.0.13",
- "nodebb-theme-lavender": "~0.0.21"
+ "nodebb-theme-lavender": "~0.0.22",
+ "less": "^1.6.3",
+ "daemon": "~1.1.0",
+ "underscore": "^1.6.0"
},
"optionalDependencies": {
"redis": "0.8.3",
diff --git a/public/language/ar/category.json b/public/language/ar/category.json
index 53f8e469b3..382c60fd40 100644
--- a/public/language/ar/category.json
+++ b/public/language/ar/category.json
@@ -1,9 +1,6 @@
{
"new_topic_button": "موضوع جديد",
"no_topics": "لا توجد مواضيع في هذه الفئةلماذا لا تحاول نشر واحد؟' +
+ '
' +
+ '' +
+ '' +
+ '' +
+ '' +
+ '
' +
+ '' +
- '' +
- '' +
- '
' +
- '' + resultObj.name + '
' +
+ '' +
+ '' +
+ '
' +
+ 'There seems to be a group with this name already.
'; break; case 'name-too-short': - errorText = 'Please specify a grou nameA group name is required for administrative purposes.
'; + errorText = 'Please specify a group nameA group name is required for administrative purposes.
'; break; default: errorText = 'Uh-OhThere was a problem creating your group. Please try again later!
'; @@ -57,8 +57,9 @@ define(function() { }); listEl.on('click', 'button[data-action]', function() { - var action = this.getAttribute('data-action'), - gid = $(this).parents('li[data-gid]').attr('data-gid'); + var el = $(this), + action = el.attr('data-action'), + gid = el.parents('li[data-gid]').attr('data-gid'); switch (action) { case 'delete': @@ -80,28 +81,21 @@ define(function() { var formEl = detailsModal.find('form'), nameEl = formEl.find('#change-group-name'), descEl = formEl.find('#change-group-desc'), - memberIcon = document.createElement('li'), numMembers = groupObj.members.length, - membersFrag = document.createDocumentFragment(), - memberIconImg, x; - + x; nameEl.val(groupObj.name); descEl.val(groupObj.description); - // Member list - memberIcon.innerHTML = 'A new version (v' + latestVersion + ') has been released. Consider upgrading your NodeBB.
'); } }); + + $('.restart').on('click', function() { + socket.emit('admin.restart'); + }); + + socket.emit('admin.getVisitorCount', function(err, data) { + if(err) { + return app.alertError(err.message); + } + + var uniqueVisitors = $('#unique-visitors'); + for(var key in data) { + uniqueVisitors.find('#' + key).text(data[key]); + } + + }); }; Admin.updateRoomUsage = function(err, data) { diff --git a/public/src/forum/admin/languages.js b/public/src/forum/admin/languages.js index 44182e3a13..207a75fedb 100644 --- a/public/src/forum/admin/languages.js +++ b/public/src/forum/admin/languages.js @@ -1,5 +1,5 @@ define(['forum/admin/settings'], function(Settings) { - jQuery('document').ready(function() { + $(function() { Settings.prepare(); }); }); \ No newline at end of file diff --git a/public/src/forum/admin/plugins.js b/public/src/forum/admin/plugins.js index 9386f8390f..1de7c4637b 100644 --- a/public/src/forum/admin/plugins.js +++ b/public/src/forum/admin/plugins.js @@ -17,9 +17,9 @@ define(function() { pluginTgl.toggleClass('btn-warning', status.active).toggleClass('btn-success', !status.active); app.alert({ - alert_id: 'plugin_toggled_' + status.id, + alert_id: 'plugin_toggled', title: 'Plugin ' + (status.active ? 'Enabled' : 'Disabled'), - message: 'You may need to restart NodeBB in order for these changes to be reflected.', + message: 'Restarting your NodeBB ', type: 'warning', timeout: 5000 }) diff --git a/public/src/forum/admin/settings.js b/public/src/forum/admin/settings.js index 44f0e22cc2..d33a3f720e 100644 --- a/public/src/forum/admin/settings.js +++ b/public/src/forum/admin/settings.js @@ -9,44 +9,44 @@ define(['uploader'], function(uploader) { // Come back in 125ms if the config isn't ready yet if (!app.config) { setTimeout(function() { - Settings.prepare(); + Settings.prepare(callback); }, 125); return; } // Populate the fields on the page from the config - var fields = document.querySelectorAll('#content [data-field]'), + var fields = $('#content [data-field]'), numFields = fields.length, - saveBtn = document.getElementById('save'), - x, key, inputType; + saveBtn = $('#save'), + x, key, inputType, field; for (x = 0; x < numFields; x++) { - key = fields[x].getAttribute('data-field'); - inputType = fields[x].getAttribute('type'); - if (fields[x].nodeName === 'INPUT') { + field = fields.eq(x); + key = field.attr('data-field'); + inputType = field.attr('type'); + if (field.is('input')) { if (app.config[key]) { switch (inputType) { case 'text': case 'password': case 'textarea': case 'number': - fields[x].value = app.config[key]; + field.val(app.config[key]); break; case 'checkbox': - fields[x].checked = parseInt(app.config[key], 10) === 1; + field.prop('checked', parseInt(app.config[key], 10) === 1); break; } } - } 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]; + } else if (field.is('textarea')) { + if (app.config[key]) field.val(app.config[key]); + } else if (field.is('select')) { + if (app.config[key]) field.val(app.config[key]); } } - saveBtn.addEventListener('click', function(e) { - + saveBtn.on('click', function(e) { e.preventDefault(); for (x = 0; x < numFields; x++) { @@ -55,27 +55,28 @@ define(['uploader'], function(uploader) { }); function saveField(field) { - var key = field.getAttribute('data-field'), + field = $(field); + var key = field.attr('data-field'), value; - if (field.nodeName === 'INPUT') { - inputType = field.getAttribute('type'); + if (field.is('input')) { + inputType = field.attr('type'); switch (inputType) { case 'text': case 'password': case 'textarea': case 'number': - value = field.value; + value = field.val(); break; case 'checkbox': - value = field.checked ? '1' : '0'; + value = field.prop('checked') ? '1' : '0'; break; } - } else if (field.nodeName === 'TEXTAREA') { - value = field.value; - } else if (field.nodeName === 'SELECT') { - value = field.value; + } else if (field.is('textarea')) { + value = field.val(); + } else if (field.is('select')) { + value = field.val(); } socket.emit('admin.config.set', { diff --git a/public/src/forum/admin/themes.js b/public/src/forum/admin/themes.js index 6207b98fff..d5873a7164 100644 --- a/public/src/forum/admin/themes.js +++ b/public/src/forum/admin/themes.js @@ -2,17 +2,21 @@ define(['forum/admin/settings'], function(Settings) { var Themes = {}; Themes.init = function() { - var scriptEl = document.createElement('script'); - scriptEl.src = 'http://api.bootswatch.com/3/?callback=bootswatchListener'; - document.body.appendChild(scriptEl); + var scriptEl = $(''); + scriptEl.attr('src', 'http://api.bootswatch.com/3/?callback=bootswatchListener'); + $('body').append(scriptEl); + + var bootstrapThemeContainer = $('#bootstrap_themes'), + installedThemeContainer = $('#installed_themes'), - var bootstrapThemeContainer = document.querySelector('#bootstrap_themes'), - installedThemeContainer = document.querySelector('#installed_themes'), themeEvent = function(e) { - if (e.target.hasAttribute('data-action')) { - switch (e.target.getAttribute('data-action')) { + var target = $(e.target), + action = target.attr('data-action'); + + if (action) { + switch (action) { case 'use': - var parentEl = $(e.target).parents('li'), + var parentEl = target.parents('li'), themeType = parentEl.attr('data-type'), cssSrc = parentEl.attr('data-css'), themeId = parentEl.attr('data-theme'); @@ -26,20 +30,19 @@ define(['forum/admin/settings'], function(Settings) { alert_id: 'admin:theme', type: 'success', title: 'Theme Changed', - message: 'You have successfully changed your NodeBB\'s theme. Please restart to see the changes.', - timeout: 2500 + message: 'Restarting your NodeBB ', + timeout: 3500 }); }); - break; + break; } } }; - bootstrapThemeContainer.addEventListener('click', themeEvent); - installedThemeContainer.addEventListener('click', themeEvent); + bootstrapThemeContainer.on('click', themeEvent); + installedThemeContainer.on('click', themeEvent); - var revertEl = document.getElementById('revert_theme'); - revertEl.addEventListener('click', function() { + $('#revert_theme').on('click', function() { bootbox.confirm('Are you sure you wish to remove the custom theme and restore the NodeBB default theme?', function(confirm) { if (confirm) { socket.emit('admin.themes.set', { @@ -50,7 +53,7 @@ define(['forum/admin/settings'], function(Settings) { alert_id: 'admin:theme', type: 'success', title: 'Theme Changed', - message: 'You have successfully reverted your NodeBB back to it\'s default theme. Please restart to see the changes.', + message: 'You have successfully reverted your NodeBB back to it\'s default theme. Restarting your NodeBB ', timeout: 3500 }); }); @@ -64,37 +67,32 @@ define(['forum/admin/settings'], function(Settings) { return app.alertError(err.message); } - var instListEl = document.getElementById('installed_themes'), - themeFrag = document.createDocumentFragment(), - liEl = document.createElement('li'); - liEl.setAttribute('data-type', 'local'); + var instListEl = $('#installed_themes').empty(), liEl; if (themes.length > 0) { for (var x = 0, numThemes = themes.length; x < numThemes; x++) { - liEl.setAttribute('data-theme', themes[x].id); - liEl.innerHTML = ' + ')
' +
- '' +
- '
' +
- '' +
- ' ' +
- '
' +
- '' + themes[x].name + '
' + - '' + - themes[x].description + - (themes[x].url ? ' (Homepage)' : '') + - '
' + - '';
- themeFrag.appendChild(liEl.cloneNode(true));
+ liEl = $('').attr({
+ 'data-type': 'local',
+ 'data-theme': themes[x].id
+ }).html('' +
+ '
' +
+ '' +
+ '
' +
+ '' +
+ ' ' +
+ '
' +
+ '' + themes[x].name + '
' + + '' + + themes[x].description + + (themes[x].url ? ' (Homepage)' : '') + + '
' + + '');
+
+ instListEl.append(liEl);
}
} else {
// No themes found
- liEl.className = 'no-themes';
- liEl.innerHTML = 'No installed themes found';
- themeFrag.appendChild(liEl);
+ instListEl.append($('').addClass('no-themes').html('No installed themes found'));
}
-
- instListEl.innerHTML = '';
- instListEl.appendChild(themeFrag);
});
// Proper tabbing for "Custom CSS" field
@@ -105,40 +103,37 @@ define(['forum/admin/settings'], function(Settings) {
Themes.prepareWidgets();
Settings.prepare();
- }
+ };
Themes.render = function(bootswatch) {
- var themeFrag = document.createDocumentFragment(),
- themeEl = document.createElement('li'),
- themeContainer = document.querySelector('#bootstrap_themes'),
- numThemes = bootswatch.themes.length;
-
- themeEl.setAttribute('data-type', 'bootswatch');
+ var themeContainer = $('#bootstrap_themes').empty(),
+ numThemes = bootswatch.themes.length, themeEl, theme;
for (var x = 0; x < numThemes; x++) {
- var theme = bootswatch.themes[x];
- themeEl.setAttribute('data-css', theme.cssCdn);
- themeEl.setAttribute('data-theme', theme.name);
- themeEl.innerHTML = '
' +
- '
' +
- '
' +
- '' +
- ' ' +
- '
' +
- '' + theme.name + '
' + - '' + theme.description + '
' + - '';
- themeFrag.appendChild(themeEl.cloneNode(true));
+ theme = bootswatch.themes[x];
+ themeEl = $('').attr({
+ 'data-type': 'bootswatch',
+ 'data-css': theme.cssCdn,
+ 'data-theme': theme.name
+ }).html('' +
+ '
' +
+ '
' +
+ '' +
+ ' ' +
+ '
' +
+ '' + theme.name + '
' + + '' + theme.description + '
' + + '');
+ themeContainer.append(themeEl);
}
- themeContainer.innerHTML = '';
- themeContainer.appendChild(themeFrag);
- }
+ };
Themes.prepareWidgets = function() {
$('#widgets .available-widgets .panel').draggable({
helper: function(e) {
return $(e.target).parents('.panel').clone().addClass('block').width($(e.target.parentNode).width());
},
+ distance: 10,
connectToSortable: ".widget-area"
});
@@ -148,7 +143,8 @@ define(['forum/admin/settings'], function(Settings) {
target = target.attr('data-container-html') ? target : target.parents('[data-container-html]');
return target.clone().addClass('block').width(target.width()).css('opacity', '0.5');
- }
+ },
+ distance: 10
});
function appendToggle(el) {
@@ -165,8 +161,8 @@ define(['forum/admin/settings'], function(Settings) {
hoverClass: "panel-info"
})
.children('.panel-heading')
- .append(' ')
- .children('small').html('');
+ .append(' ')
+ .children('small').html('');
}
}
@@ -176,18 +172,18 @@ define(['forum/admin/settings'], function(Settings) {
},
connectWith: "div"
}).on('click', '.toggle-widget', function() {
- $(this).parents('.panel').children('.panel-body').toggleClass('hidden');
- }).on('click', '.delete-widget', function() {
- var panel = $(this).parents('.panel');
+ $(this).parents('.panel').children('.panel-body').toggleClass('hidden');
+ }).on('click', '.delete-widget', function() {
+ var panel = $(this).parents('.panel');
- bootbox.confirm('Are you sure you wish to delete this widget?', function(confirm) {
- if (confirm) {
- panel.remove();
- }
+ bootbox.confirm('Are you sure you wish to delete this widget?', function(confirm) {
+ if (confirm) {
+ panel.remove();
+ }
+ });
+ }).on('dblclick', '.panel-heading', function() {
+ $(this).parents('.panel').children('.panel-body').toggleClass('hidden');
});
- }).on('dblclick', '.panel-heading', function() {
- $(this).parents('.panel').children('.panel-body').toggleClass('hidden');
- });
$('#widgets .btn[data-template]').on('click', function() {
var btn = $(this),
@@ -203,13 +199,13 @@ define(['forum/admin/settings'], function(Settings) {
for (var d in data) {
if (data.hasOwnProperty(d)) {
if (data[d].name) {
- widgetData[data[d].name] = data[d].value;
+ widgetData[data[d].name] = data[d].value;
}
}
}
widgets.push({
- widget: this.getAttribute('data-widget'),
+ widget: $(this).attr('data-widget'),
data: widgetData
});
});
@@ -243,7 +239,7 @@ define(['forum/admin/settings'], function(Settings) {
return widget;
}
-
+
$.get(RELATIVE_PATH + '/api/admin/themes', function(data) {
var areas = data.areas;
diff --git a/public/src/forum/admin/topics.js b/public/src/forum/admin/topics.js
index 1d112ddca4..545fc6b2a3 100644
--- a/public/src/forum/admin/topics.js
+++ b/public/src/forum/admin/topics.js
@@ -2,14 +2,14 @@ define(function() {
var Topics = {};
Topics.init = function() {
- var topicsListEl = document.querySelector('.topics'),
- loadMoreEl = document.getElementById('topics_loadmore');
+ var topicsListEl = $('.topics'),
+ loadMoreEl = $('#topics_loadmore');
this.resolveButtonStates();
- $(topicsListEl).on('click', '[data-action]', function() {
+ topicsListEl.on('click', '[data-action]', function() {
var $this = $(this),
- action = this.getAttribute('data-action'),
+ action = $this.attr('data-action'),
tid = $this.parents('[data-tid]').attr('data-tid');
switch (action) {
@@ -40,17 +40,17 @@ define(function() {
}
});
- loadMoreEl.addEventListener('click', function() {
- if (this.className.indexOf('disabled') === -1) {
- var topics = document.querySelectorAll('.topics li[data-tid]');
+ loadMoreEl.on('click', function() {
+ if (!$(this).hasClass('disabled')) {
+ var topics = $('.topics li[data-tid]');
if(!topics.length) {
return;
}
- var lastTid = parseInt(topics[topics.length - 1].getAttribute('data-tid'));
+ var lastTid = parseInt(topics.eq(topics.length - 1).attr('data-tid'));
- this.innerHTML = ' Retrieving topics';
+ $(this).html(' Retrieving topics');
socket.emit('admin.topics.getMore', {
limit: 10,
after: lastTid
@@ -59,27 +59,27 @@ define(function() {
return app.alertError(err.message);
}
- var btnEl = document.getElementById('topics_loadmore');
+ var btnEl = $('#topics_loadmore');
if (topics.length > 0) {
var html = templates.prepare(templates['admin/topics'].blocks['topics']).parse({
topics: topics
}),
- topicsListEl = document.querySelector('.topics');
+ topicsListEl = $('.topics');
// Fix relative paths
html = html.replace(/\{relative_path\}/g, RELATIVE_PATH);
- topicsListEl.innerHTML += html;
+ topicsListEl.html(topicsListEl.html() + html);
Topics.resolveButtonStates();
- btnEl.innerHTML = 'Load More Topics';
+ btnEl.html('Load More Topics');
$('span.timeago').timeago();
} else {
// Exhausted all topics
- btnEl.className += ' disabled';
- btnEl.innerHTML = 'No more topics';
+ btnEl.addClass('disabled');
+ btnEl.html('No more topics');
}
});
}
@@ -88,24 +88,26 @@ define(function() {
Topics.resolveButtonStates = function() {
// Resolve proper button state for all topics
- var topicsListEl = document.querySelector('.topics'),
- topicEls = topicsListEl.querySelectorAll('li'),
+ var topicsListEl = $('.topics'),
+ topicEls = topicsListEl.find('li'),
numTopics = topicEls.length;
+
for (var x = 0; x < numTopics; x++) {
- if (topicEls[x].getAttribute('data-pinned') === '1') {
- topicEls[x].querySelector('[data-action="pin"]').className += ' active';
- topicEls[x].removeAttribute('data-pinned');
+ var topic = topicEls.eq(x);
+ if (topic.attr('data-pinned') === '1') {
+ topic.find('[data-action="pin"]').addClass('active');
+ topic.removeAttr('data-pinned');
}
- if (topicEls[x].getAttribute('data-locked') === '1') {
- topicEls[x].querySelector('[data-action="lock"]').className += ' active';
- topicEls[x].removeAttribute('data-locked');
+ if (topic.attr('data-locked') === '1') {
+ topic.find('[data-action="lock"]').addClass('active');
+ topic.removeAttr('data-locked');
}
- if (topicEls[x].getAttribute('data-deleted') === '1') {
- topicEls[x].querySelector('[data-action="delete"]').className += ' active';
- topicEls[x].removeAttribute('data-deleted');
+ if (topic.attr('data-deleted') === '1') {
+ topic.find('[data-action="delete"]').addClass('active');
+ topic.removeAttr('data-deleted');
}
}
- }
+ };
Topics.setDeleted = function(err, response) {
if(err) {
@@ -113,10 +115,9 @@ define(function() {
}
if (response && response.tid) {
- var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="delete"]');
-
- $(btnEl).addClass('active');
- $(btnEl).siblings('[data-action="lock"]').addClass('active');
+ var btnEl = $('li[data-tid="' + response.tid + '"] button[data-action="delete"]');
+ btnEl.addClass('active');
+ btnEl.siblings('[data-action="lock"]').addClass('active');
}
};
@@ -126,10 +127,10 @@ define(function() {
}
if (response && response.tid) {
- var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="delete"]');
+ var btnEl = $('li[data-tid="' + response.tid + '"] button[data-action="delete"]');
- $(btnEl).removeClass('active');
- $(btnEl).siblings('[data-action="lock"]').removeClass('active');
+ btnEl.removeClass('active');
+ btnEl.siblings('[data-action="lock"]').removeClass('active');
}
};
@@ -139,9 +140,9 @@ define(function() {
}
if (response && response.tid) {
- var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="lock"]');
+ var btnEl = $('li[data-tid="' + response.tid + '"] button[data-action="lock"]');
- $(btnEl).addClass('active');
+ btnEl.addClass('active');
}
};
@@ -151,9 +152,9 @@ define(function() {
}
if (response && response.tid) {
- var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="lock"]');
+ var btnEl = $('li[data-tid="' + response.tid + '"] button[data-action="lock"]');
- $(btnEl).removeClass('active');
+ btnEl.removeClass('active');
}
};
@@ -164,9 +165,9 @@ define(function() {
}
if (response && response.tid) {
- var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="pin"]');
+ var btnEl = $('li[data-tid="' + response.tid + '"] button[data-action="pin"]');
- $(btnEl).removeClass('active');
+ btnEl.removeClass('active');
}
};
@@ -176,9 +177,9 @@ define(function() {
}
if (response && response.tid) {
- var btnEl = document.querySelector('li[data-tid="' + response.tid + '"] button[data-action="pin"]');
+ var btnEl = $('li[data-tid="' + response.tid + '"] button[data-action="pin"]');
- $(btnEl).addClass('active');
+ btnEl.addClass('active');
}
};
diff --git a/public/src/forum/admin/users.js b/public/src/forum/admin/users.js
index 42e466534d..25e6aee335 100644
--- a/public/src/forum/admin/users.js
+++ b/public/src/forum/admin/users.js
@@ -156,7 +156,7 @@ define(function() {
}
- jQuery('document').ready(function() {
+ $('document').ready(function() {
var timeoutId = 0,
loadingMoreUsers = false;
@@ -165,15 +165,16 @@ define(function() {
parts = url.split('/'),
active = parts[parts.length - 1];
- jQuery('.nav-pills li').removeClass('active');
- jQuery('.nav-pills li a').each(function() {
- if (this.getAttribute('href').match(active)) {
- jQuery(this.parentNode).addClass('active');
+ $('.nav-pills li').removeClass('active');
+ $('.nav-pills li a').each(function() {
+ var $this = $(this);
+ if ($this.attr('href').match(active)) {
+ $this.parent().addClass('active');
return false;
}
});
- jQuery('#search-user').on('keyup', function() {
+ $('#search-user').on('keyup', function() {
if (timeoutId !== 0) {
clearTimeout(timeoutId);
timeoutId = 0;
@@ -182,7 +183,7 @@ define(function() {
timeoutId = setTimeout(function() {
var username = $('#search-user').val();
- jQuery('.fa-spinner').removeClass('none');
+ $('.fa-spinner').removeClass('none');
socket.emit('admin.user.search', username, function(err, data) {
if(err) {
@@ -195,7 +196,7 @@ define(function() {
userListEl = document.querySelector('.users');
userListEl.innerHTML = html;
- jQuery('.fa-spinner').addClass('none');
+ $('.fa-spinner').addClass('none');
if (data && data.users.length === 0) {
$('#user-notfound-notify').html('User not found!')
diff --git a/public/src/forum/category.js b/public/src/forum/category.js
index e9777904ab..80231bc931 100644
--- a/public/src/forum/category.js
+++ b/public/src/forum/category.js
@@ -3,27 +3,22 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
loadingMoreTopics = false;
Category.init = function() {
- var cid = templates.get('category_id'),
- categoryName = templates.get('category_name'),
- categoryUrl = encodeURIComponent(window.location.href),
- twitterUrl = "https://twitter.com/intent/tweet?url=" + categoryUrl + "&text=" + encodeURIComponent(categoryName),
- facebookUrl = "https://www.facebook.com/sharer/sharer.php?u=" + categoryUrl,
- googleUrl = "https://plus.google.com/share?url=" + categoryUrl;
+ var cid = templates.get('category_id');
app.enterRoom('category_' + cid);
- $('#twitter-intent').on('click', function () {
- window.open(twitterUrl, '_blank', 'width=550,height=420,scrollbars=no,status=no');
+ $('#twitter-share').on('click', function () {
+ window.open('https://twitter.com/intent/tweet?url=' + encodeURIComponent(window.location.href) + '&text=' + encodeURIComponent(templates.get('category_name')), '_blank', 'width=550,height=420,scrollbars=no,status=no');
return false;
});
$('#facebook-share').on('click', function () {
- window.open(facebookUrl, '_blank', 'width=626,height=436,scrollbars=no,status=no');
+ window.open('https://www.facebook.com/sharer/sharer.php?u=' + encodeURIComponent(window.location.href), '_blank', 'width=626,height=436,scrollbars=no,status=no');
return false;
});
$('#google-share').on('click', function () {
- window.open(googleUrl, '_blank', 'width=500,height=570,scrollbars=no,status=no');
+ window.open('https://plus.google.com/share?url=' + encodeURIComponent(window.location.href), '_blank', 'width=500,height=570,scrollbars=no,status=no');
return false;
});
@@ -38,13 +33,126 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
socket.on('event:new_topic', Category.onNewTopic);
enableInfiniteLoading();
+
+ $('#topics-container').on('click', '.topic-title', function() {
+ var clickedTid = $(this).parents('li.category-item[data-tid]').attr('data-tid');
+ $('#topics-container li.category-item').each(function(index, el) {
+ if($(el).offset().top - $(window).scrollTop() > 0) {
+ localStorage.setItem('category:bookmark', $(el).attr('data-tid'));
+ localStorage.setItem('category:bookmark:clicked', clickedTid);
+ return false;
+ }
+ });
+ });
+ };
+
+ $(window).on('action:popstate', function(ev, data) {
+ if(data.url.indexOf('category/') === 0) {
+ var bookmark = localStorage.getItem('category:bookmark');
+ var clicked = localStorage.getItem('category:bookmark:clicked');
+
+ if (bookmark) {
+
+ if(config.usePagination) {
+ socket.emit('topics.getTidPage', bookmark, function(err, page) {
+ if(err) {
+ return;
+ }
+ if(parseInt(page, 10) !== pagination.currentPage) {
+ pagination.loadPage(page);
+ } else {
+ Category.scrollToTopic(bookmark, clicked, 400);
+ }
+ });
+ } else {
+
+ socket.emit('topics.getTidIndex', bookmark, function(err, index) {
+ if(err) {
+ return;
+ }
+
+ if(index === 0) {
+ Category.highlightTopic(clicked);
+ return;
+ }
+
+ if (index < 0) {
+ index = 0;
+ }
+
+ $('#topics-container').empty();
+ loadingMoreTopics = false;
+
+ Category.loadMoreTopics(templates.get('category_id'), index, function() {
+ Category.scrollToTopic(bookmark, clicked, 0);
+ });
+ });
+ }
+ }
+ }
+ });
+
+ Category.highlightTopic = function(tid) {
+ var highlight = $('#topics-container li.category-item[data-tid="' + tid + '"]');
+ if(highlight.length && !highlight.hasClass('highlight')) {
+ highlight.addClass('highlight');
+ setTimeout(function() {
+ highlight.removeClass('highlight');
+ }, 5000);
+ }
+ };
+
+ Category.scrollToTopic = function(tid, clickedTid, duration, offset) {
+ if(!tid) {
+ return;
+ }
+
+ if(!offset) {
+ offset = 0;
+ }
+
+ if($('#topics-container li.category-item[data-tid="' + tid + '"]').length) {
+ var cid = templates.get('category_id');
+ var scrollTo = $('#topics-container li.category-item[data-tid="' + tid + '"]');
+
+ if (cid && scrollTo.length) {
+ $('html, body').animate({
+ scrollTop: (scrollTo.offset().top - $('#header-menu').height() - offset) + 'px'
+ }, duration !== undefined ? duration : 400, function() {
+ Category.highlightTopic(clickedTid);
+ });
+ }
+ }
};
function enableInfiniteLoading() {
if(!config.usePagination) {
- app.enableInfiniteLoading(function() {
- if(!loadingMoreTopics) {
- Category.loadMoreTopics(templates.get('category_id'));
+ app.enableInfiniteLoading(function(direction) {
+
+ if(!loadingMoreTopics && $('#topics-container').children().length) {
+
+ var after = 0,
+ offset = 0,
+ el = null;
+
+ if(direction > 0) {
+ el = $('#topics-container .category-item[data-tid]').last();
+ after = parseInt(el.attr('data-index'), 10) + 1;
+ } else {
+ el = $('#topics-container .category-item[data-tid]').first();
+ after = parseInt(el.attr('data-index'), 10);
+ after -= config.topicsPerPage;
+ if(after < 0) {
+ after = 0;
+ }
+ offset = el.offset().top - $('#header-menu').offset().top + $('#header-menu').height();
+ }
+
+ Category.loadMoreTopics(templates.get('category_id'), after, function() {
+ if(direction < 0 && el) {
+ Category.scrollToTopic(el.attr('data-tid'), null, 0, offset);
+ }
+ });
}
});
} else {
@@ -65,8 +173,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
topics = $('#topics-container').children('.category-item'),
numTopics = topics.length;
- jQuery('#topics-container, .category-sidebar').removeClass('hidden');
- jQuery('#category-no-topics').remove();
+ $('#topics-container, .category-sidebar').removeClass('hidden');
+ $('#category-no-topics').remove();
if (numTopics > 0) {
for (var x = 0; x < numTopics; x++) {
@@ -89,61 +197,117 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
pagination.recreatePaginationLinks(newPageCount);
});
- $('#topics-container span.timeago').timeago();
+ topic.find('span.timeago').timeago();
app.createUserTooltips();
$(window).trigger('action:categories.new_topic.loaded');
});
- }
+ };
+
+ Category.onTopicsLoaded = function(topics, callback) {
+ if(!topics || !topics.length) {
+ return;
+ }
+
+ function removeAlreadyAddedTopics() {
+ topics = topics.filter(function(topic) {
+ return $('#topics-container li[data-tid="' + topic.tid +'"]').length === 0;
+ });
+ }
+
+ var after = null,
+ before = null;
+
+ function findInsertionPoint() {
+ if (!$('#topics-container .category-item[data-tid]').length) {
+ return;
+ }
+ var last = $('#topics-container .category-item[data-tid]').last();
+ var lastIndex = last.attr('data-index');
+ var firstIndex = topics[topics.length - 1].index;
+ if (firstIndex > lastIndex) {
+ after = last;
+ } else {
+ before = $('#topics-container .category-item[data-tid]').first();
+ }
+ }
+
+ removeAlreadyAddedTopics();
+ if(!topics.length) {
+ return;
+ }
+
+ findInsertionPoint();
- Category.onTopicsLoaded = function(topics) {
var html = templates.prepare(templates['category'].blocks['topics']).parse({
topics: topics
});
translator.translate(html, function(translatedHTML) {
- var container = $('#topics-container');
-
- jQuery('#topics-container, .category-sidebar').removeClass('hidden');
- jQuery('#category-no-topics').remove();
+ var container = $('#topics-container'),
+ html = $(translatedHTML);
- html = $(translatedHTML);
+ $('#topics-container, .category-sidebar').removeClass('hidden');
+ $('#category-no-topics').remove();
if(config.usePagination) {
container.empty().append(html);
} else {
- container.append(html);
+ if(after) {
+ html.insertAfter(after);
+ } else if(before) {
+ html.insertBefore(before);
+ } else {
+ container.append(html);
+ }
}
- $('#topics-container span.timeago').timeago();
+ html.find('span.timeago').timeago();
app.createUserTooltips();
app.makeNumbersHumanReadable(html.find('.human-readable-number'));
+
+ if (typeof callback === 'function') {
+ callback(topics);
+ }
});
- }
+ };
- Category.loadMoreTopics = function(cid) {
+ Category.loadMoreTopics = function(cid, after, callback) {
if (loadingMoreTopics || !$('#topics-container').length) {
return;
}
+ if(after === 0 && $('#topics-container li.category-item[data-index="0"]').length) {
+ return;
+ }
+
$(window).trigger('action:categories.loading');
loadingMoreTopics = true;
+
socket.emit('categories.loadMore', {
cid: cid,
- after: $('#topics-container').attr('data-nextstart')
+ after: after
}, function (err, data) {
+ loadingMoreTopics = false;
+
if(err) {
return app.alertError(err.message);
}
if (data && data.topics.length) {
- Category.onTopicsLoaded(data.topics);
+ Category.onTopicsLoaded(data.topics, callback);
$('#topics-container').attr('data-nextstart', data.nextStart);
+ } else {
+
+ if (typeof callback === 'function') {
+ callback(data.topics);
+ }
}
- loadingMoreTopics = false;
+
+
$(window).trigger('action:categories.loaded');
});
- }
+ };
return Category;
});
\ No newline at end of file
diff --git a/public/src/forum/footer.js b/public/src/forum/footer.js
index d5eac0bf4f..e866b70cf9 100644
--- a/public/src/forum/footer.js
+++ b/public/src/forum/footer.js
@@ -9,13 +9,17 @@ define(['notifications', 'chat'], function(Notifications, Chat) {
translator.prepareDOM();
function updateUnreadCount(err, tids) {
- var count = 0;
- if(tids && tids.length) {
+ var count = 0, unreadEl = $('#unread-count');
+
+ if (err) {
+ console.warn('Error updating unread count', err);
+ } else if(tids && tids.length) {
count = tids.length;
}
- $('#unread-count').toggleClass('unread-count', count > 0);
- $('#unread-count').attr('data-content', count > 20 ? '20+' : count);
+ unreadEl
+ .toggleClass('unread-count', count > 0)
+ .attr('data-content', count > 20 ? '20+' : count);
}
diff --git a/public/src/forum/login.js b/public/src/forum/login.js
index 1f4df45ea6..11afd12cdc 100644
--- a/public/src/forum/login.js
+++ b/public/src/forum/login.js
@@ -52,7 +52,7 @@ define(function() {
return false;
});
- document.querySelector('#content input').focus();
+ $('#content input').focus();
};
return Login;
diff --git a/public/src/forum/pagination.js b/public/src/forum/pagination.js
index 3b19fce4c1..afd4bf3fb8 100644
--- a/public/src/forum/pagination.js
+++ b/public/src/forum/pagination.js
@@ -17,8 +17,6 @@ define(function() {
return pagination.loadPage(pagination.currentPage - 1);
}).on('click', '.next', function() {
return pagination.loadPage(pagination.currentPage + 1);
- }).on('click', '.page', function() {
- return pagination.loadPage($(this).attr('data-page'));
}).on('click', '.select_page', function(e) {
e.preventDefault();
bootbox.prompt('Enter page number:', function(pageNum) {
@@ -77,7 +75,11 @@ define(function() {
return false;
}
- ajaxify.go(window.location.pathname.slice(1) + '?page=' + page);
+ ajaxify.go(window.location.pathname.slice(1) + '?page=' + page, function() {
+ if (typeof callback === 'function') {
+ callback();
+ }
+ });
return true;
}
diff --git a/public/src/forum/recent.js b/public/src/forum/recent.js
index 8837c41367..8c7d6c3b32 100644
--- a/public/src/forum/recent.js
+++ b/public/src/forum/recent.js
@@ -38,10 +38,11 @@ define(function() {
Recent.selectActivePill = function() {
var active = getActiveSection();
- jQuery('.nav-pills li').removeClass('active');
- jQuery('.nav-pills li a').each(function() {
- if (this.getAttribute('href').match(active)) {
- jQuery(this.parentNode).addClass('active');
+ $('.nav-pills li').removeClass('active');
+ $('.nav-pills li a').each(function() {
+ var $this = $(this);
+ if ($this.attr('href').match(active)) {
+ $this.parent().addClass('active');
return false;
}
});
diff --git a/public/src/forum/register.js b/public/src/forum/register.js
index 4f0acb2a0d..674f53af6e 100644
--- a/public/src/forum/register.js
+++ b/public/src/forum/register.js
@@ -93,7 +93,7 @@ define(function() {
}
username.on('keyup', function() {
- jQuery('#yourUsername').html(this.value.length > 0 ? this.value : 'username');
+ $('#yourUsername').html(this.value.length > 0 ? this.value : 'username');
});
username.on('blur', function() {
diff --git a/public/src/forum/reset.js b/public/src/forum/reset.js
index a04b3d31e5..b03007c74e 100644
--- a/public/src/forum/reset.js
+++ b/public/src/forum/reset.js
@@ -2,32 +2,31 @@ define(function() {
var ResetPassword = {};
ResetPassword.init = function() {
- var inputEl = document.getElementById('email'),
- errorEl = document.getElementById('error'),
- errorTextEl = errorEl.querySelector('p');
+ var inputEl = $('#email'),
+ errorEl = $('#error'),
+ successEl = $('#success'),
+ errorTextEl = errorEl.find('p');
- document.getElementById('reset').onclick = function() {
- if (inputEl.value.length > 0 && inputEl.value.indexOf('@') !== -1) {
+ $('#reset').on('click', function() {
+ if (inputEl.val() && inputEl.val().indexOf('@') !== -1) {
socket.emit('user.reset.send', {
- email: inputEl.value
+ email: inputEl.val()
}, function(err, data) {
if(err) {
return app.alertError(err.message);
}
- var submitEl = document.getElementById('reset');
-
- jQuery('#error').hide();
- jQuery('#success').show();
- jQuery('#success p').html('An email has been dispatched to "' + inputEl.value + '" with instructions on setting a new password.');
- inputEl.value = '';
+ errorEl.addClass('hide').hide();
+ successEl.removeClass('hide').show();
+ successEl.find('p').html('An email has been dispatched to "' + inputEl.val() + '" with instructions on setting a new password.');
+ inputEl.val('');
});
} else {
- jQuery('#success').hide();
- jQuery(errorEl).show();
- errorTextEl.innerHTML = 'Please enter a valid email';
+ successEl.addClass('hide').hide();
+ errorEl.removeClass('hide').show();
+ errorTextEl.html('Please enter a valid email');
}
- };
+ });
};
return ResetPassword;
diff --git a/public/src/forum/reset_code.js b/public/src/forum/reset_code.js
index 2eb4b49f28..36af29de16 100644
--- a/public/src/forum/reset_code.js
+++ b/public/src/forum/reset_code.js
@@ -4,39 +4,37 @@ define(function() {
ResetCode.init = function() {
var reset_code = templates.get('reset_code');
- var resetEl = document.getElementById('reset'),
- password = document.getElementById('password'),
- repeat = document.getElementById('repeat'),
- noticeEl = document.getElementById('notice');
+ var resetEl = $('#reset'),
+ password = $('#password'),
+ repeat = $('#repeat'),
+ noticeEl = $('#notice');
- resetEl.addEventListener('click', function() {
- if (password.value.length < 6) {
- $('#error').hide();
- noticeEl.querySelector('strong').innerHTML = 'Invalid Password';
- noticeEl.querySelector('p').innerHTML = 'The password entered is too short, please pick a different password.';
- noticeEl.style.display = 'block';
+ resetEl.on('click', function() {
+ if (password.val().length < 6) {
+ $('#error').addClass('hide').hide();
+ noticeEl.find('strong').html('Invalid Password');
+ noticeEl.find('p').html('The password entered is too short, please pick a different password.');
+ noticeEl.removeClass('hide').css({display: 'block'});
} else if (password.value !== repeat.value) {
$('#error').hide();
- noticeEl.querySelector('strong').innerHTML = 'Invalid Password';
- noticeEl.querySelector('p').innerHTML = 'The two passwords you\'ve entered do not match.';
- noticeEl.style.display = 'block';
+ noticeEl.find('strong').html('Invalid Password');
+ noticeEl.find('p').html('The two passwords you\'ve entered do not match.');
+ noticeEl.removeClass('hide').css({display: 'block'});
} else {
socket.emit('user.reset.commit', {
code: reset_code,
- password: password.value
+ password: password.val()
}, function(err) {
if(err) {
return app.alert(err.message);
}
-
- $('#error').hide();
- $('#notice').hide();
- $('#success').show();
+ $('#error').addClass('hide').hide();
+ $('#notice').addClass('hide').hide();
+ $('#success').removeClass('hide').addClass('show').show();
});
}
- }, false);
+ });
- // Enable the form if the code is valid
socket.emit('user.reset.valid', {
code: reset_code
}, function(err, valid) {
@@ -45,12 +43,12 @@ define(function() {
}
if (valid) {
- resetEl.disabled = false;
+ resetEl.prop('disabled', false);
} else {
- var formEl = document.getElementById('reset-form');
+ var formEl = $('#reset-form');
// Show error message
$('#error').show();
- formEl.parentNode.removeChild(formEl);
+ formEl.remove();
}
});
};
diff --git a/public/src/forum/search.js b/public/src/forum/search.js
index 71ed19b69f..3d3c72389e 100644
--- a/public/src/forum/search.js
+++ b/public/src/forum/search.js
@@ -3,14 +3,14 @@ define(function() {
Search.init = function() {
var searchQuery = $('#topic-results').attr('data-search-query');
- $('.search-result-text').children().each(function() {
- var text = $(this).text();
+
+ $('.search-result-text').each(function() {
+ var text = $(this).html();
var regex = new RegExp(searchQuery, 'gi');
text = text.replace(regex, '' + searchQuery + '');
$(this).html(text);
});
-
$('#search-form input').val(searchQuery);
$('#mobile-search-form').off('submit').on('submit', function() {
diff --git a/public/src/forum/topic.js b/public/src/forum/topic.js
index dbb1aa3431..6383cac823 100644
--- a/public/src/forum/topic.js
+++ b/public/src/forum/topic.js
@@ -1,6 +1,8 @@
define(['composer', 'forum/pagination'], function(composer, pagination) {
var Topic = {},
- infiniteLoaderActive = false;
+ infiniteLoaderActive = false,
+ scrollingToPost = false,
+ currentUrl = '';
function showBottomPostBar() {
if($('#post-container .post-row').length > 1 || !$('#post-container li[data-index="0"]').length) {
@@ -10,13 +12,13 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
$(window).on('action:ajaxify.start', function(ev, data) {
if(data.url.indexOf('topic') !== 0) {
- $('.pagination-block').addClass('hide');
- $('#header-topic-title').html('').hide();
+ $('.pagination-block').addClass('hidden');
+ $('.header-topic-title').find('span').text('').hide();
+ app.removeAlert('bookmark');
}
});
Topic.init = function() {
-
var expose_tools = templates.get('expose_tools'),
tid = templates.get('topic_id'),
thread_state = {
@@ -33,17 +35,16 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
$(window).trigger('action:topic.loading');
function fixDeleteStateForPosts() {
- var postEls = document.querySelectorAll('#post-container li[data-deleted]');
+ var postEls = $('#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'));
+ if (postEls.eq(x).attr('data-deleted') === '1') {
+ toggle_post_delete_state(postEls.eq(x).attr('data-pid'));
}
- postEls[x].removeAttribute('data-deleted');
+ postEls.eq(x).removeAttr('data-deleted');
}
}
- jQuery('document').ready(function() {
-
+ $(function() {
app.addCommasToNumbers();
app.enterRoom('topic_' + tid);
@@ -105,57 +106,58 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
if(err) {
return app.alertError(err.message);
}
+ app.alertSuccess('[[topic:markAsUnreadForAll.success]]');
btn.parents('.thread-tools.open').find('.dropdown-toggle').trigger('click');
});
return false;
- })
+ });
moveThreadModal.on('shown.bs.modal', function() {
- var loadingEl = document.getElementById('categories-loading');
- if (loadingEl) {
+ var loadingEl = $('#categories-loading');
+ if (loadingEl.length) {
socket.emit('categories.get', function(err, data) {
+
// Render categories
- var categoriesFrag = document.createDocumentFragment(),
- categoryEl = document.createElement('li'),
+ var categoryEl,
numCategories = data.categories.length,
modalBody = moveThreadModal.find('.modal-body'),
- categoriesEl = modalBody[0].getElementsByTagName('ul')[0],
- confirmDiv = document.getElementById('move-confirm'),
- confirmCat = confirmDiv.getElementsByTagName('span')[0],
- commitEl = document.getElementById('move_thread_commit'),
- cancelEl = document.getElementById('move_thread_cancel'),
+ categoriesEl = modalBody.find('ul').eq(0).addClass('categories-list'),
+ confirmDiv = $('#move-confirm'),
+ confirmCat = confirmDiv.find('span').eq(0),
+ commitEl = $('#move_thread_commit'),
+ cancelEl = $('#move_thread_cancel'),
x, info, targetCid, targetCatLabel;
- categoriesEl.className = 'category-list';
for (x = 0; x < numCategories; x++) {
info = data.categories[x];
- 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));
+ categoryEl = $('');
+ categoryEl.css({background: info.bgColor, color: info.color || '#fff'})
+ .addClass(info.disabled === '1' ? ' disabled' : '')
+ .attr('data-cid', info.cid)
+ .html(' ' + info.name);
+
+ categoriesEl.append(categoryEl);
}
- categoriesEl.appendChild(categoriesFrag);
- modalBody[0].removeChild(loadingEl);
-
- categoriesEl.addEventListener('click', function(e) {
- if (e.target.nodeName === 'LI') {
- confirmCat.innerHTML = e.target.innerHTML;
- confirmDiv.style.display = 'block';
- targetCid = e.target.getAttribute('data-cid');
- targetCatLabel = e.target.innerHTML;
- commitEl.disabled = false;
+ loadingEl.remove();
+
+ categoriesEl.on('click', 'li[data-cid]', function(e) {
+ var el = $(this);
+ if (el.is('li')) {
+ confirmCat.html(el.html());
+ confirmDiv.css({display: 'block'});
+ targetCid = el.attr('data-cid');
+ targetCatLabel = el.html();
+ commitEl.prop('disabled', false);
}
- }, false);
+ });
- commitEl.addEventListener('click', function() {
- if (!commitEl.disabled && targetCid) {
- commitEl.disabled = true;
- $(cancelEl).fadeOut(250);
- $(moveThreadModal).find('.modal-header button').fadeOut(250);
- commitEl.innerHTML = 'Moving ';
+ commitEl.on('click', function() {
+ if (!commitEl.prop('disabled') && targetCid) {
+ commitEl.prop('disabled', true);
+ cancelEl.fadeOut(250);
+ moveThreadModal.find('.modal-header button').fadeOut(250);
+ commitEl.html('Moving ');
socket.emit('topics.move', {
tid: tid,
@@ -191,10 +193,10 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
var forkModal = $('#fork-thread-modal'),
forkCommit = forkModal.find('#fork_thread_commit');
forkModal.removeClass('hide');
- forkModal.css("position", "fixed")
- .css("left", Math.max(0, (($(window).width() - $(forkModal).outerWidth()) / 2) + $(window).scrollLeft()) + "px")
- .css("top", "0px")
- .css("z-index", "2000");
+ forkModal.css('position', 'fixed')
+ .css('left', Math.max(0, (($(window).width() - $(forkModal).outerWidth()) / 2) + $(window).scrollLeft()) + 'px')
+ .css('top', '0px')
+ .css('z-index', '2000');
showNoPostsSelected();
@@ -255,7 +257,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
function closeForkModal() {
for(var i=0; i 0) {
var snippet = selection.toString();
@@ -405,13 +390,14 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
}
var username = '',
- post = $(this).parents('li[data-pid]');
+ post = $(this).parents('li[data-pid]'),
+ pid = $(this).parents('.post-row').attr('data-pid');
if (post.length) {
username = '@' + post.attr('data-username').replace(/\s/g, '-') + ' ';
}
if (thread_state.locked !== '1') {
- composer.newReply(tid, topic_name, selectionText.length > 0 ? selectionText + '\n\n' + username : '' + username);
+ composer.newReply(tid, pid, topic_name, selectionText.length > 0 ? selectionText + '\n\n' + username : '' + username);
}
});
@@ -436,7 +422,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
if($('.composer').length) {
composer.addQuote(tid, pid, topic_name, username, quoted);
}else {
- composer.newReply(tid, topic_name, username + ' said:\n' + quoted);
+ composer.newReply(tid, pid, topic_name, username + ' said:\n' + quoted);
}
});
}
@@ -496,10 +482,10 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
});
$('#post-container').on('click', '.flag', function() {
+ var btn = $(this);
bootbox.confirm('Are you sure you want to flag this post?', function(confirm) {
if (confirm) {
- var pid = $(this).parents('.post-row').attr('data-pid');
-
+ var pid = btn.parents('.post-row').attr('data-pid');
socket.emit('posts.flag', pid, function(err) {
if(err) {
return app.alertError(err.message);
@@ -513,7 +499,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
$('#post-container').on('shown.bs.dropdown', '.share-dropdown', function() {
var pid = $(this).parents('.post-row').attr('data-pid');
- $('#post_' + pid + '_link').val(window.location.href + "#" + pid);
+ $('#post_' + pid + '_link').val(window.location.protocol + '//' + window.location.host + window.location.pathname + '#' + pid);
// without the setTimeout can't select the text in the input
setTimeout(function() {
$('#post_' + pid + '_link').putCursorAtEnd().select();
@@ -629,25 +615,19 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
'event:topic_deleted', 'event:topic_restored', 'event:topic:locked',
'event:topic_unlocked', 'event:topic_pinned', 'event:topic_unpinned',
'event:topic_moved', 'event:post_edited', 'event:post_deleted', 'event:post_restored',
- 'posts.favourite', 'user.isOnline', 'posts.upvote', 'posts.downvote'
+ 'posts.favourite', 'user.isOnline', 'posts.upvote', 'posts.downvote',
+ 'event:topic.replyStart', 'event:topic.replyStop'
]);
socket.on('get_users_in_room', function(data) {
if(data && data.room.indexOf('topic') !== -1) {
- var activeEl = $('.thread_active_users');
+ var activeEl = $('li.post-bar[data-index="0"] .thread_active_users');
function createUserIcon(uid, picture, userslug, username) {
- if(!activeEl.find('[href="'+ RELATIVE_PATH +'/user/' + data.users[i].userslug + '"]').length) {
- var userIcon = $('
');
-
- var userLink = $('').append(userIcon);
- userLink.attr('data-uid', uid);
-
- var div = $('');
- div.append(userLink);
-
- userLink.tooltip({
+ if(!activeEl.find('[data-uid="' + uid + '"]').length) {
+ var div = $('');
+ div.find('a').tooltip({
placement: 'top',
title: username
});
@@ -657,22 +637,23 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
}
// remove users that are no longer here
- activeEl.children().each(function(index, element) {
+ activeEl.find('a').each(function(index, element) {
if(element) {
var uid = $(element).attr('data-uid');
- for(var i=0; i [[topic:thread_tools.unlock]]', function(translated) {
- lockThreadEl.html(translated);
- });
- threadReplyBtn.attr('disabled', true);
- threadReplyBtn.html('Locked ');
- for (x = 0; x < numPosts; x++) {
- postReplyBtns[x].innerHTML = 'Locked ';
- quoteBtns[x].style.display = 'none';
- editBtns[x].style.display = 'none';
- deleteBtns[x].style.display = 'none';
- }
+ function set_follow_state(state, alert) {
- if (alert) {
- app.alert({
- 'alert_id': 'thread_lock',
- type: 'success',
- title: 'Thread Locked',
- message: 'Thread has been successfully locked',
- timeout: 5000
- });
- }
+ $('.posts .follow').toggleClass('btn-success', state).attr('title', state ? 'You are currently receiving updates to this topic' : 'Be notified of new replies in this topic');
- thread_state.locked = '1';
- } else {
- translator.translate(' [[topic:thread_tools.lock]]', function(translated) {
- lockThreadEl.html(translated);
+ if(alert) {
+ app.alert({
+ alert_id: 'topic_follow',
+ timeout: 2500,
+ title: state ? '[[topic:following_topic.title]]' : '[[topic:not_following_topic.title]]',
+ message: state ? '[[topic:following_topic.message]]' : '[[topic:not_following_topic.message]]',
+ type: 'success'
});
- threadReplyBtn.attr('disabled', false);
- threadReplyBtn.html('Reply');
- for (x = 0; x < numPosts; x++) {
- postReplyBtns[x].innerHTML = 'Reply ';
- quoteBtns[x].style.display = 'inline-block';
- editBtns[x].style.display = 'inline-block';
- deleteBtns[x].style.display = 'inline-block';
- }
+ }
+ };
- if (alert) {
- app.alert({
- 'alert_id': 'thread_lock',
- type: 'success',
- title: 'Thread Unlocked',
- message: 'Thread has been successfully unlocked',
- timeout: 5000
- });
- }
+ function set_locked_state(locked, alert) {
+ translator.translate(' [[topic:thread_tools.' + (locked ? 'un': '') + 'lock]]', function(translated) {
+ $('.lock_thread').html(translated);
+ });
+
+ $('.topic-main-buttons .post_reply').attr('disabled', locked).html(locked ? 'Locked ' : 'Reply');
+
+ $('#post-container .post_reply').html(locked ? 'Locked ' : 'Reply ');
+ $('#post-container').find('.quote, .edit, .delete').toggleClass('none', locked);
- thread_state.locked = '0';
+ if (alert) {
+ app.alert({
+ 'alert_id': 'thread_lock',
+ type: 'success',
+ title: 'Thread ' + (locked ? 'Locked' : 'Unlocked'),
+ message: 'Thread has been successfully ' + (locked ? 'locked' : 'unlocked'),
+ timeout: 5000
+ });
}
- }
+
+ thread_state.locked = locked ? '1' : '0';
+ };
function set_delete_state(deleted) {
- 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) {
- translator.translate(' [[topic:thread_tools.restore]]', function(translated) {
- deleteTextEl.html(translated);
- });
- threadEl.addClass('deleted');
+ var threadEl = $('#post-container');
- // Spawn a 'deleted' notice at the top of the page
- deleteNotice.setAttribute('id', 'thread-deleted');
- deleteNotice.className = 'alert alert-warning';
- deleteNotice.innerHTML = 'This thread has been deleted. Only users with thread management privileges can see it.';
- threadEl.before(deleteNotice);
+ translator.translate(' [[topic:thread_tools.' + (deleted ? 'restore' : 'delete') + ']]', function(translated) {
+ $('.delete_thread span').html(translated);
+ });
- thread_state.deleted = '1';
- } else {
- translator.translate(' [[topic:thread_tools.delete]]', function(translated) {
- deleteTextEl.html(translated);
- });
- threadEl.removeClass('deleted');
- deleteNotice.parentNode.removeChild(deleteNotice);
+ threadEl.toggleClass('deleted', deleted);
+ thread_state.deleted = deleted ? '1' : '0';
- thread_state.deleted = '0';
+ if(deleted) {
+ $('
' + userObj.username + '';
- chatsFrag.appendChild(chatEl.cloneNode(true));
+ for(x = 0;x < numChats; x++) {
+ userObj = chats[x];
+ chatEl = $('')
+ .attr('data-uid', userObj.uid)
+ .html('
' + userObj.username + '');
+
+ chatsListEl.append(chatEl);
}
-
- chatsListEl.empty();
- chatsListEl.html(chatsFrag);
} else {
translator.get('modules:chat.no_active', function(str) {
- chatEl.className = 'no_active';
- chatEl.innerHTML = '' + str + '';
- chatsFrag.appendChild(chatEl.cloneNode(true));
-
- chatsListEl.empty();
- chatsListEl.html(chatsFrag);
+ chatEl = $('')
+ .addClass('no_active')
+ .html('' + str + '');
+ chatsListEl.append(chatEl);
});
}
});
@@ -79,19 +81,23 @@ define(['taskbar', 'string'], function(taskbar, S) {
}
});
chatModal.css('zIndex', topZ + 1);
- }
+ };
module.getModal = function(touid) {
return $('#chat-modal-' + touid);
- }
+ };
module.modalExists = function(touid) {
return $('#chat-modal-' + touid).length !== 0;
- }
+ };
function checkStatus(chatModal) {
socket.emit('user.isOnline', chatModal.touid, function(err, data) {
- $('#chat-user-status').attr('class', 'fa fa-circle status ' + data.status);
+ translator.translate('[[global:' + data.status + ']]', function(translated) {
+ $('#chat-user-status').attr('class', 'fa fa-circle status ' + data.status)
+ .attr('title', translated)
+ .attr('data-original-title', translated);
+ });
});
}
@@ -126,6 +132,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
stop:function() {
chatModal.find('#chat-message-input').focus();
},
+ distance: 10,
handle: '.modal-header'
});
@@ -157,7 +164,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
callback(chatModal);
});
});
- }
+ };
module.center = function(chatModal) {
chatModal.css("left", Math.max(0, (($(window).width() - $(chatModal).outerWidth()) / 2) + $(window).scrollLeft()) + "px");
@@ -165,7 +172,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
chatModal.css("zIndex", 2000);
chatModal.find('#chat-message-input').focus();
return chatModal;
- }
+ };
module.load = function(uuid) {
var chatModal = $('div[UUID="'+uuid+'"]');
@@ -175,7 +182,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
scrollToBottom(chatModal.find('#chat-content'));
module.center(chatModal);
module.bringModalToTop(chatModal);
- }
+ };
module.minimize = function(uuid) {
var chatModal = $('div[UUID="'+uuid+'"]');
@@ -183,7 +190,7 @@ define(['taskbar', 'string'], function(taskbar, S) {
taskbar.minimize('chat', uuid);
clearInterval(chatModal.intervalId);
chatModal.intervalId = 0;
- }
+ };
function getChatMessages(chatModal, callback) {
socket.emit('modules.chats.get', {touid:chatModal.touid}, function(err, messages) {
diff --git a/public/src/modules/composer.js b/public/src/modules/composer.js
index 3e352401a4..c9457aa38a 100644
--- a/public/src/modules/composer.js
+++ b/public/src/modules/composer.js
@@ -4,6 +4,27 @@ define(['taskbar'], function(taskbar) {
posts: {}
};
+ function initialise() {
+ socket.on('event:composer.ping', function(post_uuid) {
+ if (composer.active === post_uuid) {
+ socket.emit('modules.composer.pingActive', post_uuid);
+ }
+ });
+ };
+ initialise();
+
+ function maybeParse(response) {
+ if (typeof response == 'string') {
+ try {
+ return $.parseJSON(response);
+ } catch (e) {
+ return {status: 500, message: 'Something went wrong while parsing server response'}
+ }
+ }
+ return response;
+
+ }
+
function resetInputFile($el) {
$el.wrap('').closest('form').get(0).reset();
$el.unwrap();
@@ -44,9 +65,9 @@ define(['taskbar'], function(taskbar) {
//http://stackoverflow.com/questions/14441456/how-to-detect-which-device-view-youre-on-using-twitter-bootstrap-api
function findBootstrapEnvironment() {
- var envs = ['xs', 'sm', 'md', 'lg'];
+ var envs = ['xs', 'sm', 'md', 'lg'],
+ $el = $('
This thread has been deleted. Only users with thread management privileges can see it.
').insertBefore(threadEl);
+ } else {
+ $('#thread-deleted').remove();
}
- }
+ };
function set_pinned_state(pinned, alert) {
- var pinEl = $('.pin_thread');
-
translator.translate(' [[topic:thread_tools.' + (pinned ? 'unpin' : 'pin') + ']]', function(translated) {
- if (pinned) {
- pinEl.html(translated);
- if (alert) {
- app.alert({
- 'alert_id': 'thread_pin',
- type: 'success',
- title: 'Thread Pinned',
- message: 'Thread has been successfully pinned',
- timeout: 5000
- });
- }
+ $('.pin_thread').html(translated);
- thread_state.pinned = '1';
- } else {
- pinEl.html(translated);
- if (alert) {
- app.alert({
- 'alert_id': 'thread_pin',
- type: 'success',
- title: 'Thread Unpinned',
- message: 'Thread has been successfully unpinned',
- timeout: 5000
- });
- }
-
- thread_state.pinned = '0';
+ if (alert) {
+ app.alert({
+ 'alert_id': 'thread_pin',
+ type: 'success',
+ title: 'Thread ' + (pinned ? 'Pinned' : 'Unpinned'),
+ message: 'Thread has been successfully ' + (pinned ? 'pinned' : 'unpinned'),
+ timeout: 5000
+ });
}
+ thread_state.pinned = pinned ? '1' : '0';
});
- }
+ };
function toggle_post_delete_state(pid) {
var postEl = $('#post-container li[data-pid="' + pid + '"]');
@@ -1049,34 +995,23 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
updatePostCount();
}
- }
+ };
function toggle_post_tools(pid, isDeleted) {
- var postEl = $('#post-container li[data-pid="' + pid + '"]'),
- quoteEl = $(postEl[0].querySelector('.quote')),
- favEl = $(postEl[0].querySelector('.favourite')),
- replyEl = $(postEl[0].querySelector('.post_reply')),
- chatEl = $(postEl[0].querySelector('.chat'));
-
- if (isDeleted) {
- quoteEl.addClass('none');
- favEl.addClass('none');
- replyEl.addClass('none');
- chatEl.addClass('none');
- } else {
- quoteEl.removeClass('none');
- favEl.removeClass('none');
- replyEl.removeClass('none');
- chatEl.removeClass('none');
- }
- }
+ var postEl = $('#post-container li[data-pid="' + pid + '"]');
+
+ postEl.find('.quote, .favourite, .post_reply, .chat').toggleClass('none', isDeleted);
+
+ translator.translate(isDeleted ? ' [[topic:restore]]' : ' [[topic:delete]]', function(translated) {
+ postEl.find('.delete').find('span').html(translated);
+ });
+ };
$(window).on('scroll', updateHeader);
$(window).trigger('action:topic.loaded');
};
function updateHeader() {
- var paginationEl = $('#pagination');
$('.pagination-block a').off('click').on('click', function() {
return false;
@@ -1090,16 +1025,10 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
app.scrollToBottom();
});
- var windowHeight = jQuery(window).height();
- var scrollTop = jQuery(window).scrollTop();
- var scrollBottom = scrollTop + windowHeight;
- var progressBar = $('.progress-bar');
- var tid = templates.get('topic_id');
-
- if(scrollTop > 50) {
- $('#header-topic-title').html(templates.get('topic_name')).show();
+ if($(window).scrollTop() > 50) {
+ $('.header-topic-title').find('span').text(templates.get('topic_name')).show();
} else {
- $('#header-topic-title').html('').hide();
+ $('.header-topic-title').find('span').text('').hide();
}
$($('.posts > .post-row').get().reverse()).each(function() {
@@ -1110,37 +1039,44 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
if(index > Topic.postCount) {
index = Topic.postCount;
}
- paginationEl.html(index + ' out of ' + Topic.postCount);
- progressBar.width((index / Topic.postCount * 100) + '%');
- return false;
- }
- });
- $('.posts > .post-row').each(function() {
- var el = $(this);
- if (elementInView(el)) {
- var index = parseInt(el.attr('data-index'), 10) + 1;
- if(index === 0) {
- localStorage.removeItem("topic:" + tid + ":bookmark");
- } else {
- localStorage.setItem("topic:" + tid + ":bookmark", el.attr('data-pid'));
+ $('#pagination').html(index + ' out of ' + Topic.postCount);
+ $('.progress-bar').width((index / Topic.postCount * 100) + '%');
+
+ var currentBookmark = localStorage.getItem('topic:' + templates.get('topic_id') + ':bookmark');
+ if (!currentBookmark || parseInt(el.attr('data-pid'), 10) > parseInt(currentBookmark, 10)) {
+ localStorage.setItem('topic:' + templates.get('topic_id') + ':bookmark', el.attr('data-pid'));
}
+
+ if (!scrollingToPost) {
+
+ var newUrl = window.location.href.replace(window.location.hash, '') + '#' + el.attr('data-pid');
+
+ if (newUrl !== currentUrl) {
+ if (history.replaceState) {
+ history.replaceState({
+ url: window.location.pathname.slice(1) + (window.location.search ? window.location.search : '' ) + '#' + el.attr('data-pid')
+ }, null, newUrl);
+ }
+ currentUrl = newUrl;
+ }
+ }
+
return false;
}
});
}
function elementInView(el) {
- var scrollTop = $(window).scrollTop();
+ var scrollTop = $(window).scrollTop() + $('#header-menu').height();
var scrollBottom = scrollTop + $(window).height();
var elTop = el.offset().top;
- var height = Math.floor(el.height());
- var elBottom = elTop + height;
- return !(elTop > scrollBottom || elBottom < scrollTop);
+ var elBottom = elTop + Math.floor(el.height());
+ return (elTop >= scrollTop && elBottom <= scrollBottom) || (elTop <= scrollTop && elBottom >= scrollTop);
}
- Topic.scrollToPost = function(pid, duration, offset) {
+ Topic.scrollToPost = function(pid, highlight, duration, offset) {
if (!pid) {
return;
}
@@ -1149,7 +1085,6 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
offset = 0;
}
-
if($('#post_anchor_' + pid).length) {
return scrollToPid(pid);
}
@@ -1160,7 +1095,9 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
return;
}
if(parseInt(page, 10) !== pagination.currentPage) {
- pagination.loadPage(page);
+ pagination.loadPage(page, function() {
+ scrollToPid(pid);
+ });
} else {
scrollToPid(pid);
}
@@ -1176,6 +1113,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
if(after < 0) {
after = 0;
}
+
loadMorePosts(tid, after, function() {
scrollToPid(pid);
});
@@ -1187,10 +1125,19 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
tid = $('#post-container').attr('data-tid');
function animateScroll() {
- $('window,html').animate({
- scrollTop: scrollTo.offset().top - $('#header-menu').height() - offset
+ scrollingToPost = true;
+
+ $("html, body").animate({
+ scrollTop: (scrollTo.offset().top - $('#header-menu').height() - offset) + "px"
}, duration !== undefined ? duration : 400, function() {
+ scrollingToPost = false;
updateHeader();
+ if (highlight) {
+ scrollTo.parent().find('.topic-item').addClass('highlight');
+ setTimeout(function() {
+ scrollTo.parent().find('.topic-item').removeClass('highlight');
+ }, 5000);
+ }
});
}
@@ -1202,7 +1149,7 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
}
}
}
- }
+ };
function onNewPostPagination(data) {
var posts = data.posts;
@@ -1315,18 +1262,8 @@ define(['composer', 'forum/pagination'], function(composer, pagination) {
}
- function toggle_mod_tools(pid, state) {
- var postEl = $(document.querySelector('#post-container li[data-pid="' + pid + '"]')),
- editEl = postEl.find('.edit'),
- deleteEl = postEl.find('.delete');
-
- if (state) {
- editEl.removeClass('none');
- deleteEl.removeClass('none');
- } else {
- editEl.addClass('none');
- deleteEl.addClass('none');
- }
+ function toggle_mod_tools(pid, editable) {
+ $('#post-container li[data-pid="' + pid + '"]').find('.edit, .delete').toggleClass('none', !editable);
}
function updatePostCount() {
diff --git a/public/src/forum/unread.js b/public/src/forum/unread.js
index 9829ca7a25..ac9b275a68 100644
--- a/public/src/forum/unread.js
+++ b/public/src/forum/unread.js
@@ -12,8 +12,17 @@ define(['forum/recent'], function(recent) {
recent.watchForNewPosts();
$('#mark-allread-btn').on('click', function() {
+ function getUnreadTids() {
+ var tids = [];
+ $('#topics-container .category-item[data-tid]').each(function() {
+ tids.push($(this).attr('data-tid'));
+ });
+ return tids;
+ }
+
var btn = $(this);
- socket.emit('topics.markAllRead', function(err) {
+
+ socket.emit('topics.markAllRead', getUnreadTids(), function(err) {
if(err) {
return app.alertError('There was an error marking topics read!');
}
diff --git a/public/src/forum/users.js b/public/src/forum/users.js
index 5e780b4670..e64b29ec00 100644
--- a/public/src/forum/users.js
+++ b/public/src/forum/users.js
@@ -18,15 +18,16 @@ define(function() {
app.addCommasToNumbers();
- jQuery('.nav-pills li').removeClass('active');
- jQuery('.nav-pills li a').each(function() {
- if (this.getAttribute('href').match(active)) {
- jQuery(this.parentNode).addClass('active');
+ $('.nav-pills li').removeClass('active');
+ $('.nav-pills li a').each(function() {
+ var $this = $(this);
+ if ($this.attr('href').match(active)) {
+ $this.parent().addClass('active');
return false;
}
});
- jQuery('#search-user').on('keyup', function() {
+ $('#search-user').on('keyup', function() {
if (timeoutId !== 0) {
clearTimeout(timeoutId);
timeoutId = 0;
@@ -36,15 +37,15 @@ define(function() {
var username = $('#search-user').val();
if (username == '') {
- jQuery('#user-notfound-notify').html('');
- jQuery('#user-notfound-notify').parent().removeClass('btn-warning label-warning btn-success label-success');
+ $('#user-notfound-notify').html('');
+ $('#user-notfound-notify').parent().removeClass('btn-warning label-warning btn-success label-success');
return;
}
if (lastSearch === username) return;
lastSearch = username;
- jQuery('#user-notfound-notify').html('');
+ $('#user-notfound-notify').html('');
setTimeout(function() {
socket.emit('user.search', username, function(err, data) {
@@ -111,12 +112,14 @@ define(function() {
users: users
});
- if(emptyContainer) {
- $('#users-container .registered-user').remove();
- }
+ translator.translate(html, function(translated) {
+ if(emptyContainer) {
+ $('#users-container .registered-user').remove();
+ }
- $('#users-container').append(html);
- $('#users-container .anon-user').appendTo($('#users-container'));
+ $('#users-container').append(translated);
+ $('#users-container .anon-user').appendTo($('#users-container'));
+ });
}
function loadMoreUsers() {
diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js
index c874b330b1..a79e213b48 100644
--- a/public/src/modules/chat.js
+++ b/public/src/modules/chat.js
@@ -14,30 +14,32 @@ define(['taskbar', 'string'], function(taskbar, S) {
}
socket.emit('modules.chats.list', function(err, chats) {
- var chatsFrag = document.createDocumentFragment(),
- chatEl = document.createElement('li'),
- numChats = chats.length,
- x, userObj;
-
+ var numChats = chats.length,
+ chatEl, x, userObj;
+ chatsListEl.empty();
if (!err && numChats > 0) {
- for(x=0;x');
- $el = $('
@@ -128,8 +140,8 @@
[[global:posted]]
[[global:in]]
-
- {posts.categoryName}
+
+ {posts.category.name}
diff --git a/public/templates/accountposts.tpl b/public/templates/accountposts.tpl
index 19744217d1..a407030ea3 100644
--- a/public/templates/accountposts.tpl
+++ b/public/templates/accountposts.tpl
@@ -5,7 +5,7 @@
');
$el.appendTo($('body'));
for (var i = envs.length - 1; i >= 0; i--) {
@@ -73,8 +94,8 @@ define(['taskbar'], function(taskbar) {
function initializeDragAndDrop(post_uuid) {
- if(jQuery.event.props.indexOf('dataTransfer') === -1) {
- jQuery.event.props.push('dataTransfer');
+ if($.event.props.indexOf('dataTransfer') === -1) {
+ $.event.props.push('dataTransfer');
}
var draggingDocument = false;
@@ -88,7 +109,7 @@ define(['taskbar'], function(taskbar) {
$(document).off('dragstart').on('dragstart', function(e) {
draggingDocument = true;
}).off('dragend').on('dragend', function(e) {
- draggingDocument = false;
+ draggingDocument = false;
});
textarea.on('dragenter', function(e) {
@@ -116,17 +137,24 @@ define(['taskbar'], function(taskbar) {
drop.on('drop', function(e) {
e.preventDefault();
- var dt = e.dataTransfer,
- files = dt.files;
+ var files = e.files || (e.dataTransfer || {}).files || (e.target.value ? [e.target.value] : []),
+ fd;
if(files.length) {
- var fd = new FormData();
- for (var i = 0, file; file = dt.files[i]; i++) {
- fd.append('files[]', file, file.name);
+ if (window.FormData) {
+ fd = new FormData();
+ for (var i = 0, file; file = files[i]; i++) {
+ fd.append('files[]', file, file.name);
+ }
}
- fileForm[0].reset();
- uploadContentFiles({files: files, post_uuid: post_uuid, route: '/api/post/upload', formData: fd});
+ // fileForm[0].reset();
+ uploadContentFiles({
+ files: files,
+ post_uuid: post_uuid,
+ route: '/api/post/upload',
+ formData: fd
+ });
}
drop.hide();
@@ -135,7 +163,8 @@ define(['taskbar'], function(taskbar) {
$(window).off('paste').on('paste', function(event) {
- var items = (event.clipboardData || event.originalEvent.clipboardData).items;
+ var items = (event.clipboardData || event.originalEvent.clipboardData || {}).items,
+ fd;
if(items && items.length) {
@@ -143,11 +172,18 @@ define(['taskbar'], function(taskbar) {
if(blob) {
blob.name = 'upload-'+ utils.generateUUID();
- var fd = new FormData();
- fd.append('files[]', blob, blob.name);
+ if (window.FormData) {
+ fd = new FormData();
+ fd.append('files[]', blob, blob.name);
+ }
- fileForm[0].reset();
- uploadContentFiles({files: [blob], post_uuid: post_uuid, route: '/api/post/upload', formData: fd});
+ // fileForm[0].reset();
+ uploadContentFiles({
+ files: [blob],
+ post_uuid: post_uuid,
+ route: '/api/post/upload',
+ formData: fd
+ });
}
}
});
@@ -167,7 +203,7 @@ define(['taskbar'], function(taskbar) {
uploadForm.attr('action', route);
for(var i = 0; i < files.length; ++i) {
- var isImage = files[i].type.match('image.*');
+ var isImage = files[i].type.match(/image./);
text += (isImage ? '!' : '') + '[' + files[i].name + '](uploading...) ';
if(files[i].size > parseInt(config.maximumFileSize, 10) * 1024) {
@@ -181,6 +217,7 @@ define(['taskbar'], function(taskbar) {
uploadForm.off('submit').submit(function() {
$(this).find('#postUploadCsrf').val($('#csrf_token').val());
+
if(formData) {
formData.append('_csrf', $('#csrf_token').val());
}
@@ -191,19 +228,25 @@ define(['taskbar'], function(taskbar) {
resetForm: true,
clearForm: true,
formData: formData,
+
error: function(xhr) {
+ xhr = maybeParse(xhr);
+
app.alertError('Error uploading file!\nStatus : ' + xhr.status + '\nMessage : ' + xhr.responseText);
if (typeof callback == 'function')
callback(xhr);
},
+
uploadProgress: function(event, position, total, percent) {
var current = textarea.val();
- for(var i=0; i 0) {
+ postContainer.find('.help').html(html);
+ postContainer.find('[data-pane=".tab-help"]').parent().removeClass('hidden');
+ }
+ });
+
$(window).trigger('action:composer.loaded', {
post_uuid: post_uuid
});
@@ -652,7 +718,6 @@ define(['taskbar'], function(taskbar) {
}
var percentage = localStorage.getItem('composer:resizePercentage'),
- bodyRect = document.body.getBoundingClientRect(),
postContainer = $('#cmp-uuid-' + post_uuid);
composer.active = post_uuid;
@@ -673,10 +738,12 @@ define(['taskbar'], function(taskbar) {
postContainer.find('.upload-instructions').removeClass('hide');
}
postContainer.find('.img-upload-btn').removeClass('hide');
+ postContainer.find('#files.lt-ie9').removeClass('hide');
}
if(config.allowFileUploads) {
postContainer.find('.file-upload-btn').removeClass('hide');
+ postContainer.find('#files.lt-ie9').removeClass('hide');
}
postContainer.css('visibility', 'visible')
@@ -736,8 +803,9 @@ define(['taskbar'], function(taskbar) {
}, done);
} else if (parseInt(postData.tid, 10) > 0) {
socket.emit('posts.reply', {
- topic_id: postData.tid,
- content: bodyEl.val()
+ tid: postData.tid,
+ content: bodyEl.val(),
+ toPid: postData.toPid
}, done);
} else if (parseInt(postData.pid, 10) > 0) {
socket.emit('posts.edit', {
@@ -764,6 +832,8 @@ define(['taskbar'], function(taskbar) {
taskbar.discard('composer', post_uuid);
$('body').css({'margin-bottom': 0});
$('.action-bar button').removeAttr('disabled');
+
+ socket.emit('modules.composer.unregister', post_uuid);
}
};
@@ -772,156 +842,9 @@ define(['taskbar'], function(taskbar) {
postContainer.css('visibility', 'hidden');
composer.active = undefined;
taskbar.minimize('composer', post_uuid);
- };
-
- function initializeDragAndDrop(post_uuid) {
-
- if(jQuery.event.props.indexOf('dataTransfer') === -1) {
- jQuery.event.props.push('dataTransfer');
- }
-
- var draggingDocument = false;
-
- var postContainer = $('#cmp-uuid-' + post_uuid),
- fileForm = postContainer.find('#fileForm');
- drop = postContainer.find('.imagedrop'),
- tabContent = postContainer.find('.tab-content'),
- 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', tabContent.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;
-
- if(files.length) {
- var fd = new FormData();
- for (var i = 0, file; file = dt.files[i]; i++) {
- fd.append('files[]', file, file.name);
- }
-
- fileForm[0].reset();
- uploadSubmit(files, post_uuid, '/api/post/upload', fd);
- }
- drop.hide();
- return false;
- });
-
- $(window).off('paste').on('paste', function(event) {
-
- var items = (event.clipboardData || event.originalEvent.clipboardData).items;
-
- if(items && items.length) {
-
- var blob = items[0].getAsFile();
- if(blob) {
- blob.name = 'upload-'+ utils.generateUUID();
-
- var fd = new FormData();
- fd.append('files[]', blob, blob.name);
-
- fileForm[0].reset();
- uploadSubmit([blob], post_uuid, '/api/post/upload', fd);
- }
- }
- });
- }
-
- function uploadSubmit(files, post_uuid, route, formData, callback) {
- var postContainer = $('#cmp-uuid-' + post_uuid),
- textarea = postContainer.find('textarea'),
- text = textarea.val(),
- uploadForm = postContainer.find('#fileForm');
-
- uploadForm.attr('action', route);
-
- for(var i=0; i parseInt(config.maximumFileSize, 10) * 1024) {
- uploadForm[0].reset();
- return composerAlert('File too big', 'Maximum allowed file size is ' + config.maximumFileSize + 'kbs');
- }
- }
-
- textarea.val(text);
-
- uploadForm.off('submit').submit(function() {
-
- $(this).find('#postUploadCsrf').val($('#csrf_token').val());
- if(formData) {
- formData.append('_csrf', $('#csrf_token').val());
- }
-
- composer.posts[post_uuid].uploadsInProgress.push(1);
-
- $(this).ajaxSubmit({
- resetForm: true,
- clearForm: true,
- formData: formData,
- error: function(xhr) {
- app.alertError('Error uploading file!\nStatus : ' + xhr.status + '\nMessage : ' + xhr.responseText);
- },
- uploadProgress: function(event, position, total, percent) {
- var current = textarea.val();
- for(var i=0; i
' : '') +
- '' + (options.title || 'NodeBB Task') + '' +
- '';
- btnEl.setAttribute('data-module', module);
- btnEl.setAttribute('data-uuid', uuid);
- btnEl.className = options.state !== undefined ? options.state : 'active';
+ var btnEl = $('')
+ .html('' +
+ (options.icon ? '' : '') +
+ '' + (options.title || 'NodeBB Task') + '' +
+ '')
+ .attr({
+ 'data-module': module,
+ 'data-uuid': uuid
+ })
+ .addClass(options.state !== undefined ? options.state : 'active');
if (!options.state || options.state === 'active') taskbar.minimizeAll();
- taskbar.tasklist.appendChild(btnEl);
+ taskbar.tasklist.append(btnEl);
taskbar.update();
},
+
minimize: function(module, uuid) {
- var btnEl = taskbar.tasklist.querySelector('[data-module="' + module + '"][data-uuid="' + uuid + '"]');
- $(btnEl).removeClass('active');
+ var btnEl = taskbar.tasklist.find('[data-module="' + module + '"][data-uuid="' + uuid + '"]');
+ btnEl.removeClass('active');
},
+
minimizeAll: function() {
- $(taskbar.tasklist.querySelectorAll('.active')).removeClass('active');
+ taskbar.tasklist.find('.active').removeClass('active');
},
+
toggleNew: function(uuid, state) {
- var btnEl = $(taskbar.tasklist.querySelector('[data-uuid="' + uuid + '"]'));
+ var btnEl = taskbar.tasklist.find('[data-uuid="' + uuid + '"]');
btnEl.toggleClass('new', state);
},
+
updateActive: function(uuid) {
- var tasks = $(taskbar.tasklist).find('li');
+ var tasks = taskbar.tasklist.find('li');
tasks.removeClass('active');
tasks.filter('[data-uuid="' + uuid + '"]').addClass('active');
}
- }
+ };
if (!taskbar.initialized) {
taskbar.init();
diff --git a/public/src/modules/uploader.js b/public/src/modules/uploader.js
index c82073c17a..fe9715e4d0 100644
--- a/public/src/modules/uploader.js
+++ b/public/src/modules/uploader.js
@@ -1,6 +1,16 @@
define(function() {
- var module = {};
+ var module = {},
+ maybeParse = function(response) {
+ if (typeof response == 'string') {
+ try {
+ return $.parseJSON(response);
+ } catch (e) {
+ return {error: 'Something went wrong while parsing server response'};
+ }
+ }
+ return response;
+ };
module.open = function(route, params, fileSize, callback) {
$('#upload-picture-modal').modal('show').removeClass('hide');
@@ -21,7 +31,7 @@ define(function() {
$('#uploadForm').submit();
});
- $('#uploadForm').off('submit').submit(function() {
+ uploadForm.off('submit').submit(function() {
function status(message) {
module.hideAlerts();
@@ -52,8 +62,8 @@ define(function() {
$(this).ajaxSubmit({
-
error: function(xhr) {
+ xhr = maybeParse(xhr);
error('Error: ' + xhr.status);
},
@@ -62,6 +72,8 @@ define(function() {
},
success: function(response) {
+ response = maybeParse(response);
+
if (response.error) {
error(response.error);
return;
@@ -78,14 +90,14 @@ define(function() {
return false;
});
- }
+ };
module.hideAlerts = function() {
$('#alert-status').addClass('hide');
$('#alert-success').addClass('hide');
$('#alert-error').addClass('hide');
$('#upload-progress-box').addClass('hide');
- }
+ };
return module;
});
\ No newline at end of file
diff --git a/public/src/overrides.js b/public/src/overrides.js
new file mode 100644
index 0000000000..df4ab27f24
--- /dev/null
+++ b/public/src/overrides.js
@@ -0,0 +1,51 @@
+if ('undefined' !== typeof window) {
+
+ (function ($, undefined) {
+ $.fn.getCursorPosition = function() {
+ var el = $(this).get(0);
+ var pos = 0;
+ if('selectionStart' in el) {
+ pos = el.selectionStart;
+ } else if('selection' in document) {
+ el.focus();
+ var Sel = document.selection.createRange();
+ var SelLength = document.selection.createRange().text.length;
+ Sel.moveStart('character', -el.value.length);
+ pos = Sel.text.length - SelLength;
+ }
+ return pos;
+ };
+
+ $.fn.selectRange = function(start, end) {
+ if(!end) end = start;
+ return this.each(function() {
+ if (this.setSelectionRange) {
+ this.focus();
+ this.setSelectionRange(start, end);
+ } else if (this.createTextRange) {
+ var range = this.createTextRange();
+ range.collapse(true);
+ range.moveEnd('character', end);
+ range.moveStart('character', start);
+ range.select();
+ }
+ });
+ };
+
+ //http://stackoverflow.com/questions/511088/use-javascript-to-place-cursor-at-end-of-text-in-text-input-element
+ $.fn.putCursorAtEnd = function() {
+ return this.each(function() {
+ $(this).focus();
+
+ if (this.setSelectionRange) {
+ var len = $(this).val().length * 2;
+ this.setSelectionRange(len, len);
+ } else {
+ $(this).val($(this).val());
+ }
+ this.scrollTop = 999999;
+ });
+ };
+
+ })(jQuery || {fn:{}});
+}
\ No newline at end of file
diff --git a/public/src/templates.js b/public/src/templates.js
index 866e076302..cf12ba9a09 100644
--- a/public/src/templates.js
+++ b/public/src/templates.js
@@ -3,6 +3,7 @@
var config = {},
templates,
fs = null,
+ path = null,
available_templates = [],
parsed_variables = {},
apiXHR;
@@ -13,11 +14,12 @@
try {
fs = require('fs');
+ path = require('path');
} catch (e) {}
templates.force_refresh = function (tpl) {
return !!config.force_refresh[tpl];
- }
+ };
templates.get_custom_map = function (tpl) {
if (config['custom_mapping'] && tpl) {
@@ -32,7 +34,7 @@
}
templates.is_available = function (tpl) {
- return jQuery.inArray(tpl, available_templates) !== -1;
+ return $.inArray(tpl, available_templates) !== -1;
};
templates.ready = function (callback) {
@@ -111,7 +113,7 @@
}
function loadClient() {
- jQuery.when(jQuery.getJSON(RELATIVE_PATH + '/templates/config.json'), jQuery.getJSON(RELATIVE_PATH + '/api/get_templates_listing')).done(function (config_data, templates_data) {
+ $.when($.getJSON(RELATIVE_PATH + '/templates/config.json'), $.getJSON(RELATIVE_PATH + '/api/get_templates_listing')).done(function (config_data, templates_data) {
config = config_data[0];
available_templates = templates_data[0];
templates.ready();
@@ -125,7 +127,28 @@
templates.init = function (templates_to_load, custom_templates) {
loadTemplates(templates_to_load || [], custom_templates || false);
- }
+ };
+
+ templates.render = function(filename, options, fn) {
+ if ('function' === typeof options) {
+ fn = options, options = false;
+ }
+
+ var tpl = filename
+ .replace(path.join(__dirname + '/../templates/'), '')
+ .replace('.' + options.settings['view engine'], '');
+
+ if (!templates[tpl]) {
+ fs.readFile(filename, function (err, html) {
+ templates[tpl] = html.toString();
+ templates.prepare(templates[tpl]);
+
+ return fn(err, templates[tpl].parse(options));
+ });
+ } else {
+ return fn(null, templates[tpl].parse(options));
+ }
+ };
templates.getTemplateNameFromUrl = function (url) {
var parts = url.split('?')[0].split('/');
@@ -136,7 +159,7 @@
}
}
return '';
- }
+ };
templates.preload_template = function(tpl_name, callback) {
@@ -148,12 +171,12 @@
// should be named something else
// TODO: The "Date.now()" in the line below is only there for development purposes.
// It should be removed at some point.
- jQuery.get(RELATIVE_PATH + '/templates/' + tpl_name + '.tpl?v=' + Date.now(), function (html) {
+ $.get(RELATIVE_PATH + '/templates/' + tpl_name + '.tpl?v=' + Date.now(), function (html) {
var template = function () {
this.toString = function () {
return this.html;
};
- }
+ };
template.prototype.parse = parse;
template.prototype.html = String(html);
@@ -163,7 +186,7 @@
callback();
});
- }
+ };
templates.load_template = function (callback, url, template) {
var location = document.location || window.location,
@@ -176,8 +199,6 @@
var template_data = null;
- var timestamp = new Date().getTime(); //debug
-
if (!templates[tpl_url]) {
templates.preload_template(tpl_url, function() {
parse_template();
@@ -222,7 +243,7 @@
$('#content').html(translatedTemplate);
- jQuery('#content [template-variable]').each(function (index, element) {
+ $('#content [template-variable]').each(function (index, element) {
var value = null;
switch ($(element).attr('template-type')) {
@@ -247,29 +268,29 @@
});
}
- }
+ };
templates.cancelRequest = function() {
if (apiXHR) {
apiXHR.abort();
}
- }
+ };
templates.flush = function () {
parsed_variables = {};
- }
+ };
templates.get = function (key) {
return parsed_variables[key];
- }
+ };
templates.set = function (key, value) {
parsed_variables[key] = value;
- }
+ };
templates.setGlobal = function(key, value) {
templates.globals[key] = value;
- }
+ };
//modified from https://github.com/psychobunny/dcp.templates
var parse = function (data) {
@@ -383,7 +404,7 @@
namespace = namespace.replace(d + '.', '');
template = setBlock(regex, result, template);
} else if (data[d] instanceof Object) {
- template = parse(data[d], d + '.', template);
+ template = parse(data[d], namespace + d + '.', template);
} else {
var key = namespace + d,
value = typeof data[d] === 'string' ? data[d].replace(/^\s+|\s+$/g, '') : data[d];
@@ -410,7 +431,8 @@
} else {
// clean up all undefined conditionals
template = template.replace(//gi, 'ENDIF -->')
- .replace(//gi, '');
+ .replace(//gi, '')
+ .replace(//gi, '');
}
return template;
@@ -418,6 +440,8 @@
})(data, "", template);
}
+ module.exports.__express = module.exports.render;
+
if ('undefined' !== typeof window) {
window.templates = module.exports;
templates.init();
@@ -427,4 +451,4 @@
module: {
exports: {}
}
-} : module)
+} : module);
diff --git a/public/src/translator.js b/public/src/translator.js
index 10c511fc21..265365ce5e 100644
--- a/public/src/translator.js
+++ b/public/src/translator.js
@@ -105,7 +105,7 @@
if (value) {
for (var i = 1, ii = variables.length; i < ii; i++) {
var variable = variables[i].replace(']]', '');
- value = value.replace('%' + i, variable);
+ value = ('' + value).replace('%' + i, variable);
}
text = text.replace(key, value);
@@ -119,6 +119,7 @@
for (var key in keys) {
if (keys.hasOwnProperty(key)) {
+ keys[key] = '' + keys[key];
var variables = keys[key].split(/[,][?\s+]/);
var parsedKey = keys[key].replace('[[', '').replace(']]', '').split(':');
@@ -127,7 +128,7 @@
}
var languageFile = parsedKey[0];
- parsedKey = parsedKey[1].split(',')[0];
+ parsedKey = ('' + parsedKey[1]).split(',')[0];
if (files.loaded[languageFile]) {
data = insertLanguage(data, keys[key], files.loaded[languageFile][parsedKey], variables);
@@ -178,7 +179,7 @@
files.loading[filename] = true;
- jQuery.getJSON(RELATIVE_PATH + '/language/' + config.defaultLang + '/' + filename + '.json?v=' + timestamp, function (language) {
+ $.getJSON(RELATIVE_PATH + '/language/' + config.defaultLang + '/' + filename + '.json?v=' + timestamp, function (language) {
files.loaded[filename] = language;
if (callback) {
diff --git a/public/src/utils.js b/public/src/utils.js
index 2e4064d1f8..1ebd7e475b 100644
--- a/public/src/utils.js
+++ b/public/src/utils.js
@@ -99,15 +99,14 @@
return difference + (min ? 'y' : ' year') + (difference !== 1 && !min ? 's' : '');
},
- invalidUnicodeChars : XRegExp('[^\\p{L}\\s\\d\\-_]', 'g'),
- invalidLatinChars : /[^\w\s\d\-_]/g,
-
- trimRegex : /^\s+|\s+$/g,
- collapseWhitespace : /\s+/g,
- collapseDash : /-+/g,
- trimTrailingDash : /-$/g,
- trimLeadingDash : /^-/g,
- isLatin : /^[\w]+$/,
+ invalidUnicodeChars: XRegExp('[^\\p{L}\\s\\d\\-_]', 'g'),
+ invalidLatinChars: /[^\w\s\d\-_]/g,
+ trimRegex: /^\s+|\s+$/g,
+ collapseWhitespace: /\s+/g,
+ collapseDash: /-+/g,
+ trimTrailingDash: /-$/g,
+ trimLeadingDash: /^-/g,
+ isLatin: /^[\w]+$/,
//http://dense13.com/blog/2009/05/03/converting-string-to-slug-javascript/
slugify: function(str) {
@@ -138,9 +137,11 @@
isPasswordValid: function(password) {
return password && password.indexOf(' ') === -1;
},
+
isNumber: function(n) {
return !isNaN(parseFloat(n)) && isFinite(n);
},
+
// shallow objects merge
merge: function() {
var result = {}, obj, keys;
@@ -154,6 +155,43 @@
return result;
},
+ fileExtension: function (path) {
+ return ('' + path).split('.').pop();
+ },
+
+ fileMimeType: (function () {
+ // we only care about images, for now
+ var map = {
+ "bmp": "image/bmp",
+ "cmx": "image/x-cmx",
+ "cod": "image/cis-cod",
+ "gif": "image/gif",
+ "ico": "image/x-icon",
+ "ief": "image/ief",
+ "jfif": "image/pipeg",
+ "jpe": "image/jpeg",
+ "jpeg": "image/jpeg",
+ "jpg": "image/jpeg",
+ "pbm": "image/x-portable-bitmap",
+ "pgm": "image/x-portable-graymap",
+ "pnm": "image/x-portable-anymap",
+ "ppm": "image/x-portable-pixmap",
+ "ras": "image/x-cmu-raster",
+ "rgb": "image/x-rgb",
+ "svg": "image/svg+xml",
+ "tif": "image/tiff",
+ "tiff": "image/tiff",
+ "xbm": "image/x-xbitmap",
+ "xpm": "image/x-xpixmap",
+ "xwd": "image/x-xwindowdump"
+ };
+
+ return function (path) {
+ var extension = utils.fileExtension(path);
+ return map[extension] || '*';
+ }
+ })(),
+
isRelativeUrl: function(url) {
var firstChar = url.slice(0, 1);
return (firstChar === '.' || firstChar === '/');
@@ -200,64 +238,8 @@
}
};
-
- if (!String.prototype.trim) {
- String.prototype.trim = function() {
- return this.replace(utils.trimRegex, '');
- };
- }
-
if ('undefined' !== typeof window) {
window.utils = module.exports;
-
- (function ($, undefined) {
- $.fn.getCursorPosition = function() {
- var el = $(this).get(0);
- var pos = 0;
- if('selectionStart' in el) {
- pos = el.selectionStart;
- } else if('selection' in document) {
- el.focus();
- var Sel = document.selection.createRange();
- var SelLength = document.selection.createRange().text.length;
- Sel.moveStart('character', -el.value.length);
- pos = Sel.text.length - SelLength;
- }
- return pos;
- }
-
- $.fn.selectRange = function(start, end) {
- if(!end) end = start;
- return this.each(function() {
- if (this.setSelectionRange) {
- this.focus();
- this.setSelectionRange(start, end);
- } else if (this.createTextRange) {
- var range = this.createTextRange();
- range.collapse(true);
- range.moveEnd('character', end);
- range.moveStart('character', start);
- range.select();
- }
- });
- };
-
- //http://stackoverflow.com/questions/511088/use-javascript-to-place-cursor-at-end-of-text-in-text-input-element
- $.fn.putCursorAtEnd = function() {
- return this.each(function() {
- $(this).focus();
-
- if (this.setSelectionRange) {
- var len = $(this).val().length * 2;
- this.setSelectionRange(len, len);
- } else {
- $(this).val($(this).val());
- }
- this.scrollTop = 999999;
- });
- };
-
- })(jQuery);
}
})('undefined' === typeof module ? {
diff --git a/public/templates/account.tpl b/public/templates/account.tpl
index 683b1c42f6..24fc37573b 100644
--- a/public/templates/account.tpl
+++ b/public/templates/account.tpl
@@ -17,7 +17,7 @@
+
+
-
+
{username}
@@ -108,6 +108,18 @@
+
+
+
+ [[global:recentips]]
+
+
+
+ {ips.ip}
+
+
-
[[topic:favourites.has_no_favourites]]
+ [[user:has_no_posts]]
@@ -25,10 +25,10 @@
\ No newline at end of file
diff --git a/public/templates/admin/plugins.tpl b/public/templates/admin/plugins.tpl
index 3aa7e5f5e1..dd69ffa721 100644
--- a/public/templates/admin/plugins.tpl
+++ b/public/templates/admin/plugins.tpl
@@ -12,7 +12,7 @@
- posted
- in
-
- {posts.categoryName}
+ [[global:posted]]
+ [[global:in]]
+
+ {posts.category.name}
diff --git a/public/templates/admin/header.tpl b/public/templates/admin/header.tpl
index 1916453ccb..944785c592 100644
--- a/public/templates/admin/header.tpl
+++ b/public/templates/admin/header.tpl
@@ -3,13 +3,25 @@
NodeBB Administration Panel
+
+
+
+
+
-
+
+
+
+
-
@@ -34,10 +46,10 @@
}
});
-
+
+
-
diff --git a/public/templates/admin/index.tpl b/public/templates/admin/index.tpl
index a6b8db55be..21e1578cd3 100644
--- a/public/templates/admin/index.tpl
+++ b/public/templates/admin/index.tpl
@@ -1,4 +1,5 @@
-
-
+
+
+
+
+
Welcome to NodeBB
@@ -11,7 +12,46 @@
+
+
+ Notices
+
+
+
+ Emailer Installed
+
+
+ Search Plugin Installed
+
+
+
+
Unique Visitors
+
+
+
+
+
+
+
+ Day
+
+
+
+ Week
+
+
+
+ Month
+
+
+
+ All Time
+ Updates
@@ -22,15 +62,18 @@
Always make sure that your NodeBB is up to date for the latest security patches and bug fixes.
++ +
+
+
Active Users socket connections
-
-
{plugins.name}
+{plugins.name}
diff --git a/public/templates/admin/users.tpl b/public/templates/admin/users.tpl index dd178658a2..6a8fdacfd4 100644 --- a/public/templates/admin/users.tpl +++ b/public/templates/admin/users.tpl @@ -20,9 +20,7 @@- +
-
@@ -50,7 +56,7 @@ - + {topics.title} @@ -74,13 +80,13 @@ [[category:no_replies]] - -- - - - \ No newline at end of file diff --git a/public/templates/chat.tpl b/public/templates/chat.tpl index 8cc01343d8..8a7653651c 100644 --- a/public/templates/chat.tpl +++ b/public/templates/chat.tpl @@ -4,7 +4,7 @@
+ +
- + [[category:replied]] - + @@ -109,7 +115,3 @@
-[[topic:composer.drag_and_drop_images]]+- [[topic:composer.content_is_parsed_with]] Markdown. diff --git a/public/templates/favourites.tpl b/public/templates/favourites.tpl index 273b88cfc5..e793d0475b 100644 --- a/public/templates/favourites.tpl +++ b/public/templates/favourites.tpl @@ -25,10 +25,10 @@diff --git a/public/templates/noscript/category.tpl b/public/templates/noscript/category.tpl index ccfeffd740..52122e121c 100644 --- a/public/templates/noscript/category.tpl +++ b/public/templates/noscript/category.tpl @@ -3,17 +3,17 @@ [[global:home]]- posted - in - - {posts.categoryName} + [[global:posted]] + [[global:in]] + + {posts.category.name} diff --git a/public/templates/header.tpl b/public/templates/header.tpl index 5e4c0e2d4a..9682271b8a 100644 --- a/public/templates/header.tpl +++ b/public/templates/header.tpl @@ -6,7 +6,7 @@{title}
+ ++ ++- - {category_name} + {name}
- - + {topics.title} ({topics.postcount}) diff --git a/public/templates/noscript/topic.tpl b/public/templates/noscript/topic.tpl index f3d5180fe2..cf8b968a90 100644 --- a/public/templates/noscript/topic.tpl +++ b/public/templates/noscript/topic.tpl @@ -3,10 +3,10 @@ [[global:home]]
- - {category_name} + {category.name}
- - {topic_name} + {title}
- +
-
-
@@ -32,7 +32,7 @@
- + {topics.title}
@@ -50,8 +50,8 @@ | [[category:posted]] [[global:in]] - - {topics.categoryName} + + {topics.category.name} @@ -61,13 +61,13 @@ [[category:no_replies]] - -diff --git a/public/templates/search.tpl b/public/templates/search.tpl index 55a3b57443..ceb1082404 100644 --- a/public/templates/search.tpl +++ b/public/templates/search.tpl @@ -13,7 +13,7 @@-
-
- +
-
- + {topics.title}
@@ -51,9 +51,7 @@ | [[category:posted]] [[global:in]] - - {topics.categoryName} - + {topics.category.name} @@ -62,13 +60,13 @@ [[category:no_replies]] - -- [[reset_password:reset_password:enter_email]] + [[reset_password:enter_email]]@@ -21,7 +21,7 @@ [[reset_password:invalid_email]]
+@@ -28,25 +28,19 @@- -{topics.title}
-- posted - in - - {topics.categoryName} - +- -+ + {posts.content} - - {posts.username} - - - {posts.content} - -
- posted - in - - {posts.categoryName} + ++-
{topic_name}
+{title}
+ ++ + {widgets.html} + +\ No newline at end of file diff --git a/public/templates/unread.tpl b/public/templates/unread.tpl index 6ec77b3668..58cd9eab1e 100644 --- a/public/templates/unread.tpl +++ b/public/templates/unread.tpl @@ -19,14 +19,14 @@-
-
- +
-
- + {topics.title}
@@ -44,9 +44,7 @@ | [[category:posted]] [[global:in]] - - {topics.categoryName} - + {topics.category.name} @@ -55,13 +53,13 @@ [[category:no_replies]] - -
-
diff --git a/public/templates/popular.tpl b/public/templates/popular.tpl
index f2c2f59362..2ead0b6b08 100644
--- a/public/templates/popular.tpl
+++ b/public/templates/popular.tpl
@@ -24,7 +24,7 @@
-
-
- -- +
{users.username}
diff --git a/public/templates/category.tpl b/public/templates/category.tpl index 418c8ca40b..f1b6a9c365 100644 --- a/public/templates/category.tpl +++ b/public/templates/category.tpl @@ -1,9 +1,15 @@ + + + + + + @@ -11,13 +17,13 @@ - + - +
@@ -33,7 +39,7 @@-
-