You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by ca...@apache.org on 2018/09/24 14:53:00 UTC

[royale-asjs] branch develop updated: fix Alert removing scroll blocking when dismiss

This is an automated email from the ASF dual-hosted git repository.

carlosrovira pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git


The following commit(s) were added to refs/heads/develop by this push:
     new 11cfc28  fix Alert removing scroll blocking when dismiss
11cfc28 is described below

commit 11cfc2841cc94b787cc88fc22e25f8841098911c
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Mon Sep 24 16:52:52 2018 +0200

    fix Alert removing scroll blocking when dismiss
---
 .../projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as   | 4 ++++
 .../org/apache/royale/jewel/beads/controllers/AlertController.as      | 1 +
 .../src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as  | 2 --
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as
index a30b9bb..74ebed3 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Alert.as
@@ -223,6 +223,9 @@ package org.apache.royale.jewel
 					{
 						window["dialogPolyfill"]["registerDialog"](dialog);
 					}
+
+					//avoid scroll in html
+					document.body.classList.add("viewport");
 				}
 			}
 		}
@@ -320,6 +323,7 @@ package org.apache.royale.jewel
 		{
 			COMPILE::JS
 			{
+				document.body.classList.remove("viewport");
 				dialog.close();
 			}
 		}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/AlertController.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/AlertController.as
index 4191c8d..0f4d1de 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/AlertController.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controllers/AlertController.as
@@ -93,6 +93,7 @@ package org.apache.royale.jewel.beads.controllers
 
 			COMPILE::JS
 			{
+				document.body.classList.remove("viewport");
 				var host:UIBase = strand as UIBase;
                 var htmlElement:HTMLElement = host.element as HTMLElement;
                 htmlElement.parentElement.removeChild(host.element);
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
index 367aaec..2b9b0bc 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/views/AlertView.as
@@ -194,8 +194,6 @@ package org.apache.royale.jewel.beads.views
 			COMPILE::JS
 			{
 				UIBase(_strand).element.classList.add("open");
-				//avoid scroll in html
-				document.body.classList.add("viewport");
 			}
 		}