paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

modals: Implement new modal methods.

Browse Source
This commit is contained in:
Cynthia Lin
2017-08-29 10:05:30 -07:00
committed by showell
parent aa21b2bce6
commit f697e6bb0e
3 changed files with 7 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/js/hotkey.js
View File

@@ -160,10 +160,6 @@ exports.is_editing_stream_name = function (e) {
return $(e.target).is(".editable-section"); return $(e.target).is(".editable-section");
}; };
exports.is_modal_open = function () {
return $(".modal").hasClass("in");
};
// Returns true if we handled it, false if the browser should. // Returns true if we handled it, false if the browser should.
exports.process_escape_key = function (e) { exports.process_escape_key = function (e) {
var row; var row;
@@ -172,8 +168,8 @@ exports.process_escape_key = function (e) {
return false; return false;
} }
if (exports.is_modal_open()) { if (overlays.is_modal_open()) {
$(".modal").modal("hide").attr("aria-hidden", false); overlays.close_active_modal();
return true; return true;
} }

4
static/js/settings_account.js
View File

@@ -149,7 +149,7 @@ exports.set_up = function () {
$('#change_email_button').on('click', function (e) { $('#change_email_button').on('click', function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
$('#change_email_modal').modal('hide'); overlays.close_modal('change_email_modal');
var data = {}; var data = {};
data.email = $('.email_change_container').find("input[name='email']").val(); data.email = $('.email_change_container').find("input[name='email']").val();
@@ -173,7 +173,7 @@ exports.set_up = function () {
$('#change_email').on('click', function (e) { $('#change_email').on('click', function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
$('#change_email_modal').modal('show'); overlays.open_modal('change_email_modal');
var email = $('#email_value').text().trim(); var email = $('#email_value').text().trim();
$('.email_change_container').find("input[name='email']").val(email); $('.email_change_container').find("input[name='email']").val(email);
}); });

8
static/js/settings_display.js
View File

@@ -9,15 +9,13 @@ exports.set_up = function () {
$("#emojiset_select").val(page_params.emojiset); $("#emojiset_select").val(page_params.emojiset);
$("#default_language_modal [data-dismiss]").click(function () { $("#default_language_modal [data-dismiss]").click(function () {
$('#default_language_modal').attr('aria-hidden', true); overlays.close_modal('default_language_modal');
$("#default_language_modal").fadeOut(300);
}); });
$("#default_language_modal .language").click(function (e) { $("#default_language_modal .language").click(function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
$('#default_language_modal').show().attr('aria-hidden', true); overlays.close_modal('default_language_modal');
$('#default_language_modal').fadeOut(300);
var data = {}; var data = {};
var $link = $(e.target).closest("a[data-code]"); var $link = $(e.target).closest("a[data-code]");
@@ -46,7 +44,7 @@ exports.set_up = function () {
$('#default_language').on('click', function (e) { $('#default_language').on('click', function (e) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
$('#default_language_modal').show().attr('aria-hidden', false); overlays.open_modal('default_language_modal');
}); });
$("#high_contrast_mode").change(function () { $("#high_contrast_mode").change(function () {