diff --git a/app/views/topology/service.js b/app/views/topology/service.js index c831e4300e..a3cc87bda0 100644 --- a/app/views/topology/service.js +++ b/app/views/topology/service.js @@ -301,7 +301,6 @@ YUI.add('juju-topology-service', function(Y) { scene: { '.service': { click: 'serviceClick', - dblclick: 'serviceDblClick', mouseenter: 'serviceMouseEnter', mouseleave: 'serviceMouseLeave', mousemove: 'serviceMouseMove' @@ -539,19 +538,6 @@ YUI.add('juju-topology-service', function(Y) { self[curr_click_action](box, topo); }, - serviceDblClick: function(box, self) { - if (box.pending) { - return; - } - // Just show the service on double-click. - var service = box.model; - // The browser sends a click event right before the dblclick one, and - // it opens the service menu: close it before moving to the service - // details. - self.hideServiceMenu(); - self.show_service(service); - }, - serviceMouseEnter: function(box, context) { var rect = Y.one(this); // Do not fire if this service isn't selectable. diff --git a/test/test_service_module.js b/test/test_service_module.js index ada458b84b..2c68febbeb 100644 --- a/test/test_service_module.js +++ b/test/test_service_module.js @@ -205,17 +205,6 @@ describe('service module events', function() { return viewContainer.one('#service-menu'); }; - it('should not show the service menu after the service is double-clicked', - function() { - var service = viewContainer.one('.service'); - var menu = clickService(service); - - // Ideally the browser would not send the click event right away... - assert(menu.hasClass('active')); - service.simulate('dblclick'); - assert.isFalse(menu.hasClass('active')); - }); - it('should handle touch/click events properly', function() { var service = viewContainer.one('.service'); var menu = viewContainer.one('#service-menu'); diff --git a/undocumented b/undocumented index e2fb662981..cdcd46d2a6 100644 --- a/undocumented +++ b/undocumented @@ -132,7 +132,6 @@ app/views/topology/service.js:1365 "show" app/views/topology/service.js:1015 "dragend" app/views/topology/service.js:1399 "updateServiceMenuLocation" app/views/topology/service.js:550 "serviceMouseEnter" -app/views/topology/service.js:537 "serviceDblClick" app/views/topology/service.js:401 "initializer" app/views/topology/service.js:574 "serviceMouseLeave" app/views/topology/topology.js:289 "setter"