diff --git a/.gitignore b/.gitignore index 06df04d..6578331 100644 --- a/.gitignore +++ b/.gitignore @@ -4,6 +4,7 @@ build/ /*.log /dist* /uw-git_keys +/untracked-assets *.pem diff --git a/CHANGELOG.md b/CHANGELOG.md index e11b08e..098de7c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,7 +13,12 @@ QoL improvements for me: * logging: allow to enable logging at will and export said logs to a file -### v4.4.6 (current) +### v4.4.7 (current) + +* Removed unnecessary font files and image files from the package. +* LoggerUI is now functional. + +### v4.4.6 * Ensured that Vue part of the content script (logger UI) only loads when necessary in order to fix breakage on certain sites (#96). * Disabling (or enabling, if running in whitelist-only mode) specific sites used to not work (#91). This issue appears to have been fixed. diff --git a/README-AMO.md b/README-AMO.md index 346f57f..2766fe1 100644 --- a/README-AMO.md +++ b/README-AMO.md @@ -14,4 +14,4 @@ Run `npm ci` `npm run build` -The compiled code pops up in /dist-ff. \ No newline at end of file +The compiled code pops up in /dist-ff (/dist-chrome for Chromium-based browsers). \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index b39c11a..84c8692 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "ultravidify", - "version": "4.4.6", + "version": "4.4.7", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/package.json b/package.json index 38dade1..d554435 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ultravidify", - "version": "4.4.6", + "version": "4.4.7", "description": "Aspect ratio fixer for youtube and other sites, with automatic aspect ratio detection. Supports ultrawide and other ratios.", "author": "Tamius Han ", "scripts": { diff --git a/src/common/components/JsonEditor/JsonArray.vue b/src/common/components/JsonEditor/JsonArray.vue new file mode 100644 index 0000000..db6fb3e --- /dev/null +++ b/src/common/components/JsonEditor/JsonArray.vue @@ -0,0 +1,84 @@ + + + + + diff --git a/src/common/components/JsonEditor/JsonElement.vue b/src/common/components/JsonEditor/JsonElement.vue new file mode 100644 index 0000000..592582d --- /dev/null +++ b/src/common/components/JsonEditor/JsonElement.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/common/components/JsonEditor/JsonObject.vue b/src/common/components/JsonEditor/JsonObject.vue new file mode 100644 index 0000000..11ef46f --- /dev/null +++ b/src/common/components/JsonEditor/JsonObject.vue @@ -0,0 +1,92 @@ + + + + + \ No newline at end of file diff --git a/src/common/components/JsonEditor/json.scss b/src/common/components/JsonEditor/json.scss new file mode 100644 index 0000000..216e47b --- /dev/null +++ b/src/common/components/JsonEditor/json.scss @@ -0,0 +1,23 @@ +.json-level-indent { + padding-left: 2em !important; + font-family: 'Overpass Mono', monospace; +} +.item-key { + color: rgb(255, 196, 148); +} +.item-key-boolean-false { + color: rgb(207, 149, 101) +} + +.json-value-boolean-true { + color: rgb(150, 240, 198); +} +.json-value-boolean-false { + color: rgb(241, 21, 21); +} +.json-value-number { + color: rgb(121, 121, 238); +} +.json-value-string { + color: rgb(226, 175, 7); +} diff --git a/src/csui/LoggerUi.vue b/src/csui/LoggerUi.vue index 61c1cb2..5ef210d 100644 --- a/src/csui/LoggerUi.vue +++ b/src/csui/LoggerUi.vue @@ -1,5 +1,9 @@ +
diff --git a/src/ext/conf/ExtConfPatches.js b/src/ext/conf/ExtConfPatches.js index 112599e..f4eaaa4 100644 --- a/src/ext/conf/ExtConfPatches.js +++ b/src/ext/conf/ExtConfPatches.js @@ -320,7 +320,7 @@ const ExtensionConfPatch = [ } } }, { - forVersion: '4.4.6', + forVersion: '4.4.7', updateFn: (userOptions, defaultOptions) => { if (!userOptions.sites['www.netflix.com'].DOM) { userOptions.sites['www.netflix.com']['DOM'] = { diff --git a/src/ext/lib/Logger.js b/src/ext/lib/Logger.js index 55fda0f..f322017 100644 --- a/src/ext/lib/Logger.js +++ b/src/ext/lib/Logger.js @@ -1,5 +1,6 @@ import currentBrowser from '../conf/BrowserDetect'; import { decycle } from 'json-cyclic'; +import Comms from './comms/Comms'; class Logger { constructor(options) { @@ -104,8 +105,8 @@ class Logger { // console.info('[Logger:: No new logger settings!'); } if (changes['uwLogger'] && changes['uwLogger'].newValue) { - console.log("[Logger::] Logger have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area); - console.info("[Logger::] new logger settings object (parsed):", JSON.parse(changes.uwLogger.newValue)); + // console.log("[Logger::] Logger have been changed outside of here. Updating active settings. Changes:", changes, "storage area:", area); + // console.info("[Logger::] new logger settings object (parsed):", JSON.parse(changes.uwLogger.newValue)); } } if (!changes['uwLogger']) { @@ -202,7 +203,7 @@ class Logger { // } else { // this.exportLogToFile(); } - this.saveToVuex(); + this.saveViaBgScript(); } parseStack() { @@ -457,6 +458,10 @@ class Logger { } } + appendLog(logs) { + this.history = this.history.concat(logs); + } + addLogFromPage(host, tabId, frameId, pageHistory) { if (! this.globalHistory[host]) { this.globalHistory[host] = {}; @@ -471,6 +476,34 @@ class Logger { } } + saveViaBgScript() { + console.info('[info] will attempt to save. Issuing "show-logger"'); + if (!this.conf?.fileOptions?.enabled || this.isBackgroundScript) { + console.info('[info] Logging to file is either disabled or we\'re not on the content script. Not saving.'); + return; + } + + Comms.sendMessage({cmd: 'show-logger', forwardToSameFramePort: true, port: 'content-ui-port'}); + + let exportObject; + try { + exportObject = { + pageLogs: decycle(this.history), + backgroundLogs: decycle(this.globalHistory), + loggerFileOptions: this.conf.fileOptions, + } + } catch (e) { + console.error("[fail] error parsing logs!", e) + return; + } + + try { + Comms.sendMessage({cmd: 'emit-logs', payload: JSON.stringify(exportObject), forwardToSameFramePort: true, port: 'content-ui-port'}) + } catch (e) { + console.log("failed to send message") + } + } + saveToVuex() { console.info('[info] will attempt to save to vuex store.'); if (!this.conf?.fileOptions?.enabled || this.isBackgroundScript) { diff --git a/src/ext/lib/comms/CommsServer.js b/src/ext/lib/comms/CommsServer.js index e2d8b56..3d273a6 100644 --- a/src/ext/lib/comms/CommsServer.js +++ b/src/ext/lib/comms/CommsServer.js @@ -186,13 +186,21 @@ class CommsServer { } } - async sendToContentScripts(message, tab, frame) { + // if port is NOT defined, send to all content scripts of a given frame + // if port is defined, send just to that particular script of a given frame + async sendToFrameContentScripts(message, tab, frame, port) { + if (port !== undefined) { + // note: 'port' is _not_ shadowed here. + this.ports[tab][frame][port].postMessage(message); + return; + } for (const port in this.ports[tab][frame]) { + // note: 'port' is shadowed here! this.ports[tab][frame][port].postMessage(message); } } - async sendToFrame(message, tab, frame) { + async sendToFrame(message, tab, frame, port) { this.logger.log('info', 'comms', `%c[CommsServer::sendToFrame] attempting to send message to tab ${tab}, frame ${frame}`, "background: #dda; color: #11D", message); if (isNaN(tab)) { @@ -210,12 +218,18 @@ class CommsServer { this.logger.log('info', 'comms', `%c[CommsServer::sendToFrame] attempting to send message to tab ${tab}, frame ${frame}`, "background: #dda; color: #11D", message); try { - this.sendToContentScripts(message, tab, frame); + this.sendToFrameContentScripts(message, tab, frame, port); } catch (e) { this.logger.log('error', 'comms', `%c[CommsServer::sendToFrame] Sending message failed. Reason:`, "background: #dda; color: #11D", e); } } + async sendToAllFrames(message, tab, port) { + for (const frame in this.ports[tab]) { + this.sendToFrameContentScripts(message, tab, frame, port); + } + } + async sendToActive(message) { this.logger.log('info', 'comms', "%c[CommsServer::sendToActive] trying to send a message to active tab. Message:", "background: #dda; color: #11D", message); @@ -227,7 +241,7 @@ class CommsServer { } for (const frame in this.ports[tabs[0].id]) { - this.sendToContentScripts(message, tabs[0].id, frame); + this.sendToFrameContentScripts(message, tabs[0].id, frame); } } @@ -286,6 +300,9 @@ class CommsServer { async handleMessage(message, portOrSender, sendResponse) { await this.execCmd(message, portOrSender, sendResponse); + if (message.forwardToSameFramePort) { + this.sendToFrameContentScripts(message, portOrSender.tab.id, portOrSender.frameId, message.port) + } if (message.forwardToContentScript) { this.logger.log('info', 'comms', "[CommsServer.js::processReceivedMessage] Message has 'forward to content script' flag set. Forwarding message as is. Message:", message); this.sendToFrame(message, message.targetTab, message.targetFrame); diff --git a/src/ext/uw-bg.js b/src/ext/uw-bg.js index 76f47eb..0440aa5 100644 --- a/src/ext/uw-bg.js +++ b/src/ext/uw-bg.js @@ -64,6 +64,7 @@ class UWServer { this.comms.subscribe('show-logger', async () => await this.initUiAndShowLogger()); this.comms.subscribe('init-vue', async () => await this.initUi()); this.comms.subscribe('uwui-vue-initialized', () => this.uiLoggerInitialized = true); + this.comms.subscribe('emit-logs', () => {}); // we don't need to do anything, this gets forwarded to UI content script as is if(BrowserDetect.firefox) { diff --git a/src/ext/uw-ui.js b/src/ext/uw-ui.js index d3607bc..c4bf579 100644 --- a/src/ext/uw-ui.js +++ b/src/ext/uw-ui.js @@ -22,6 +22,7 @@ class UwUi { this.commsHandlers = { 'show-logger': [() => this.showLogger()], 'hide-logger': [() => this.hideLogger()], + 'emit-logs' : [(message) => this.addLogs(message)] } } @@ -122,42 +123,54 @@ class UwUi { return; } - Vue.prototype.$browser = global.browser; - Vue.use(Vuex); - this.vuexStore = new Vuex.Store({ - plugins: [VuexWebExtensions({ - persistentStates: [ - 'uwLog', - 'showLogger', - ], - })], - state: { - uwLog: '', - showLogger: false, - }, - mutations: { - 'uw-set-log'(state, payload) { - state['uwLog'] = payload; + try { + Vue.prototype.$browser = global.browser; + Vue.use(Vuex); + this.vuexStore = new Vuex.Store({ + plugins: [VuexWebExtensions({ + persistentStates: [ + 'uwLog', + 'showLogger', + 'loggingEnded', + ], + })], + state: { + uwLog: '', + showLogger: false, + loggingEnded: false, }, - 'uw-show-logger'(state) { - state['showLogger'] = true; + mutations: { + 'uw-set-log'(state, payload) { + state['uwLog'] = payload; + }, + 'uw-show-logger'(state) { + state['showLogger'] = true; + }, + 'uw-hide-logger'(state) { + state['showLogger'] = false; + }, + 'uw-logging-ended'(state) { + state['loggingEnded'] = state; + } }, - 'uw-hide-logger'(state) { - state['showLogger'] = false; + actions: { + 'uw-set-log' ({commit}, payload) { + commit('uw-set-log', payload); + }, + 'uw-show-logger'({commit}) { + commit('uw-show-logger'); + }, + 'uw-hide-logger'({commit}) { + commit('uw-hide-logger'); + }, + 'uw-logging-ended'({commit}, payload) { + commit('uw-logging-ended', payload); + } } - }, - actions: { - 'uw-set-log' ({commit}, payload) { - commit('uw-set-log', payload); - }, - 'uw-show-logger'({commit}) { - commit('uw-show-logger'); - }, - 'uw-hide-logger'({commit}) { - commit('uw-hide-logger'); - } - } - }); + }); + } catch (e) { + console.error("Ultrawidify failed to initialize vue. Error:", e); + } // make sure we don't init twice this.vueInitiated = true; @@ -211,6 +224,17 @@ class UwUi { this.vuexStore.dispatch('uw-hide-logger'); } } + + addLogs(message) { + this.logger.appendLog(JSON.parse(message.payload)); + + // since this gets called _after_ logging has been finished, + // we also inform logger UI to save current settings + if (this.vueInitiated && this.vuexStore !== undefined) { + console.log("got add logs. payload:", message.payload); + this.vuexStore.dispatch('uw-logging-ended', true); + } + } } // leave a mark, so this script won't get executed more than once on a given page diff --git a/src/ext/uw.js b/src/ext/uw.js index c7fd89e..702105b 100644 --- a/src/ext/uw.js +++ b/src/ext/uw.js @@ -1,8 +1,9 @@ import Debug from './conf/Debug'; import BrowserDetect from './conf/BrowserDetect'; -import ExtensionMode from '../common/enums/extension-mode.enum' +import ExtensionMode from '../common/enums/extension-mode.enum'; import Settings from './lib/Settings'; import ActionHandler from './lib/ActionHandler'; +import Comms from './lib/comms/Comms'; import CommsClient from './lib/comms/CommsClient'; import PageInfo from './lib/video-data/PageInfo'; import Logger from './lib/Logger'; @@ -111,18 +112,12 @@ class UW { this.logger = new Logger(); await this.logger.init(loggingOptions); - if (this.logger.isLoggingAllowed()) { - console.info("[uw::init] Logging is allowed! Initalizing vue and UI!"); - } - // show popup if logging to file is enabled - if (this.logger.isLoggingToFile()) { - console.info('[uw::init] Logging to file is enabled. Will show popup!'); - try { - this.vuexStore.dispatch('uw-show-logger'); - } catch (e) { - console.error('[uw::init] Failed to open popup!', e) - } + if (this.logger.isLoggingAllowed() && this.logger.isLoggingToFile()) { + console.info("[uw::init] Logging is allowed! Initalizing vue and UI!"); + + // CommsClient is not initiated yet, so we use static comms to send the command + Comms.sendMessage({cmd: 'show-logger'}); } } } catch (e) { diff --git a/src/manifest.json b/src/manifest.json index 68a5b7a..c2d3fab 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -2,7 +2,7 @@ "manifest_version": 2, "name": "Ultrawidify", "description": "Removes black bars on ultrawide videos and offers advanced options to fix aspect ratio.", - "version": "4.4.6.1", + "version": "4.4.7", "applications": { "gecko": { "id": "{cf02b1a7-a01a-4e37-a609-516a283f1ed3}" @@ -23,7 +23,7 @@ "ext/uw.js" ], "css": [ - "ext/uw.css" + "ext/uw-ui.css" ], "all_frames": true }], @@ -46,14 +46,7 @@ "ext/*", "res/fonts/*", "res/css/*", - - "res/img/ytplayer-icons/zoom.png", - "res/img/ytplayer-icons/unzoom.png", - "res/img/ytplayer-icons/fitw.png", - "res/img/ytplayer-icons/fith.png", - "res/img/ytplayer-icons/reset.png", - "res/img/ytplayer-icons/settings.png", - + "res/img/settings/about-bg.png" ], "permissions": [ diff --git a/src/popup/App.vue b/src/popup/App.vue index af02676..7f060ec 100644 --- a/src/popup/App.vue +++ b/src/popup/App.vue @@ -484,6 +484,7 @@ html, body { #tablist { min-width: 275px; + max-width: 300px; } .header { diff --git a/src/popup/panels/VideoPanel.vue b/src/popup/panels/VideoPanel.vue index ae9a741..72f1968 100644 --- a/src/popup/panels/VideoPanel.vue +++ b/src/popup/panels/VideoPanel.vue @@ -25,7 +25,7 @@
You can change or add additional aspect ratios on the settings page (in 'actions&shortcuts' menu).
-
Zooming and panning

What's new

Full changelog for older versions is available here.

-

4.4.6

+

4.4.7

    -
  • Ensured that Vue part of the content script (logger UI) only loads when necessary in order to fix breakage on certain sites (#96).
    • -
  • Disabling (or enabling, if running in whitelist-only mode) specific sites used to not work (#91). This issue appears to have been fixed.
    • -
  • Default stretch mode for sites is now probably being observed, too (#94).
    • -
  • Fixed netflix (and possibly disney+ — please provide feedback for disney+ as I am unable to test it due to regional restrictions)
    • +
  • Removed unnecessary font files and image files from the package.
    • +
  • (For testing/debugging purposes) Logger UI in swatter mode is now somewhat functional and user-friendly.
diff --git a/src/res/css/font/overpass.css b/src/res/css/font/overpass.css index 80992b3..e9603df 100644 --- a/src/res/css/font/overpass.css +++ b/src/res/css/font/overpass.css @@ -76,9 +76,6 @@ font-style: italic; } - - - @font-face { font-family: 'overpass'; src: url('../../fonts/overpass-webfont/overpass-bold.woff2') format('woff2'); @@ -91,35 +88,4 @@ src: url('../../fonts/overpass-webfont/overpass-bold-italic.woff2') format('woff2'); font-weight: 700; font-style: italic; -} - - - -@font-face { - font-family: 'overpass'; - src: url('../../fonts/overpass-webfont/overpass-extrabold.woff2') format('woff2'); - font-weight: 800; - font-style: normal; -} - -@font-face { - font-family: 'overpass'; - src: url('../../fonts/overpass-webfont/overpass-extrabold-italic.woff2') format('woff2'); - font-weight: 800; - font-style: italic; -} - - -@font-face { - font-family: 'overpass'; - src: url('../../fonts/overpass-webfont/overpass-heavy.woff2') format('woff2'); - font-weight: 900; - font-style: normal; -} - -@font-face { - font-family: 'overpass'; - src: url('../../fonts/overpass-webfont/overpass-heavy-italic.woff2') format('woff2'); - font-weight: 900; - font-style: italic; -} +} \ No newline at end of file diff --git a/src/res/fonts/overpass-mono-webfont/overpass-mono-bold.woff b/src/res/fonts/overpass-mono-webfont/overpass-mono-bold.woff deleted file mode 100644 index 9101baa..0000000 Binary files a/src/res/fonts/overpass-mono-webfont/overpass-mono-bold.woff and /dev/null differ diff --git a/src/res/fonts/overpass-mono-webfont/overpass-mono-light.woff b/src/res/fonts/overpass-mono-webfont/overpass-mono-light.woff deleted file mode 100644 index 88ab3a0..0000000 Binary files a/src/res/fonts/overpass-mono-webfont/overpass-mono-light.woff and /dev/null differ diff --git a/src/res/fonts/overpass-mono-webfont/overpass-mono-regular.woff b/src/res/fonts/overpass-mono-webfont/overpass-mono-regular.woff deleted file mode 100644 index 313d044..0000000 Binary files a/src/res/fonts/overpass-mono-webfont/overpass-mono-regular.woff and /dev/null differ diff --git a/src/res/fonts/overpass-mono-webfont/overpass-mono-semibold.woff b/src/res/fonts/overpass-mono-webfont/overpass-mono-semibold.woff deleted file mode 100644 index 11639d3..0000000 Binary files a/src/res/fonts/overpass-mono-webfont/overpass-mono-semibold.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-bold-italic.woff b/src/res/fonts/overpass-webfont/overpass-bold-italic.woff deleted file mode 100644 index 4c182e3..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-bold-italic.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-bold.woff b/src/res/fonts/overpass-webfont/overpass-bold.woff deleted file mode 100644 index e71c04c..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-bold.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-extrabold-italic.woff b/src/res/fonts/overpass-webfont/overpass-extrabold-italic.woff deleted file mode 100644 index 099aa4f..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-extrabold-italic.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-extrabold-italic.woff2 b/src/res/fonts/overpass-webfont/overpass-extrabold-italic.woff2 deleted file mode 100644 index d0a1184..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-extrabold-italic.woff2 and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-extrabold.woff b/src/res/fonts/overpass-webfont/overpass-extrabold.woff deleted file mode 100644 index b964cc6..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-extrabold.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-extrabold.woff2 b/src/res/fonts/overpass-webfont/overpass-extrabold.woff2 deleted file mode 100644 index 72e7ced..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-extrabold.woff2 and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-extralight-italic.woff b/src/res/fonts/overpass-webfont/overpass-extralight-italic.woff deleted file mode 100644 index d44ec1a..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-extralight-italic.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-extralight.woff b/src/res/fonts/overpass-webfont/overpass-extralight.woff deleted file mode 100644 index f300387..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-extralight.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-heavy-italic.woff b/src/res/fonts/overpass-webfont/overpass-heavy-italic.woff deleted file mode 100644 index 679e7c3..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-heavy-italic.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-heavy-italic.woff2 b/src/res/fonts/overpass-webfont/overpass-heavy-italic.woff2 deleted file mode 100644 index ed1dfd8..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-heavy-italic.woff2 and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-heavy.woff b/src/res/fonts/overpass-webfont/overpass-heavy.woff deleted file mode 100644 index 14db22c..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-heavy.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-heavy.woff2 b/src/res/fonts/overpass-webfont/overpass-heavy.woff2 deleted file mode 100644 index dbb499f..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-heavy.woff2 and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-italic.woff b/src/res/fonts/overpass-webfont/overpass-italic.woff deleted file mode 100644 index 95bda4c..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-italic.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-light-italic.woff b/src/res/fonts/overpass-webfont/overpass-light-italic.woff deleted file mode 100644 index d2b01bc..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-light-italic.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-light.woff b/src/res/fonts/overpass-webfont/overpass-light.woff deleted file mode 100644 index 1f2e380..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-light.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-regular.woff b/src/res/fonts/overpass-webfont/overpass-regular.woff deleted file mode 100644 index 0c5c51a..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-regular.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-semibold-italic.woff b/src/res/fonts/overpass-webfont/overpass-semibold-italic.woff deleted file mode 100644 index e021632..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-semibold-italic.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-semibold.woff b/src/res/fonts/overpass-webfont/overpass-semibold.woff deleted file mode 100644 index 8c931c4..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-semibold.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-thin-italic.woff b/src/res/fonts/overpass-webfont/overpass-thin-italic.woff deleted file mode 100644 index f61d749..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-thin-italic.woff and /dev/null differ diff --git a/src/res/fonts/overpass-webfont/overpass-thin.woff b/src/res/fonts/overpass-webfont/overpass-thin.woff deleted file mode 100644 index 4ddc55a..0000000 Binary files a/src/res/fonts/overpass-webfont/overpass-thin.woff and /dev/null differ diff --git a/src/res/img/ytplayer-icons/fith.png b/src/res/img/ytplayer-icons/fith.png deleted file mode 100644 index 7260a88..0000000 Binary files a/src/res/img/ytplayer-icons/fith.png and /dev/null differ diff --git a/src/res/img/ytplayer-icons/fitw.png b/src/res/img/ytplayer-icons/fitw.png deleted file mode 100644 index f20f9ad..0000000 Binary files a/src/res/img/ytplayer-icons/fitw.png and /dev/null differ diff --git a/src/res/img/ytplayer-icons/reset.png b/src/res/img/ytplayer-icons/reset.png deleted file mode 100644 index c69b408..0000000 Binary files a/src/res/img/ytplayer-icons/reset.png and /dev/null differ diff --git a/src/res/img/ytplayer-icons/settings.png b/src/res/img/ytplayer-icons/settings.png deleted file mode 100644 index 48a5b04..0000000 Binary files a/src/res/img/ytplayer-icons/settings.png and /dev/null differ diff --git a/src/res/img/ytplayer-icons/unzoom.png b/src/res/img/ytplayer-icons/unzoom.png deleted file mode 100644 index cdd4fad..0000000 Binary files a/src/res/img/ytplayer-icons/unzoom.png and /dev/null differ diff --git a/src/res/img/ytplayer-icons/zoom.png b/src/res/img/ytplayer-icons/zoom.png deleted file mode 100644 index 845e49e..0000000 Binary files a/src/res/img/ytplayer-icons/zoom.png and /dev/null differ diff --git a/webpack.config.js b/webpack.config.js index 75be6a5..881a7fc 100644 --- a/webpack.config.js +++ b/webpack.config.js @@ -75,12 +75,12 @@ const config = { filename: '[name].css', }), new CopyWebpackPlugin([ - { from: 'res', to: 'res'}, + { from: 'res', to: 'res', ignore: ['css', 'css/**']}, { from: 'ext', to: 'ext', ignore: ['conf/*', 'lib/**']}, { from: 'icons', to: 'icons', ignore: ['icon.xcf'] }, { from: 'popup/popup.html', to: 'popup/popup.html', transform: transformHtml }, { from: 'options/options.html', to: 'options/options.html', transform: transformHtml }, - { from: 'install/first-time/first-time.html', to: 'install/first-time/first-time.html', transform: transformHtml}, + // { from: 'install/first-time/first-time.html', to: 'install/first-time/first-time.html', transform: transformHtml}, { from: 'manifest.json', to: 'manifest.json', @@ -128,6 +128,8 @@ const config = { if (process.env.BROWSER !== 'firefox') { jsonContent.version = jsonContent.version.replace(/[a-zA-Z-]/g, ''); + delete jsonContent.applications; + delete jsonContent.options_ui.browser_style; } return JSON.stringify(jsonContent, null, 2);