Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

Fix inspector breakage post-service double click. #357

Merged
merged 1 commit into from Jun 3, 2014
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
14 changes: 0 additions & 14 deletions app/views/topology/service.js
Expand Up @@ -301,7 +301,6 @@ YUI.add('juju-topology-service', function(Y) {
scene: {
'.service': {
click: 'serviceClick',
dblclick: 'serviceDblClick',
mouseenter: 'serviceMouseEnter',
mouseleave: 'serviceMouseLeave',
mousemove: 'serviceMouseMove'
Expand Down Expand Up @@ -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.
Expand Down
11 changes: 0 additions & 11 deletions test/test_service_module.js
Expand Up @@ -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');
Expand Down
1 change: 0 additions & 1 deletion undocumented
Expand Up @@ -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"
Expand Down