diff --git a/plugins/custom/domain-icon.js b/plugins/custom/domain-icon.js index 09bee5a3d..eccf0d500 100644 --- a/plugins/custom/domain-icon.js +++ b/plugins/custom/domain-icon.js @@ -19,7 +19,7 @@ export default { domain = m[2]; protocol = m[1]; } else { - // prevent self recursion for root domains like http://domain.com. + // prevent self recursion for root domains like https://domain.com. return cb(); } diff --git a/plugins/domains/bandcamp.com.js b/plugins/domains/bandcamp.com.js index 2474e5851..2a0e8a85d 100644 --- a/plugins/domains/bandcamp.com.js +++ b/plugins/domains/bandcamp.com.js @@ -142,10 +142,10 @@ export default { "og-description" ] }, - "http://music.zackhemsey.com/album/ronin", - "http://music.zackhemsey.com/track/dont-get-in-my-way", + "https://music.zackhemsey.com/album/ronin", + "https://music.zackhemsey.com/track/dont-get-in-my-way", "https://decembersongs.bandcamp.com/album/an-east-nashville-christmas", - "http://sonsofoflaherty.bandcamp.com/album/misc-songs", - "http://badsheeps.bandcamp.com/album/bad-sheeps" // doesn't have twitter player when not published + "https://sonsofoflaherty.bandcamp.com/album/misc-songs", + "https://badsheeps.bandcamp.com/album/bad-sheeps" // doesn't have twitter player when not published ] }; \ No newline at end of file diff --git a/plugins/domains/bigthink.com.js b/plugins/domains/bigthink.com.js index 21efce2ac..e7903ec76 100644 --- a/plugins/domains/bigthink.com.js +++ b/plugins/domains/bigthink.com.js @@ -4,21 +4,16 @@ export default { "*" ], - getData: function(ld, cheerio, cb) { - var $el = cheerio('head script[src*="cdn.jwplayer.com"]'); - var player_re = /jwplayer.com\/libraries\/(\w+)\.js/i; - var media_re = /jwplayer.com\/v\d+\/media\/(\w+)\/poster\.jpg$/i; + getData: function(cheerio, cb) { + var $el = cheerio('mux-player[src*="cdn.jwplayer.com/manifests/"]'); + var media_re = /cdn\.jwplayer\.com\/manifests\/(\w+)\.m3u8$/i; - if ($el.length > 0 - && player_re.test($el.attr('src')) - && ld.article && ld.article.image - && media_re.test(ld.article.image.url)) { + var src = $el.attr('src'); + var match = src && src.match(media_re); - var player_id = $el.attr('src').match(player_re)[1]; - var media_id = ld.article.image.url.match(media_re)[1]; - - cb (null, { - __promoUri: `https://content.jwplatform.com/players/${media_id}-${player_id}.html` + if (match) { + cb(null, { + __promoUri: `https://content.jwplatform.com/players/${match[1]}.html` }); } else { cb(null); @@ -26,8 +21,11 @@ export default { }, tests: [ - "http://bigthink.com/videos/bre-pettis-on-makerbot-3-d-printing", - "http://bigthink.com/videos/vivek-wadhwa-every-industry-will-be-disrupted", - "https://bigthink.com/the-present/neil-degrasse-tyson-life-on-europa-jupiters-icy-moon/" + "https://bigthink.com/videos/bre-pettis-on-makerbot-3-d-printing", + "https://bigthink.com/videos/vivek-wadhwa-every-industry-will-be-disrupted", + "https://bigthink.com/the-present/neil-degrasse-tyson-life-on-europa-jupiters-icy-moon/", + "https://bigthink.com/the-present/how-can-cognitive-science-inform-the-future-of-education/", + "https://bigthink.com/the-present/systemic-racism-in-schools/", + "https://bigthink.com/series/the-big-think-interview/tiago-forte", ] }; \ No newline at end of file diff --git a/plugins/domains/buzzfeed.com/buzzfeed.video.js b/plugins/domains/buzzfeed.com/buzzfeed.video.js index a4a3e65f0..c0d7f450c 100644 --- a/plugins/domains/buzzfeed.com/buzzfeed.video.js +++ b/plugins/domains/buzzfeed.com/buzzfeed.video.js @@ -28,6 +28,6 @@ export default { tests: [{ noFeeds: true }, - "http://www.buzzfeed.com/brentbennett/star-wars-cast-members-do-star-wars-impersonations#.idE4zm45aA" + "https://www.buzzfeed.com/brentbennett/star-wars-cast-members-do-star-wars-impersonations#.idE4zm45aA" ] }; diff --git a/plugins/domains/cnevids.com.js b/plugins/domains/cnevids.com.js index 83aba0cd4..aeb968fe0 100644 --- a/plugins/domains/cnevids.com.js +++ b/plugins/domains/cnevids.com.js @@ -34,6 +34,6 @@ export default { tests: [ "https://player.cnevids.com/embed/5670377e94c05f43e9000000/51097beb8ef9aff9f5000008", - "http://player-backend.cnevids.com/iframe/video/54c5640161646d294c080000" + "https://player-backend.cnevids.com/iframe/video/54c5640161646d294c080000" ] }; diff --git a/plugins/domains/codepen.io.js b/plugins/domains/codepen.io.js index dff5c1391..e5af72b52 100644 --- a/plugins/domains/codepen.io.js +++ b/plugins/domains/codepen.io.js @@ -65,9 +65,9 @@ export default { }, tests: [ - "http://codepen.io/kevinjannis/pen/pyuix", - "http://codepen.io/nosecreek/details/sprDl", - "http://codepen.io/dudleystorey/pen/HrFBx", + "https://codepen.io/kevinjannis/pen/pyuix", + "https://codepen.io/nosecreek/details/sprDl", + "https://codepen.io/dudleystorey/pen/HrFBx", "https://codepen.io/pen/vwOyvW" ] diff --git a/plugins/domains/dailymotion.com/dailymotion.playlist.js b/plugins/domains/dailymotion.com/dailymotion.playlist.js index bc9d3679e..72c3e98cf 100644 --- a/plugins/domains/dailymotion.com/dailymotion.playlist.js +++ b/plugins/domains/dailymotion.com/dailymotion.playlist.js @@ -1,6 +1,6 @@ export default { - // Canonical playlists are covered by oEmbed `http://www.dailymotion.com/services/oembed` + // Canonical playlists are covered by oEmbed `https://www.dailymotion.com/services/oembed` re: [ /^https?:\/\/www\.dailymotion\.com\/embed\/playlist\/([a-zA-Z0-9]+)(?:\?.+)?$/i, /^https?:\/\/geo\.dailymotion\.com\/player.html\?playlist=([a-zA-Z0-9]+)(?:&.+)?$/i, diff --git a/plugins/domains/facebook.com/facebook.video.js b/plugins/domains/facebook.com/facebook.video.js index 7a4b0a94e..71ed91072 100644 --- a/plugins/domains/facebook.com/facebook.video.js +++ b/plugins/domains/facebook.com/facebook.video.js @@ -51,7 +51,7 @@ export default { }, tests: [ - "http://www.facebook.com/video/video.php?v=4253262701205&set=vb.1574932468&type=2", + "https://www.facebook.com/video/video.php?v=4253262701205&set=vb.1574932468&type=2", "https://business.facebook.com/KMPHFOX26/videos/10154356403004012/", "https://www.facebook.com/sugarandsoulco/videos/1484037581637646/?pnref=story", "https://www.facebook.com/watch/?v=235613163792499", diff --git a/plugins/domains/flickr.com/flickr.gallery.js b/plugins/domains/flickr.com/flickr.gallery.js index 0c285f2bd..7a8ecba9a 100644 --- a/plugins/domains/flickr.com/flickr.gallery.js +++ b/plugins/domains/flickr.com/flickr.gallery.js @@ -51,10 +51,10 @@ export default { tests: [ { // Flickr sets feed. - page: "http://www.flickr.com/photos/jup3nep/sets/", + page: "https://www.flickr.com/photos/jup3nep/sets/", selector: "a.photo-list-album" }, - "http://www.flickr.com/photos/jup3nep/sets/72157603856136177/", + "https://www.flickr.com/photos/jup3nep/sets/72157603856136177/", "https://www.flickr.com/photos/marshal-banana/albums/72157661935064149", "https://www.flickr.com/photos/mediacult/albums/72157703180229901", { diff --git a/plugins/domains/flickr.com/flickr.photo.js b/plugins/domains/flickr.com/flickr.photo.js index 690fe82c2..81048b069 100644 --- a/plugins/domains/flickr.com/flickr.photo.js +++ b/plugins/domains/flickr.com/flickr.photo.js @@ -81,11 +81,11 @@ export default { }, tests: [{ - feed: "http://api.flickr.com/services/feeds/photos_public.gne" + feed: "https://api.flickr.com/services/feeds/photos_public.gne" }, - "http://www.flickr.com/photos/jup3nep/8243797061/?f=hp", + "https://www.flickr.com/photos/jup3nep/8243797061/?f=hp", "https://www.flickr.com/photos/marshal-banana/23869537421", - "http://www.flickr.com/photos/gonzai/6027481335/in/photostream/", + "https://www.flickr.com/photos/gonzai/6027481335/in/photostream/", { skipMixins: [ "oembed-title", diff --git a/plugins/domains/google.com/maps.google.com.js b/plugins/domains/google.com/maps.google.com.js index aa6bf03f3..631ee5a0a 100644 --- a/plugins/domains/google.com/maps.google.com.js +++ b/plugins/domains/google.com/maps.google.com.js @@ -142,7 +142,7 @@ export default { delete thumb_query.zoom; } links.push({ - href: 'http://maps.googleapis.com/maps/api/staticmap?'+QueryString.stringify(thumb_query), + href: 'https://maps.googleapis.com/maps/api/staticmap?'+QueryString.stringify(thumb_query), rel: CONFIG.R.thumbnail, type: CONFIG.T.image // And let's validate image = that API key allows static maps @@ -165,7 +165,7 @@ export default { /* "https://maps.google.com/maps?saddr=Linz,+Austria&daddr=48.8674527,2.3531961+to:London,+United+Kingdom&hl=en&sll=49.843352,7.08885&sspn=5.930447,16.907959&geocode=Ffwa4QIdBvzZAClNhZn6lZVzRzHEdXlXLClTfA%3BFXyo6QIdLOgjACmptoaSEG7mRzHRA-RB5kIhIA%3BFa7_EQMd8Cv-_yl13iGvC6DYRzGZKtXdWjqWUg&oq=London&t=h&mra=dpe&mrsp=1&sz=7&via=1&z=7", "https://maps.google.com.ua/maps?q=%D1%87%D0%BE%D1%80%D0%BD%D0%BE%D0%B1%D0%B8%D0%BB%D1%8C%D1%81%D0%BA%D0%B0+%D0%B0%D0%B5%D1%81&hl=uk&ie=UTF8&ll=51.376442,30.132086&spn=0.01539,0.022144&sll=48.33599,31.18287&sspn=16.793485,22.675781&t=h&hq=%D1%87%D0%BE%D1%80%D0%BD%D0%BE%D0%B1%D0%B8%D0%BB%D1%8C%D1%81%D0%BA%D0%B0+%D0%B0%D0%B5%D1%81&z=16", - "http://goo.gl/maps/WmfmA", + "https://goo.gl/maps/WmfmA", "https://www.google.com/maps/preview#!q=hotel&data=!1m4!1m3!1d849587!2d29.1797946!3d47.0152013!2m1!1e3!4m10!1m9!4m8!1m3!1d849633!2d19.1797946!3d47.0152013!3m2!1i1920!2i937!4f13.1&fid=7" */ ] diff --git a/plugins/domains/hockeydb.com.js b/plugins/domains/hockeydb.com.js index 4dca39323..b98461e1b 100644 --- a/plugins/domains/hockeydb.com.js +++ b/plugins/domains/hockeydb.com.js @@ -10,7 +10,7 @@ export default { type: CONFIG.T.text_html, rel: [CONFIG.R.app, CONFIG.R.ssl], html:'', - // href: 'http://www.hockeydb.com/em/?pid=' + urlMatch[1], + // href: 'https://www.hockeydb.com/em/?pid=' + urlMatch[1], 'max-width': 604, height: 414 }]; diff --git a/plugins/domains/i.giphy.com.js b/plugins/domains/i.giphy.com.js index c4d01fa1a..6085d1368 100644 --- a/plugins/domains/i.giphy.com.js +++ b/plugins/domains/i.giphy.com.js @@ -17,7 +17,7 @@ export default { noFeeds: true, skipMethods: ["getData"] }, - "http://i.giphy.com/10rNBP8yt1LUnm.gif", + "https://i.giphy.com/10rNBP8yt1LUnm.gif", "https://media.giphy.com/media/3o6Zt09XtyqOJWVgRO/source.gif", "https://media3.giphy.com/media/puOukoEvH4uAw/giphy.gif?cid=4bf119fc5b9ed43565707a736f134885", "https://media.giphy.com/media/2tSodgDfwCjIMCBY8h/200w_d.gif", diff --git a/plugins/domains/knightlab.js b/plugins/domains/knightlab.js index ed23fd906..410b4a33c 100644 --- a/plugins/domains/knightlab.js +++ b/plugins/domains/knightlab.js @@ -34,7 +34,7 @@ export default { tests: [{skipMethods: ["getMeta"]}, "https://s3.amazonaws.com/uploads.knightlab.com/storymapjs/86a5b5c6facef8e74eb685573b846f6b/civilian-deaths-evidence-of-war-crimes-in-yemen/index.html", "https://cdn.knightlab.com/libs/juxtapose/latest/embed/index.html?uid=f9031656-dcc3-11e5-a524-0e7075bba956", - "http://cdn.knightlab.com/libs/juxtapose/dev/embed/index.html?uid=75ec66e0-204a-11e5-91b9-0e7075bba956", - "http://cdn.knightlab.com/libs/timeline/latest/embed/index.html?source=0Atwxho6G5yhjdEdJNU1JMzhLdjdHUTFMNnc4bHNud3c&font=PTSerif-PTSans&maptype=toner&lang=en&hash_bookmark=true&start_zoom_adjust=2&height=650#13" + "https://cdn.knightlab.com/libs/juxtapose/dev/embed/index.html?uid=75ec66e0-204a-11e5-91b9-0e7075bba956", + "https://cdn.knightlab.com/libs/timeline/latest/embed/index.html?source=0Atwxho6G5yhjdEdJNU1JMzhLdjdHUTFMNnc4bHNud3c&font=PTSerif-PTSans&maptype=toner&lang=en&hash_bookmark=true&start_zoom_adjust=2&height=650#13" ] }; \ No newline at end of file diff --git a/plugins/domains/loom.com.js b/plugins/domains/loom.com.js index 88bf3f75c..9a70e182f 100644 --- a/plugins/domains/loom.com.js +++ b/plugins/domains/loom.com.js @@ -42,6 +42,7 @@ export default { href: iframe.replaceQuerystring(q), type: CONFIG.T.text_html, // Validator fails because we receive x-frame-options. It actually works fine. rel: CONFIG.R.player, + autoplay: "autoplay=1", 'aspect-ratio': width / height, options: { hideinfo: { @@ -49,7 +50,7 @@ export default { label: "Hide player attribution info" } } - } + }; }, diff --git a/plugins/domains/npr.org/npr.sections.js b/plugins/domains/npr.org/npr.sections.js index ef26c4d23..3c4cd75cb 100644 --- a/plugins/domains/npr.org/npr.sections.js +++ b/plugins/domains/npr.org/npr.sections.js @@ -46,10 +46,10 @@ export default { }, tests: [ - "http://www.npr.org/sections/thetwo-way/2016/04/11/473874785/hundreds-protest-gerrymandering-campaign-finance-laws-on-capitols-steps", - "http://www.npr.org/sections/alltechconsidered/2015/04/29/401236656/libraries-make-space-for-3-d-printers-rules-are-sure-to-follow", - "http://www.npr.org/sections/itsallpolitics/2015/08/27/434872755/exactly-what-kind-of-socialist-is-bernie-sanders", - // "http://www.npr.org/2016/05/04/476793671/first-listen-mudcrutch-2" - "http://www.npr.org/2016/08/12/489769830/anderson-paak-the-free-nationals-tiny-desk-concert" // jw player + "https://www.npr.org/sections/thetwo-way/2016/04/11/473874785/hundreds-protest-gerrymandering-campaign-finance-laws-on-capitols-steps", + "https://www.npr.org/sections/alltechconsidered/2015/04/29/401236656/libraries-make-space-for-3-d-printers-rules-are-sure-to-follow", + "https://www.npr.org/sections/itsallpolitics/2015/08/27/434872755/exactly-what-kind-of-socialist-is-bernie-sanders", + // "https://www.npr.org/2016/05/04/476793671/first-listen-mudcrutch-2" + "https://www.npr.org/2016/08/12/489769830/anderson-paak-the-free-nationals-tiny-desk-concert" // jw player ] }; \ No newline at end of file diff --git a/plugins/domains/nytimes.video.js b/plugins/domains/nytimes.video.js index 4226bd5fd..a6b2b5a14 100644 --- a/plugins/domains/nytimes.video.js +++ b/plugins/domains/nytimes.video.js @@ -23,11 +23,11 @@ export default { }, tests: [ - "http://www.nytimes.com/video/movies/100000002478606/anatomy-of-a-scene-gravity.html?smid=nytimesarts", - "http://www.nytimes.com/video/nyregion/100000003880254/a-complicated-love-story.html?playlistId=1194811622241", - "http://www.nytimes.com/video/realestate/100000003852081/block-by-block-hoboken.html?playlistId=1194811622241", - "http://www.nytimes.com/video/world/middleeast/100000004055530/turkey-footage-shows-plane-blast.html", - "http://www.nytimes.com/video/us/100000004255656/the-terminator-and-the-washing-machine.html?smid=tw-share", - "http://www.nytimes.com/video/t-magazine/100000004528545/on-set-natalie-portman.html?smid=pl-share" + "https://www.nytimes.com/video/movies/100000002478606/anatomy-of-a-scene-gravity.html?smid=nytimesarts", + "https://www.nytimes.com/video/nyregion/100000003880254/a-complicated-love-story.html?playlistId=1194811622241", + "https://www.nytimes.com/video/realestate/100000003852081/block-by-block-hoboken.html?playlistId=1194811622241", + "https://www.nytimes.com/video/world/middleeast/100000004055530/turkey-footage-shows-plane-blast.html", + "https://www.nytimes.com/video/us/100000004255656/the-terminator-and-the-washing-machine.html?smid=tw-share", + "https://www.nytimes.com/video/t-magazine/100000004528545/on-set-natalie-portman.html?smid=pl-share" ] }; \ No newline at end of file diff --git a/plugins/domains/openstreetmap.org.js b/plugins/domains/openstreetmap.org.js index e7910168c..a778f772a 100644 --- a/plugins/domains/openstreetmap.org.js +++ b/plugins/domains/openstreetmap.org.js @@ -20,7 +20,7 @@ function sinh(x) { return (Math.exp(x) - Math.exp(-x)) / 2; } -// See: http://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Lon..2Flat._to_bbox +// See: https://wiki.openstreetmap.org/wiki/Slippy_map_tilenames#Lon..2Flat._to_bbox function getTileNumber(lat, lon, zoom) { var n = Math.pow(2, zoom); var xtile = Math.floor((lon + 180) / 360 * n); @@ -208,7 +208,7 @@ export default { // https://help.openstreetmap.org/questions/26293/error-on-image-stream-using-ojwdevopenstreetmaporg /* , { - href: "http://ojw.dev.openstreetmap.org/StaticMap/?"+QueryString.stringify(thumb_query), + href: "https://ojw.dev.openstreetmap.org/StaticMap/?"+QueryString.stringify(thumb_query), rel: CONFIG.R.thumbnail, type: CONFIG.T.image_png, width: thumb_width, diff --git a/plugins/domains/pinterest.com/pinterest.board.js b/plugins/domains/pinterest.com/pinterest.board.js index c9f8310d8..710eccd40 100644 --- a/plugins/domains/pinterest.com/pinterest.board.js +++ b/plugins/domains/pinterest.com/pinterest.board.js @@ -54,8 +54,8 @@ export default { // No Test Feed here not to violate "scrapping" restrictions of Pinterest noFeeds: true }, - "http://pinterest.com/bcij/art-mosaics/", - "http://pinterest.com/bcij/aging-gracefully/", + "https://pinterest.com/bcij/art-mosaics/", + "https://pinterest.com/bcij/aging-gracefully/", "https://www.pinterest.com/pinterest/official-news/", "https://www.pinterest.com/mimimememe/office-humor-work-jokes/" ] diff --git a/plugins/domains/pinterest.com/pinterest.user.js b/plugins/domains/pinterest.com/pinterest.user.js index 5010d27c7..2e9df4de2 100644 --- a/plugins/domains/pinterest.com/pinterest.user.js +++ b/plugins/domains/pinterest.com/pinterest.user.js @@ -54,8 +54,8 @@ export default { noFeeds: true, skipMixins: ["og-title", "og-description"] }, - "http://pinterest.com/bcij/", - "http://pinterest.com/franktofineart/", + "https://pinterest.com/bcij/", + "https://pinterest.com/franktofineart/", "https://www.pinterest.com/pinterest/" ] }; \ No newline at end of file diff --git a/plugins/domains/polldaddy.com.js b/plugins/domains/polldaddy.com.js index d343f4aa7..9f7b5dd2d 100644 --- a/plugins/domains/polldaddy.com.js +++ b/plugins/domains/polldaddy.com.js @@ -46,8 +46,8 @@ export default { ] }, "https://polldaddy.com/poll/7451882/?s=twitter", - "http://polldaddy.com/poll/9113163/", + "https://polldaddy.com/poll/9113163/", "https://poll.fm/15096510", - "http://poll.fm/15188921" + "https://poll.fm/15188921" ] }; \ No newline at end of file diff --git a/plugins/domains/simplecast.com.js b/plugins/domains/simplecast.com.js index 8feda22a0..306f5722e 100644 --- a/plugins/domains/simplecast.com.js +++ b/plugins/domains/simplecast.com.js @@ -46,10 +46,10 @@ export default { "https://the-smerconish-podcast.simplecast.com/episodes/todays-poll-question-should-joe-have-pardoned-hunter", /* - http://bikeshed.fm/54 - http://bikeshed.fm/57 + https://bikeshed.fm/54 + https://bikeshed.fm/57 https://podcast.emojiwrap.com/episodes/17-no-time-for-hands-openhands-with - http://podcast.thegadgetflow.com/mark-campbell-inventurex + https://podcast.thegadgetflow.com/mark-campbell-inventurex */ ] }; \ No newline at end of file diff --git a/plugins/domains/slid.es.js b/plugins/domains/slid.es.js index 4ca16a35b..a01a22fa7 100644 --- a/plugins/domains/slid.es.js +++ b/plugins/domains/slid.es.js @@ -20,7 +20,7 @@ export default { getLink: function(urlMatch, query) { if (urlMatch[1] !== 'blog.') { return { - href: `${urlMatch[0].replace('http://', '//')}/embed` + (query.token ? `?token=${query.token}` : ''), + href: `${urlMatch[0].replace('https://', '//')}/embed` + (query.token ? `?token=${query.token}` : ''), accept: CONFIG.T.text_html, rel: [CONFIG.R.player, CONFIG.R.slideshow], 'aspect-ratio': 960/700, @@ -37,11 +37,11 @@ export default { }, tests: [{skipMethods: ["getData"]}, - "http://slides.com/timkindberg/ui-router", + "https://slides.com/timkindberg/ui-router", "https://slides.com/thedatacentral/the-data-central", "https://slides.com/sunilos/javaio#/2", "https://slides.com/webmax/angular-status-13" - // But exclude http://blog.slides.com/post/84828911898/slides-turns-one-year-old from Tumblr tests + // But exclude https://blog.slides.com/post/84828911898/slides-turns-one-year-old from Tumblr tests ] }; diff --git a/plugins/domains/spotify.com.js b/plugins/domains/spotify.com.js index 451aaee85..50fe98b89 100644 --- a/plugins/domains/spotify.com.js +++ b/plugins/domains/spotify.com.js @@ -104,13 +104,13 @@ export default { tests: [{noFeeds: true}, {skipMethods: ["getData"], skipMixins: ["oembed-iframe", "oembed-thumbnail", "og-image", "oembed-title"]}, "https://open.spotify.com/playlist/44CgBWWr6nlpy7bdZS8ZmN", - "http://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB", + "https://open.spotify.com/track/6ol4ZSifr7r3Lb2a9L5ZAB", "https://open.spotify.com/playlist/4SsKyjaGlrHJbRCQwpeUsz", - "http://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi", + "https://open.spotify.com/album/42jcZtPYrmZJhqTbUhLApi", "https://open.spotify.com/playlist/0OV99Ep2d1DCENJRPuEtXV", "https://open.spotify.com/track/4by34YzNiEFRESAnBXo7x4", "https://open.spotify.com/track/2qZ36jzyP1u29KaeuMmRZx", - "http://open.spotify.com/track/7ldU6Vh9bPCbKW2zHE65dg", + "https://open.spotify.com/track/7ldU6Vh9bPCbKW2zHE65dg", "https://play.spotify.com/track/2vN0b6d2ogn72kL75EmN3v", "https://play.spotify.com/track/34zWZOSpU2V1ab0PiZCcv4", "https://open.spotify.com/show/7gozmLqbcbr6PScMjc0Zl4?si=nUubrGA2Sj-2pYPgkSWYrA", diff --git a/plugins/domains/test.com/test1.js b/plugins/domains/test.com/test1.js deleted file mode 100644 index 01ef363d1..000000000 --- a/plugins/domains/test.com/test1.js +++ /dev/null @@ -1,16 +0,0 @@ -export default { - - provides: 'test_data1', - - getData: function(cb) { - setTimeout(function() { - cb(null, { - test_data1: true - }); - }, 100); - }, - - tests: { - noTest: true - } -}; \ No newline at end of file diff --git a/plugins/domains/test.com/test2.js b/plugins/domains/test.com/test2.js deleted file mode 100644 index 33fd1557c..000000000 --- a/plugins/domains/test.com/test2.js +++ /dev/null @@ -1,15 +0,0 @@ -export default { - - provides: ['test_data2', 'test_plugin'], - - getData: function(test_data1) { - return { - test_data2: true, - test_plugin: true - }; - }, - - tests: { - noTest: true - } -}; \ No newline at end of file diff --git a/plugins/domains/test.com/test3.js b/plugins/domains/test.com/test3.js deleted file mode 100644 index 7e0d746cc..000000000 --- a/plugins/domains/test.com/test3.js +++ /dev/null @@ -1,13 +0,0 @@ -export default { - - getLink: function(test_data2) { - return { - href: 'http://test.com', - type: 'text/html' - }; - }, - - tests: { - noTest: true - } -}; \ No newline at end of file diff --git a/plugins/domains/tumblr.com/tumblr.oembed.js b/plugins/domains/tumblr.com/tumblr.oembed.js index 53584bcd7..e4158dbf4 100644 --- a/plugins/domains/tumblr.com/tumblr.oembed.js +++ b/plugins/domains/tumblr.com/tumblr.oembed.js @@ -36,7 +36,7 @@ export default { }, tests: [ - "http://fewthistle.tumblr.com/post/58045916432", + "https://fewthistle.tumblr.com/post/58045916432", "https://nasa.tumblr.com/post/186150527809/pew-pew-pew-imagine-slow-motion-fireworks-that", "https://tuulikki.tumblr.com/post/806272596495794176/what-is-the-sex-is-just-rock-climbing", "https://lincolnmotorco.tumblr.com/post/159272549438/the-1961-continental-convertible-photographed-at" diff --git a/plugins/domains/tumblr.com/tumblr.video.js b/plugins/domains/tumblr.com/tumblr.video.js index b6d3bfe10..8f0ec5726 100644 --- a/plugins/domains/tumblr.com/tumblr.video.js +++ b/plugins/domains/tumblr.com/tumblr.video.js @@ -38,8 +38,8 @@ export default { }, tests: [{skipMethods: ["getData", "getLink"]}, - "http://fyteensontop.tumblr.com/post/58053062280/130812-fanta-fanmeeting-niel-apink-eunji-cut", - "http://hubol.tumblr.com/post/58053061056/check-out-how-cool-this-class-is", - "http://soupsoup.tumblr.com/post/41952443284/think-of-yourself-less-of-a-journalist-and-more" + "https://fyteensontop.tumblr.com/post/58053062280/130812-fanta-fanmeeting-niel-apink-eunji-cut", + "https://hubol.tumblr.com/post/58053061056/check-out-how-cool-this-class-is", + "https://soupsoup.tumblr.com/post/41952443284/think-of-yourself-less-of-a-journalist-and-more" ] }; diff --git a/plugins/domains/usatoday.com.js b/plugins/domains/usatoday.com.js index 0df252e62..7dc7269f4 100644 --- a/plugins/domains/usatoday.com.js +++ b/plugins/domains/usatoday.com.js @@ -53,32 +53,32 @@ export default { "https://www.usatoday.com/videos/life/movies/academy-awards/2019/02/25/diversity-red-carpet-academy-awards/2980115002/", "https://www.usatoday.com/videos/tech/2019/03/26/drones-flying-blood-north-carolina-hospital/3282276002/", "https://www.usatoday.com/videos/life/movies/2017/11/06/some-theaters-may-not-show-last-jedi-due-disneys-demands/107396942/?utm_source=feedblitz&utm_medium=FeedBlitzRss&utm_campaign=usatodaycommoney-topstories", - "http://www.usatoday.com/media/cinematic/video/87694100/abdul-jabbar-mocks-trump-says-im-jordan/", - "http://www.usatoday.com/videos/news/nation/2016/07/29/87694100/", - "http://www.usatoday.com/videos/life/people/2016/11/03/93261598/", + "https://www.usatoday.com/media/cinematic/video/87694100/abdul-jabbar-mocks-trump-says-im-jordan/", + "https://www.usatoday.com/videos/news/nation/2016/07/29/87694100/", + "https://www.usatoday.com/videos/life/people/2016/11/03/93261598/", "https://www.usatoday.com/videos/news/2018/07/03/white-house-twitter-account-attacks-senators-critical-ice/36581999/", - "http://www.usatoday.com/videos/life/2016/11/09/93525560/", - "http://www.usatoday.com/videos/news/politics/elections/2016/2016/11/09/93532206/", - "http://www.usatoday.com/videos/sports/2016/12/20/behind-scenes:-michael-phelps-cover-shoot/95645660/", - "http://www.usatoday.com/videos/news/2017/01/07/what-know-ft.-lauderdale-airport-shooter/96291014/", + "https://www.usatoday.com/videos/life/2016/11/09/93525560/", + "https://www.usatoday.com/videos/news/politics/elections/2016/2016/11/09/93532206/", + "https://www.usatoday.com/videos/sports/2016/12/20/behind-scenes:-michael-phelps-cover-shoot/95645660/", + "https://www.usatoday.com/videos/news/2017/01/07/what-know-ft.-lauderdale-airport-shooter/96291014/", */ "https://www.desertsun.com/videos/news/nation/california/2025/06/30/juniper-fire-spreads-rapidly-near-perris/84422397007/", "https://www.cincinnati.com/videos/sports/high-school/high-school-sports/2020/08/19/watch-enquirer-writers-break-down-ohio-high-school-girls-soccer-scene-2020/5607979002/", - // "http://www.guampdn.com/videos/news/nation/2015/08/18/31948487/", - "http://www.courier-journal.com/videos/sports/college/kentucky/2015/08/17/31862551/", - "http://www.newarkadvocate.com/videos/sports/high-school/football/2015/08/15/31789999/", - "http://www.citizen-times.com/videos/news/2015/08/17/31865067/", - "http://www.sctimes.com/videos/weather/2015/08/17/31839437/", - "http://www.delmarvanow.com/videos/sports/high-school/2015/08/18/31933549/", + // "https://www.guampdn.com/videos/news/nation/2015/08/18/31948487/", + "https://www.courier-journal.com/videos/sports/college/kentucky/2015/08/17/31862551/", + "https://www.newarkadvocate.com/videos/sports/high-school/football/2015/08/15/31789999/", + "https://www.citizen-times.com/videos/news/2015/08/17/31865067/", + "https://www.sctimes.com/videos/weather/2015/08/17/31839437/", + "https://www.delmarvanow.com/videos/sports/high-school/2015/08/18/31933549/", "https://www.courier-journal.com/videos/entertainment/2015/08/24/31920575/", - "http://www.detroitnews.com/videos/sports/nfl/lions/2015/08/19/31954181/", - "http://www.press-citizen.com/videos/news/education/k-12/2015/08/18/31959369/", - "http://www.tennessean.com/videos/entertainment/2015/08/18/31958929/", - "http://www.coloradoan.com/videos/sports/2015/08/18/31951489/", + "https://www.detroitnews.com/videos/sports/nfl/lions/2015/08/19/31954181/", + "https://www.press-citizen.com/videos/news/education/k-12/2015/08/18/31959369/", + "https://www.tennessean.com/videos/entertainment/2015/08/18/31958929/", + "https://www.coloradoan.com/videos/sports/2015/08/18/31951489/", "https://www.thenewsstar.com/videos/news/2019/02/25/barge-traffic-swollen-mississippi-river/636614000/", - "http://www.hawkcentral.com/videos/sports/college/iowa/football/2015/08/13/31628619/", - "http://www.sheboyganpress.com/videos/sports/golf/2015/08/16/31830213/", - "http://www.packersnews.com/videos/sports/nfl/packers/2015/08/15/31800211/", - "http://www.shreveporttimes.com/videos/news/2015/08/18/31906711/" + "https://www.hawkcentral.com/videos/sports/college/iowa/football/2015/08/13/31628619/", + "https://www.sheboyganpress.com/videos/sports/golf/2015/08/16/31830213/", + "https://www.packersnews.com/videos/sports/nfl/packers/2015/08/15/31800211/", + "https://www.shreveporttimes.com/videos/news/2015/08/18/31906711/" ] }; \ No newline at end of file diff --git a/plugins/domains/vimeo-moogaloop.js b/plugins/domains/vimeo-moogaloop.js index edcb01730..91cf9f2ff 100644 --- a/plugins/domains/vimeo-moogaloop.js +++ b/plugins/domains/vimeo-moogaloop.js @@ -3,7 +3,7 @@ export default { re: /^https?:\/\/vimeo\.com\/moogaloop\.swf\?clip_id=(\d+)/i, // Direct link to old swfs. For example, - // http://vimeo.com/moogaloop.swf?clip_id=8527987&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=00ADEF&fullscreen=1 + // https://vimeo.com/moogaloop.swf?clip_id=8527987&server=vimeo.com&show_title=1&show_byline=1&show_portrait=0&color=00ADEF&fullscreen=1 getLink: function(urlMatch, cb) { cb ({ diff --git a/plugins/domains/vimeo.com.js b/plugins/domains/vimeo.com.js index aa55f0b2e..cd5434efc 100644 --- a/plugins/domains/vimeo.com.js +++ b/plugins/domains/vimeo.com.js @@ -105,7 +105,7 @@ export default { tests: [{ - feed: "http://vimeo.com/channels/bestofstaffpicks/videos/rss" + feed: "https://vimeo.com/channels/bestofstaffpicks/videos/rss" }, "https://vimeo.com/65836516", "https://vimeo.com/141567420", diff --git a/plugins/domains/xkcd.com.js b/plugins/domains/xkcd.com.js index 8531b088b..d85b320c2 100644 --- a/plugins/domains/xkcd.com.js +++ b/plugins/domains/xkcd.com.js @@ -39,9 +39,9 @@ export default { pageWithFeed: 'https://xkcd.com/', skipMixins: ["og-image-rel-image"] }, - "http://xkcd.com/1392/", // Large image present. - "http://xkcd.com/731/", - "http://www.xkcd.com/1709/", + "https://xkcd.com/1392/", // Large image present. + "https://xkcd.com/731/", + "https://www.xkcd.com/1709/", "https://xkcd.com/162/" ] }; \ No newline at end of file diff --git a/plugins/domains/youtube.com/youtube.video.js b/plugins/domains/youtube.com/youtube.video.js index 652fdaa23..acebf2afe 100644 --- a/plugins/domains/youtube.com/youtube.video.js +++ b/plugins/domains/youtube.com/youtube.video.js @@ -343,7 +343,7 @@ export default { tests: [{ noFeeds: true }, - "http://www.youtube.com/watch?v=etDRmrB9Css", // 4:3 + "https://www.youtube.com/watch?v=etDRmrB9Css", // 4:3 "https://www.youtube.com/embed/mDFBTdToRmw?rel=0", "https://www.youtube.com/embed/yJpJ8REjvqo?si=-2PKj71d6RhnnCFU&clip=UgkxvYwD1omSQWCDuoWYo6hHJjQzcLGbJqYi&clipt=EPjgJhjg4ig" // sic! with & - as the code is manually copied from YouTube // embeds disabled - https://www.youtube.com/watch?v=e58FeKOgsU8 diff --git a/plugins/links/canonical-redirect.js b/plugins/links/canonical-redirect.js index 4d31d2c41..7f21ee87c 100644 --- a/plugins/links/canonical-redirect.js +++ b/plugins/links/canonical-redirect.js @@ -29,14 +29,14 @@ export default { cb(null); } - // ex. http://mobile.abc.net.au/news/2014-10-22/government-wants-rooftop-solar-program-to-continue/5833664 - // http://m.forms2office.com/form/43144244572148 + // ex. https://mobile.abc.net.au/news/2014-10-22/government-wants-rooftop-solar-program-to-continue/5833664 + // https://m.forms2office.com/form/43144244572148 // https://www.washingtonpost.com/amphtml/politics/mueller-examining-trumps-draft-letter-firing-fbi-director-comey/2017/09/01/52c6cd8e-8f17-11e7-8df5-c2e5cf46c1e2_story.html // https://www.washingtonpost.com/video/c/embed/145b32ce-d1bd-11e5-90d3-34c2c42653ac // https://e.infogram.com/browser_market_share_totals?src=embed // https://www.sueddeutsche.de/politik/us-grenze-zu-mexiko-trump-will-bis-zu-soldaten-schicken-1.4192873!amp - // http://www.spiegel.de/politik/ausland/midterm-wahlen-usa-darum-geht-es-bei-den-zwischenwahlen-a-1234924-amp.html + // https://www.spiegel.de/politik/ausland/midterm-wahlen-usa-darum-geht-es-bei-den-zwischenwahlen-a-1234924-amp.html // https://www.t-online.de/nachrichten/deutschland/parteien/id_84705926/tid_amp/kampf-um-merkel-nachfolge-armin-laschet-verzichtet-auf-kandidatur-vorerst.html - // http://amp.actionnewsjax.com/news/halloween-candy-possibly-tampered-with-in-clay-county-deputies-say/864286361 + // https://amp.actionnewsjax.com/news/halloween-candy-possibly-tampered-with-in-clay-county-deputies-say/864286361 }; \ No newline at end of file diff --git a/plugins/links/google-docs-viewer.js b/plugins/links/google-docs-viewer.js index 8c28d46d5..944610312 100644 --- a/plugins/links/google-docs-viewer.js +++ b/plugins/links/google-docs-viewer.js @@ -7,8 +7,8 @@ export default { if (__nonHtmlContentData.content_length < 10 * 1024 * 1024) { // Skip files that are over 10Mb, - // ex - http://topchoice.com.mt/pdf/TOPCHOICE-AD.pdf - // ex - http://zwinnalodz.eu/wp-content/uploads/2016/02/The-Lean-Startup-.pdf + // ex - https://topchoice.com.mt/pdf/TOPCHOICE-AD.pdf + // ex - https://zwinnalodz.eu/wp-content/uploads/2016/02/The-Lean-Startup-.pdf // (Though Google seems to have the limit of 25Mb - that is still too much for general Iframely use) var src = "https://docs.google.com/viewer?embedded=true&url=" + encodeURIComponent(url); diff --git a/plugins/links/hosted/hosted-via-canonical.js b/plugins/links/hosted/hosted-via-canonical.js index 4f3385190..35e17470c 100644 --- a/plugins/links/hosted/hosted-via-canonical.js +++ b/plugins/links/hosted/hosted-via-canonical.js @@ -22,5 +22,5 @@ export default { cb(null); } - // ex. http://www.espn1530.com/media/play/27017084/ + // ex. https://www.espn1530.com/media/play/27017084/ }; \ No newline at end of file diff --git a/plugins/links/oembed-rich.js b/plugins/links/oembed-rich.js index 537a685a0..6f906711e 100644 --- a/plugins/links/oembed-rich.js +++ b/plugins/links/oembed-rich.js @@ -131,7 +131,7 @@ export default { /** Tests are only applicable with the whitelist, otherwise will throw errors on Test UI. * tests: [ - * "http://list.ly/list/303-alternatives-to-twitter-bootstrap-html5-css3-responsive-framework" //Oembed rich reader + * "https://list.ly/list/303-alternatives-to-twitter-bootstrap-html5-css3-responsive-framework" //Oembed rich reader * ] */ diff --git a/plugins/links/oembed-video.js b/plugins/links/oembed-video.js index 879f737b8..031922694 100644 --- a/plugins/links/oembed-video.js +++ b/plugins/links/oembed-video.js @@ -91,7 +91,7 @@ export default { // tests are only applicable with the whitelist, otherwise will throw errors on Test UI /* tests: [ - "http://sports.pixnet.net/album/video/183041064", + "https://sports.pixnet.net/album/video/183041064", ] */ }; diff --git a/plugins/meta/geo-url.js b/plugins/meta/geo-url.js index 3c5080a81..b6ae20f9c 100644 --- a/plugins/meta/geo-url.js +++ b/plugins/meta/geo-url.js @@ -6,7 +6,7 @@ export default { Example: "ICBM": "42.88, -78.88", "geo.position": "42.88;-78.88", - Sample: http://qik.com/video/52767028 + Sample: https://qik.com/video/52767028 */ var geo = meta.icbm || meta["geo.position"]; diff --git a/plugins/meta/ld-article.js b/plugins/meta/ld-article.js index 418169b29..2902ecfcc 100644 --- a/plugins/meta/ld-article.js +++ b/plugins/meta/ld-article.js @@ -35,6 +35,6 @@ export default { } // ex: - // http://www.app.com/story/entertainment/music/2017/03/17/springsteen-legacy-apmff-upstage-film-explores-1970-asbury-park/99313864/ + // https://www.app.com/story/entertainment/music/2017/03/17/springsteen-legacy-apmff-upstage-film-explores-1970-asbury-park/99313864/ // https://www.nhl.com/video/oshie-buries-ppg-with-a-backhand/c-51625603?tcid=tw_video_content_id }; diff --git a/plugins/meta/og-article.js b/plugins/meta/og-article.js index b563e4f61..8f22fea1d 100644 --- a/plugins/meta/og-article.js +++ b/plugins/meta/og-article.js @@ -20,7 +20,7 @@ export default { category: article.section, keywords: k }; - // example - http://www.entrepreneur.com/article/237644 + // example - https://www.entrepreneur.com/article/237644 // https://open.bufferapp.com/customer-development-interviews-using-twitter/ } } diff --git a/static/css/bootstrap.css b/static/css/bootstrap.css index 5940a99d3..e37f7f006 100644 --- a/static/css/bootstrap.css +++ b/static/css/bootstrap.css @@ -3,7 +3,7 @@ * * Copyright 2012 Twitter, Inc * Licensed under the Apache License v2.0 - * http://www.apache.org/licenses/LICENSE-2.0 + * https://www.apache.org/licenses/LICENSE-2.0 * * Designed and built with all the love in the world @twitter by @mdo and @fat. */ diff --git a/static/js/underscore-min.js b/static/js/underscore-min.js index f01025b7b..71cf8247a 100644 --- a/static/js/underscore-min.js +++ b/static/js/underscore-min.js @@ -1,5 +1,5 @@ // Underscore.js 1.8.3 -// http://underscorejs.org +// https://underscorejs.org // (c) 2009-2015 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors // Underscore may be freely distributed under the MIT license. (function(){function n(n){function t(t,r,e,u,i,o){for(;i>=0&&o>i;i+=n){var a=u?u[i]:i;e=r(e,t[a],a,t)}return e}return function(r,e,u,i){e=b(e,i,4);var o=!k(r)&&m.keys(r),a=(o||r).length,c=n>0?0:a-1;return arguments.length<3&&(u=r[o?o[c]:c],c+=n),t(r,e,u,o,c,a)}}function t(n){return function(t,r,e){r=x(r,e);for(var u=O(t),i=n>0?0:u-1;i>=0&&u>i;i+=n)if(r(t[i],i,t))return i;return-1}}function r(n,t,r){return function(e,u,i){var o=0,a=O(e);if("number"==typeof i)n>0?o=i>=0?i:Math.max(i+a,o):a=i>=0?Math.min(i+1,a):i+a+1;else if(r&&i&&a)return i=r(e,u),e[i]===u?i:-1;if(u!==u)return i=t(l.call(e,o,a),m.isNaN),i>=0?i+o:-1;for(i=n>0?o:a-1;i>=0&&a>i;i+=n)if(e[i]===u)return i;return-1}}function e(n,t){var r=I.length,e=n.constructor,u=m.isFunction(e)&&e.prototype||a,i="constructor";for(m.has(n,i)&&!m.contains(t,i)&&t.push(i);r--;)i=I[r],i in n&&n[i]!==u[i]&&!m.contains(t,i)&&t.push(i)}var u=this,i=u._,o=Array.prototype,a=Object.prototype,c=Function.prototype,f=o.push,l=o.slice,s=a.toString,p=a.hasOwnProperty,h=Array.isArray,v=Object.keys,g=c.bind,y=Object.create,d=function(){},m=function(n){return n instanceof m?n:this instanceof m?void(this._wrapped=n):new m(n)};"undefined"!=typeof exports?("undefined"!=typeof module&&module.exports&&(exports=module.exports=m),exports._=m):u._=m,m.VERSION="1.8.3";var b=function(n,t,r){if(t===void 0)return n;switch(null==r?3:r){case 1:return function(r){return n.call(t,r)};case 2:return function(r,e){return n.call(t,r,e)};case 3:return function(r,e,u){return n.call(t,r,e,u)};case 4:return function(r,e,u,i){return n.call(t,r,e,u,i)}}return function(){return n.apply(t,arguments)}},x=function(n,t,r){return null==n?m.identity:m.isFunction(n)?b(n,t,r):m.isObject(n)?m.matcher(n):m.property(n)};m.iteratee=function(n,t){return x(n,t,1/0)};var _=function(n,t){return function(r){var e=arguments.length;if(2>e||null==r)return r;for(var u=1;e>u;u++)for(var i=arguments[u],o=n(i),a=o.length,c=0;a>c;c++){var f=o[c];t&&r[f]!==void 0||(r[f]=i[f])}return r}},j=function(n){if(!m.isObject(n))return{};if(y)return y(n);d.prototype=n;var t=new d;return d.prototype=null,t},w=function(n){return function(t){return null==t?void 0:t[n]}},A=Math.pow(2,53)-1,O=w("length"),k=function(n){var t=O(n);return"number"==typeof t&&t>=0&&A>=t};m.each=m.forEach=function(n,t,r){t=b(t,r);var e,u;if(k(n))for(e=0,u=n.length;u>e;e++)t(n[e],e,n);else{var i=m.keys(n);for(e=0,u=i.length;u>e;e++)t(n[i[e]],i[e],n)}return n},m.map=m.collect=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=Array(u),o=0;u>o;o++){var a=e?e[o]:o;i[o]=t(n[a],a,n)}return i},m.reduce=m.foldl=m.inject=n(1),m.reduceRight=m.foldr=n(-1),m.find=m.detect=function(n,t,r){var e;return e=k(n)?m.findIndex(n,t,r):m.findKey(n,t,r),e!==void 0&&e!==-1?n[e]:void 0},m.filter=m.select=function(n,t,r){var e=[];return t=x(t,r),m.each(n,function(n,r,u){t(n,r,u)&&e.push(n)}),e},m.reject=function(n,t,r){return m.filter(n,m.negate(x(t)),r)},m.every=m.all=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(!t(n[o],o,n))return!1}return!0},m.some=m.any=function(n,t,r){t=x(t,r);for(var e=!k(n)&&m.keys(n),u=(e||n).length,i=0;u>i;i++){var o=e?e[i]:i;if(t(n[o],o,n))return!0}return!1},m.contains=m.includes=m.include=function(n,t,r,e){return k(n)||(n=m.values(n)),("number"!=typeof r||e)&&(r=0),m.indexOf(n,t,r)>=0},m.invoke=function(n,t){var r=l.call(arguments,2),e=m.isFunction(t);return m.map(n,function(n){var u=e?t:n[t];return null==u?u:u.apply(n,r)})},m.pluck=function(n,t){return m.map(n,m.property(t))},m.where=function(n,t){return m.filter(n,m.matcher(t))},m.findWhere=function(n,t){return m.find(n,m.matcher(t))},m.max=function(n,t,r){var e,u,i=-1/0,o=-1/0;if(null==t&&null!=n){n=k(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],e>i&&(i=e)}else t=x(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(u>o||u===-1/0&&i===-1/0)&&(i=n,o=u)});return i},m.min=function(n,t,r){var e,u,i=1/0,o=1/0;if(null==t&&null!=n){n=k(n)?n:m.values(n);for(var a=0,c=n.length;c>a;a++)e=n[a],i>e&&(i=e)}else t=x(t,r),m.each(n,function(n,r,e){u=t(n,r,e),(o>u||1/0===u&&1/0===i)&&(i=n,o=u)});return i},m.shuffle=function(n){for(var t,r=k(n)?n:m.values(n),e=r.length,u=Array(e),i=0;e>i;i++)t=m.random(0,i),t!==i&&(u[i]=u[t]),u[t]=r[i];return u},m.sample=function(n,t,r){return null==t||r?(k(n)||(n=m.values(n)),n[m.random(n.length-1)]):m.shuffle(n).slice(0,Math.max(0,t))},m.sortBy=function(n,t,r){return t=x(t,r),m.pluck(m.map(n,function(n,r,e){return{value:n,index:r,criteria:t(n,r,e)}}).sort(function(n,t){var r=n.criteria,e=t.criteria;if(r!==e){if(r>e||r===void 0)return 1;if(e>r||e===void 0)return-1}return n.index-t.index}),"value")};var F=function(n){return function(t,r,e){var u={};return r=x(r,e),m.each(t,function(e,i){var o=r(e,i,t);n(u,e,o)}),u}};m.groupBy=F(function(n,t,r){m.has(n,r)?n[r].push(t):n[r]=[t]}),m.indexBy=F(function(n,t,r){n[r]=t}),m.countBy=F(function(n,t,r){m.has(n,r)?n[r]++:n[r]=1}),m.toArray=function(n){return n?m.isArray(n)?l.call(n):k(n)?m.map(n,m.identity):m.values(n):[]},m.size=function(n){return null==n?0:k(n)?n.length:m.keys(n).length},m.partition=function(n,t,r){t=x(t,r);var e=[],u=[];return m.each(n,function(n,r,i){(t(n,r,i)?e:u).push(n)}),[e,u]},m.first=m.head=m.take=function(n,t,r){return null==n?void 0:null==t||r?n[0]:m.initial(n,n.length-t)},m.initial=function(n,t,r){return l.call(n,0,Math.max(0,n.length-(null==t||r?1:t)))},m.last=function(n,t,r){return null==n?void 0:null==t||r?n[n.length-1]:m.rest(n,Math.max(0,n.length-t))},m.rest=m.tail=m.drop=function(n,t,r){return l.call(n,null==t||r?1:t)},m.compact=function(n){return m.filter(n,m.identity)};var S=function(n,t,r,e){for(var u=[],i=0,o=e||0,a=O(n);a>o;o++){var c=n[o];if(k(c)&&(m.isArray(c)||m.isArguments(c))){t||(c=S(c,t,r));var f=0,l=c.length;for(u.length+=l;l>f;)u[i++]=c[f++]}else r||(u[i++]=c)}return u};m.flatten=function(n,t){return S(n,t,!1)},m.without=function(n){return m.difference(n,l.call(arguments,1))},m.uniq=m.unique=function(n,t,r,e){m.isBoolean(t)||(e=r,r=t,t=!1),null!=r&&(r=x(r,e));for(var u=[],i=[],o=0,a=O(n);a>o;o++){var c=n[o],f=r?r(c,o,n):c;t?(o&&i===f||u.push(c),i=f):r?m.contains(i,f)||(i.push(f),u.push(c)):m.contains(u,c)||u.push(c)}return u},m.union=function(){return m.uniq(S(arguments,!0,!0))},m.intersection=function(n){for(var t=[],r=arguments.length,e=0,u=O(n);u>e;e++){var i=n[e];if(!m.contains(t,i)){for(var o=1;r>o&&m.contains(arguments[o],i);o++);o===r&&t.push(i)}}return t},m.difference=function(n){var t=S(arguments,!0,!0,1);return m.filter(n,function(n){return!m.contains(t,n)})},m.zip=function(){return m.unzip(arguments)},m.unzip=function(n){for(var t=n&&m.max(n,O).length||0,r=Array(t),e=0;t>e;e++)r[e]=m.pluck(n,e);return r},m.object=function(n,t){for(var r={},e=0,u=O(n);u>e;e++)t?r[n[e]]=t[e]:r[n[e][0]]=n[e][1];return r},m.findIndex=t(1),m.findLastIndex=t(-1),m.sortedIndex=function(n,t,r,e){r=x(r,e,1);for(var u=r(t),i=0,o=O(n);o>i;){var a=Math.floor((i+o)/2);r(n[a])i;i++,n+=r)u[i]=n;return u};var E=function(n,t,r,e,u){if(!(e instanceof t))return n.apply(r,u);var i=j(n.prototype),o=n.apply(i,u);return m.isObject(o)?o:i};m.bind=function(n,t){if(g&&n.bind===g)return g.apply(n,l.call(arguments,1));if(!m.isFunction(n))throw new TypeError("Bind must be called on a function");var r=l.call(arguments,2),e=function(){return E(n,e,t,this,r.concat(l.call(arguments)))};return e},m.partial=function(n){var t=l.call(arguments,1),r=function(){for(var e=0,u=t.length,i=Array(u),o=0;u>o;o++)i[o]=t[o]===m?arguments[e++]:t[o];for(;e=e)throw new Error("bindAll must be passed function names");for(t=1;e>t;t++)r=arguments[t],n[r]=m.bind(n[r],n);return n},m.memoize=function(n,t){var r=function(e){var u=r.cache,i=""+(t?t.apply(this,arguments):e);return m.has(u,i)||(u[i]=n.apply(this,arguments)),u[i]};return r.cache={},r},m.delay=function(n,t){var r=l.call(arguments,2);return setTimeout(function(){return n.apply(null,r)},t)},m.defer=m.partial(m.delay,m,1),m.throttle=function(n,t,r){var e,u,i,o=null,a=0;r||(r={});var c=function(){a=r.leading===!1?0:m.now(),o=null,i=n.apply(e,u),o||(e=u=null)};return function(){var f=m.now();a||r.leading!==!1||(a=f);var l=t-(f-a);return e=this,u=arguments,0>=l||l>t?(o&&(clearTimeout(o),o=null),a=f,i=n.apply(e,u),o||(e=u=null)):o||r.trailing===!1||(o=setTimeout(c,l)),i}},m.debounce=function(n,t,r){var e,u,i,o,a,c=function(){var f=m.now()-o;t>f&&f>=0?e=setTimeout(c,t-f):(e=null,r||(a=n.apply(i,u),e||(i=u=null)))};return function(){i=this,u=arguments,o=m.now();var f=r&&!e;return e||(e=setTimeout(c,t)),f&&(a=n.apply(i,u),i=u=null),a}},m.wrap=function(n,t){return m.partial(t,n)},m.negate=function(n){return function(){return!n.apply(this,arguments)}},m.compose=function(){var n=arguments,t=n.length-1;return function(){for(var r=t,e=n[t].apply(this,arguments);r--;)e=n[r].call(this,e);return e}},m.after=function(n,t){return function(){return--n<1?t.apply(this,arguments):void 0}},m.before=function(n,t){var r;return function(){return--n>0&&(r=t.apply(this,arguments)),1>=n&&(t=null),r}},m.once=m.partial(m.before,2);var M=!{toString:null}.propertyIsEnumerable("toString"),I=["valueOf","isPrototypeOf","toString","propertyIsEnumerable","hasOwnProperty","toLocaleString"];m.keys=function(n){if(!m.isObject(n))return[];if(v)return v(n);var t=[];for(var r in n)m.has(n,r)&&t.push(r);return M&&e(n,t),t},m.allKeys=function(n){if(!m.isObject(n))return[];var t=[];for(var r in n)t.push(r);return M&&e(n,t),t},m.values=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=n[t[u]];return e},m.mapObject=function(n,t,r){t=x(t,r);for(var e,u=m.keys(n),i=u.length,o={},a=0;i>a;a++)e=u[a],o[e]=t(n[e],e,n);return o},m.pairs=function(n){for(var t=m.keys(n),r=t.length,e=Array(r),u=0;r>u;u++)e[u]=[t[u],n[t[u]]];return e},m.invert=function(n){for(var t={},r=m.keys(n),e=0,u=r.length;u>e;e++)t[n[r[e]]]=r[e];return t},m.functions=m.methods=function(n){var t=[];for(var r in n)m.isFunction(n[r])&&t.push(r);return t.sort()},m.extend=_(m.allKeys),m.extendOwn=m.assign=_(m.keys),m.findKey=function(n,t,r){t=x(t,r);for(var e,u=m.keys(n),i=0,o=u.length;o>i;i++)if(e=u[i],t(n[e],e,n))return e},m.pick=function(n,t,r){var e,u,i={},o=n;if(null==o)return i;m.isFunction(t)?(u=m.allKeys(o),e=b(t,r)):(u=S(arguments,!1,!1,1),e=function(n,t,r){return t in r},o=Object(o));for(var a=0,c=u.length;c>a;a++){var f=u[a],l=o[f];e(l,f,o)&&(i[f]=l)}return i},m.omit=function(n,t,r){if(m.isFunction(t))t=m.negate(t);else{var e=m.map(S(arguments,!1,!1,1),String);t=function(n,t){return!m.contains(e,t)}}return m.pick(n,t,r)},m.defaults=_(m.allKeys,!0),m.create=function(n,t){var r=j(n);return t&&m.extendOwn(r,t),r},m.clone=function(n){return m.isObject(n)?m.isArray(n)?n.slice():m.extend({},n):n},m.tap=function(n,t){return t(n),n},m.isMatch=function(n,t){var r=m.keys(t),e=r.length;if(null==n)return!e;for(var u=Object(n),i=0;e>i;i++){var o=r[i];if(t[o]!==u[o]||!(o in u))return!1}return!0};var N=function(n,t,r,e){if(n===t)return 0!==n||1/n===1/t;if(null==n||null==t)return n===t;n instanceof m&&(n=n._wrapped),t instanceof m&&(t=t._wrapped);var u=s.call(n);if(u!==s.call(t))return!1;switch(u){case"[object RegExp]":case"[object String]":return""+n==""+t;case"[object Number]":return+n!==+n?+t!==+t:0===+n?1/+n===1/t:+n===+t;case"[object Date]":case"[object Boolean]":return+n===+t}var i="[object Array]"===u;if(!i){if("object"!=typeof n||"object"!=typeof t)return!1;var o=n.constructor,a=t.constructor;if(o!==a&&!(m.isFunction(o)&&o instanceof o&&m.isFunction(a)&&a instanceof a)&&"constructor"in n&&"constructor"in t)return!1}r=r||[],e=e||[];for(var c=r.length;c--;)if(r[c]===n)return e[c]===t;if(r.push(n),e.push(t),i){if(c=n.length,c!==t.length)return!1;for(;c--;)if(!N(n[c],t[c],r,e))return!1}else{var f,l=m.keys(n);if(c=l.length,m.keys(t).length!==c)return!1;for(;c--;)if(f=l[c],!m.has(t,f)||!N(n[f],t[f],r,e))return!1}return r.pop(),e.pop(),!0};m.isEqual=function(n,t){return N(n,t)},m.isEmpty=function(n){return null==n?!0:k(n)&&(m.isArray(n)||m.isString(n)||m.isArguments(n))?0===n.length:0===m.keys(n).length},m.isElement=function(n){return!(!n||1!==n.nodeType)},m.isArray=h||function(n){return"[object Array]"===s.call(n)},m.isObject=function(n){var t=typeof n;return"function"===t||"object"===t&&!!n},m.each(["Arguments","Function","String","Number","Date","RegExp","Error"],function(n){m["is"+n]=function(t){return s.call(t)==="[object "+n+"]"}}),m.isArguments(arguments)||(m.isArguments=function(n){return m.has(n,"callee")}),"function"!=typeof/./&&"object"!=typeof Int8Array&&(m.isFunction=function(n){return"function"==typeof n||!1}),m.isFinite=function(n){return isFinite(n)&&!isNaN(parseFloat(n))},m.isNaN=function(n){return m.isNumber(n)&&n!==+n},m.isBoolean=function(n){return n===!0||n===!1||"[object Boolean]"===s.call(n)},m.isNull=function(n){return null===n},m.isUndefined=function(n){return n===void 0},m.has=function(n,t){return null!=n&&p.call(n,t)},m.noConflict=function(){return u._=i,this},m.identity=function(n){return n},m.constant=function(n){return function(){return n}},m.noop=function(){},m.property=w,m.propertyOf=function(n){return null==n?function(){}:function(t){return n[t]}},m.matcher=m.matches=function(n){return n=m.extendOwn({},n),function(t){return m.isMatch(t,n)}},m.times=function(n,t,r){var e=Array(Math.max(0,n));t=b(t,r,1);for(var u=0;n>u;u++)e[u]=t(u);return e},m.random=function(n,t){return null==t&&(t=n,n=0),n+Math.floor(Math.random()*(t-n+1))},m.now=Date.now||function(){return(new Date).getTime()};var B={"&":"&","<":"<",">":">",'"':""","'":"'","`":"`"},T=m.invert(B),R=function(n){var t=function(t){return n[t]},r="(?:"+m.keys(n).join("|")+")",e=RegExp(r),u=RegExp(r,"g");return function(n){return n=null==n?"":""+n,e.test(n)?n.replace(u,t):n}};m.escape=R(B),m.unescape=R(T),m.result=function(n,t,r){var e=null==n?void 0:n[t];return e===void 0&&(e=r),m.isFunction(e)?e.call(n):e};var q=0;m.uniqueId=function(n){var t=++q+"";return n?n+t:t},m.templateSettings={evaluate:/<%([\s\S]+?)%>/g,interpolate:/<%=([\s\S]+?)%>/g,escape:/<%-([\s\S]+?)%>/g};var K=/(.)^/,z={"'":"'","\\":"\\","\r":"r","\n":"n","\u2028":"u2028","\u2029":"u2029"},D=/\\|'|\r|\n|\u2028|\u2029/g,L=function(n){return"\\"+z[n]};m.template=function(n,t,r){!t&&r&&(t=r),t=m.defaults({},t,m.templateSettings);var e=RegExp([(t.escape||K).source,(t.interpolate||K).source,(t.evaluate||K).source].join("|")+"|$","g"),u=0,i="__p+='";n.replace(e,function(t,r,e,o,a){return i+=n.slice(u,a).replace(D,L),u=a+t.length,r?i+="'+\n((__t=("+r+"))==null?'':_.escape(__t))+\n'":e?i+="'+\n((__t=("+e+"))==null?'':__t)+\n'":o&&(i+="';\n"+o+"\n__p+='"),t}),i+="';\n",t.variable||(i="with(obj||{}){\n"+i+"}\n"),i="var __t,__p='',__j=Array.prototype.join,"+"print=function(){__p+=__j.call(arguments,'');};\n"+i+"return __p;\n";try{var o=new Function(t.variable||"obj","_",i)}catch(a){throw a.source=i,a}var c=function(n){return o.call(this,n,m)},f=t.variable||"obj";return c.source="function("+f+"){\n"+i+"}",c},m.chain=function(n){var t=m(n);return t._chain=!0,t};var P=function(n,t){return n._chain?m(t).chain():t};m.mixin=function(n){m.each(m.functions(n),function(t){var r=m[t]=n[t];m.prototype[t]=function(){var n=[this._wrapped];return f.apply(n,arguments),P(this,r.apply(m,n))}})},m.mixin(m),m.each(["pop","push","reverse","shift","sort","splice","unshift"],function(n){var t=o[n];m.prototype[n]=function(){var r=this._wrapped;return t.apply(r,arguments),"shift"!==n&&"splice"!==n||0!==r.length||delete r[0],P(this,r)}}),m.each(["concat","join","slice"],function(n){var t=o[n];m.prototype[n]=function(){return P(this,t.apply(this._wrapped,arguments))}}),m.prototype.value=function(){return this._wrapped},m.prototype.valueOf=m.prototype.toJSON=m.prototype.value,m.prototype.toString=function(){return""+this._wrapped},"function"==typeof define&&define.amd&&define("underscore",[],function(){return m})}).call(this); diff --git a/test/core-plugins.js b/test/core-plugins.js index 00116a6f8..791d63f54 100644 --- a/test/core-plugins.js +++ b/test/core-plugins.js @@ -82,7 +82,7 @@ describe('Core plugins', function() { var error, data; before(function(done) { - iframely("http://www.ted.com/talks/kent_larson_brilliant_designs_to_fit_more_people_in_every_city", 'oembed', findWhitelistRecordFor, function(_error, _data) { + iframely("https://www.ted.com/talks/kent_larson_brilliant_designs_to_fit_more_people_in_every_city", 'oembed', findWhitelistRecordFor, function(_error, _data) { error = _error; data = _data; done(); @@ -102,7 +102,7 @@ describe('Core plugins', function() { describe('image size', function() { it('has correct size and type', function(done) { - utils.getImageMetadata("http://www.google.com/logos/2013/dia_dos_namorados_2013-1529005-hp.jpg", function(error, data) { + utils.getImageMetadata("https://www.google.com/logos/2013/dia_dos_namorados_2013-1529005-hp.jpg", function(error, data) { assert.equal(data.width, 400); assert.equal(data.height, 211); assert.equal(data.content_length, 33572); diff --git a/test/e2e.js b/test/e2e.js index 499e77a7c..87c319bf9 100644 --- a/test/e2e.js +++ b/test/e2e.js @@ -187,7 +187,7 @@ describe('meta endpoint', function() { } }); - var url = 'http://blacklisted.com/test-timeout'; + var url = 'https://blacklisted.com/test-timeout'; request(BASE_IFRAMELY_SERVER_URL) .get('/iframely?url=' + url) .end(function(err, res) { diff --git a/views/debug.ejs b/views/debug.ejs index c635a1bb7..5bfc8957b 100644 --- a/views/debug.ejs +++ b/views/debug.ejs @@ -1,5 +1,5 @@ - + Iframely dev debug tool