From 48e72f75a47af1a86fdcc0b5e7a8a4802f4ad73e Mon Sep 17 00:00:00 2001
From: devezhao-mac <zhaofang123@gmail.com>
Date: Tue, 30 Oct 2018 19:36:49 +0800
Subject: [PATCH] icon

---
 src/main/webapp/commons/search-icon.jsp   |  1 +
 src/main/webapp/settings/nav-settings.jsp | 13 +++++--------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/main/webapp/commons/search-icon.jsp b/src/main/webapp/commons/search-icon.jsp
index 00116de35..c21c64a07 100644
--- a/src/main/webapp/commons/search-icon.jsp
+++ b/src/main/webapp/commons/search-icon.jsp
@@ -24,6 +24,7 @@ $(document).ready(function(){
 		let a = $('<a data-icon="' + this + '" title="' + this.toUpperCase() + '"><i class="zmdi zmdi-' + this + '"></a>').appendTo('#icons');
 		a.click(function(){
 			call($(this).data('icon'))
+			console.log($(this).data('icon') + ',')
 		});
 	});
 });
diff --git a/src/main/webapp/settings/nav-settings.jsp b/src/main/webapp/settings/nav-settings.jsp
index 36c17dd31..9e97d8d6c 100644
--- a/src/main/webapp/settings/nav-settings.jsp
+++ b/src/main/webapp/settings/nav-settings.jsp
@@ -92,16 +92,13 @@ $(document).ready(function(){
 			$('.J_menuName').val(name)
 		}
 	})
-	iconModal = null
 	$('.J_menuIcon').click(function(){
-		if (iconModal) iconModal.show()
-		else{
-			parent.icon_call = function(s){
-				$('.J_menuIcon .zmdi').attr('class', 'zmdi zmdi-' + s)
-				iconModal.hide()
-			}
-			iconModal = parent.rb.modal(rb.baseUrl + '/page/commons/search-icon', '选择图标')
+		let url = rb.baseUrl + '/page/commons/search-icon'
+		parent.clickIcon = function(s){
+			$('.J_menuIcon .zmdi').attr('class', 'zmdi zmdi-' + s)
+			parent.rb.modalHide(url)
 		}
+		parent.rb.modal(url, '选择图标')
 	})
 	
 	$('.J_menuConfirm').click(function(){