diff --git a/package.json b/package.json index 5ba0ddfbd4..1cb47da746 100644 --- a/package.json +++ b/package.json @@ -38,7 +38,7 @@ "prompt": "~0.2.11", "uglify-js": "~2.4.0", "validator": "~1.5.1", - "nodebb-plugin-mentions": "~0.2", + "nodebb-plugin-mentions": "~0.3", "nodebb-plugin-markdown": "~0.3", "nodebb-theme-vanilla": "~0.0.13", "nodebb-theme-cerulean": "~0.0.12", diff --git a/public/src/forum/admin/groups.js b/public/src/forum/admin/groups.js index 2a7d256364..16283d9150 100644 --- a/public/src/forum/admin/groups.js +++ b/public/src/forum/admin/groups.js @@ -171,13 +171,17 @@ define(function() { groupMembersEl.on('click', 'li[data-uid]', function() { var uid = this.getAttribute('data-uid'), gid = detailsModal.attr('data-gid'); - - socket.emit('admin.groups.leave', { - gid: gid, - uid: uid - }, function(err, data) { - if (!err) { - groupMembersEl.find('li[data-uid="' + uid + '"]').remove(); + + bootbox.confirm('Are you sure you want to remove this user?', function(confirm) { + if (confirm){ + socket.emit('admin.groups.leave', { + gid: gid, + uid: uid + }, function(err, data) { + if (!err) { + groupMembersEl.find('li[data-uid="' + uid + '"]').remove(); + } + }); } }); }); diff --git a/public/src/forum/admin/themes.js b/public/src/forum/admin/themes.js index 5163f0df1d..7c0baaa568 100644 --- a/public/src/forum/admin/themes.js +++ b/public/src/forum/admin/themes.js @@ -114,7 +114,7 @@ define(function() { for (var x = 0; x < numThemes; x++) { var theme = bootswatch.themes[x]; - themeEl.setAttribute('data-css', theme.cssMin); + themeEl.setAttribute('data-css', theme.cssCdn); themeEl.setAttribute('data-theme', theme.name); themeEl.innerHTML = '' + '
' + diff --git a/public/src/modules/chat.js b/public/src/modules/chat.js index 6aecfe0271..f79271a94e 100644 --- a/public/src/modules/chat.js +++ b/public/src/modules/chat.js @@ -131,7 +131,8 @@ define(['taskbar', 'string'], function(taskbar, S) { chatModal.draggable({ start:function() { module.bringModalToTop(chatModal); - } + }, + handle: '.modal-header' }); chatModal.find('#chat-with-name').html(username); diff --git a/public/templates/admin/groups.tpl b/public/templates/admin/groups.tpl index fa23608102..40ceae9669 100644 --- a/public/templates/admin/groups.tpl +++ b/public/templates/admin/groups.tpl @@ -95,4 +95,4 @@
- + \ No newline at end of file