From bef95d7fed01a0a611390860b0247e1b02d9806d Mon Sep 17 00:00:00 2001 From: Joseph Stevens Date: Mon, 16 Jan 2017 12:19:02 +0000 Subject: [PATCH] Use same format triggers as Android (#1323) --- app/js/lib/ng_utils.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/js/lib/ng_utils.js b/app/js/lib/ng_utils.js index b0f810b9..a3637cc4 100755 --- a/app/js/lib/ng_utils.js +++ b/app/js/lib/ng_utils.js @@ -1239,7 +1239,7 @@ angular.module('izhukov.utils', []) var spotifyRegExp = /(https?:\/\/(open\.spotify\.com|play\.spotify\.com|spoti\.fi)\/(.+)|spotify:(.+))/i var markdownTestRegExp = /[`_*@]/ - var markdownRegExp = /(^|\s)(````?)([\s\S]+?)(````?)([\s\n\.,:?!;]|$)|(^|\s)([`*_])([^\n]+?)\7([\s\.,:?!;]|$)|@(\d+)\s*\((.+?)\)/ + var markdownRegExp = /(^|\s)(````?)([\s\S]+?)(````?)([\s\n\.,:?!;]|$)|(^|\s)(`|\*\*|__)([^\n]+?)\7([\s\.,:?!;]|$)|@(\d+)\s*\((.+?)\)/ var siteHashtags = { Telegram: 'tg://search_hashtag?hashtag={1}', @@ -1257,8 +1257,8 @@ angular.module('izhukov.utils', []) var markdownEntities = { '`': 'messageEntityCode', - '*': 'messageEntityBold', - '_': 'messageEntityItalic' + '**': 'messageEntityBold', + '__': 'messageEntityItalic' } return { @@ -1824,13 +1824,13 @@ angular.module('izhukov.utils', []) case 'messageEntityBold': code.push( - '*', entityText, '*' + '**', entityText, '**' ) break case 'messageEntityItalic': code.push( - '_', entityText, '_' + '__', entityText, '__' ) break @@ -2089,7 +2089,7 @@ angular.module('izhukov.utils', []) return } settings.baseUrl = (location.href || '').replace(/#.*$/, '') + '#/im' - + var eventData = { type: 'ping', localNotifications: localNotificationsAvailable, @@ -2150,7 +2150,7 @@ angular.module('izhukov.utils', []) if (subscription) { var subscriptionObj = subscription.toJSON() if (!subscriptionObj || - !subscriptionObj.endpoint || + !subscriptionObj.endpoint || !subscriptionObj.keys || !subscriptionObj.keys.p256dh || !subscriptionObj.keys.auth) { @@ -2181,4 +2181,4 @@ angular.module('izhukov.utils', []) setSettings: setSettings } - }) \ No newline at end of file + })