Merge lp:~michael-sheldon/webbrowser-app/fix-vcard-mime-mapping into lp:webbrowser-app

[Michael Sheldon]

Add support for alternative mimetype header for vcards

Add support for alternative mimetype header for vcards

[Olivier Tilloy (osomon)]

Looks good to me.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1188
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/2271/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/4327
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/1025/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1025
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/1025/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/1025
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3527
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4324
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/4324/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/23612

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

review: Needs Fixing (continuous-integration)

=== modified file 'src/app/MimeTypeMapper.js'
--- src/app/MimeTypeMapper.js	2014-11-11 15:07:46 +0000
+++ src/app/MimeTypeMapper.js	2015-09-23 14:32:47 +0000
@@ -24,7 +24,8 @@
         return ContentType.Music;
     } else if(mimeType.search("video/") === 0) {
         return ContentType.Videos;
-    } else if(mimeType.search("text/x-vcard") === 0) {
+    } else if(mimeType.search("text/x-vcard") === 0
+              || mimeType.search("text/vcard") === 0) {
         return ContentType.Contacts;
     } else if(mimeType.search("application/epub[+]zip") === 0
               || mimeType.search("application/vnd\.amazon\.ebook") === 0