From 8174b08bfb77b1f6100e50ba4b5166f6bc4825e3 Mon Sep 17 00:00:00 2001
From: Mathis Neumann <mathis@simpletechs.net>
Date: Thu, 14 Jul 2016 19:09:53 +0200
Subject: [PATCH] functional button for side bar minimizing, to not push
visualisation interaction to history stack
---
app/routes/deployments/single.js | 5 ++++-
app/styles/components/_architecture.scss | 8 ++++----
app/templates/components/architecture-viewer.hbs | 2 +-
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/app/routes/deployments/single.js b/app/routes/deployments/single.js
index 1a2b8a4..82d6000 100644
--- a/app/routes/deployments/single.js
+++ b/app/routes/deployments/single.js
@@ -49,7 +49,10 @@ export default Ember.Route.extend({
entityType,
entityId
});
- this.transitionTo(url);
+ this.replaceWith(url);
+ },
+ backToSystem() {
+ this.replaceWith(this.get('routeName'));
},
willTransition(transition) {
this.debug('transition', transition.targetName, this.get('routeName'));
diff --git a/app/styles/components/_architecture.scss b/app/styles/components/_architecture.scss
index e29fa4c..229e0b9 100644
--- a/app/styles/components/_architecture.scss
+++ b/app/styles/components/_architecture.scss
@@ -14,8 +14,8 @@ $resizingAnimationDuration: .5s; // see deployments/detail route for property
transition: width $resizingAnimationDuration;
}
-.minimizeSidebar {
- visibility: hidden;
+button.minimizeSidebar {
+ display: none;
}
.extendedSidebar { // TODO: not set by route?
.visualisationContainer {
@@ -24,8 +24,8 @@ $resizingAnimationDuration: .5s; // see deployments/detail route for property
.visualisationSidebar {
@extend .col-md-4
}
- .minimizeSidebar {
- visibility: visible;
+ button.minimizeSidebar {
+ display: inline-block;
}
}
diff --git a/app/templates/components/architecture-viewer.hbs b/app/templates/components/architecture-viewer.hbs
index 21d572f..6f21101 100644
--- a/app/templates/components/architecture-viewer.hbs
+++ b/app/templates/components/architecture-viewer.hbs
@@ -4,7 +4,7 @@
</div>
<div class="visualisationSidebar">
- <button class="btn btn-default minimizeSidebar">
+ <button class="btn btn-default minimizeSidebar" {{action (route-action 'backToSystem')}}>
<i class="glyphicon glyphicon-chevron-right"></i>
</button>
--
GitLab