diff --git a/app/assets/javascripts/discourse/controllers/user_invited_controller.js b/app/assets/javascripts/discourse/controllers/user_invited_controller.js index db07e01ea07..fac3c5be298 100644 --- a/app/assets/javascripts/discourse/controllers/user_invited_controller.js +++ b/app/assets/javascripts/discourse/controllers/user_invited_controller.js @@ -44,8 +44,7 @@ Discourse.UserInvitedController = Ember.ArrayController.extend({ @property showSearch **/ showSearch: function() { - if (Em.isNone(this.get('searchTerm')) && this.get('model.length') === 0) { return false; } - return true; + return !(Em.isNone(this.get('searchTerm')) && this.get('model.length') === 0); }.property('searchTerm', 'model.length'), /** diff --git a/app/assets/javascripts/discourse/dialects/dialect.js b/app/assets/javascripts/discourse/dialects/dialect.js index d3d35b645d5..6dfe71cfb2c 100644 --- a/app/assets/javascripts/discourse/dialects/dialect.js +++ b/app/assets/javascripts/discourse/dialects/dialect.js @@ -120,10 +120,10 @@ function parseTree(tree, path, insideCounts) { **/ function invalidBoundary(args, prev) { - if (!args.wordBoundary && !args.spaceBoundary) { return; } + if (!args.wordBoundary && !args.spaceBoundary) { return false; } var last = prev[prev.length - 1]; - if (typeof last !== "string") { return; } + if (typeof last !== "string") { return false; } if (args.wordBoundary && (last.match(/(\w|\/)$/))) { return true; } if (args.spaceBoundary && (!last.match(/\s$/))) { return true; } @@ -149,10 +149,9 @@ Discourse.Dialect = { cook: function(text, opts) { if (!initialized) { initializeDialects(); } dialect.options = opts; - var tree = parser.toHTMLTree(text, 'Discourse'), - html = parser.renderJsonML(parseTree(tree)); + var tree = parser.toHTMLTree(text, 'Discourse'); - return html; + return parser.renderJsonML(parseTree(tree)); }, /** diff --git a/app/assets/javascripts/discourse/lib/formatter.js b/app/assets/javascripts/discourse/lib/formatter.js index 946aebc3df3..337a81f8dd2 100644 --- a/app/assets/javascripts/discourse/lib/formatter.js +++ b/app/assets/javascripts/discourse/lib/formatter.js @@ -237,7 +237,7 @@ relativeAgeMediumSpan = function(distance, leaveAgo) { relativeAgeMedium = function(date, options){ var displayDate, fiveDaysAgo, oneMinuteAgo, fullReadable, leaveAgo; - var wrapInSpan = options.wrapInSpan === false ? false : true; + var wrapInSpan = options.wrapInSpan !== false; leaveAgo = options.leaveAgo; var distance = Math.round((new Date() - date) / 1000); diff --git a/app/assets/javascripts/discourse/lib/mobile.js b/app/assets/javascripts/discourse/lib/mobile.js index c1b904970fe..902053b71fd 100644 --- a/app/assets/javascripts/discourse/lib/mobile.js +++ b/app/assets/javascripts/discourse/lib/mobile.js @@ -14,7 +14,7 @@ Discourse.Mobile = { this.mobileView = $html.hasClass('mobile-view'); if (localStorage && localStorage.mobileView) { - var savedValue = (localStorage.mobileView === 'true' ? true : false); + var savedValue = (localStorage.mobileView === 'true'); if (savedValue !== this.mobileView) { this.reloadPage(savedValue); } diff --git a/app/assets/javascripts/discourse/lib/user_search.js b/app/assets/javascripts/discourse/lib/user_search.js index c0a11c80f70..c9756046cbb 100644 --- a/app/assets/javascripts/discourse/lib/user_search.js +++ b/app/assets/javascripts/discourse/lib/user_search.js @@ -54,8 +54,7 @@ Discourse.UserSearch = { users.push(u); results.push(u); } - if (results.length > limit) return false; - return true; + return results.length <= limit; }); _.each(r.groups,function(g) { diff --git a/app/assets/javascripts/discourse/models/composer.js b/app/assets/javascripts/discourse/models/composer.js index f05797533fb..4416bf5c01a 100644 --- a/app/assets/javascripts/discourse/models/composer.js +++ b/app/assets/javascripts/discourse/models/composer.js @@ -126,14 +126,10 @@ Discourse.Composer = Discourse.Model.extend({ // reply is always required if (this.get('missingReplyCharacters') > 0) return true; - if (this.get('canCategorize') && + return this.get('canCategorize') && !Discourse.SiteSettings.allow_uncategorized_topics && !this.get('categoryId') && - !Discourse.User.currentProp('staff')) { - return true; - } - - return false; + !Discourse.User.currentProp('staff'); }.property('loading', 'canEditTitle', 'titleLength', 'targetUsernames', 'replyLength', 'categoryId', 'missingReplyCharacters'), /** diff --git a/app/assets/javascripts/discourse/models/post.js b/app/assets/javascripts/discourse/models/post.js index f681d1f4725..a41377b15ca 100644 --- a/app/assets/javascripts/discourse/models/post.js +++ b/app/assets/javascripts/discourse/models/post.js @@ -103,11 +103,10 @@ Discourse.Post = Discourse.Model.extend({ }.property('updated_at'), flagsAvailable: function() { - var post = this, - flags = Discourse.Site.currentProp('flagTypes').filter(function(item) { + var post = this; + return Discourse.Site.currentProp('flagTypes').filter(function(item) { return post.get("actionByName." + (item.get('name_key')) + ".can_act"); }); - return flags; }.property('actions_summary.@each.can_act'), actionsHistory: function() { diff --git a/app/assets/javascripts/discourse/models/topic.js b/app/assets/javascripts/discourse/models/topic.js index ca4858cd49c..bb7b60fe6e5 100644 --- a/app/assets/javascripts/discourse/models/topic.js +++ b/app/assets/javascripts/discourse/models/topic.js @@ -168,8 +168,7 @@ Discourse.Topic = Discourse.Model.extend({ if (!wordCount) return; // Avg for 500 words per minute when you account for skimming - var minutes = Math.floor(wordCount / 500.0); - return minutes; + return Math.floor(wordCount / 500.0); }.property('word_count'), toggleStar: function() {