Merge lp:~makyo/juju-gui/add-rel-touch-1166819 into lp:juju-gui/experimental

[Madison Scott-Clary]

Trivial: add relation works with touch.

https://codereview.appspot.com/8628044/

[Madison Scott-Clary (makyo)]

Reviewers: mp+158180_code.launchpad.net,

Message:
Please take a look.

Description:
Trivial: add relation works with touch.

https://code.launchpad.net/~makyo/juju-gui/add-rel-touch-1166819/+merge/158180

(do not edit description out of merge proposal)

Please review this at https://codereview.appspot.com/8628044/

Affected files:
   A [revision details]
   M app/views/topology/service.js

Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>

Index: app/views/topology/service.js
=== modified file 'app/views/topology/service.js'
--- app/views/topology/service.js 2013-04-09 21:46:28 +0000
+++ app/views/topology/service.js 2013-04-10 17:57:03 +0000
@@ -377,11 +377,13 @@
      },

      dragend: function(box, self) {
+ var topo = self.get('component');
        if (box.tapped) {
          box.tapped = false;
- return;
+ if (!topo.buildingRelation) {
+ return;
+ }
        }
- var topo = self.get('component');
        if (topo.buildingRelation) {
          topo.ignoreServiceClick = true;
          topo.fire('addRelationDragEnd');

[Gary Poster (gary)]

LGTM without qa. Lemme know if you want qa before landing.

https://codereview.appspot.com/8628044/

[Madison Scott-Clary (makyo)]

*** Submitted:

Trivial: add relation works with touch.

R=gary.poster
CC=
https://codereview.appspot.com/8628044

https://codereview.appspot.com/8628044/

=== modified file 'app/views/topology/service.js'
--- app/views/topology/service.js	2013-04-09 21:46:28 +0000
+++ app/views/topology/service.js	2013-04-10 18:00:33 +0000
@@ -377,11 +377,13 @@
     },
 
     dragend: function(box,  self) {
+      var topo = self.get('component');
       if (box.tapped) {
         box.tapped = false;
-        return;
+        if (!topo.buildingRelation) {
+          return;
+        }
       }
-      var topo = self.get('component');
       if (topo.buildingRelation) {
         topo.ignoreServiceClick = true;
         topo.fire('addRelationDragEnd');