From df81ef3f22b0516c32be161782c8a46361d69049 Mon Sep 17 00:00:00 2001
From: libccy <libccy@gmail.com>
Date: Sat, 9 Apr 2016 10:55:50 +0800
Subject: [PATCH] scroll

---
 game/game.js            | 49 +++++++++++++++++------------------------
 game/update.js          |  2 +-
 layout/phone/layout.css |  2 +-
 3 files changed, 22 insertions(+), 31 deletions(-)

diff --git a/game/game.js b/game/game.js
index e3b7d56f4..2b70062b2 100755
--- a/game/game.js
+++ b/game/game.js
@@ -12098,6 +12098,15 @@
 	var game={
         online:false,
         onlineID:null,
+        closePopped:function(){
+            if(ui.currentpopped){
+                if(ui.currentpopped._uiintro){
+                    ui.currentpopped._uiintro.delete();
+                    delete ui.currentpopped._uiintro;
+                }
+                delete ui.currentpopped;
+            }
+        },
         broadcast:function(){
             if(!lib.node||!lib.node.clients||game.online) return;
             for(var i=0;i<lib.node.clients.length;i++){
@@ -16987,7 +16996,7 @@
 			dialog:function(){
 				var i;
 				var hidden=false;
-                var noscroll=false;
+                var notouchscroll=false;
 				var dialog=ui.create.div('.dialog');
 				dialog.contentContainer=ui.create.div('.content-container',dialog);
 				dialog.content=ui.create.div('.content',dialog.contentContainer);
@@ -17000,14 +17009,14 @@
 				for(i=0;i<arguments.length;i++){
 					if(typeof arguments[i]=='boolean') dialog.static=arguments[i];
                     else if(arguments[i]=='hidden') hidden=true;
-					else if(arguments[i]=='noscroll') noscroll=true;
+					else if(arguments[i]=='notouchscroll') notouchscroll=true;
 					else dialog.add(arguments[i]);
 				}
 				if(!hidden){
 					dialog.open();
 				}
 				if(!lib.config.touchscreen) dialog.contentContainer.onscroll=ui.update;
-                if(!noscroll){
+                if(!notouchscroll){
                     dialog.contentContainer.ontouchstart=ui.click.dialogtouchStart;
     				dialog.contentContainer.ontouchmove = ui.click.touchScroll;
     				dialog.contentContainer.style.WebkitOverflowScrolling='touch';
@@ -21189,7 +21198,7 @@
 			roundmenu:function(){
 				switch(lib.config.round_menu_func){
 					case 'system':
-                        ui.click.window();
+                        game.closePopped();
 						ui.system1.classList.add('shown');
 						ui.system2.classList.add('shown');
                         if(!ui.menuContainer.classList.contains('hidden')){
@@ -21198,7 +21207,7 @@
                         ui.click.shortcut();
 						break;
 					case 'menu':
-                        ui.click.window();
+                        game.closePopped();
 						game.pause2();
 						ui.click.configMenu();
 						ui.system1.classList.remove('shown');
@@ -21867,7 +21876,7 @@
 						var goswipe=function(action){
 							switch(action){
 								case 'system':
-                                    ui.click.window();
+                                    game.closePopped();
 									ui.system1.classList.add('shown');
 									ui.system2.classList.add('shown');
                                     if(!ui.menuContainer.classList.contains('hidden')){
@@ -21876,7 +21885,7 @@
                                     ui.click.shortcut();
 									break;
 								case 'menu':
-                                    ui.click.window();
+                                    game.closePopped();
 									game.pause2();
 									ui.click.configMenu();
 									ui.system1.classList.remove('shown');
@@ -22455,13 +22464,7 @@
 					_status.tempunpop=false;
 				}
 				else{
-					if(ui.currentpopped){
-						if(ui.currentpopped._uiintro){
-							ui.currentpopped._uiintro.delete();
-							delete ui.currentpopped._uiintro;
-						}
-						delete ui.currentpopped;
-					}
+					game.closePopped();
 				}
 				if(_status.event.custom.add.window){
 					_status.event.custom.add.window(clicked);
@@ -23208,13 +23211,7 @@
 					_status.clickedplayer=false;
 					return;
 				}
-				if(ui.currentpopped){
-					if(ui.currentpopped._uiintro){
-						ui.currentpopped._uiintro.delete();
-						delete ui.currentpopped._uiintro;
-					}
-					delete ui.currentpopped;
-				}
+				game.closePopped();
 				switch(lib.config.right_click){
 					case 'pause':ui.click.pause();break;
 					case 'auto':ui.click.auto();break;
@@ -24605,7 +24602,7 @@
 			}
 		},
 		nodeintro:function(node,simple){
-			var uiintro=ui.create.dialog('hidden','noscroll');
+			var uiintro=ui.create.dialog('hidden','notouchscroll');
 			if(node.classList.contains('player')&&!node.name){
 				return uiintro;
 			}
@@ -25811,13 +25808,7 @@
 		}
 		window.onkeydown=function(e){
 			if(!ui.menuContainer||!ui.menuContainer.classList.contains('hidden')) return;
-			if(ui.currentpopped){
-				if(ui.currentpopped._uiintro){
-					ui.currentpopped._uiintro.delete();
-					delete ui.currentpopped._uiintro;
-				}
-				delete ui.currentpopped;
-			}
+			game.closePopped();
 			var dialogs=document.querySelectorAll('#window>.dialog.popped:not(.static)');
 			for(var i=0;i<dialogs.length;i++){
 				dialogs[i].delete();
diff --git a/game/update.js b/game/update.js
index 677f32148..2d65383bf 100644
--- a/game/update.js
+++ b/game/update.js
@@ -1,5 +1,5 @@
 window.noname_update={
-    version:'1.8.4',
+    version:'1.8.4.1',
     changeLog:[
         '修复完杀和双将bug',
         '旁观可切换视角',
diff --git a/layout/phone/layout.css b/layout/phone/layout.css
index 7c015bd97..44a83525a 100644
--- a/layout/phone/layout.css
+++ b/layout/phone/layout.css
@@ -21,7 +21,7 @@
     z-index: 31 !important;
 }
 #window>.dialog.popped{
-    z-index: 11 !important;
+    z-index: 21 !important;
 }
 #system>div{
     position: absolute;