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

app.js

@@ -20,11 +20,11 @@ global.configuration = {};
             if (data.categories.length === 0) {
                 console.log('Setting up default categories...');
 
-                fs.readFile(config.ROOT_DIRECTORY + '/install/data/categories.json', function(err, categories) {
+                fs.readFile(config.ROOT_DIRECTORY + '/install/data/categories.json', function(err, default_categories) {
-                    categories = JSON.parse(categories);
+                    default_categories = JSON.parse(default_categories);
                     
-                    for (var category in categories) {
+                    for (var category in default_categories) {
-                        categories.create(categories[category]);
+                        categories.create(default_categories[category]);
                     }
                 });
 

public/src/app.js

@@ -280,7 +280,33 @@ var socket,
 		}, false);
 
 		// Posting
+		var	formattingBar = document.getElementById('formatting-bar'),
+			postContentEl = document.getElementById('post_content');
 		jQuery('#post_window').slideToggle(0);
+		formattingBar.addEventListener('click', function(e) {
+			if (e.target.nodeName === 'I') {
+				switch(e.target.className) {
+					case 'icon-bold':
+						var cursorEnd = postContentEl.value.length;
+						postContentEl.value = postContentEl.value + '**bolded text**';
+						postContentEl.selectionStart = cursorEnd+2;
+						postContentEl.selectionEnd = postContentEl.value.length - 2;
+					break;
+					case 'icon-italic':
+						var cursorEnd = postContentEl.value.length;
+						postContentEl.value = postContentEl.value + '*italicised text*';
+						postContentEl.selectionStart = cursorEnd+1;
+						postContentEl.selectionEnd = postContentEl.value.length - 1;
+					break;
+					case 'icon-list':
+						var cursorEnd = postContentEl.value.length;
+						postContentEl.value = postContentEl.value + "\n\n* list item";
+						postContentEl.selectionStart = cursorEnd+4;
+						postContentEl.selectionEnd = postContentEl.value.length;
+					break;
+				}
+			}
+		}, false);
 	})
 
 

public/templates/header.tpl

@@ -61,10 +61,10 @@
 			<div class="container">
 
 				<div class="btn-toolbar">
-					<div class="btn-group">
+					<div class="btn-group" id="formatting-bar">
 						<span class="btn btn-link" tabindex="-1"><i class="icon-bold"></i></span>
 						<span class="btn btn-link" tabindex="-1"><i class="icon-italic"></i></span>
-						<span class="btn btn-link" tabindex="-1"><i class="icon-font"></i></span>
+						<!-- <span class="btn btn-link" tabindex="-1"><i class="icon-font"></i></span> -->
 						<span class="btn btn-link" tabindex="-1"><i class="icon-list"></i></span>
 					</div>
 					<div class="btn-group" style="float: right; margin-right: -12px">