public-mirrors/NewsBlur
1
0
Fork 0
mirror of https://github.com/samuelclay/NewsBlur.git synced 2025-09-18 21:50:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into social

Browse source 
* master:
  Handling story-level original/story view bans, preventing iframe busts on nytimes/twitter. Thanks to @j4ded for the persistance.

Conflicts:
	media/js/newsblur/reader/reader_utils.js
This commit is contained in:
Samuel Clay 2012-05-09 12:11:58 -07:00
commit 1d91cb1a6c
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
media/js/newsblur/reader/reader_utils.js
View file

@ -128,8 +128,7 @@ NEWSBLUR.utils = {
var BROKEN_URLS = [ var BROKEN_URLS = [
'nytimes.com', 'nytimes.com',
'stackoverflow.com', 'stackoverflow.com',
'twitter.com', 'twitter.com'
'mlb.com'
]; ];
return _.any(BROKEN_URLS, function(broken_url) { return _.any(BROKEN_URLS, function(broken_url) {
return _.string.contains(url, broken_url); return _.string.contains(url, broken_url);