r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Added no-capture prefix for youtube

Browse Source
This commit is contained in:
Igor Zhukov 2014-10-15 15:50:15 +04:00
parent bc5a03c99a
commit a5fd419863
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/js/services.js
View File

@ -3182,7 +3182,7 @@ angular.module('myApp.services', ['myApp.i18n'])
var regexAlphaNumericChars = "0-9\.\_" + regexAlphaChars; var regexAlphaNumericChars = "0-9\.\_" + regexAlphaChars;
var regExp = new RegExp('((?:(ftp|https?)://|(?:mailto:)?([A-Za-z0-9._%+-]+@))(\\S*\\.\\S*[^\\s.;,(){}<>"\']))|(\\n)|(' + emojiUtf.join('|') + ')|(^|\\s)(#[' + regexAlphaNumericChars + ']{3,20})', 'i'); var regExp = new RegExp('((?:(ftp|https?)://|(?:mailto:)?([A-Za-z0-9._%+-]+@))(\\S*\\.\\S*[^\\s.;,(){}<>"\']))|(\\n)|(' + emojiUtf.join('|') + ')|(^|\\s)(#[' + regexAlphaNumericChars + ']{3,20})', 'i');
var youtubeRegex = /(?:https?:\/\/)?(?:www\.)?youtu(?:|.be|be.com|.b)(?:\/v\/|\/watch\\?v=|e\/|(\/(\?#|#))?\/watch(?:.+)v=)(.{11})(?:\&[^\s]*)?/; var youtubeRegex = /(?:https?:\/\/)?(?:www\.)?youtu(?:|.be|be.com|.b)(?:\/v\/|\/watch\\?v=|e\/|(?:\/\??#)?\/watch(?:.+)v=)(.{11})(?:\&[^\s]*)?/;
return { return {
wrapRichText: wrapRichText, wrapRichText: wrapRichText,
@ -3321,7 +3321,7 @@ angular.module('myApp.services', ['myApp.i18n'])
// console.log(4, text, html); // console.log(4, text, html);
if (!options.noLinks) { if (!options.noLinks) {
var youtubeMatches = text.match(youtubeRegex), var youtubeMatches = text.match(youtubeRegex),
videoID = youtubeMatches && youtubeMatches[youtubeMatches.length-1]; videoID = youtubeMatches && youtubeMatches[1];
if (videoID) { if (videoID) {
var tag = Config.Modes.chrome_packed ? 'webview' : 'iframe'; var tag = Config.Modes.chrome_packed ? 'webview' : 'iframe';