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

Fixed hashtags

Browse Source 
Closes #1014
This commit is contained in:
Igor Zhukov 2016-01-04 22:59:01 +01:00
parent d4d815efa0
commit 5e0242816f
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/js/controllers.js
View File

@ -804,6 +804,13 @@ angular.module('myApp.controllers', ['myApp.i18n'])
$scope.$on('ui_dialogs_search_clear', $scope.searchClear); $scope.$on('ui_dialogs_search_clear', $scope.searchClear);
if (!$scope.noMessages) {
$scope.$on('dialogs_search', function (e, data) {
$scope.search.query = data.query || '';
$scope.toggleSearch();
});
}
var searchTimeoutPromise; var searchTimeoutPromise;
function getDialogs(force) { function getDialogs(force) {
var curJump = ++jump; var curJump = ++jump;

2
app/js/lib/ng_utils.js
View File

@ -1181,7 +1181,7 @@ angular.module('izhukov.utils', [])
var markdownRegExp = /(^|\s)(````?)([\s\S]+?)(````?)([\s\.,:?!;]|$)|(^|\s)`([^\n]+?)`([\s\.,:?!;]|$)/; var markdownRegExp = /(^|\s)(````?)([\s\S]+?)(````?)([\s\.,:?!;]|$)|(^|\s)`([^\n]+?)`([\s\.,:?!;]|$)/;
var siteHashtags = { var siteHashtags = {
Telegram: '#/im?q=%23{1}', Telegram: 'tg://search_hashtag?hashtag={1}',
Twitter: 'https://twitter.com/hashtag/{1}', Twitter: 'https://twitter.com/hashtag/{1}',
Instagram: 'https://instagram.com/explore/tags/{1}/', Instagram: 'https://instagram.com/explore/tags/{1}/',
'Google Plus': 'https://plus.google.com/explore/{1}' 'Google Plus': 'https://plus.google.com/explore/{1}'