Skip to content

See My Slack Message - No need to Merge: Item Selection and Component Linking #19

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ziadsawalha wants to merge 4 commits into
base: master
Choose a base branch
from
+292 −47
Open

See My Slack Message - No need to Merge: Item Selection and Component Linking #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
383f9aa
feat(topology): select/deselect components
ziadsawalha Dec 2, 2014
bcf5507
feat(linker): UI for connecting components
ziadsawalha Dec 3, 2014
9c505c4
fix(scaling): fix connector when scaled
ziadsawalha Dec 3, 2014
6475e42
fix(style): minor lint, cleanup, and bug fixes
ziadsawalha Dec 3, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,6 @@

<link rel="stylesheet" type="text/css" href="/styles/application-configure.css">
<link href="/libs/font-awesome-4.2.0/css/font-awesome.min.css" rel="stylesheet">

<script src="/libs/jquery-2.1.1.min.js"></script>
<script src="/libs/angular-1.3.2.min.js"></script>
</head>

<body class="rs-responsive" ng-app="app" ng-controller="ConfigureCtrl">
Expand Down Expand Up @@ -55,6 +52,9 @@
</div>

<!-- Libs -->
<script src="/libs/jquery-2.1.1.min.js"></script>
<script src="/libs/angular-1.3.2.min.js"></script>

<script src="/libs/d3.v3.min.js"></script>
<script src="/libs/underscore-1.7.0-min.js"></script>
<script src="/libs/yaml.js"></script>
Expand Down
22 changes: 16 additions & 6 deletions scripts/app/applications/applications-configure.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ angular.module('applications-configure')

// This could toggle an extra sidebar to reveal details about a service.
$scope.selection = {
'data': {},
'isVisible': false,
data: {},
isVisible: false,
save: function(component) {
Blueprint.update($scope.deployment.blueprint);
},
Expand All @@ -39,9 +39,9 @@ angular.module('applications-configure')

// This is the catalog model for the sidebar.
$scope.catalog = {
'isVisible': false,
'data': Catalog.get(),
'components': Catalog.getComponents()
isVisible: false,
data: Catalog.get(),
components: Catalog.getComponents()
};

// This is the codemirror model for the sidebar.
Expand All @@ -59,7 +59,17 @@ angular.module('applications-configure')
});

$scope.$on('topology:select', function(event, selection) {
$scope.selection.isVisible = true;
$scope.selection.data = selection;
if (selection) {
$scope.selection.isVisible = true;
} else {
$scope.selection.isVisible = false;
$scope.$apply(); // No idea why, but this is needed to hide the properties drawer
}
});

$scope.$on('topology:deselect', function(event, selection) {
$scope.selection.data = selection;
$scope.selection.isVisible = false;
});
});
2 changes: 1 addition & 1 deletion scripts/app/applications/applications-configure.tpl.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ <h4>{{type}}</h4>
<div class="rs-app-launch-sidebar stick-left dark" ng-class="{'visible': selection.isVisible}">
<header class="rs-app-launch-header">
<div class="rs-app-launch-title">
Header Title
{{ selection.data.service }}\{{ selection.data.component }}
</div> <!-- /.rs-app-launch-input.rs-app-launch-search-bar -->
<div class="rs-app-launch-control">
<i class="fa fa-close fa-inverse" ng-click="selection.isVisible = false"></i>
Expand Down
Loading