Ubuntu File Manager App

Merge lp:~rschroll/ubuntu-filemanager-app/content-type-unknown into lp:ubuntu-filemanager-app

  1. content-type-unknown
  2. Merge into trunk
Proposed by Robert Schroll
Status: Merged
Approved by: Bartosz Kosiorek
Approved revision: 377
Merged at revision: 377
Proposed branch: lp:~rschroll/ubuntu-filemanager-app/content-type-unknown
Merge into: lp:ubuntu-filemanager-app
Diff against target: 12 lines (+1/-1)
1 file modified
src/app/qml/content-hub/contenttyperesolver.js (+1/-1)
To merge this branch: bzr merge lp:~rschroll/ubuntu-filemanager-app/content-type-unknown
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Arto Jalkanen Approve
Review via email: mp+248212@code.launchpad.net

Commit message

Actually return ContentType.Unknown for unrecognized extension

Description of the change

Spelling counts.

To post a comment you must log in.
Revision history for this message
Arto Jalkanen (ajalkane) wrote :

It does. Thank you.

review: Approve
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~rschroll/ubuntu-filemanager-app/content-type-unknown/+merge/248212/+edit-commit-message

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/app/qml/content-hub/contenttyperesolver.js'
2--- src/app/qml/content-hub/contenttyperesolver.js 2014-10-22 21:55:37 +0000
3+++ src/app/qml/content-hub/contenttyperesolver.js 2015-02-02 04:50:07 +0000
4@@ -58,7 +58,7 @@
5
6 if (contentType === null) {
7 console.log("Unrecognized extension", extension)
8- contentTYpe = CH.ContentType.Unknown
9+ contentType = CH.ContentType.Unknown
10 }
11
12 console.log("returning contentType:", contentType)

Subscribers

People subscribed via source and target branches