add menu option to confirm dialog
hook up to "K" action for killing a controller
diff --git a/web/ons-demo/js/init.js b/web/ons-demo/js/init.js
index f7bd55b..23f4649 100644
--- a/web/ons-demo/js/init.js
+++ b/web/ons-demo/js/init.js
@@ -33,5 +33,13 @@
alert('reset')
});
+ d3.select('#action-kill').on('click', function () {
+ var prompt = "Kill ONOS node?";
+ var options = model.activeControllers;
+ doConfirm(prompt, function (result) {
+ controllerDown(result);
+ }, options);
+ });
+
createTopologyView(cb);
}
diff --git a/web/ons-demo/js/utils.js b/web/ons-demo/js/utils.js
index 265c661..1b4c38c 100644
--- a/web/ons-demo/js/utils.js
+++ b/web/ons-demo/js/utils.js
@@ -204,10 +204,24 @@
/***************************************************************************************************
***************************************************************************************************/
-function doConfirm(prompt, cb) {
+function doConfirm(prompt, cb, options) {
var confirm = d3.select('#confirm');
confirm.select('#confirm-prompt').text(prompt);
+ var select = d3.select(document.getElementById('confirm-select'));
+ if (options) {
+ select.style('display', 'block');
+ select.text('');
+ select.selectAll('option').
+ data(options)
+ .enter()
+ .append('option')
+ .attr('value', function (d) {return d})
+ .text(function (d) {return d});
+ } else {
+ select.style('display', 'none');
+ }
+
function show() {
confirm.style('display', '-webkit-box');
confirm.style('opacity', 0);
@@ -227,7 +241,11 @@
confirm.select('#confirm-ok').on('click', function () {
d3.select(this).on('click', null);
dismiss();
- cb(true);
+ if (options) {
+ cb(select[0][0].value);
+ } else {
+ cb(true);
+ }
});
confirm.select('#confirm-cancel').on('click', function () {