File tree Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Expand file tree Collapse file tree 2 files changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -58,7 +58,7 @@ export function isInteger(value) {
58
58
* @return {boolean }
59
59
*/
60
60
export function isVimeoUrl ( url ) {
61
- return ( / ^ ( h t t p s ? : ) ? \/ \/ ( ( p l a y e r | w w w ) \. ) ? v i m e o \. c o m (? = $ | \/ ) / ) . test ( url ) ;
61
+ return ( / ^ ( h t t p s ? : ) ? \/ \/ ( ( ( ( p l a y e r | w w w ) \. ) ? v i m e o \. c o m ) | ( ( p l a y e r \. ) ? [ a - z A - Z 0 - 9 - ] + \. v i d e o j i . h k ) ) (? = $ | \/ ) / ) . test ( url ) ;
62
62
}
63
63
64
64
/**
@@ -68,7 +68,7 @@ export function isVimeoUrl(url) {
68
68
* @return {boolean }
69
69
*/
70
70
export function isVimeoEmbed ( url ) {
71
- const expr = / ^ h t t p s : \/ \/ p l a y e r \. v i m e o \. c o m \/ v i d e o \/ \d + / ;
71
+ const expr = / ^ h t t p s : \/ \/ p l a y e r \. ( ( v i m e o \. c o m ) | ( [ a - z A - Z 0 - 9 - ] + \. v i d e o j i \. h k ) ) \/ v i d e o \/ \d + / ;
72
72
return expr . test ( url ) ;
73
73
}
74
74
Original file line number Diff line number Diff line change @@ -40,6 +40,11 @@ test('isVimeoUrl identifies *.vimeo.com only', (t) => {
40
40
t . true ( isVimeoUrl ( 'https://www.vimeo.com' ) === true ) ;
41
41
t . true ( isVimeoUrl ( '//www.vimeo.com' ) === true ) ;
42
42
t . true ( isVimeoUrl ( 'http://player.vimeo.com' ) === true ) ;
43
+ t . true ( isVimeoUrl ( 'http://player.subdomain.videoji.hk' ) === true ) ;
44
+ t . true ( isVimeoUrl ( 'http://player.subdomain.videoji.hk/video/12345' ) === true ) ;
45
+ t . true ( isVimeoUrl ( 'http://player.subdomain.videoji.hk/video/12345?h=a1b2c3d4' ) === true ) ;
46
+ t . true ( isVimeoUrl ( 'http://subdomain.videoji.hk' ) === true ) ;
47
+ t . true ( isVimeoUrl ( 'http://videoji.hk' ) === false ) ;
43
48
t . true ( isVimeoUrl ( '//player.vimeo.com' ) === true ) ;
44
49
t . true ( isVimeoUrl ( 'https://player.vimeo.com' ) === true ) ;
45
50
t . true ( isVimeoUrl ( 'https://notvimeo.com' ) === false ) ;
@@ -56,6 +61,8 @@ test('isVimeoEmbed identifies Vimeo embeds only', (t) => {
56
61
t . true ( isVimeoEmbed ( 'https://player.vimeo.com/video/76979871?h=8272103f6e' ) === true ) ;
57
62
t . true ( isVimeoEmbed ( 'https://player.vimeo.com/video/76979871' ) === true ) ;
58
63
t . true ( isVimeoEmbed ( 'http://player.vimeo.com/video/76979871?h=8272103f6e' ) === false ) ;
64
+ t . true ( isVimeoEmbed ( 'http://player.subdomain.videoji.hk/video/76979871?h=8272103f6e' ) === false ) ;
65
+ t . true ( isVimeoEmbed ( 'https://player.subdomain.videoji.hk/video/76979871?h=8272103f6e' ) === true ) ;
59
66
t . true ( isVimeoEmbed ( 'http2://not-vimeo.com/video/76979871' ) === false ) ;
60
67
} ) ;
61
68
You can’t perform that action at this time.
0 commit comments