From f8707e0e1aee1f3d00a5d9feb8b49e5d5ec66038 Mon Sep 17 00:00:00 2001 From: Steffen van Bergerem Date: Wed, 1 Apr 2015 18:35:20 +0200 Subject: [PATCH] Use test instead of match wherever possible --- app/assets/javascripts/app/models/stream.js | 2 +- app/assets/javascripts/inbox.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/assets/javascripts/app/models/stream.js b/app/assets/javascripts/app/models/stream.js index 8ac6c3ebf..8201e997d 100644 --- a/app/assets/javascripts/app/models/stream.js +++ b/app/assets/javascripts/app/models/stream.js @@ -61,7 +61,7 @@ app.models.Stream = Backbone.Collection.extend({ }, sortOrder : function() { - return this.basePath().match(/activity/) ? "interactedAt" : "createdAt"; + return /activity/.test(this.basePath()) ? "interactedAt" : "createdAt"; }, /* This function is for adding a large number of posts one by one. diff --git a/app/assets/javascripts/inbox.js b/app/assets/javascripts/inbox.js index e270e121b..df8bc0219 100644 --- a/app/assets/javascripts/inbox.js +++ b/app/assets/javascripts/inbox.js @@ -10,7 +10,7 @@ $(document).ready(function(){ }); $(window).bind("popstate", function(){ - if (location.href.match(/conversations\/\d+/) !== null) { + if (/conversations\/\d+/.test(location.href)) { $.getScript(location.href, function() { Diaspora.page.directionDetector.updateBinds(); });