diff --git a/public/language/en-GB/modules.json b/public/language/en-GB/modules.json index a0f3dfe641..47d62c74d7 100644 --- a/public/language/en-GB/modules.json +++ b/public/language/en-GB/modules.json @@ -60,6 +60,8 @@ "composer.upload-file": "Upload File", "composer.zen_mode": "Zen Mode", "composer.select_category": "Select a category", + "composer.textarea.placeholder": "Enter your post content here, drag and drop images", + "bootbox.ok": "OK", "bootbox.cancel": "Cancel", diff --git a/public/src/modules/categorySearch.js b/public/src/modules/categorySearch.js index 1774fd2d16..5e8f2fcd26 100644 --- a/public/src/modules/categorySearch.js +++ b/public/src/modules/categorySearch.js @@ -11,7 +11,9 @@ define('categorySearch', function () { if (!searchEl.length) { return; } - var toggleVisibility = searchEl.parent('[component="category/dropdown"]').length > 0; + var toggleVisibility = searchEl.parent('[component="category/dropdown"]').length > 0 || + searchEl.parent('[component="category-selector"]').length > 0; + var categoryEls = el.find('[component="category/list"] [data-cid]'); el.on('show.bs.dropdown', function () { function revealParents(cid) { diff --git a/src/meta/build.js b/src/meta/build.js index 5fe5c953b2..c67960fdaa 100644 --- a/src/meta/build.js +++ b/src/meta/build.js @@ -218,7 +218,7 @@ exports.build = function (targets, options, callback) { }, ], function (err) { if (err) { - winston.error('[build] Encountered error during build step\n' + err.stack); + winston.error('[build] Encountered error during build step\n' + err.stack ? err.stack : err); return callback(err); }