merged with master

11 years ago · 7d53e0d8b8
5 changed files with 15 additions and 38240 deletions
--- a/app.manifest
+++ b/app.manifest
@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Sun Mar 23 2014 00:52:03 GMT+0400 (MSK)
+# Time: Sun Mar 23 2014 18:15:14 GMT+0400 (MSK)


 CACHE:
@ -28,8 +28,7 @@ img/emojisprite_4.png
 img/logo_dogogram.png
 img/logo_share.png
 img/sound_a.wav
-js/app-655b0fd7.js
-js/app-c244f7ed.js
+js/app-b288b02d.js
 js/background.js
 img/icons/Checks1_1x.png
 img/icons/Checks1_2x.png
--- a/css/app.css
+++ b/css/app.css
--- a/index.html
+++ b/index.html
@ -1 +1 @@
-<!doctype html><html lang=en ng-app=myApp manifest=app.manifest><head><meta charset=utf-8><meta name=viewport content="width=device-width, user-scalable=no"><title>Webogram</title><link rel=stylesheet href=css/app.css><link rel=icon href=favicon.ico type=image/x-icon><meta property=og:title content=Webogram><meta property=og:url content="http://zhukov.github.io/webogram/"><meta property=og:image content=http://zhukov.github.io/webogram/img/logo_share.png><meta property=og:site_name content=Webogram><meta property=og:description content="Welcome to an experimental web-client of Telegram messenger. See https://github.com/zhukov/webogram for more info."></head><body><div ng-view=""></div><script src=js/app-c244f7ed.js></script></body></html>
+<!doctype html><html lang=en ng-app=myApp manifest=app.manifest><head><meta charset=utf-8><meta name=viewport content="width=device-width, user-scalable=no"><title>Webogram</title><link rel=stylesheet href=css/app.css><link rel=icon href=favicon.ico type=image/x-icon><meta property=og:title content=Webogram><meta property=og:url content="http://zhukov.github.io/webogram/"><meta property=og:image content=http://zhukov.github.io/webogram/img/logo_share.png><meta property=og:site_name content=Webogram><meta property=og:description content="Welcome to an experimental web-client of Telegram messenger. See https://github.com/zhukov/webogram for more info."></head><body><div ng-view=""></div><script src=js/app-b288b02d.js></script></body></html>
--- a/js/app-655b0fd7.js
+++ b/js/app-655b0fd7.js
--- a/js/app-b288b02d.js
+++ b/js/app-b288b02d.js
@ -35286,6 +35286,7 @@ angular.module('myApp.services', [])
  }

  var regExp = new RegExp('((?:(ftp|https?)://|(?:mailto:)?([A-Za-z0-9._%+-]+@))(\\S*\\.\\S*[^\\s.;,(){}<>"\']))|(\\n)|(' + emojiUtf.join('|') + ')', 'i');
+  var youtubeRegex = /(?:https?:\/\/)?(?:www\.)?youtu(?:|.be|be.com|.b)(?:\/v\/|\/watch\\?v=|e\/|\/watch(?:.+)v=)(.{11})(?:\&[^\s]*)?/;

  return {
    wrapRichText: wrapRichText
@ -35404,6 +35405,16 @@ angular.module('myApp.services', [])
    }

    // console.log(4, text, html);
+    if (!options.noLinks) {
+      var youtubeMatches = text.match(youtubeRegex),
+          videoID = youtubeMatches && youtubeMatches[1];
+
+      if (videoID) {
+        text = text + '<div class="im_message_iframe_video"><iframe type="text/html" frameborder="0" ' +
+              'src="http://www.youtube.com/embed/' + videoID +
+              '?autoplay=0&amp;controls=2"></iframe></div>'
+      }
+    }

    return $sce.trustAs('html', text);
  }