Adopt for Firefox.

SPWwj · Sep 18, 2017 · 7b39e8e · 7b39e8e
1 parent 6a70bd7
commit 7b39e8e
Show file tree

Hide file tree

Showing 8 changed files with 66 additions and 14 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,6 +11,8 @@
 #-----------------------------------
 build/*
 build.zip
+build-firefox/*
+build-firefox.zip
 
 #Node.js modules
 #-----------------------------------

diff --git a/Gruntfile.js b/Gruntfile.js
@@ -1,9 +1,9 @@
 module.exports = function (grunt) {
     require('create-grunt-tasks')(grunt, function (create) {
-        
+
         //
         // --- Release task ---
-        
+
         create.task('release')
             .sub('clean', [
                 'build/'
@@ -41,11 +41,41 @@ module.exports = function (grunt) {
                 dest: 'build.zip',
                 compression: 'DEFLATE'
             })
+            // Firefox
+            .sub('clean', 'build-firefox')
+            .sub('copy', {
+                expand: true,
+                cwd: 'build/',
+                src: '**/*.*',
+                dest: 'build-firefox/'
+            })
+            .sub('copy', {
+                expand: true,
+                cwd: 'src/',
+                src: 'manifest.json',
+                dest: 'build-firefox/',
+                options: {
+                    process: (content) => {
+                        const fs = require('fs');
+                        const path = require('path');
+                        const obj = JSON.parse(content);
+                        const ff = fs.readFileSync('src/manifest_firefox.json');
+                        const ext = JSON.parse(ff);
+                        Object.assign(obj, ext);
+                        return JSON.stringify(obj, null, 4);
+                    }
+                }
+            })
+            .sub('zip', {
+                src: ['build-firefox/**/*.*'],
+                dest: 'build-firefox.zip',
+                compression: 'DEFLATE'
+            })
             .sub('ext-reload');
 
         //
         // --- Debug tasks ---
-        
+
         create.task('debug')
             .sub('debug-js')
             .sub('debug-css')
@@ -70,9 +100,9 @@ module.exports = function (grunt) {
                     paths: ['src/']
                 }
             });
-            
+
         // ---- Watch ----
-            
+
         create.task('debug-watch')
             .sub('concurrent', {
                 tasks: ['debug-watch-js', 'debug-watch-css', 'debug-watch-other'],
@@ -100,7 +130,7 @@ module.exports = function (grunt) {
                 files: ['src/**/*.less'],
                 tasks: ['debug-css', 'ext-reload']
             });
-            
+
         create.task('debug-watch-other')
             .sub('watch', {
                 files: ['src/**/*.{json,html,png,svg,ttf}'],
@@ -147,7 +177,7 @@ module.exports = function (grunt) {
                     closeServer();
                 });
                 server.listen(8890);
-                
+
                 // Close server if no listeners
                 setTimeout(function () {
                     grunt.log.writeln('Auto-reloader did not connect.');

diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
   },
   "homepage": "https://github.com/alexanderby/darkreader",
   "devDependencies": {
-    "create-grunt-tasks": "^0.7.1",
+    "create-grunt-tasks": "^0.8.0",
     "grunt": "^0.4.5",
     "grunt-concurrent": "^2.0.0",
     "grunt-contrib-clean": "^0.6.0",

diff --git a/src/background/config_management.ts b/src/background/config_management.ts
@@ -21,7 +21,10 @@
     };
     var REMOTE_TIMEOUT_MS = 10 * 1000;
     var RELOAD_INTERVAL_MS = 15 * 60 * 1000;
-    export var DEBUG = chrome.runtime.id !== 'eimadpbcbfnmbkopoojfekhnkhdbieeh';
+    export var DEBUG = [
+        'eimadpbcbfnmbkopoojfekhnkhdbieeh',
+        '[email protected]'
+    ].indexOf(chrome.runtime.id) < 0;
     var DEBUG_LOCAL_CONFIGS = DEBUG;
 
     /**

diff --git a/src/background/extension.ts b/src/background/extension.ts
@@ -410,6 +410,18 @@ style && style.parentElement.removeChild(style);
          * installed in system.
          */
         protected getFontList(onReturned: (fonts: string[]) => void) {
+            if (typeof chrome.fontSettings !== 'function') {
+                // Todo: Remove it as soon as Firefox and Edge get support.
+                setTimeout(() => onReturned([
+                    'serif',
+                    'sans-serif',
+                    'monospace',
+                    'cursive',
+                    'fantasy',
+                    'system-ui'
+                ]));
+                return;
+            }
             chrome.fontSettings.getFontList((res) => {
                 // id or name?
                 var fonts = res.map((r) => r.fontId);

diff --git a/src/manifest_firefox.json b/src/manifest_firefox.json
@@ -0,0 +1,8 @@
+{
+    "applications": {
+        "gecko": {
+            "id": "[email protected]",
+            "strict_min_version": "54.0"
+        }
+    }
+}
diff --git a/src/popup/style/_variables.less b/src/popup/style/_variables.less
@@ -29,9 +29,6 @@
 // Colors of modal
 @color-modal-tint: fadeout(@color-back,30%);
 
-// Font
-@font-family: 'Segoe UI',sans-serif;
-
 //---------------------------
 //   Dark Reader variables
 //---------------------------
@@ -44,7 +41,7 @@
 @color-description: #37abc8;
 @color-header: #e96c4c;
 @color-error: #db4245;
-@font-family: 'Open Sans', 'Segoe UI', 'Helvetica Neue', sans-serif;
+@font-family: 'Open Sans', 'Segoe UI', 'Helvetica Neue', 'Ubuntu', sans-serif;
 @size-control-inner: 2em;
 @size-control-description: 0.875em;
 @size-border: 0.1875em;

diff --git a/src/popup/ui/site_list.ts b/src/popup/ui/site_list.ts
@@ -66,7 +66,7 @@
                             // Add new site
                             this.sites.push(value);
                             textBox.text = '';
-                            textBox.focus();
+                            this.focus();
                         }
                     }
                     else {