webbrowser-app

Merge lp:~osomon/webbrowser-app/fix-uastring-regression into lp:webbrowser-app

  1. fix-uastring-regression
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Günter Schwann
Approved revision: 180
Merged at revision: 180
Proposed branch: lp:~osomon/webbrowser-app/fix-uastring-regression
Merge into: lp:webbrowser-app
Diff against target: 15 lines (+2/-2)
1 file modified
src/Ubuntu/Browser/UbuntuWebView.qml (+2/-2)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/fix-uastring-regression
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Günter Schwann (community) Approve
Review via email: mp+169133@code.launchpad.net

Commit message

Fix the conditional user-agent string based on form factor.

To post a comment you must log in.
Revision history for this message
Günter Schwann (schwann) wrote :

lgtm

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:180
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/79
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-amd64-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/39
        deb: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-armhf-ci/39/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/webbrowser-app-saucy-i386-ci/39
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/79
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/79/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/74

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

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/Ubuntu/Browser/UbuntuWebView.qml'
2--- src/Ubuntu/Browser/UbuntuWebView.qml 2013-06-07 08:37:10 +0000
3+++ src/Ubuntu/Browser/UbuntuWebView.qml 2013-06-13 08:46:25 +0000
4@@ -59,9 +59,9 @@
5 // this should be changed to a more neutral user-agent in the
6 // future as we don’t want websites to recommend installing
7 // their iPhone/iPad apps.
8- if (formFactor === formFactor.phone) {
9+ if (_webview.formFactor === formFactor.phone) {
10 return "Mozilla/5.0 (iPhone; CPU iPhone OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
11- } else if (formFactor === formFactor.tablet) {
12+ } else if (_webview.formFactor === formFactor.tablet) {
13 return "Mozilla/5.0 (iPad; CPU OS 5_0 like Mac OS X) AppleWebKit/534.46 (KHTML, like Gecko) Version/5.1 Mobile/9A334 Safari/7534.48.3"
14 } else {
15 return ""

Subscribers

People subscribed via source and target branches

to status/vote changes: