Merge branch 'master' of github.com:psychobunny/node-forum

public/src/forum/category.js

@@ -27,20 +27,21 @@
 		jQuery('#category-no-topics').remove();
 
 		topic.innerHTML = html;
+		topic = topic.querySelector('a');
+		
 		if (numTopics > 0) {
 			for(x=0;x<numTopics;x++) {
 				if (topics[x].querySelector('.icon-pushpin')) continue;
-				container.insertBefore(topic.querySelector('a'), topics[x]);
+				container.insertBefore(topic, topics[x]);
 				$(topic).hide().fadeIn('slow');
 				break;
 			}
 		} else {
-			container.insertBefore(topic.querySelector('a'), null);
+			container.insertBefore(topic, null);
 			$(topic).hide().fadeIn('slow');
 		}
 
-		// jQuery('<div></div>').appendTo("#topics-container").hide().append(html).fadeIn('slow');	
-		// set_up_posts(uniqueid);
+		ajaxify.enable();
 	});
 
 

public/src/utils.js

@@ -70,8 +70,8 @@
 			str = str.toLowerCase();
 
 			// remove accents, swap ñ for n, etc
-			var from = "àáäâèéëêìíïîòóöôùúüûñç·/_,:;";
-			var to   = "aaaaeeeeiiiioooouuuunc------";
+			var from = "àáäâèéëêìíïîıòóöôùúüûñçş·/_,:;";
+			var to   = "aaaaeeeeiiiiioooouuuuncs------";
 			for (var i=0, l=from.length ; i<l ; i++) {
 				str = str.replace(new RegExp(from.charAt(i), 'g'), to.charAt(i));
 			}

src/user.js

@@ -145,6 +145,10 @@ var utils = require('./../public/src/utils.js'),
 
 				var gravatar = User.createGravatarURLFromEmail(email);
 
+				var userSlug = utils.slugify(username);
+
+				console.log(userSlug);
+
 				RDB.hmset('user:'+uid, {
 					'username' : username,
 					'fullname': '',