Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-03-04 03:21:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Julian Lam
2016-12-06 16:12:42 -05:00
parent 9f9051026b a0d32e953a
commit a2fecf5ae4
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -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",

2
public/src/client/topic/postTools.js
View File

@@ -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();

4
public/src/modules/share.js
View File

@@ -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;
}