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

[Olivier Tilloy]

Pass plain strings to the worker script instead of RegExps.

[PS Jenkins bot (ps-jenkins)]

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)

[Chris Coulson (chrisccoulson)]

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

review: Approve

=== 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 @@
 /*
- * Copyright 2014 Canonical Ltd.
+ * Copyright 2014-2015 Canonical Ltd.
  *
  * This file is part of webbrowser-app.
  *
@@ -20,7 +20,11 @@
 
 oxide.onMessage = function(msg) {
     if ("overrides" in msg) {
-        overrides = msg["overrides"];
+        var o = msg["overrides"];
+        for (var i in o) {
+            var r = o[i];
+            overrides.push([new RegExp(r[0]), r[1]]);
+        }
     }
 }
 

=== 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 @@
 .pragma library
 
 var overrides = [
-      [/^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"],
-      [/^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
-      [/^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
+      ["^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"],
+      ["^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
+      ["^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
 ];

=== 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 @@
 .pragma library
 
 var overrides = [
-    [/^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"],
-    [/^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
-    [/^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
-    [/^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
-    [/^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
+    ["^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"],
+    ["^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
+    ["^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
+    ["^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
+    ["^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
 ];