Skip to content

Commit

Permalink
Version 2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
kasimi committed Sep 1, 2018
1 parent 6697ddf commit b1a67fc
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": [
Expand Down
17 changes: 10 additions & 7 deletions styles/all/template/javascript/mchat.js
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand All @@ -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');
}
}
}
};
Expand Down

0 comments on commit b1a67fc

Please sign in to comment.