Skip to content
This repository was archived by the owner on Mar 15, 2018. It is now read-only.

Commit ae2f5bb

Browse files
committed
do not let "Add Bango Account" form be dismissed by clicking outside (bug 838204)
1 parent 899ebbd commit ae2f5bb

File tree

4 files changed

+25
-10
lines changed

4 files changed

+25
-10
lines changed

media/js/devreg/payments-manage.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,10 @@ define('payments-manage', ['payments'], function(payments) {
77
}
88

99
function newBangoPaymentAccount(e) {
10-
var $overlay = payments.getOverlay('add-bango-account');
10+
var $overlay = payments.getOverlay({
11+
'id': 'add-bango-account',
12+
'class': 'undismissable'
13+
});
1114
payments.setupPaymentAccountOverlay($overlay, showAgreement);
1215
}
1316

media/js/devreg/payments.js

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,15 @@
11
define('payments', [], function() {
22
'use strict';
33

4-
function getOverlay(name) {
4+
function getOverlay(opts) {
5+
var id = opts;
6+
if (_.isObject(opts)) {
7+
id = opts.id;
8+
}
59
$('.overlay').remove();
610
z.body.addClass('overlayed');
7-
var overlay = makeOrGetOverlay(name);
8-
overlay.html($('#' + name + '-template').html())
11+
var overlay = makeOrGetOverlay(opts);
12+
overlay.html($('#' + id + '-template').html())
913
.addClass('show')
1014
.on('click', '.close', _pd(function() {
1115
overlay.trigger('overlay_dismissed').remove();

media/js/mkt/overlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
});
1919

2020
// Dismiss overlay when we click outside of it.
21-
z.win.on('click', '.overlay', function(e) {
21+
z.win.on('click', '.overlay:not(.undismissable)', function(e) {
2222
if ($(e.target).parent('body').length) {
2323
dismiss();
2424
}

media/js/mkt/utils.js

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -72,13 +72,21 @@ $.fn.exists = function(callback, args) {
7272
return !!len;
7373
};
7474

75-
function makeOrGetOverlay(id) {
76-
var el = document.getElementById(id);
77-
if (!el) {
78-
el = $('<div class="overlay" id="' + id +'">');
75+
function makeOrGetOverlay(opts) {
76+
var classes = 'overlay',
77+
id = opts;
78+
if (_.isObject(opts)) {
79+
if ('class' in opts) {
80+
classes += ' ' + opts.class;
81+
}
82+
id = opts.id;
83+
}
84+
var el = $('#' + id);
85+
if (!el.length) {
86+
el = $('<div class="' + classes + '" id="' + id +'">');
7987
$('body').append(el);
8088
}
81-
return $(el);
89+
return el;
8290
}
8391

8492
function getTemplate($el) {

0 commit comments

Comments
 (0)