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 2020/10/28 15:47:49 UTC
[royale-asjs] branch develop updated: jewel-topappbar: some
refactoring and fixes
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 cab15e8 jewel-topappbar: some refactoring and fixes
cab15e8 is described below
commit cab15e8a98c38d7b315866e26987a4ab389365c5
Author: Carlos Rovira <ca...@apache.org>
AuthorDate: Wed Oct 28 16:47:16 2020 +0100
jewel-topappbar: some refactoring and fixes
---
.../apache/royale/jewel/ApplicationMainContent.as | 11 ----------
.../royale/org/apache/royale/jewel/TopAppBar.as | 24 +++-------------------
2 files changed, 3 insertions(+), 32 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as
index 1fdfad9..d35f11f 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/ApplicationMainContent.as
@@ -53,7 +53,6 @@ package org.apache.royale.jewel
}
private var _hasTopAppBar:Boolean;
-
/**
* a boolean flag to indicate if the container needs to make some room
* for a TopAppBar so content doesn't be hide
@@ -73,16 +72,11 @@ package org.apache.royale.jewel
if (_hasTopAppBar != value)
{
_hasTopAppBar = value;
-
- COMPILE::JS
- {
toggleClass("has-topappbar", _hasTopAppBar);
- }
}
}
private var _hasFooterBar:Boolean;
-
/**
* a boolean flag to indicate if the container needs to make some room
* for a FooterBar so content doesn't be hide
@@ -96,17 +90,12 @@ package org.apache.royale.jewel
{
return _hasFooterBar;
}
-
public function set hasFooterBar(value:Boolean):void
{
if (_hasFooterBar != value)
{
_hasFooterBar = value;
-
- COMPILE::JS
- {
toggleClass("has-footerbar", _hasFooterBar);
- }
}
}
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TopAppBar.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TopAppBar.as
index a3a53f0..e39c6fe 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TopAppBar.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/TopAppBar.as
@@ -18,12 +18,6 @@
////////////////////////////////////////////////////////////////////////////////
package org.apache.royale.jewel
{
- COMPILE::SWF
- {
- import flash.display.DisplayObject;
-
- import org.apache.royale.core.IRenderedObject;
- }
import org.apache.royale.events.Event;
/**
@@ -52,7 +46,6 @@ package org.apache.royale.jewel
super();
typeNames = "jewel topappbar";
- setListenersForFixed();
}
override protected function get headerClassName():String
@@ -69,14 +62,13 @@ package org.apache.royale.jewel
{
COMPILE::JS
{
+ element.classList.toggle("fixed", _fixed);
if(_fixed)
{
- element.classList.add("fixed");
window.removeEventListener('scroll', scrollHandler, false);
}
else
{
- element.classList.remove("fixed");
window.addEventListener('scroll', scrollHandler, false);
}
}
@@ -137,8 +129,6 @@ package org.apache.royale.jewel
if (_fixed != value)
{
_fixed = value;
-
- //toggleClass("fixed", _fixed);
setListenersForFixed();
}
}
@@ -164,18 +154,10 @@ package org.apache.royale.jewel
if (_hasDrawer != value)
{
_hasDrawer = value;
-
- COMPILE::JS
- {
- if(_hasDrawer)
- {
- element.classList.add("has-drawer");
- }
- else
+ COMPILE::JS
{
- element.classList.remove("has-drawer");
+ element.classList.toggle("has-drawer", _hasDrawer);
}
- }
}
}
}