Merge remote-tracking branch 'origin/master' into flagging-refactor

v1.18.x
Julian Lam 8 years ago
commit a2fecf5ae4

@ -52,7 +52,7 @@
"morgan": "^1.3.2",
"mousetrap": "^1.5.3",
"nconf": "~0.8.2",
"nodebb-plugin-composer-default": "4.3.1",
"nodebb-plugin-composer-default": "4.3.2",
"nodebb-plugin-dbsearch": "1.0.4",
"nodebb-plugin-emoji-extended": "1.1.1",
"nodebb-plugin-emoji-one": "1.1.5",

@ -15,7 +15,7 @@ define('forum/topic/postTools', ['share', 'navigator', 'components', 'translator
addPostHandlers(tid);
share.addShareHandlers(ajaxify.data.title);
share.addShareHandlers(ajaxify.data.titleRaw);
addVoteHandler();

@ -1,6 +1,6 @@
'use strict';
/* globals define */
/* globals define, config */
define('share', function () {
@ -11,7 +11,7 @@ define('share', function () {
var baseUrl = window.location.protocol + '//' + window.location.host;
function openShare(url, urlToPost, width, height) {
window.open(url + encodeURIComponent(baseUrl + urlToPost), '_blank', 'width=' + width + ',height=' + height + ',scrollbars=no,status=no');
window.open(url + encodeURIComponent(baseUrl + config.relative_path + urlToPost), '_blank', 'width=' + width + ',height=' + height + ',scrollbars=no,status=no');
return false;
}

Loading…
Cancel
Save