Merge lp:~gerlowskija/ubuntu-filemanager-app/bug_1331333 into lp:ubuntu-filemanager-app

[Jason]

Change 'caller' of GoToDialog to mainView

This change is a fix for Bug 1331333. In this bug, the CTRL+L shortcut (which should ideally open a dialog window where a user can enter a directory to navigate to) does nothing.

The "caller" id argument given to PopupUtils.open(), due to a recent restructuring of the code, was no longer in scope. This caused the open() call to fail and the pop-up window to not appear.

To fix this behavior, the new revision on this branch changes the "caller" argument from "goToButton", to "mainView". There might be a better "caller" to use than "mainView", however mainView made sense to me, as the shortcut can be invoked only on the mainView page.

To test this fix, pull down the branch on a trusty desktop, start the app and press CTRL+L from the main page. This should cause the dialog to appear.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:216
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/280/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic/926
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic/926/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-filemanager-app-utopic-amd64-ci/78

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-filemanager-app-ci/280/rebuild

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

Thanks,

looks good.

review: Approve

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

review: Approve (continuous-integration)

=== modified file 'src/app/qml/ui/FolderListPage.qml'
--- src/app/qml/ui/FolderListPage.qml	2014-06-22 08:51:04 +0000
+++ src/app/qml/ui/FolderListPage.qml	2014-06-30 22:31:18 +0000
@@ -696,7 +696,7 @@
 
     function keyPressed(key, modifiers) {
         if (key === Qt.Key_L && modifiers & Qt.ControlModifier) {
-            PopupUtils.open(Qt.resolvedUrl("GoToDialog.qml"), goToButton)
+            PopupUtils.open(Qt.resolvedUrl("GoToDialog.qml"), mainView);
             return true;
         }