standardised afterHide calls for ui factory

(cherry picked from commit b034858d39)

src/client/ui/factory.js

@@ -125,25 +125,16 @@ define([
 
 		onUiKeyDown: function (keyEvent) {
 			if (keyEvent.key === 'esc') {
-				const closedUis = [];
-
 				this.uis.forEach(u => {
 					if (!u.modal || !u.shown)
 						return;
 
 					keyEvent.consumed = true;
 					u.hide();
-
-					closedUis.push(u);
 				});
 				
 				$('.uiOverlay').hide();
 				events.emit('onHideContextMenu');
-
-				closedUis.forEach(c => {
-					if (c.afterHide)
-						c.afterHide();
-				});
 			} else if (['o', 'j', 'h', 'i'].indexOf(keyEvent.key) > -1)
 				$('.uiOverlay').hide();
 		},

src/client/ui/templates/options/options.js

@@ -172,10 +172,8 @@ define([
 				events.emit('onShowOverlay', this.el);
 
 				this.build();
-			} else {
+			} else
 				this.hide();
-				events.emit('onToggleMainMenu');
-			}
 		},
         
 		onKeyDown: function (keyEvent) {

src/client/ui/uiBase.js

@@ -118,6 +118,9 @@ define([
 
 			this.shown = false;
 			this.el.hide();
+
+			if (this.afterHide)
+				this.afterHide();
 		},
 
 		destroy: function () {