Merge lp:~tiagosh/messaging-app/fix-attachment-context-menu into lp:messaging-app

[Tiago Salem Herrmann]

Fix pressAndHold for all kinds of attachments

Fix pressAndHold for all kinds of attachments

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:266
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/485/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5993
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/4108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-utopic-i386-ci/279
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/5632
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7245
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/7245/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/14765
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3469
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4444
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4444/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/485/rebuild

review: Needs Fixing (continuous-integration)

[lp:~tiagosh/messaging-app/fix-attachment-context-menu]

267. By Tiago Salem Herrmann on 2015-06-09

merge trunk

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:267
http://jenkins.qa.ubuntu.com/job/messaging-app-ci/593/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3133/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/messaging-app-vivid-i386-ci/106
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/2632/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3131
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3131/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/21073

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/messaging-app-ci/593/rebuild

review: Needs Fixing (continuous-integration)

[Gustavo Pichorim Boiko (boiko)]

Looks good!

review: Approve

=== modified file 'src/qml/Messages.qml'
--- src/qml/Messages.qml	2015-06-01 18:01:53 +0000
+++ src/qml/Messages.qml	2015-06-09 22:29:55 +0000
@@ -850,16 +850,14 @@
                             elide: Text.ElideRight
                             color: UbuntuColors.lightAubergine
                         }
-
                         MouseArea {
                             anchors.fill: parent
-                            onClicked: {
+                            onPressAndHold: {
                                 mouse.accept = true
                                 Qt.inputMethod.hide()
                                 activeAttachmentIndex = index
                                 PopupUtils.open(attachmentPopover, parent)
                             }
-                            onPressAndHold: clicked(mouse)
                         }
                     }
                 }
@@ -882,13 +880,12 @@
                         }
                         MouseArea {
                             anchors.fill: parent
-                            onClicked: {
+                            onPressAndHold: {
                                 mouse.accept = true
                                 Qt.inputMethod.hide()
                                 activeAttachmentIndex = index
                                 PopupUtils.open(attachmentPopover, parent)
                             }
-                            onPressAndHold: clicked(mouse)
                         }
                     }
                 }