From 676ffee45982dd3a3d6e0eddf7b27aa99dbb7b81 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 23 Jul 2013 03:51:21 +0800 Subject: [PATCH 1/7] removed text decoration from btn-link to match that of default nodebb anchors --- public/css/style.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/css/style.less b/public/css/style.less index 4ea31d8a9d..02a11e43fb 100644 --- a/public/css/style.less +++ b/public/css/style.less @@ -350,7 +350,7 @@ footer.footer { } } -a:hover { +a:hover, .btn-link:hover, .btn-link:active, .btn-link:focus { text-decoration:none; } From 38aa5aa3e63da6ab7a7741d8443432824910f929 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Mon, 22 Jul 2013 16:47:41 -0400 Subject: [PATCH 2/7] refactor to remove category_name and category_slug from topic hashes --- src/admin/categories.js | 13 ------------- src/categories.js | 29 ++++++++++++++++++++--------- src/threadTools.js | 5 ----- src/topics.js | 35 +++++++++++++++++++++++------------ src/webserver.js | 3 +-- 5 files changed, 44 insertions(+), 41 deletions(-) diff --git a/src/admin/categories.js b/src/admin/categories.js index f287f9a1ef..21d13aacac 100644 --- a/src/admin/categories.js +++ b/src/admin/categories.js @@ -41,25 +41,12 @@ var RDB = require('./../redis.js'), var slug = cid + '/' + utils.slugify(category[key]); RDB.hset('category:' + cid, 'slug', slug); RDB.set('categoryslug:' + slug + ':cid', cid); - - RDB.smembers('categories:' + cid + ':tid', function(err, tids) { - var pipe = RDB.multi(); - - for (var tid in tids) { - pipe.set(schema.topics(tid).category_name, category[key]); - pipe.set(schema.topics(tid).category_slug, slug); - } - pipe.exec(); - }); - } } updated.push(cid); } - - socket.emit('event:alert', { title: 'Updated Categories', message: 'Category IDs ' + updated.join(', ') + ' was successfully updated.', diff --git a/src/categories.js b/src/categories.js index 165f9e2c3f..476b72dcef 100644 --- a/src/categories.js +++ b/src/categories.js @@ -9,9 +9,9 @@ var RDB = require('./redis.js'), Categories.getCategoryById = function(category_id, current_user, callback) { - Categories.getCategoryData(category_id, function(categoryData) { + Categories.getCategoryData(category_id, function(err, categoryData) { - if(!categoryData) { + if(err) { callback(false); return; } @@ -341,12 +341,23 @@ var RDB = require('./redis.js'), } Categories.getCategoryData = function(cid, callback) { - RDB.hgetall('category:' + cid, function(err, data) { - if(err === null) - callback(data); - else + RDB.hgetall('category:' + cid, callback); + } + + Categories.getCategoryFields = function(cid, fields, callback) { + RDB.hmget('category:' + cid, fields, function(err, data) { + if(err === null) { + var returnData = {}; + + for(var i=0, ii=fields.length; i Date: Mon, 22 Jul 2013 16:57:18 -0400 Subject: [PATCH 3/7] added async.eachSeries to getCategories --- src/categories.js | 39 ++++++++++++++++++++++++--------------- 1 file changed, 24 insertions(+), 15 deletions(-) diff --git a/src/categories.js b/src/categories.js index 476b72dcef..8f5638be21 100644 --- a/src/categories.js +++ b/src/categories.js @@ -369,32 +369,41 @@ var RDB = require('./redis.js'), } Categories.getCategories = function(cids, callback, current_user) { - if (!cids || cids.length === 0) { + if (!cids || !Array.isArray(cids) || cids.length === 0) { callback({'categories' : []}); return; } var categories = []; - for(var i=0; i Date: Mon, 22 Jul 2013 17:08:07 -0400 Subject: [PATCH 4/7] fixed broken view again --- src/categories.js | 13 +++---------- src/posts.js | 15 +++++---------- src/redis.js | 42 ++++++++++++++++++++---------------------- src/user.js | 10 +++------- 4 files changed, 31 insertions(+), 49 deletions(-) diff --git a/src/categories.js b/src/categories.js index 8f5638be21..c1c05f486b 100644 --- a/src/categories.js +++ b/src/categories.js @@ -345,16 +345,9 @@ var RDB = require('./redis.js'), } Categories.getCategoryFields = function(cid, fields, callback) { - RDB.hmget('category:' + cid, fields, function(err, data) { - if(err === null) { - var returnData = {}; - - for(var i=0, ii=fields.length; i Date: Mon, 22 Jul 2013 17:26:18 -0400 Subject: [PATCH 5/7] images debug --- src/posts.js | 31 +++++++++++++++++++------------ 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/src/posts.js b/src/posts.js index 42ce8103bb..8f1d214a68 100644 --- a/src/posts.js +++ b/src/posts.js @@ -338,18 +338,25 @@ var RDB = require('./redis.js'), } }); } - - async.each(images, uploadImage, function(err) { - if(!err) { - postData.uploadedImages = JSON.stringify(uploadedImages); - Posts.setPostField(pid, 'uploadedImages', postData.uploadedImages); - - callback(postData); - } else { - console.log(err); - callback(null); - } - }); + + if(!images) { + console.log('images ', images); + postData.uploadedImages = JSON.stringify(uploadedImages); + Posts.setPostField(pid, 'uploadedImages', postData.uploadedImages); + callback(postData); + } else { + async.each(images, uploadImage, function(err) { + if(!err) { + postData.uploadedImages = JSON.stringify(uploadedImages); + Posts.setPostField(pid, 'uploadedImages', postData.uploadedImages); + + callback(postData); + } else { + console.log(err); + callback(null); + } + }); + } }); } else { callback(null); From 2237166e0f1356ebb66d49ed8b95e5df596d9da5 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Mon, 22 Jul 2013 17:59:49 -0400 Subject: [PATCH 6/7] removed console.log --- src/posts.js | 1 - 1 file changed, 1 deletion(-) diff --git a/src/posts.js b/src/posts.js index 8f1d214a68..ef6ef41028 100644 --- a/src/posts.js +++ b/src/posts.js @@ -340,7 +340,6 @@ var RDB = require('./redis.js'), } if(!images) { - console.log('images ', images); postData.uploadedImages = JSON.stringify(uploadedImages); Posts.setPostField(pid, 'uploadedImages', postData.uploadedImages); callback(postData); From 96a779172bc1e11865e8212ce6cb412fede8e797 Mon Sep 17 00:00:00 2001 From: Baris Soner Usakli Date: Mon, 22 Jul 2013 18:29:09 -0400 Subject: [PATCH 7/7] closes #106 --- public/src/app.js | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/public/src/app.js b/public/src/app.js index 3f325662b1..5157291698 100644 --- a/public/src/app.js +++ b/public/src/app.js @@ -230,6 +230,23 @@ var socket, app.populate_online_users(); + var url = window.location.href, + parts = url.split('/'), + active = parts[parts.length-1]; + + jQuery('.nav li').removeClass('active'); + if(active) { + jQuery('.nav li a').each(function() { + var href = this.getAttribute('href'); + if(active.match(/^users/)) + active = 'users'; + if (href.match(active)) { + jQuery(this.parentNode).addClass('active'); + return false; + } + }); + } + setTimeout(function() { window.scrollTo(0, 1); // rehide address bar on mobile after page load completes. }, 100); @@ -237,24 +254,6 @@ var socket, jQuery('document').ready(function() { - - // On menu click, change "active" state - var menuEl = document.querySelector('.nav'), - liEls = menuEl.querySelectorAll('li'), - logoutEl = document.getElementById('logout'), - parentEl; - - menuEl.addEventListener('click', function(e) { - parentEl = e.target.parentNode; - if (parentEl.nodeName === 'LI') { - for(var x=0,numLis=liEls.length;x