specter/CyTube
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #451 from Xaekai/3.0

Browse source 
Fix raw file links getting parsed as a non-existant ps: shorthand
This commit is contained in:
Calvin Montgomery 2015-02-21 14:34:13 -06:00
parent a6eaa944c1 1c263f825b
commit a88e8b8b7b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
www/js/util.js
View file

@ -1317,21 +1317,21 @@ function parseMediaLink(url) {
/* Shorthand URIs */ /* Shorthand URIs */
// To catch Google Plus by ID alone // To catch Google Plus by ID alone
if ((m = url.match(/(?:gp:)?(\d{21}_\d{19}_\d{19})/))) { if ((m = url.match(/^(?:gp:)?(\d{21}_\d{19}_\d{19})/))) {
return { return {
id: m[1], id: m[1],
type: "gp" type: "gp"
}; };
} }
// So we still trim DailyMotion URLs // So we still trim DailyMotion URLs
if((m = url.match(/dm:([^\?&#_]+)/))) { if((m = url.match(/^dm:([^\?&#_]+)/))) {
return { return {
id: m[1], id: m[1],
type: "dm" type: "dm"
}; };
} }
// Generic for the rest. // Generic for the rest.
if ((m = url.match(/([a-z]{2}):([^\?&#]+)/))) { if ((m = url.match(/^([a-z]{2}):([^\?&#]+)/))) {
return { return {
id: m[2], id: m[2],
type: m[1] type: m[1]