From 449030d08bcabf796184db705bfd352b4a8fd7dc Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Tue, 16 Dec 2014 14:09:03 -0800
Subject: [PATCH] Bugfixes

Changelog updated
Wrap register protocol in try catch
Fixed mentions in the end of sentence
---
 app/js/services.js                        |  4 ++--
 app/partials/desktop/changelog_modal.html |  3 ++-
 app/partials/desktop/login.html           |  2 +-
 app/partials/mobile/changelog_modal.html  | 11 ++---------
 app/partials/mobile/login.html            |  2 +-
 package.json                              |  2 +-
 6 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/js/services.js b/app/js/services.js
index f003c0b6..57ee87af 100644
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -3233,7 +3233,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
                         "\\uffa1-\\uffdc";                  // half width Hangul (Korean)
 
   var regexAlphaNumericChars  = "0-9\.\_" + regexAlphaChars;
-  var regExp = new RegExp('(^|\\s)((?:https?://)?telegram\\.me/|@)([a-zA-Z\\d_\\.]{5,32})|((?:(ftp|https?)://|(?:mailto:)?([A-Za-z0-9._%+-]+@))(\\S*\\.\\S*[^\\s.;,(){}<>"\']))|(\\n)|(' + emojiUtf.join('|') + ')|(^|\\s)(#[' + regexAlphaNumericChars + ']{2,20})', 'i');
+  var regExp = new RegExp('(^|\\s)((?:https?://)?telegram\\.me/|@)([a-zA-Z\\d_]{5,32})|((?:(ftp|https?)://|(?:mailto:)?([A-Za-z0-9._%+-]+@))(\\S*\\.\\S*[^\\s.;,(){}<>"\']))|(\\n)|(' + emojiUtf.join('|') + ')|(^|\\s)(#[' + regexAlphaNumericChars + ']{2,20})', 'i');
 
   var youtubeRegex = /(?:https?:\/\/)?(?:www\.)?youtu(?:|\.be|be\.com|\.b)(?:\/v\/|\/watch\\?v=|e\/|(?:\/\??#)?\/watch(?:.+)v=)(.{11})(?:\&[^\s]*)?/;
   var vimeoRegex = /(?:https?:\/\/)?(?:www\.)?vimeo\.com\/(\d+)/;
@@ -4182,8 +4182,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
     started = true;
     try {
       navigator.registerProtocolHandler('tg', '#im?tgaddr=%s', 'Telegram Web');
+      navigator.registerProtocolHandler('web+tg', '#im?tgaddr=%s', 'Telegram Web');
     } catch (e) {}
-    navigator.registerProtocolHandler('web+tg', '#im?tgaddr=%s', 'Telegram Web');
 
     $rootScope.$on('$routeUpdate', checkTgAddr);
     checkTgAddr();
diff --git a/app/partials/desktop/changelog_modal.html b/app/partials/desktop/changelog_modal.html
index 65d3182f..d0b6995b 100644
--- a/app/partials/desktop/changelog_modal.html
+++ b/app/partials/desktop/changelog_modal.html
@@ -35,7 +35,8 @@
         <div class="md_modal_section_version">0.3.8</div>
         <div class="md_modal_section_description changelog_version_changes">
           <ul class="list-unstyled changelog_version_changes_list">
-            <li>Telegram.me/username links supported</li>
+            <li>Telegram.me links open right in Telegram Web when authorized</li>
+            <li>@username mentions in messages are clickable and open a conversation with the user</li>
           </ul>
         </div>
       </div>
diff --git a/app/partials/desktop/login.html b/app/partials/desktop/login.html
index a95ce0ef..c5aacbb8 100644
--- a/app/partials/desktop/login.html
+++ b/app/partials/desktop/login.html
@@ -52,7 +52,7 @@
 
     <div class="form-group" ng-class="{'has-error': error.field == 'phone_code'}">
       <label class="control-label" for="phone_code" ng-if="error.field == 'phone_code'" my-i18n="login_incorrect_sms_code"></label>
-      <input type="number" my-focused class="form-control login_phone_code" name="phone_code" ng-model="credentials.phone_code" placeholder="{{'login_number_input_placeholder' | i18n}}" autocomplete="off" required>
+      <input type="tel" my-focused class="form-control login_phone_code" name="phone_code" ng-model="credentials.phone_code" placeholder="{{'login_number_input_placeholder' | i18n}}" autocomplete="off" required>
     </div>
 
     <button class="btn btn-primary btn-block" type="submit" ng-class="{disabled: progress.enabled}" ng-disabled="progress.enabled" ng-switch="progress.enabled">
diff --git a/app/partials/mobile/changelog_modal.html b/app/partials/mobile/changelog_modal.html
index 9d35e212..decade1c 100644
--- a/app/partials/mobile/changelog_modal.html
+++ b/app/partials/mobile/changelog_modal.html
@@ -19,14 +19,6 @@
 
     <div class="changelog_versions_wrap">
 
-      <div class="md_modal_versioned_section_wrap" ng-if="canShowVersion('0.3.8')">
-        <div class="md_modal_section_version">0.3.8</div>
-        <div class="md_modal_section_description changelog_version_changes">
-          <ul class="list-unstyled changelog_version_changes_list">
-          </ul>
-        </div>
-      </div>
-
       <div class="modal_section changelog_version_wrap">
         <h3 class="modal_section_header changelog_version_title">
           Version 0.3.8
@@ -34,7 +26,8 @@
         </h3>
         <div class="modal_section_body changelog_version_changes">
           <ul class="list-unstyled changelog_version_changes_list">
-            <li>Telegram.me/username links supported</li>
+            <li>Telegram.me links open right in Telegram Web when authorized</li>
+            <li>@username mentions in messages are clickable and open a conversation with the user</li>
           </ul>
         </div>
       </div>
diff --git a/app/partials/mobile/login.html b/app/partials/mobile/login.html
index bcd44686..1bef5702 100644
--- a/app/partials/mobile/login.html
+++ b/app/partials/mobile/login.html
@@ -52,7 +52,7 @@
 
     <div class="form-group" ng-class="{'has-error': error.field == 'phone_code'}">
       <label class="control-label" for="phone_code" ng-if="error.field == 'phone_code'" my-i18n="login_incorrect_sms_code"></label>
-      <input type="number" my-focused class="form-control login_phone_code" name="phone_code" ng-model="credentials.phone_code" placeholder="{{'login_number_input_placeholder' | i18n}}" autocomplete="off" required>
+      <input type="tel" my-focused class="form-control login_phone_code" name="phone_code" ng-model="credentials.phone_code" placeholder="{{'login_number_input_placeholder' | i18n}}" autocomplete="off" required>
     </div>
 
     <button class="btn btn-primary btn-block" type="submit" ng-class="{disabled: progress.enabled}" ng-disabled="progress.enabled" ng-switch="progress.enabled">
diff --git a/package.json b/package.json
index 5e2a2355..40b152df 100644
--- a/package.json
+++ b/package.json
@@ -37,7 +37,7 @@
     "gulp-angular-templatecache": "^1.1.0",
     "gulp-load-plugins": "^0.4.0",
     "gulp-usemin": "^0.3.8",
-    "gulp-uglify": "^1.0.1",
+    "gulp-uglify": "^1.0.2",
     "gulp-rev": "^1.1.0",
     "gulp-minify-css": "^0.3.0",
     "gulp-minify-html": "^0.1.1",