chore: clean up create icon

Author: antfu

js/downloadManager.js

@@ -1,5 +1,4 @@
 var webviews = require('webviews.js')
-const createIcon = require('./util/createIcon')
 
 function getFileSizeString (bytes) {
   let prefixes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB']

js/navbar/contentBlockingToggle.js

@@ -1,7 +1,6 @@
 const webviews = require('webviews.js')
 const settings = require('util/settings/settings.js')
 const remoteMenu = require('remoteMenuRenderer.js')
-const createIcon = require('../util/createIcon')
 
 const contentBlockingToggle = {
   enableBlocking: function (url) {

js/navbar/permissionRequests.js

@@ -1,5 +1,4 @@
 const webviews = require('webviews.js')
-const createIcon = require('../util/createIcon')
 
 const permissionRequests = {
   requests: [],
@@ -32,7 +31,9 @@ const permissionRequests = {
           button.classList.add('active')
         }
         permissionRequests.getIcons(request).forEach(function (icon) {
-          button.appendChild(createIcon(icon))
+          var el = document.createElement('span')
+          el.className = 'i ' + icon
+          button.appendChild(el)
         })
         button.addEventListener('click', function (e) {
           e.stopPropagation()

js/navbar/tabBar.js

@@ -6,7 +6,6 @@ const readerView = require('readerView.js')
 const tabEditor = require('navbar/tabEditor.js')
 const progressBar = require('navbar/progressBar.js')
 const permissionRequests = require('navbar/permissionRequests.js')
-const createIcon = require('../util/createIcon')
 
 var lastTabDeletion = 0 // TODO get rid of this
 

js/readerView.js

@@ -7,7 +7,6 @@ var urlParser = require('util/urlParser.js')
 var {db} = require('util/database.js')
 
 var readerDecision = require('readerDecision.js')
-const createIcon = require('./util/createIcon')
 
 var readerView = {
   readerURL: urlParser.getFileURL(__dirname + '/reader/index.html'),

js/searchbar/bookmarkEditor.js

@@ -1,6 +1,5 @@
 var { db } = require('util/database.js')
 var places = require('places/places.js')
-const createIcon = require('../util/createIcon')
 
 const bookmarkEditor = {
     currentInstance: null,

js/searchbar/searchbarUtils.js

@@ -1,7 +1,6 @@
 var urlParser = require('util/urlParser.js')
 
 var searchbar = require('searchbar/searchbar.js')
-const createIcon = require('../util/createIcon')
 
 var lastItemDeletion = Date.now() // TODO get rid of this
 
@@ -56,15 +55,9 @@ function createItem (data) {
   }
 
   if (data.icon) {
-    if (data.icon.startsWith('fa')) {
-      var i = document.createElement('i')
-      i.className = 'i  ' + data.icon
-
-      item.appendChild(i)
-    }
-    else {
-      item.appendChild(createIcon(data.icon))
-    }
+    var el = document.createElement('span')
+    el.className = 'i ' + data.icon
+    item.appendChild(el)
   }
 
   if (data.title) {

js/taskOverlay/taskOverlayBuilder.js

@@ -4,7 +4,6 @@ var searchbarUtils = require('searchbar/searchbarUtils.js')
 var urlParser = require('util/urlParser.js')
 var searchEngine = require('util/searchEngine.js')
 var tabBar = require('navbar/tabBar.js')
-const createIcon = require('util/createIcon')
 
 const faviconMinimumLuminance = 70 // minimum brightness for a "light" favicon
 
@@ -113,9 +112,8 @@ var TaskOverlayBuilder = {
       },
       deleteButton: function (container, task) {
         var deleteButton = document.createElement('button')
-        deleteButton.className = 'task-delete-button'
+        deleteButton.className = 'task-delete-button i carbon:close-outline'
         deleteButton.tabIndex = -1 // needed for keyboardNavigationHelper
-        deleteButton.append(createIcon('carbon:close-outline'))
 
         deleteButton.addEventListener('click', function (e) {
           if (task.tabs.isEmpty()) {