Merge remote-tracking branch 'origin/master'

zalmoxisus · Feb 15, 2016 · 8021d8c · 8021d8c
2 parents d05afd5 + 11523b8
commit 8021d8c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/gulpfile.babel.js b/gulpfile.babel.js
@@ -110,6 +110,18 @@ gulp.task('compress:firefox', () => {
     .pipe(gulp.dest('./build'));
 });
 
-gulp.task('default', ['replace-webpack-code', 'webpack:dev', 'views:dev', 'copy:dev']);
+/*
+ * watch tasks
+ */
+
+gulp.task('views:watch', () => {
+  gulp.watch('./src/browser/views/*.jade', ['views:dev']);
+});
+
+gulp.task('copy:watch', () => {
+  gulp.watch(['./src/browser/extension/manifest.json', './src/assets/**/*'], ['copy:dev']);
+});
+
+gulp.task('default', ['replace-webpack-code', 'webpack:dev', 'views:dev', 'copy:dev', 'views:watch', 'copy:watch']);
 gulp.task('build:extension', ['replace-webpack-code', 'webpack:build:extension', 'views:build:extension', 'copy:build:extension']);
 gulp.task('build:firefox', ['copy:build:firefox']);
diff --git a/src/browser/extension/manifest.json b/src/browser/extension/manifest.json
@@ -56,7 +56,8 @@
       "matches": ["<all_urls>"],
       "exclude_globs": [ "https://www.google*" ],
       "js": ["js/content.bundle.js", "js/pagewrap.bundle.js"],
-      "run_at": "document_start"
+      "run_at": "document_start",
+      "all_frames": true
     }
   ],
   "devtools_page": "devtools.html",
@@ -68,4 +69,4 @@
   "content_security_policy": "script-src 'self' 'unsafe-eval'; object-src 'self'; style-src * 'unsafe-inline'; img-src 'self' data:;",
   "update_url": "https://clients2.google.com/service/update2/crx",
   "key": "MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsdJEPwY92xUACA9CcDBDBmbdbp8Ap3cKQ0DJTUuVQvqb4FQAv8RtKY3iUjGvdwuAcSJQIZwHXcP2aNDH3TiFik/NhRK2GRW8X3OZyTdkuDueABGP2KEX8q1WQDgjX/rPIinGYztUrvoICw/UerMPwNW62jwGoVU3YhAGf+15CgX2Y6a4tppnf/+1mPedKPidh0RsM+aJY98rX+r1SPAHPcGzMjocLkqcT75DZBXer8VQN14tOOzRCd6T6oy7qm7eWru8lJwcY66qMQvhk0osqEod2G3nA7aTWpmqPFS66VEiecP9PgZlp8gQdgZ3dFhA62exydlD55JuRhiMIR63yQIDAQAB"
-}
+}