Repository: flex-asjs Updated Branches: refs/heads/develop f80b3d4a3 -> b87381941
Fix NavigationLink IR, but âhasOwnPropertyâ does not work :( Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/b8738194 Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/b8738194 Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/b8738194 Branch: refs/heads/develop Commit: b87381941445475677474aa99468fdc0e615de03 Parents: f80b3d4 Author: Carlos Rovira <[email protected]> Authored: Sat Jan 7 18:22:07 2017 +0100 Committer: Carlos Rovira <[email protected]> Committed: Sat Jan 7 18:22:07 2017 +0100 ---------------------------------------------------------------------- .../MDLExample/src/main/flex/MainNavigation.mxml | 14 -------------- .../mdl/itemRenderers/NavigationLinkItemRenderer.as | 12 +++++------- 2 files changed, 5 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8738194/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml ---------------------------------------------------------------------- diff --git a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml index ef59f71..330fbed 100644 --- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml +++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml @@ -71,33 +71,19 @@ limitations under the License. </mdl:Drawer> <mdl:NavigationLayoutContent> - <local:Cards id="cards_panel" isActive="true"/> - <local:Chips id="chips_panel" /> - <local:Sliders id="sliders_panel" /> - <local:Grids id="grids_panel"/> - <local:Tabs id="tabs_panel"/> - <local:Buttons id="buttons_panel"/> - <local:TextFields id="textfield_panel"/> - <local:Toggles id="toggles_panel"/> - <local:Snackbar id="snackbar_panel"/> - <local:Lists id="lists_panel"/> - <local:Loading id="loading_panel"/> - <local:Menus id="menus_panel"/> - <local:Badges id="badges_panel"/> - </mdl:NavigationLayoutContent> <local:MainFooter/> http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/b8738194/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/NavigationLinkItemRenderer.as ---------------------------------------------------------------------- diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/NavigationLinkItemRenderer.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/NavigationLinkItemRenderer.as index 0c1c5ae..87bfd65 100644 --- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/NavigationLinkItemRenderer.as +++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/itemRenderers/NavigationLinkItemRenderer.as @@ -112,17 +112,15 @@ package org.apache.flex.mdl.itemRenderers if(value == null) return; - /*if(value.hasOwnProperty('label')) { + if(value.label !== undefined) { label = String(value.label); } else { label = String(value); - }*/ - label = String(value.label); - - /*if(value.hasOwnProperty('href')) { + } + + if(value.href !== undefined) { href = String(value.href); - }*/ - href = String(value.href); + } COMPILE::JS {
