style changes

src/topics.js

@@ -341,7 +341,7 @@ var social = require('./social');
 
 	Topics.updateTopicBookmarks = function(tid, pids, callback) {
 		var maxIndex;
-		var Posts = posts;
+
 		async.waterfall([
 			function(next) {
 				Topics.getPostCount(tid, next);
@@ -351,72 +351,63 @@ var social = require('./social');
 				Topics.getTopicBookmarks(tid, next);
 			},
 			function(bookmarks, next) {
-				var uids = bookmarks.map( function( bookmark ){return bookmark.value});
-				var forkedPosts = pids.map( function( pid ){ return { pid: pid, tid: tid }; } );
-				var uidBookmark = new Object();
-				var uidData = bookmarks.map(
-					function( bookmark ){
-						var u = new Object();
-						u.uid = bookmark.value;
-						u.bookmark = bookmark.score;
-						return u;
+				var forkedPosts = pids.map(function(pid) {
+					return {pid: pid, tid: tid};
+				});
+
+				var uidData = bookmarks.map(function(bookmark) {
+					return {
+						uid: bookmark.value,
+						bookmark: bookmark.score
+					};
 				});
-				async.map(
-					uidData,
-					function( data, mapCallback ){
-						Posts.getPostIndices(
-							forkedPosts,
-							data.uid,
-							function( err, indices ){
+
+				async.map(uidData, function(data, mapCallback) {
+					posts.getPostIndices(forkedPosts, data.uid, function(err, indices) {
 						if (err) {
-									callback( err );
+							return callback(err);
 						}
 						data.postIndices = indices;
 						mapCallback(null, data);
-							} )
-					},
-					function( err, results ){
+					});
+				}, function(err, results) {
 					if (err) {
-							return callback();
+						return callback(err);
 					}
-						async.map(
-							results,
-							function( data, mapCallback ){
+					async.map(results, function(data, mapCallback) {
 						var uid = data.uid;
 						var bookmark = data.bookmark;
 						bookmark = bookmark < maxIndex ? bookmark : maxIndex;
 						var postIndices = data.postIndices;
-								var i;
-								for( i = 0; i < postIndices.length && postIndices[i] < data.bookmark; ++i ){
+
+						for (var i = 0; i < postIndices.length && postIndices[i] < data.bookmark; ++i ){
 							--bookmark;
 						}
 
-								if( bookmark != data.bookmark ){
+						if (parseInt(bookmark, 10) !== parseInt(data.bookmark, 10)) {
 							mapCallback( null, { uid: uid, bookmark: bookmark } );
-								}
-								else{
+						} else {
 							mapCallback( null, null );
 						}
-							},
-							function( err, results ){
-								async.map( results,
-											function(ui, cb ){
+					}, function(err, results) {
+						if (err) {
+							return callback(err);
+						}
+
+						async.map(results, function(ui, cb) {
 							if( ui && ui.bookmark) {
 								Topics.setUserBookmark(tid, ui.uid, ui.bookmark, cb);
-												}
-												else{
+							} else {
 								return cb(null, null);
 							}
-											},
-											function( err, results ){
-												next();
-											}
-										 );
-							}
-						);
+						}, function(err) {
+							next(err);
+						});
+					});
+				});
 			}
-				);
-			}],
-			function( err, result ){ callback();} );
+		], function(err){
+			callback(err);
+		});
 	};
 }(exports));