github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-27 10:50:22 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix inefficent jQuery usage

Browse Source 
Some jQueries can be cached and reused. This commit does that.
This commit is contained in:
riking 2014-03-18 18:27:15 -07:00
parent a871158c80
commit 8136468ec7
2 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/assets/javascripts/discourse/views/modal/modal_body_view.js
View File

@ -12,9 +12,10 @@ Discourse.ModalBodyView = Discourse.View.extend({
didInsertElement: function() {
var self = this;
$('#discourse-modal').modal('show');
var $discourseModal = $('#discourse-modal');
$('#discourse-modal').one("hide", function () {
$discourseModal.modal('show');
$discourseModal.one("hide", function () {
self.get("controller").send("closeModal");
});

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

@ -39,8 +39,9 @@ Discourse.ShareView = Discourse.View.extend({
}.observes('controller.link'),
didInsertElement: function() {
var shareView = this;
$('html').on('mousedown.outside-share-link', function(e) {
var shareView = this,
$html = $('html');
$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 (shareView.$().has(e.target).length !== 0) { return; }
@ -49,9 +50,10 @@ Discourse.ShareView = Discourse.View.extend({
return true;
});
$('html').on('click.discoure-share-link', '[data-share-url]', function(e) {
$html.on('click.discoure-share-link', '[data-share-url]', function(e) {
e.preventDefault();
var $currentTarget = $(e.currentTarget);
var $currentTarget = $(e.currentTarget),
$shareLink = $('#share-link');
var url = $currentTarget.data('share-url');
var postNumber = $currentTarget.data('post-number');
// Relative urls
@ -60,7 +62,7 @@ Discourse.ShareView = Discourse.View.extend({
url = window.location.protocol + "//" + window.location.host + url;
}
var shareLinkWidth = $('#share-link').width();
var shareLinkWidth = $shareLink.width();
var x = e.pageX - (shareLinkWidth / 2);
if (x < 25) {
x = 25;
@ -70,12 +72,12 @@ Discourse.ShareView = Discourse.View.extend({
}
var header = $('.d-header');
var y = e.pageY - ($('#share-link').height() + 20);
var y = e.pageY - ($shareLink.height() + 20);
if (y < header.offset().top + header.height()) {
y = e.pageY + 10;
}
$('#share-link').css({
$shareLink.css({
left: "" + x + "px",
top: "" + y + "px"
});
@ -84,7 +86,7 @@ Discourse.ShareView = Discourse.View.extend({
return false;
});
$('html').on('keydown.share-view', function(e){
$html.on('keydown.share-view', function(e){
if (e.keyCode === 27) {
shareView.get('controller').send('close');
}
@ -92,9 +94,10 @@ Discourse.ShareView = Discourse.View.extend({
},
willDestroyElement: function() {
$('html').off('click.discoure-share-link');
$('html').off('mousedown.outside-share-link');
$('html').off('keydown.share-view');
var $html = $('html');
$html.off('click.discoure-share-link');
$html.off('mousedown.outside-share-link');
$html.off('keydown.share-view');
}
});