nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #5839 from svbergerem/use-test-instead-of-match

Browse source 
Use test instead of match wherever possible
This commit is contained in:
Jonne Haß 2015-04-01 23:54:42 +02:00
commit 0155d8972a
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/models/stream.js
View file

@ -61,7 +61,7 @@ app.models.Stream = Backbone.Collection.extend({
}, },
sortOrder : function() { 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. /* This function is for adding a large number of posts one by one.

2
app/assets/javascripts/inbox.js
View file

@ -10,7 +10,7 @@ $(document).ready(function(){
}); });
$(window).bind("popstate", function(){ $(window).bind("popstate", function(){
if (location.href.match(/conversations\/\d+/) !== null) { if (/conversations\/\d+/.test(location.href)) {
$.getScript(location.href, function() { $.getScript(location.href, function() {
Diaspora.page.directionDetector.updateBinds(); Diaspora.page.directionDetector.updateBinds();
}); });