From de35cdf0562a8f86913ad065094c331c98b3aed0 Mon Sep 17 00:00:00 2001 From: Nick Wientge Date: Thu, 25 Dec 2014 19:39:30 -0500 Subject: [PATCH] more navigation functionality, added back button component --- .../ionNavBackButton/ionNavBackButton.html | 8 ++++++++ .../ionNavBackButton/ionNavBackButton.js | 19 +++++++++++++++++++ components/ionNavBar/ionNavBar.js | 9 +-------- package.js | 3 +++ 4 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 components/ionNavBackButton/ionNavBackButton.html create mode 100644 components/ionNavBackButton/ionNavBackButton.js diff --git a/components/ionNavBackButton/ionNavBackButton.html b/components/ionNavBackButton/ionNavBackButton.html new file mode 100644 index 0000000..fe11ee1 --- /dev/null +++ b/components/ionNavBackButton/ionNavBackButton.html @@ -0,0 +1,8 @@ + diff --git a/components/ionNavBackButton/ionNavBackButton.js b/components/ionNavBackButton/ionNavBackButton.js new file mode 100644 index 0000000..3c16ccc --- /dev/null +++ b/components/ionNavBackButton/ionNavBackButton.js @@ -0,0 +1,19 @@ +Template.ionNavBackButton.helpers({ + text: function () { + if (this.text) { + return this.text; + } else { + return 'Back'; + } + }, + + url: function () { + if (this.href) { + return this.href; + } + + if (this.path) { + return Router.routes[this.path].path(Template.parentData(1)); + } + } +}); diff --git a/components/ionNavBar/ionNavBar.js b/components/ionNavBar/ionNavBar.js index c68e970..52a8c2b 100644 --- a/components/ionNavBar/ionNavBar.js +++ b/components/ionNavBar/ionNavBar.js @@ -85,14 +85,7 @@ Template.ionNavBar.rendered = function () { } if ($node.hasClass('button')) { - $node.addClass('button-leaving button-stage'); - Meteor.setTimeout(function() { - $node.removeClass('button-stage').addClass('tibuttontle-active'); - }, 16); - - Meteor.setTimeout(function () { - $node.remove(); - }, template.transitionDuration + 16); + $node.remove(); } } }; diff --git a/package.js b/package.js index 48c0080..489d2e6 100644 --- a/package.js +++ b/package.js @@ -51,6 +51,9 @@ Package.onUse(function(api) { "components/ionNavBar/ionNavBar.html", "components/ionNavBar/ionNavBar.js", + "components/ionNavBackButton/ionNavBackButton.html", + "components/ionNavBackButton/ionNavBackButton.js", + "components/ionNavView/ionNavView.html", "components/ionNavView/ionNavView.js",