From b1a67fc0b61b32187aac0248bc5442f3cdef42b6 Mon Sep 17 00:00:00 2001 From: kasimi Date: Sat, 1 Sep 2018 20:17:09 +0200 Subject: [PATCH] Version 2.1.1 --- composer.json | 4 ++-- styles/all/template/javascript/mchat.js | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/composer.json b/composer.json index a65c00d..a49f221 100644 --- a/composer.json +++ b/composer.json @@ -3,8 +3,8 @@ "type": "phpbb-extension", "description": "mChat", "homepage": "https://www.phpbb.com/customise/db/extension/mchat_extension/", - "version": "2.1.0", - "time": "2018-06-22", + "version": "2.1.1", + "time": "2018-09-01", "keywords": ["phpbb", "extension", "mchat"], "license": "GPL-2.0-only", "authors": [ diff --git a/styles/all/template/javascript/mchat.js b/styles/all/template/javascript/mchat.js index c4e4777..f828786 100644 --- a/styles/all/template/javascript/mchat.js +++ b/styles/all/template/javascript/mchat.js @@ -640,20 +640,20 @@ jQuery(function($) { fixJumpToUrl: function() { var $message = $(this); var $elem = $message.find('blockquote [data-post-id]'); + var messageId = $elem.data('post-id'); var data = { message: $message, elem: $elem, - getUrl: function() { - var messageId = this.elem.data('post-id'); - mChat.getArchiveQuoteUrl(messageId) - } + url: mChat.getArchiveQuoteUrl(messageId) }; $(mChat).trigger('mchat_fix_jump_to_url_before', [data]); - data.elem.attr('href', data.getUrl()); + if (data.url) { + data.elem.attr('href', data.url); + } }, getArchiveQuoteUrl: function(messageId) { var archiveUrl = $('.mchat-nav-archive').find('a').prop('href'); - return mChat.addUrlParam(archiveUrl, 'jumpto=' + messageId) + return archiveUrl ? mChat.addUrlParam(archiveUrl, 'jumpto=' + messageId) : false; }, jumpToMessage: function() { var messageId = $(this).data('post-id'); @@ -669,7 +669,10 @@ jQuery(function($) { data.message.offset(); data.message.addClass('mchat-message-flash'); } else { - window.open(mChat.getArchiveQuoteUrl(data.messageId), '_blank'); + var url = mChat.getArchiveQuoteUrl(data.messageId); + if (url) { + window.open(url, '_blank'); + } } } };