From f697e6bb0e4a119bfb5dbd07ecbbdb8f4d413c24 Mon Sep 17 00:00:00 2001
From: Cynthia Lin <cynthialin1004@gmail.com>
Date: Tue, 29 Aug 2017 10:05:30 -0700
Subject: [PATCH] modals: Implement new modal methods.

---
 static/js/hotkey.js           | 8 ++------
 static/js/settings_account.js | 4 ++--
 static/js/settings_display.js | 8 +++-----
 3 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/static/js/hotkey.js b/static/js/hotkey.js
index 855916174f..744c05b0c2 100644
--- a/static/js/hotkey.js
+++ b/static/js/hotkey.js
@@ -160,10 +160,6 @@ exports.is_editing_stream_name = function (e) {
     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.
 exports.process_escape_key = function (e) {
     var row;
@@ -172,8 +168,8 @@ exports.process_escape_key = function (e) {
         return false;
     }
 
-    if (exports.is_modal_open()) {
-        $(".modal").modal("hide").attr("aria-hidden", false);
+    if (overlays.is_modal_open()) {
+        overlays.close_active_modal();
         return true;
     }
 
diff --git a/static/js/settings_account.js b/static/js/settings_account.js
index a46d98ee03..a045640a24 100644
--- a/static/js/settings_account.js
+++ b/static/js/settings_account.js
@@ -149,7 +149,7 @@ exports.set_up = function () {
     $('#change_email_button').on('click', function (e) {
         e.preventDefault();
         e.stopPropagation();
-        $('#change_email_modal').modal('hide');
+        overlays.close_modal('change_email_modal');
 
         var data = {};
         data.email = $('.email_change_container').find("input[name='email']").val();
@@ -173,7 +173,7 @@ exports.set_up = function () {
     $('#change_email').on('click', function (e) {
         e.preventDefault();
         e.stopPropagation();
-        $('#change_email_modal').modal('show');
+        overlays.open_modal('change_email_modal');
         var email = $('#email_value').text().trim();
         $('.email_change_container').find("input[name='email']").val(email);
     });
diff --git a/static/js/settings_display.js b/static/js/settings_display.js
index cdaac00018..0851a57af5 100644
--- a/static/js/settings_display.js
+++ b/static/js/settings_display.js
@@ -9,15 +9,13 @@ exports.set_up = function () {
     $("#emojiset_select").val(page_params.emojiset);
 
     $("#default_language_modal [data-dismiss]").click(function () {
-      $('#default_language_modal').attr('aria-hidden', true);
-      $("#default_language_modal").fadeOut(300);
+        overlays.close_modal('default_language_modal');
     });
 
     $("#default_language_modal .language").click(function (e) {
         e.preventDefault();
         e.stopPropagation();
-        $('#default_language_modal').show().attr('aria-hidden', true);
-        $('#default_language_modal').fadeOut(300);
+        overlays.close_modal('default_language_modal');
 
         var data = {};
         var $link = $(e.target).closest("a[data-code]");
@@ -46,7 +44,7 @@ exports.set_up = function () {
     $('#default_language').on('click', function (e) {
         e.preventDefault();
         e.stopPropagation();
-        $('#default_language_modal').show().attr('aria-hidden', false);
+        overlays.open_modal('default_language_modal');
     });
 
     $("#high_contrast_mode").change(function () {