Hotkeys & more

Added hotkey support for first 9 presets
Remove old migration code
Reorganized code for better function reuse

Author: drcheap

background.js

@@ -0,0 +1,22 @@
+function handleCommand(command)
+{
+   console.log("(background) handling command: " + command);
+
+   if(command.startsWith(PRESET_PREFIX))
+   {
+      browser.storage.local.get("presets").then((obj) => {
+         if(obj != undefined)
+         {
+            let presets = obj.presets;
+            let presetNum = parseInt(command.substring(PRESET_PREFIX.length));
+            if(presetNum <= presets.length)
+            {
+               let presetId = presets[presetNum - 1].id;
+               applyPreset(presetId);
+            }
+         }
+      });
+   }
+}
+
+browser.commands.onCommand.addListener(handleCommand);

common.js

@@ -0,0 +1,35 @@
+const PRESET_PREFIX = "preset-";
+
+function applyPreset(presetId)
+{
+   console.log("(common) applying preset: " + presetId);
+
+   browser.storage.local.get("presets").then((obj) => {
+      if(obj != undefined)
+      {
+         let presets = obj.presets;
+         for(let i = 0;i < presets.length;i++)
+         {
+            if(presets[i].id == presetId)
+            {
+               resizeWindow(presets[i].width,presets[i].height);
+               break;
+            }
+         }
+      }
+   });
+}
+
+function resizeWindow(newWidth, newHeight)
+{
+   console.log("(common) resizing to: " + newWidth + "x" + newHeight);
+
+   let updateInfo = {
+      "width": parseInt(newWidth),
+      "height": parseInt(newHeight)
+   };
+
+   browser.windows.getCurrent().then((currentWindow) => {
+      browser.windows.update(currentWindow.id, updateInfo);
+   });
+}

manifest.json

@@ -1,7 +1,7 @@
 {
    "manifest_version": 2,
    "name": "WindowSizer",
-   "version": "0.4beta2",
+   "version": "0.5.1",
    "author": "Dr. Cheap",
    "description": "Quickly resize the window to one of your favorite sizes",
    "homepage_url": "https://addons.mozilla.org/en-US/firefox/addon/windowsizer",
@@ -35,5 +35,66 @@
          "16": "icons/ws_icon_16.png",
          "32": "icons/ws_icon_32.png"
       }
+   },
+
+   "background": {
+      "scripts": ["common.js", "background.js"]
+   },
+
+   "commands": {
+      "preset-1": {
+         "suggested_key": {
+            "default": "Alt+1"
+         },
+         "description": "Activate preset #1"
+      },
+      "preset-2": {
+         "suggested_key": {
+            "default": "Alt+2"
+         },
+         "description": "Activate preset #2"
+      },
+      "preset-3": {
+         "suggested_key": {
+            "default": "Alt+3"
+         },
+         "description": "Activate preset #3"
+      },
+      "preset-4": {
+         "suggested_key": {
+            "default": "Alt+4"
+         },
+         "description": "Activate preset #4"
+      },
+      "preset-5": {
+         "suggested_key": {
+            "default": "Alt+5"
+         },
+         "description": "Activate preset #5"
+      },
+      "preset-6": {
+         "suggested_key": {
+            "default": "Alt+6"
+         },
+         "description": "Activate preset #6"
+      },
+      "preset-7": {
+         "suggested_key": {
+            "default": "Alt+7"
+         },
+         "description": "Activate preset #7"
+      },
+      "preset-8": {
+         "suggested_key": {
+            "default": "Alt+8"
+         },
+         "description": "Activate preset #8"
+      },
+      "preset-9": {
+         "suggested_key": {
+            "default": "Alt+9"
+         },
+         "description": "Activate preset #9"
+      }
    }
 }

options.html

@@ -10,14 +10,16 @@
  <fieldset>
   <legend>Mange Presets</legend>
   <form>
-   <table id="presets">
+   <table id="presetsList">
     <tr>
+     <th>Hotkey</td>
      <th>Width</th>
      <th>Height</th>
      <th>Name</th>
      <th>Aciton</th>
     </tr>
     <tr id="addPreset">
+     <td>&nbsp;</td>
      <td><input type="text" id="newWidth" name="newWidth" size="4" maxlength="4"></td>
      <td><input type="text" id="newHeight" name="newHeight" size="4" maxlength="4"></td>
      <td><input type="text" id="newName" name="newName" size="15" maxlength="15"></td>

options.js

@@ -38,8 +38,8 @@ function addPreset(e) {
       console.log("(add) Adding preset: " + newWidth + "x" + newHeight + " " + newName);
       let item = {
          "id": new Date().valueOf(),      // This is not *perfect* but works as long as two presets aren't created in the same millisecond (o).(O)
-         "width": newWidth,
-         "height": newHeight,
+         "width": parseInt(newWidth),
+         "height": parseInt(newHeight),
          "name": newName
       };
 
@@ -66,11 +66,16 @@ function displayPresets() {
 
       for(let i = 0;i < presets.length;i++)
       {
-         console.log("(display) Add item row " + (i+1) + ": " + presets[i].name);
+         let presetIndex = i + 1;
+         console.log("(display) Add item " + presetIndex + ": " + presets[i].name);
 
          let tr = document.createElement("tr");
          tr.className = "presetItem";
 
+         let tdK = document.createElement("td");
+         tdK.appendChild(document.createTextNode("Alt+" + presetIndex));
+         tr.appendChild(tdK);
+
          let tdW = document.createElement("td");
          tdW.appendChild(document.createTextNode(presets[i].width));
          tr.appendChild(tdW);
@@ -129,20 +134,8 @@ function removePreset(e)
 browser.storage.local.get("presets").then((obj) => {
    if(!Array.isArray(obj.presets))
    {
-      // Possible v0.3beta to v0.4beta settings migration
-      browser.storage.sync.get("presets").then((obj) => {
-         if(Array.isArray(obj.presets))
-         {
-            console.log("(init) Migrating settings to local storage...");
-            browser.storage.local.set({"presets": obj.presets}).then(displayPresets);
-            browser.storage.sync.remove("presets");
-         }
-         else
-         {
-            console.log("(init) No presets found, initializing...");
-            browser.storage.local.set({"presets": []});
-         }
-      });
+      console.log("(init) No presets found, initializing...");
+      browser.storage.local.set({"presets": []});
    }
 });
 

toolbar_menu.css

@@ -14,3 +14,7 @@ a:hover {
 .panel {
   margin: 5px;
 }
+
+.presetIndex {
+   text-align: right
+}

toolbar_menu.html

@@ -12,15 +12,16 @@
         <div class="text-section-header">WindowSizer</div>
       </div>
 
-      <div id="presets">
-      </div>
+      <table id="presetsList">
+      </table>
 
       <div class="panel-section-separator"></div>
 
       <a href="#" id="customize">Customize...</a><br>
 
     </div>
 
+  <script src="common.js"></script>
   <script src="toolbar_menu.js"></script>
 </body>
 

toolbar_menu.js

@@ -1,28 +1,42 @@
-const RESIZE_PREFIX = "resize-";
-
 function updateMenuWithPresets()
 {
    let getPresets = browser.storage.local.get("presets");
    getPresets.then((obj) => {
       if(obj != undefined)
       {
-         let menu = document.querySelector("#presets");
+         let list = document.querySelector("#presetsList");
 
          let presets = obj.presets;
          for(let i = 0;i < presets.length;i++)
          {
+            let linkText = presets[i].width + "x" + presets[i].height + " " + presets[i].name;
+            let numberText = "&nbsp;";
+            if(i < 9)
+            {
+               numberText = (i + 1) + ": ";
+            }
+
+            let tr = document.createElement("tr");
+
+            let tdN = document.createElement("td");
+            tr.className = "presetIndex";
+            tdN.appendChild(document.createTextNode(numberText));
+            tr.appendChild(tdN);
+
+            let tdL = document.createElement("td");
+
             let a = document.createElement("a");
             a.href = "#";
-            a.id = RESIZE_PREFIX + presets[i].width + "x" + presets[i].height;
-            a.appendChild(document.createTextNode(presets[i].width + "x" + presets[i].height + " " + presets[i].name));
-            menu.appendChild(a);
+            a.id = PRESET_PREFIX + presets[i].id;
+            a.appendChild(document.createTextNode(linkText));
+            tdL.appendChild(a);
+
+            tr.appendChild(tdL);
 
-            let br = document.createElement("br");
-            menu.appendChild(br);
+            list.appendChild(tr);
          }
       }
    });
-
 }
 
 function doMenuClick(e)
@@ -33,19 +47,10 @@ function doMenuClick(e)
    {
       browser.runtime.openOptionsPage();
    }
-   else if(myId.startsWith(RESIZE_PREFIX))
+   else if(myId.startsWith(PRESET_PREFIX))
    {
-      let xPos = myId.indexOf("x",RESIZE_PREFIX.length);
-      let newWidth = parseInt(myId.substring(RESIZE_PREFIX.length,xPos));
-      let newHeight = parseInt(myId.substring(xPos + 1));
-      let updateInfo = {
-         "width": newWidth,
-         "height": newHeight
-      };
-
-      browser.windows.getCurrent().then((currentWindow) => {
-         browser.windows.update(currentWindow.id, updateInfo);
-      });
+      let presetId = myId.substring(PRESET_PREFIX.length);
+      applyPreset(presetId);
    }
 
    e.preventDefault();