webbrowser-app

Merge lp:~osomon/webbrowser-app/worker-script-no-regexp into lp:webbrowser-app

  1. worker-script-no-regexp
  2. Merge into trunk
Proposed by Olivier Tilloy
Status: Merged
Approved by: Olivier Tilloy
Approved revision: 1033
Merged at revision: 1042
Proposed branch: lp:~osomon/webbrowser-app/worker-script-no-regexp
Merge into: lp:webbrowser-app
Diff against target: 57 lines (+14/-10)
3 files modified
src/Ubuntu/Web/ua-override-worker.js (+6/-2)
src/Ubuntu/Web/ua-overrides-desktop.js (+3/-3)
src/Ubuntu/Web/ua-overrides-mobile.js (+5/-5)
To merge this branch: bzr merge lp:~osomon/webbrowser-app/worker-script-no-regexp
Reviewer Review Type Date Requested Status
Chris Coulson Approve
PS Jenkins bot continuous-integration Needs Fixing
Review via email: mp+260073@code.launchpad.net

Commit message

Pass plain strings to the worker script instead of RegExps.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:1033
http://jenkins.qa.ubuntu.com/job/webbrowser-app-ci/1810/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/2937/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-amd64-ci/567/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-armhf-ci/567/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/webbrowser-app-vivid-i386-ci/567/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/2935/console

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Chris Coulson (chrisccoulson) wrote :

This looks like it should be compatible with the Oxide change. Thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'src/Ubuntu/Web/ua-override-worker.js'
--- src/Ubuntu/Web/ua-override-worker.js 2014-10-14 09:59:13 +0000
+++ src/Ubuntu/Web/ua-override-worker.js 2015-05-25 21:23:59 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2014 Canonical Ltd.2 * Copyright 2014-2015 Canonical Ltd.
3 *3 *
4 * This file is part of webbrowser-app.4 * This file is part of webbrowser-app.
5 *5 *
@@ -20,7 +20,11 @@
2020
21oxide.onMessage = function(msg) {21oxide.onMessage = function(msg) {
22 if ("overrides" in msg) {22 if ("overrides" in msg) {
23 overrides = msg["overrides"];23 var o = msg["overrides"];
24 for (var i in o) {
25 var r = o[i];
26 overrides.push([new RegExp(r[0]), r[1]]);
27 }
24 }28 }
25}29}
2630
2731
=== modified file 'src/Ubuntu/Web/ua-overrides-desktop.js'
--- src/Ubuntu/Web/ua-overrides-desktop.js 2015-01-28 12:00:18 +0000
+++ src/Ubuntu/Web/ua-overrides-desktop.js 2015-05-25 21:23:59 +0000
@@ -19,7 +19,7 @@
19.pragma library19.pragma library
2020
21var overrides = [21var overrides = [
22 [/^https?:\/\/(www\.)?google\.com\/calendar/, "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/35.0.1870.2 Chrome/35.0.1870.2 Safari/537.36"],22 ["^https?:\/\/(www\.)?google\.com\/calendar", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chromium/35.0.1870.2 Chrome/35.0.1870.2 Safari/537.36"],
23 [/^http:\/\/chrome\.angrybirds\.com\//, "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/128415823 ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/1284158
24 [/^https?:\/\/(www\.)?youtube\.com\//, "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/141288024 ["^https?:\/\/(www\.)?youtube\.com\/", "Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 Chrome/35.0.1870.2 Safari/537.36"], // http://pad.lv/1412880
25];25];
2626
=== modified file 'src/Ubuntu/Web/ua-overrides-mobile.js'
--- src/Ubuntu/Web/ua-overrides-mobile.js 2015-02-03 16:58:20 +0000
+++ src/Ubuntu/Web/ua-overrides-mobile.js 2015-05-25 21:23:59 +0000
@@ -19,9 +19,9 @@
19.pragma library19.pragma library
2020
21var overrides = [21var overrides = [
22 [/^https?:\/\/mail\.google\.com\//, "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4) AppleWebKit/537.36 Chromium/35.0.1870.2 Mobile Safari"],22 ["^https?:\/\/mail\.google\.com\/", "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4) AppleWebKit/537.36 Chromium/35.0.1870.2 Mobile Safari"],
23 [/^https?:\/\/m\.youtube\.com\//, "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chromium/35.0.1870.2 Mobile Safari/537.36"], // http://pad.lv/1228415, http://pad.lv/1415107, http://pad.lv/141725823 ["^https?:\/\/m\.youtube\.com\/", "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chromium/35.0.1870.2 Mobile Safari/537.36"], // http://pad.lv/1228415, http://pad.lv/1415107, http://pad.lv/1417258
24 [/^http:\/\/chrome\.angrybirds\.com\//, "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/35.0.1870.2 Mobile Safari/537.36"], // http://pad.lv/128415824 ["^http:\/\/chrome\.angrybirds\.com\/", "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/35.0.1870.2 Mobile Safari/537.36"], // http://pad.lv/1284158
25 [/^https?:\/\/(\w+\.)*hsbc\.com\.br\//, "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/35.0.1870.2 Mobile Safari/537.36"], // http://pad.lv/138065725 ["^https?:\/\/(\w+\.)*hsbc\.com\.br\/", "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/35.0.1870.2 Mobile Safari/537.36"], // http://pad.lv/1380657
26 [/^http:\/\/(\w+\.)*espn\.(go\.)?com\//, "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/35.0.1870.2 Mobile Safari/537.36"], // http://pad.lv/131625926 ["^http:\/\/(\w+\.)*espn\.(go\.)?com\/", "Mozilla/5.0 (Linux; Ubuntu 14.04 like Android 4.4;) AppleWebKit/537.36 Chrome/35.0.1870.2 Mobile Safari/537.36"], // http://pad.lv/1316259
27];27];

Subscribers

People subscribed via source and target branches

to status/vote changes: