Browse Source

Bugfixes

Changelog updated
Wrap register protocol in try catch
Fixed mentions in the end of sentence
master
Igor Zhukov 10 years ago
parent
commit
449030d08b
  1. 4
      app/js/services.js
  2. 3
      app/partials/desktop/changelog_modal.html
  3. 2
      app/partials/desktop/login.html
  4. 11
      app/partials/mobile/changelog_modal.html
  5. 2
      app/partials/mobile/login.html
  6. 2
      package.json

4
app/js/services.js

@ -3233,7 +3233,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils']) @@ -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']) @@ -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();

3
app/partials/desktop/changelog_modal.html

@ -35,7 +35,8 @@ @@ -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>

2
app/partials/desktop/login.html

@ -52,7 +52,7 @@ @@ -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">

11
app/partials/mobile/changelog_modal.html

@ -19,14 +19,6 @@ @@ -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 @@ @@ -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>

2
app/partials/mobile/login.html

@ -52,7 +52,7 @@ @@ -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">

2
package.json

@ -37,7 +37,7 @@ @@ -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",

Loading…
Cancel
Save