You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ca...@apache.org on 2016/11/30 11:52:08 UTC
git commit: [flex-asjs] [refs/heads/develop] - Fill example links in
drawer and navigation
Repository: flex-asjs
Updated Branches:
refs/heads/develop 8bf5dfd85 -> e8a913ef2
Fill example links in drawer and navigation
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/e8a913ef
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/e8a913ef
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/e8a913ef
Branch: refs/heads/develop
Commit: e8a913ef2111f8c91039510d53b9c8600bdca188
Parents: 8bf5dfd
Author: Carlos Rovira <ca...@apache.org>
Authored: Wed Nov 30 12:52:04 2016 +0100
Committer: Carlos Rovira <ca...@apache.org>
Committed: Wed Nov 30 12:52:04 2016 +0100
----------------------------------------------------------------------
.../src/main/flex/MainNavigation.mxml | 20 ++++++++++++--------
.../flex/org/apache/flex/mdl/NavigationLink.as | 2 +-
2 files changed, 13 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e8a913ef/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 65e3661..39a61a2 100644
--- a/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
+++ b/examples/flexjs/MDLExample/src/main/flex/MainNavigation.mxml
@@ -28,10 +28,10 @@ limitations under the License.
<mdl:LayoutTitle text="FlexJS Material Design Layout"/>
<mdl:Spacer/>
<mdl:Navigation>
- <mdl:NavigationLink text="link 1" href="#"/>
- <mdl:NavigationLink text="link 2" href="#"/>
- <mdl:NavigationLink text="link 3" href="#"/>
- <mdl:NavigationLink text="link 4" href="#"/>
+ <mdl:NavigationLink text="About" href="https://getmdl.io/index.html"/>
+ <mdl:NavigationLink text="Getting Started" href="https://getmdl.io/started/index.html"/>
+ <mdl:NavigationLink text="Components" href="https://getmdl.io/components/index.html"/>
+ <mdl:NavigationLink text="Customize" href="https://getmdl.io/customize/index.html"/>
</mdl:Navigation>
</mdl:HeaderRow>
<mdl:TabBar ripple="true">
@@ -50,10 +50,14 @@ limitations under the License.
<mdl:Drawer>
<mdl:LayoutTitle text="Drawer"/>
<mdl:Navigation>
- <mdl:NavigationLink text="link 1" href="#"/>
- <mdl:NavigationLink text="link 2" href="#"/>
- <mdl:NavigationLink text="link 3" href="#"/>
- <mdl:NavigationLink text="link 4" href="#"/>
+ <mdl:NavigationLink text="About" href="https://getmdl.io/index.html"/>
+ <mdl:NavigationLink text="Getting Started" href="https://getmdl.io/started/index.html"/>
+ <mdl:NavigationLink text="Templates" href="https://getmdl.io/templates/index.html"/>
+ <mdl:NavigationLink text="Components" href="https://getmdl.io/components/index.html"/>
+ <mdl:NavigationLink text="Styles" href="https://getmdl.io/styles/index.html"/>
+ <mdl:NavigationLink text="Customize" href="https://getmdl.io/customize/index.html"/>
+ <mdl:NavigationLink text="Showcase" href="https://getmdl.io/showcase/index.html"/>
+ <mdl:NavigationLink text="FAQ" href="https://getmdl.io/faq/index.html"/>
</mdl:Navigation>
</mdl:Drawer>
http://git-wip-us.apache.org/repos/asf/flex-asjs/blob/e8a913ef/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLink.as
----------------------------------------------------------------------
diff --git a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLink.as b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLink.as
index b468be9..61b04f5 100644
--- a/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLink.as
+++ b/frameworks/projects/MaterialDesignLite/src/main/flex/org/apache/flex/mdl/NavigationLink.as
@@ -62,7 +62,7 @@ package org.apache.flex.mdl
var a:HTMLElement = document.createElement('a') as HTMLElement;
a.setAttribute('href', href);
- textNode = document.createTextNode('') as Text;
+ textNode = document.createTextNode(text) as Text;
a.appendChild(textNode);
element = a as WrappedHTMLElement;