← Back to branch summary

~michael-sheldon/webbrowser-app/implement-download-folder

« back to all changes in this revision

Viewing changes to src/app/ContentPickerDialog.qml

  • Committer: Michael Sheldon
  • Date: 2015-09-08 12:35:50 UTC
  • Revision ID: michael.sheldon@canonical.com-20150908123550-k0977bxr9z25juo6
Fix check for whether we're in the browser or a webapp when performing an internal file upload

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/app/ContentPickerDialog.qml
50
50
                handler: ContentHandler.Source
51
51
 
52
52
                onPeerSelected: {
53
 
                    if (browser && peer.appId == "webbrowser-app") {
 
53
                    if (typeof(webapp) == "undefined" && peer.appId == "webbrowser-app") {
54
54
                        // If we're inside the browser and the user has
55
55
                        // requested content from the browser then we
56
56
                        // need to handle the transfer internally