Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Make sure share dialog goes away when clicking outside of it, including links to other routes

This commit is contained in:
Neil Lalonde 2013-03-27 19:43:37 -04:00
parent e0fc7afc41
commit e263cb81ca
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/assets/javascripts/discourse/views/share_view.js
View File

@ -29,7 +29,9 @@ Discourse.ShareView = Discourse.View.extend({
didInsertElement: function() { didInsertElement: function() {
var _this = this; var _this = this;
$('html').on('click.outside-share-link', function(e) { $('html').on('mousedown.outside-share-link', function(e) {
// Use mousedown instead of click so this event is handled before routing occurs when a
// link is clicked (which is a click event) while the share dialog is showing.
if (_this.$().has(e.target).length !== 0) { if (_this.$().has(e.target).length !== 0) {
return; return;
} }
@ -50,7 +52,7 @@ Discourse.ShareView = Discourse.View.extend({
_this.get('controller').shareLink(e, url); _this.get('controller').shareLink(e, url);
return false; return false;
}); });
$('html').on('keydown.shareView', function(e){ $('html').on('keydown.share-view', function(e){
if (e.keyCode === 27) { if (e.keyCode === 27) {
_this.get('controller').close(); _this.get('controller').close();
} }
@ -59,8 +61,8 @@ Discourse.ShareView = Discourse.View.extend({
willDestroyElement: function() { willDestroyElement: function() {
$('html').off('click.discoure-share-link'); $('html').off('click.discoure-share-link');
$('html').off('click.outside-share-link'); $('html').off('mousedown.outside-share-link');
$('html').off('keydown.shareView'); $('html').off('keydown.share-view');
} }
}); });