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

Use a generic matcher for the shorthand URIs.

Browse source
This commit is contained in:
Xaekai 2015-02-16 22:40:18 -08:00
parent ca17c82c8c
commit 5c6a966e6f
1 changed files with 6 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
www/js/util.js
View file

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