From 0965fc5a05b60ef7b8991a4c49c79e331cbecfb2 Mon Sep 17 00:00:00 2001
From: Steve Howell <showell30@yahoo.com>
Date: Fri, 5 May 2017 16:04:45 -0700
Subject: [PATCH] Use modal.open_overlay() in settings/admin.

---
 static/js/admin.js    |  2 +-
 static/js/modals.js   | 10 ++++++++++
 static/js/settings.js |  8 ++------
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/static/js/admin.js b/static/js/admin.js
index a7c9c4ed75..2aa8715e0e 100644
--- a/static/js/admin.js
+++ b/static/js/admin.js
@@ -83,7 +83,7 @@ exports.launch_page = function (tab) {
         $(".sidebar .ind-tab[data-tab-key='organization']").click();
     }
 
-    $("#settings_overlay_container").addClass("show");
+    modals.open_settings();
     $active_tab.click();
 };
 
diff --git a/static/js/modals.js b/static/js/modals.js
index 20a64a2a2b..364ba27c59 100644
--- a/static/js/modals.js
+++ b/static/js/modals.js
@@ -40,6 +40,16 @@ exports.close_modal = function (name) {
     }
 };
 
+exports.open_settings = function () {
+    modals.open_overlay({
+        name: 'settings',
+        overlay: $("#settings_overlay_container"),
+        on_close: function () {
+            hashchange.exit_modal();
+        },
+    });
+};
+
 $(function () {
     $("body").on("click", ".overlay, .overlay .exit", function (e) {
         var $target = $(e.target);
diff --git a/static/js/settings.js b/static/js/settings.js
index 36e87a72fd..c439763221 100644
--- a/static/js/settings.js
+++ b/static/js/settings.js
@@ -41,11 +41,6 @@ $("body").ready(function () {
     });
 
     $("body").on("click", "[data-sidebar-form-close]", close_sidebar);
-
-    function settings_close_modal() {
-        hashchange.exit_modal();
-    }
-    modals.set_close_handler("settings", settings_close_modal);
 });
 
 
@@ -92,7 +87,8 @@ exports.launch_page = function (tab) {
         $(".sidebar .ind-tab[data-tab-key='settings']").click();
     }
 
-    $("#settings_overlay_container").addClass("show");
+    modals.open_settings();
+
     $active_tab.click();
 };