Merge branch 'master' into stable

CHANGELOG.md

@@ -12,7 +12,12 @@ QoL improvements for me:
 
 * logging: allow to enable logging at will and export said logs to a file
 
-### v4.3.0 (current)
+### v4.3.1 (current)
+
+* Minor rework of settings page (actions & shortcuts section)
+* Fixed bug that prevented settings page from opening
+
+### v4.3.0
 
 * Fixed some issues with incorrect alignment after window resize
 * Fixed all sorts of issues for videos hosted on v.reddit for new (and old) reddit

package.json

@@ -1,6 +1,6 @@
 {
   "name": "ultravidify",
-  "version": "4.3.0",
+  "version": "4.3.1",
   "description": "Aspect ratio fixer for youtube that works around some people's disability to properly encode 21:9 (and sometimes, 16:9) videos.",
   "author": "Tamius Han <tamius.han@gmail.com>",
   "scripts": {

src/common/components/ActionAlt.vue

@@ -1,18 +1,18 @@
 <template>
-  <div class="action flex flex-column">
+  <div class="action">
-
+    <div class="flex-row action-name-cmd-container">
-    <div class="flex flex-row action-name-cmd-container">
       <div class="">
 
       </div>
       <div class="flex action-name">
-        <span class="icon red" @click="removeAction()">🗙</span> &nbsp; &nbsp;
+        <span v-if="action.cmd && action.cmd.length > 1 || action.cmd[0].action === 'set-ar' && action.cmd[0].arg === AspectRatio.Fixed" class="icon red" @click="removeAction()">🗙</span> &nbsp; &nbsp;
+        <span v-else class="icon transparent">🗙</span> &nbsp; &nbsp;
         <span class="icon" @click="editAction()">🖉</span> &nbsp; &nbsp;
         {{action.name}}
       </div>
     </div>
-    <div class="flex flex-row command-details">
+    <div class="command-details">
-      <div class="flex flex-column cmd-container">
+      <div class="flex flex-column cmd-container cd-pad">
         <div class="flex bold">
           Command: 
         </div>
@@ -22,8 +22,8 @@
       </div>
 
      <!-- SCOPES -->
-      <div class="flex flex-column scopes-container">
+      <div class="flex flex-column scopes-container cd-pad">
-        <div class="flex bold">Popup scopes:</div>
+        <div class="flex bold">Popup tabs:</div>
 
         <!-- global scope -->
         <div v-if="action.scopes.global"
@@ -109,13 +109,15 @@
 
 <script>
 import Stretch from '../enums/stretch.enum';
+import AspectRatio from '../enums/aspect-ratio.enum';
 import KeyboardShortcutParser from '../js/KeyboardShortcutParser';
 
 
 export default {
   data () {
     return {
-      Stretch: Stretch
+      Stretch: Stretch,
+      AspectRatio: AspectRatio,
     }
   },
   created () {
@@ -151,6 +153,8 @@ export default {
 
 .action {
   cursor: pointer;
+  position: relative;
+  box-sizing: border-box;
 }
 
 .action .command-details {
@@ -159,6 +163,10 @@ export default {
   transition: max-height 0.5s ease;
   overflow: hidden;
   transition: height 0.5s ease;
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 50%;
 }
 
 .action:hover .command-details {
@@ -167,16 +175,29 @@ export default {
   transition: max-height 0.5s ease;
 }
 
-.action-name-cmd-container {
+.command-details {
+  position: absolute;
+  top: 0;
+  right: 0;
+  width: 50%;
+}
+
+.action-name-cmd-container, .p1rem {
   padding: 1rem;
 }
 
+.cd-pad {
+  padding: 0.5em;
+}
+
 .action-name {
   font-size: 1.5rem;
   font-weight: 300;
   color: $text-normal;
+  width: 50%;
 }
-.action-name:hover {
+
+.action-name:hover, .action:hover .action-name {
   color: lighten($primary-color, 20%);
 }
 
@@ -220,5 +241,8 @@ export default {
   color: $text-normal;
 }
 
+.transparent {
+  opacity: 0;
+}
 
 </style>

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.3.0.2",
+  "version": "4.3.1",
   "applications": {
     "gecko": {
       "id": "{cf02b1a7-a01a-4e37-a609-516a283f1ed3}"

src/options/App.vue

@@ -48,7 +48,7 @@
               :class="{'selected-tab': selectedTab === 'controls'}"
               @click="setSelectedTab('controls')"
               >
-              Actions
+              Actions & shortcuts
           </div>
           <div class="menu-item"
               :class="{'selected-tab': selectedTab === 'txtconf'}"
@@ -113,21 +113,17 @@ import Donate from '../common/misc/Donate.vue';
 import SuperAdvancedSettings from './SuperAdvancedSettings.vue';
 import Debug from '../ext/conf/Debug.js';
 import BrowserDetect from '../ext/conf/BrowserDetect.js';
-
 import ExtensionConf from '../ext/conf/ExtensionConf.js';
-
 import ObjectCopy from '../ext/lib/ObjectCopy.js';
-
 import Settings from '../ext/lib/Settings.js';
-
 import GeneralSettings from './GeneralSettings';
 import ControlsSettings from './controls-settings/ControlsSettings';
 import AddEditActionPopup from './controls-settings/AddEditActionPopup';
 import ConfirmPopup from './common/ConfirmationPopup';
 import About from './about'
-
 import AutodetectionSettings  from './AutodetectionSettings';
 // import SuperAdvancedSettings from './'
+import Logger from '../ext/lib/Logger';
 
 export default {
   name: "Ultrawidify",

src/popup/panels/WhatsNewPanel.vue

@@ -2,21 +2,10 @@
   <div>
     <h2>What's new</h2>
     <p>Full changelog for older versions <a href="https://github.com/xternal7/ultrawidify/blob/master/CHANGELOG.md">is available here</a>.</p>
-    <p class="label">4.3.0.2</p>
+    <p class="label">4.3.1</p>
     <ul>
-      <li><b>[4.3.0.2]</b> Extension would not work for new users. (Special thanks to [ezzak](https://github.com/ezzak) for finding and submitting a patch)</li>
+      <li>Minor rework of settings page (actions & shortcuts section)</li>
-      <li><b>[4.3.0.1]</b> Removed some stray, forgotten console.logs.</li>
+      <li>Fixed bug that prevented settings page from opening</li>
-      <li>Fixed an issue where videos would get incorrectly aligned following a window resize.</li>
-      <li>Fixed all sorts of issues for videos hosted on v.reddit for new (and old) reddit</li>
-      <li>Fixed the issue where setting extension to 'whitelist only' would disable 'site settings' in popup.</li>
-      <li>User-friendly way of importing-exporting settings (exporting settings requires 'download' permission)</li>
-      <li>Started using mutation observers to watch for changes in player size as well, but with some caveats.</li>
-      <li>Mutation observers are now used to detect both video and player size changes.</li>
-      <li>Settings patching has been reworked. Settings can now be patched incrementally.</li>
-    </ul>
-    <p>I'm also laying ground for some features that will make my life easier:</p>
-    <ul>
-      <li>Reworked how logging works internally, but this point still needs some work.</li>
     </ul>
   </div>
 </template>