You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by hi...@apache.org on 2022/03/30 01:00:07 UTC
[royale-asjs] branch develop updated (2cdd988 -> 63c2080)
This is an automated email from the ASF dual-hosted git repository.
hiedra pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git.
from 2cdd988 Merge branch 'release/0.9.9' into develop
new d9d123a Some fixs with the ResponsiveSize bead (percen sizes, responsive breakpoints).
new 63c2080 [TDJ] Min fix MainContent (Error for null object)
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../TourDeJewel/src/main/royale/MainContent.mxml | 2 +
.../royale/jewel/beads/controls/ResponsiveSize.as | 107 +++++++++++++--------
2 files changed, 70 insertions(+), 39 deletions(-)
[royale-asjs] 02/02: [TDJ] Min fix MainContent (Error for null object)
Posted by hi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hiedra pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit 63c2080439f422129b5d93660ab22b447575e931
Author: mjesteve <mj...@iest.com>
AuthorDate: Wed Mar 30 02:58:51 2022 +0200
[TDJ] Min fix MainContent (Error for null object)
---
examples/jewel/TourDeJewel/src/main/royale/MainContent.mxml | 2 ++
1 file changed, 2 insertions(+)
diff --git a/examples/jewel/TourDeJewel/src/main/royale/MainContent.mxml b/examples/jewel/TourDeJewel/src/main/royale/MainContent.mxml
index 21c7d62..e2dc5ff 100644
--- a/examples/jewel/TourDeJewel/src/main/royale/MainContent.mxml
+++ b/examples/jewel/TourDeJewel/src/main/royale/MainContent.mxml
@@ -144,6 +144,8 @@ limitations under the License.
{
currentNavOption = (event.target as Navigation).selectedItem as NavigationLinkVO;
currentNavOption = currentNavOption.selectedChild;
+ if( !currentNavOption )
+ return;
router.routeState.title = currentNavOption.label;
router.routeState.path = currentNavOption.hash;
[royale-asjs] 01/02: Some fixs with the ResponsiveSize bead (percen sizes, responsive breakpoints).
Posted by hi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hiedra pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git
commit d9d123a56d2a1d59f2e7f103a74c55056a417df0
Author: mjesteve <mj...@iest.com>
AuthorDate: Wed Mar 30 02:51:40 2022 +0200
Some fixs with the ResponsiveSize bead (percen sizes, responsive breakpoints).
---
.../royale/jewel/beads/controls/ResponsiveSize.as | 107 +++++++++++++--------
1 file changed, 68 insertions(+), 39 deletions(-)
diff --git a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as
index f45cbc6..83debfe 100644
--- a/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as
+++ b/frameworks/projects/Jewel/src/main/royale/org/apache/royale/jewel/beads/controls/ResponsiveSize.as
@@ -21,6 +21,7 @@ package org.apache.royale.jewel.beads.controls
import org.apache.royale.core.IBead;
import org.apache.royale.core.IStrand;
import org.apache.royale.core.StyledUIBase;
+ import org.apache.royale.events.IEventDispatcher;
import org.apache.royale.events.Event;
import org.apache.royale.jewel.supportClasses.ResponsiveSizes;
@@ -226,6 +227,8 @@ package org.apache.royale.jewel.beads.controls
private var control:StyledUIBase;
private var originalWidth:Number = NaN;
private var originalHeight:Number = NaN;
+ private var originalPercenWidth:Number = NaN;
+ private var originalPercenHeight:Number = NaN;
/**
* @copy org.apache.royale.core.IBead#strand
@@ -243,15 +246,18 @@ package org.apache.royale.jewel.beads.controls
originalWidth = control.width;
if(control.height != 0)
originalHeight = control.height;
- // trace("originalWidth",originalWidth)
- // trace("originalHeight",originalHeight)
+ if(control.percentWidth != 0)
+ originalPercenWidth = control.percentWidth;
+ if(control.percentHeight != 0)
+ originalPercenHeight = control.percentHeight;
COMPILE::JS
{
window.addEventListener('resize', resizeHandler, false);
}
+
resizeHandler();
- }
+ }
/**
* to check only width
@@ -265,17 +271,15 @@ package org.apache.royale.jewel.beads.controls
{
COMPILE::JS
{
- if(outerWidth == document.body.getBoundingClientRect().width)
+ var widthall:Number = document.body.getBoundingClientRect().width;
+ if(outerWidth == widthall)
return;
- control.percentWidth = NaN;
- control.percentHeight = NaN;
-
- outerWidth = document.body.getBoundingClientRect().width;
+ outerWidth = widthall;
var responsiveFlag:Boolean = false;
- if(outerWidth < ResponsiveSizes.FULL_BREAKPOINT && outerWidth > ResponsiveSizes.WIDESCREEN_BREAKPOINT)
+ if(outerWidth < ResponsiveSizes.FULL_BREAKPOINT && outerWidth >= ResponsiveSizes.WIDESCREEN_BREAKPOINT)
{
if(!isNaN(widescreenWidth) || !isNaN(widescreenHeight))
{
@@ -285,15 +289,19 @@ package org.apache.royale.jewel.beads.controls
if(widescreenHeight != originalHeight)
control.height = widescreenHeight;
responsiveFlag = true;
- }
- if(!isNaN(widescreenPercentWidth))
- control.percentWidth = widescreenPercentWidth;
+ }
+ if( !isNaN(widescreenPercentWidth) || !isNaN(widescreenPercentHeight) )
+ {
+ if(widescreenPercentWidth != originalPercenWidth)
+ control.percentWidth = widescreenPercentWidth;
+ if(widescreenPercentHeight != originalPercenHeight)
+ control.percentHeight = widescreenPercentHeight;
+ responsiveFlag = true;
- if(!isNaN(widescreenPercentHeight))
- control.percentHeight = widescreenPercentHeight;
+ }
}
- else if(outerWidth < ResponsiveSizes.WIDESCREEN_BREAKPOINT && outerWidth > ResponsiveSizes.DESKTOP_BREAKPOINT)
+ else if(outerWidth < ResponsiveSizes.WIDESCREEN_BREAKPOINT && outerWidth >= ResponsiveSizes.DESKTOP_BREAKPOINT)
{
if(!isNaN(desktopWidth) || !isNaN(desktopHeight))
{
@@ -303,15 +311,19 @@ package org.apache.royale.jewel.beads.controls
if(desktopHeight != originalHeight)
control.height = desktopHeight;
responsiveFlag = true;
- }
- if(!isNaN(desktopPercentWidth))
- control.percentWidth = desktopPercentWidth;
+ }
+ if( !isNaN(desktopPercentWidth) || !isNaN(desktopPercentHeight) )
+ {
+ if(desktopPercentWidth != originalPercenWidth)
+ control.percentWidth = desktopPercentWidth;
+ if(desktopPercentHeight != originalPercenHeight)
+ control.percentHeight = desktopPercentHeight;
+ responsiveFlag = true;
- if(!isNaN(desktopPercentHeight))
- control.percentHeight = desktopPercentHeight;
+ }
}
- else if(outerWidth < ResponsiveSizes.DESKTOP_BREAKPOINT && outerWidth > ResponsiveSizes.TABLET_BREAKPOINT)
+ else if(outerWidth < ResponsiveSizes.DESKTOP_BREAKPOINT && outerWidth >= ResponsiveSizes.TABLET_BREAKPOINT)
{
if(!isNaN(tabletWidth) || !isNaN(tabletHeight))
{
@@ -321,15 +333,19 @@ package org.apache.royale.jewel.beads.controls
if(tabletHeight != originalHeight)
control.height = tabletHeight;
responsiveFlag = true;
+
}
+ if( !isNaN(tabletPercentWidth) || !isNaN(tabletPercentHeight) )
+ {
+ if(tabletPercentWidth != originalPercenWidth)
+ control.percentWidth = tabletPercentWidth;
+ if(tabletPercentHeight != originalPercenHeight)
+ control.percentHeight = tabletPercentHeight;
+ responsiveFlag = true;
- if(!isNaN(tabletPercentWidth))
- control.percentWidth = tabletPercentWidth;
-
- if(!isNaN(tabletPercentHeight))
- control.percentHeight = tabletPercentHeight;
+ }
}
- else if(outerWidth < ResponsiveSizes.TABLET_BREAKPOINT && outerWidth > ResponsiveSizes.PHONE_BREAKPOINT)
+ else if(outerWidth < ResponsiveSizes.TABLET_BREAKPOINT && outerWidth >= ResponsiveSizes.PHONE_BREAKPOINT)
{
if(!isNaN(phoneWidth) || !isNaN(phoneHeight))
{
@@ -339,23 +355,36 @@ package org.apache.royale.jewel.beads.controls
if(phoneHeight != originalHeight)
control.height = phoneHeight;
responsiveFlag = true;
+
+ }
+ if( !isNaN(phonePercentWidth) || !isNaN(phonePercentHeight) )
+ {
+ if(phonePercentWidth != originalPercenWidth)
+ control.percentWidth = phonePercentWidth;
+ if(phonePercentHeight != originalPercenHeight)
+ control.percentHeight = phonePercentHeight;
+ responsiveFlag = true;
}
-
- if(!isNaN(phonePercentWidth))
- control.percentWidth = phonePercentWidth;
-
- if(!isNaN(phonePercentHeight))
- control.percentWidth = phonePercentWidth;
}
if(!responsiveFlag)
{
- // trace("use FULL size", originalWidth, originalHeight);
- if(control.width != originalWidth)
- control.width = originalWidth;
-
- if(control.height != originalHeight)
- control.height = originalHeight;
+ if( !isNaN(originalHeight) || !isNaN(originalWidth) )
+ {
+ if(control.width != originalWidth)
+ control.width = originalWidth;
+
+ if(control.height != originalHeight)
+ control.height = originalHeight;
+ }
+ if( !isNaN(originalPercenHeight) || !isNaN(originalPercenWidth) )
+ {
+ if(control.percentWidth != originalPercenWidth)
+ control.percentWidth = originalPercenWidth;
+ if(control.percentHeight != originalPercenHeight)
+ control.percentHeight = originalPercenHeight;
+ }
+
}
}
}