You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by pi...@apache.org on 2019/08/21 14:33:16 UTC

[royale-asjs] branch develop updated: jewel-snackbar: Fix dismissing Snackbar

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

piotrz 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 50592b5  jewel-snackbar: Fix dismissing Snackbar
50592b5 is described below

commit 50592b55565b4ad8aa776a7ded403da2d70d54a4
Author: Piotr Zarzycki <pi...@gmail.com>
AuthorDate: Wed Aug 21 16:33:06 2019 +0200

    jewel-snackbar: Fix dismissing Snackbar
    
    - Rename parameter from parent to parentContainer to avoid naming issue
---
 .../royale/org/apache/royale/jewel/Snackbar.as     | 25 ++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as
index 295e834..6833af2 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/Snackbar.as
@@ -66,6 +66,8 @@ package org.apache.royale.jewel
 			typeNames = "jewel snackbar layout";
 		}
 
+		private var _isAddedToParent:Boolean;
+
 		/**
 		 *  Action event name.
          * 
@@ -187,16 +189,18 @@ package org.apache.royale.jewel
 		 *  @playerversion AIR 2.6
 		 *  @productversion Royale 0.9.4
 		 */
-		public function show(parent:Object = null) : void
+		public function show(parentContainer:Object = null) : void
 		{
             COMPILE::JS
 			{
-				if (parent)
+				if (parentContainer)
 				{
-					parent.element.appendChild(element);
+					_isAddedToParent = true;
+                    parentContainer.element.appendChild(element);
 				}
 				else
 				{
+					_isAddedToParent = false;
 					var body:HTMLElement = document.getElementsByTagName('body')[0];
 					body.appendChild(element);
 				}
@@ -205,7 +209,7 @@ package org.apache.royale.jewel
 
             COMPILE::SWF
 			{
-				parent.addElement(this);
+                parentContainer.addElement(this);
 			}
 		}
 
@@ -223,8 +227,17 @@ package org.apache.royale.jewel
 			{
 				removeAllListeners();
 
-				var body:HTMLElement = document.getElementsByTagName('body')[0];
-				body.removeChild(element);
+				if (_isAddedToParent)
+				{
+					parent["element"].removeChild(element);
+				}
+				else
+				{
+					var body:HTMLElement = document.getElementsByTagName('body')[0];
+					body.removeChild(element);
+				}
+
+				_isAddedToParent = false;
 			}
 		}
 	}