Fixes for pictures in portrait mode

client/preview.js

@@ -61,15 +61,20 @@ minimap.onBrush(function(extent){
 
 // Resize video and preview canvas to maintain aspect ratio
 function resize(width, height) {
-
-  var widthFactor = 640 / width,
-      heightFactor = 360 / height,
-      factor = Math.min(widthFactor, heightFactor);
+  var widthFactor, heightFactor;
+  if (height > width) {
+    widthFactor = 360 / width;
+    heightFactor = 640 / height;
+  } else {
+    widthFactor = 640 / width;
+    heightFactor = 360 / height;
+  }
+  var factor = Math.min(widthFactor, heightFactor);
 
   d3.select("canvas")
     .attr("width", factor * width)
     .attr("height", factor * height);
-
+    
   d3.select("#canvas")
     .style("width", (factor * width) + "px");
 

client/theme-editor.js

@@ -7,7 +7,6 @@ function _initialize() {
   	d3.select("#input-new-theme").on("change", updateNewThemeFile).each(updateNewThemeFile);
   	d3.select("#input-new-caption").on("change keyup", updateNewCaption).each(updateNewCaption);
   	d3.select("#btn-delete-theme").on("click", deleteTheme);
-    d3.select("#btn-save-theme").on("click", saveTheme);
     d3.select("#chkNoPattern").on("change", setNoPattern);
 }
 
@@ -26,46 +25,77 @@ function uploadTheme() {
 
   formData.append("newCaption", newCaption);
 
-  $.ajax({
-    url: "/theme/upload",
-    type: "POST",
-    data: formData,
-    dataType: "json",
-    contentType: false,
-    cache: false,
-    processData: false,
-    success: function () {
-      d3.json("/settings/themes.json", function(err, themes){
-
-        var errorMessage;
-
-        // Themes are missing or invalid
-        if (err || !d3.keys(themes).filter(function(d){ return d !== "default"; }).length) {
-          if (err instanceof SyntaxError) {
-            errorMessage = "Error in settings/themes.json:<br/><code>" + err.toString() + "</code>";
-          } else if (err instanceof ProgressEvent) {
-            errorMessage = "Error: no settings/themes.json.";
-          } else if (err) {
-            errorMessage = "Error: couldn't load settings/themes.json.";
-          } else {
-            errorMessage = "No themes found in settings/themes.json.";
-          }
-          d3.select("#loading-bars").remove();
-          d3.select("#loading-message").html(errorMessage);
-          if (err) {
-            throw err;
+  var img = new Image();
+  img.onload = function() {
+    var sizes = {
+      width: this.width,
+      height: this.height
+    };
+    URL.revokeObjectURL(this.src);
+
+    if (sizes.width > sizes.height) {
+      if (sizes.width > 1280) {
+        sizes.width = 1280;
+      }
+      if (sizes.height > 720) {
+        sizes.height = 720;
+      }
+    } else {
+      if (sizes.height > 1280) {
+        sizes.height = 1280;
+      }
+      if (sizes.width > 720) {
+        sizes.width = 720;
+      }
+    }
+    
+    formData.append("newWidth", sizes.width);
+    formData.append("newHeight", sizes.height);
+
+    $.ajax({
+      url: "/theme/upload",
+      type: "POST",
+      data: formData,
+      dataType: "json",
+      contentType: false,
+      cache: false,
+      processData: false,
+      success: function () {
+        d3.json("/settings/themes.json", function(err, themes){
+
+          var errorMessage;
+
+          // Themes are missing or invalid
+          if (err || !d3.keys(themes).filter(function(d){ return d !== "default"; }).length) {
+            if (err instanceof SyntaxError) {
+              errorMessage = "Error in settings/themes.json:<br/><code>" + err.toString() + "</code>";
+            } else if (err instanceof ProgressEvent) {
+              errorMessage = "Error: no settings/themes.json.";
+            } else if (err) {
+              errorMessage = "Error: couldn't load settings/themes.json.";
+            } else {
+              errorMessage = "No themes found in settings/themes.json.";
+            }
+            d3.select("#loading-bars").remove();
+            d3.select("#loading-message").html(errorMessage);
+            if (err) {
+              throw err;
+            }
+            return;
           }
-          return;
-        }
 
-        location.reload();
+          location.reload();
 
-      });
-    },
-    error: function (error) {
-      console.log('error', error);
-    }
-  });
+        });
+      },
+      error: function (error) {
+        console.log('error', error);
+      }
+    });
+
+  }
+  var objectURL = URL.createObjectURL(file);
+  img.src = objectURL;
 
 }
 
@@ -77,6 +107,7 @@ function updateNewThemeFile() {
   }
 
   newTheme = this.files[0];
+
   preview.loadNewTheme(newTheme, function (err) {
     if (err) {
       setClass("error", "Error updating new theme file");
@@ -117,12 +148,6 @@ function deleteTheme() {
 }
 
 function saveTheme() {
-  if(!confirm($("#btn-save-theme").data("confirm"))){
-      d3.event.stopImmediatePropagation();
-      d3.event.preventDefault();
-      return;
-  }
-
   $.ajax({
     url: "/theme/save",
     type: "POST",
@@ -150,6 +175,8 @@ function setNoPattern() {
   } else {
     theme.noPattern = checked;
   }
+
+  saveTheme();
 }
 
 module.exports = {

editor/index.html

@@ -48,7 +48,7 @@
           <input id="input-caption" name="caption" type="text" autocomplete="off" placeholder="Add a caption" />
         </div>
         <div id="preview">
-          <div style="background-color: black;">
+          <div>
             <div id="canvas">
               <canvas width="640" height="360"></canvas>
               <div id="preview-label">Preview</div>

editor/theme.html

@@ -36,11 +36,10 @@
 
         <div class="row form-row" style="padding-bottom: 40px">
           <button type="button" id="btn-delete-theme" class="left" data-confirm="Are you sure you want to delete this theme?"><i class="fa fa-trash"></i>Delete</button>
-          <button type="button" id="btn-save-theme" class="left" data-confirm="Are you sure you want to save changes?"><i class="fa fa-save"></i>Save</button>
         </div>
 
         <div id="preview">
-          <div style="background-color: black;">
+          <div>
             <div id="canvas">
               <canvas width="640" height="360"></canvas>
               <div id="preview-label">Preview</div>

package-lock.json

@@ -28,9 +28,9 @@
       }
     },
     "acorn": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.1.0.tgz",
-      "integrity": "sha512-kL5CuoXA/dgxlBbVrflsflzQ3PAas7RYZB52NOm/6839iVYJgKMJ3cQJD+t2i5+qFa8h3MDpEOJiS64E8JLnSQ=="
+      "version": "7.4.0",
+      "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.0.tgz",
+      "integrity": "sha512-+G7P8jJmCHr+S+cLfQxygbWhXy+8YTVGzAkpEbcLo2mLoL7tij/VG41QSHACSf5QgYRhMZYHuNc6drJaO0Da+w=="
     },
     "acorn-node": {
       "version": "1.8.2",
@@ -1516,9 +1516,9 @@
       },
       "dependencies": {
         "acorn": {
-          "version": "5.7.3",
-          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.3.tgz",
-          "integrity": "sha512-T/zvzYRfbVojPWahDsE5evJdHb3oJoQfFbsrKM7w5Zcs++Tr257tia3BmMP8XYVjp1S9RZXQMh7gao96BlqZOw=="
+          "version": "5.7.4",
+          "resolved": "https://registry.npmjs.org/acorn/-/acorn-5.7.4.tgz",
+          "integrity": "sha512-1D++VG7BhrtvQpNbBzovKNc1FLGGEE/oGe7b9xJm/RFHMBeUaUGpluV9RLjZa47YFdPcDAenEYuq9pQPcMdLJg=="
         }
       }
     },
@@ -1565,9 +1565,9 @@
       "integrity": "sha1-hnqksJP6oF8d4IwG9NeyH9+GmLw="
     },
     "dot-prop": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.0.tgz",
-      "integrity": "sha512-tUMXrxlExSW6U2EXiiKGSBVdYgtV8qlHL+C10TsW4PURY/ic+eaysnSkwB4kA/mBlCyy/IKDJ+Lc3wbWeaXtuQ==",
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-4.2.1.tgz",
+      "integrity": "sha512-l0p4+mIuJIua0mhxGoh4a+iNL9bmeK5DvnSVQa6T0OhrVmaEa1XScX5Etc673FePCJOArq/4Pa2cLGODUWTPOQ==",
       "dev": true,
       "requires": {
         "is-obj": "^1.0.0"
@@ -1612,9 +1612,9 @@
       "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0="
     },
     "elliptic": {
-      "version": "6.5.2",
-      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.2.tgz",
-      "integrity": "sha512-f4x70okzZbIQl/NSRLkI/+tteV/9WqL98zx+SQ69KbXxmVrmjwsNUPn/gYJJ0sHvEak24cZgHIPegRePAtA/xw==",
+      "version": "6.5.3",
+      "resolved": "https://registry.npmjs.org/elliptic/-/elliptic-6.5.3.tgz",
+      "integrity": "sha512-IMqzv5wNQf+E6aHeIqATs0tOLeOTwj1QKbRcS3jBbYkl5oLAserA8yJTT7/VyHUYG91PRmPyeQDObKLPpeS4dw==",
       "requires": {
         "bn.js": "^4.4.0",
         "brorand": "^1.0.1",
@@ -2250,13 +2250,6 @@
             "brace-expansion": "^1.1.7"
           }
         },
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true,
-          "optional": true
-        },
         "minipass": {
           "version": "2.9.0",
           "resolved": "https://registry.npmjs.org/minipass/-/minipass-2.9.0.tgz",
@@ -2279,13 +2272,13 @@
           }
         },
         "mkdirp": {
-          "version": "0.5.1",
-          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-          "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
           "dev": true,
           "optional": true,
           "requires": {
-            "minimist": "0.0.8"
+            "minimist": "^1.2.5"
           }
         },
         "ms": {
@@ -2455,9 +2448,9 @@
           },
           "dependencies": {
             "minimist": {
-              "version": "1.2.0",
-              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-              "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+              "version": "1.2.5",
+              "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+              "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
               "dev": true,
               "optional": true
             }
@@ -3203,9 +3196,9 @@
       "integrity": "sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc="
     },
     "jquery": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.4.1.tgz",
-      "integrity": "sha512-36+AdBzCL+y6qjw5Tx7HgzeGCzC81MDDgaUP8ld2zhx58HdqXGoBd+tHdrBMiyjGQs0Hxs/MLZTu/eHNJJuWPw=="
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.5.1.tgz",
+      "integrity": "sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg=="
     },
     "json-stable-stringify": {
       "version": "0.0.1",
@@ -3399,9 +3392,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
-      "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ="
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
     },
     "minipass": {
       "version": "2.9.0",
@@ -3442,20 +3435,19 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.5",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+      "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
       "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0="
-        }
+        "minimist": "^1.2.5"
       }
     },
+    "mkdirp-classic": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz",
+      "integrity": "sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==",
+      "dev": true
+    },
     "module-deps": {
       "version": "4.1.1",
       "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-4.1.1.tgz",
@@ -3508,6 +3500,16 @@
         "on-finished": "^2.3.0",
         "type-is": "^1.6.4",
         "xtend": "^4.0.0"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
       }
     },
     "nan": {
@@ -3589,6 +3591,16 @@
         "rimraf": "^2.6.1",
         "semver": "^5.3.0",
         "tar": "^4"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
       }
     },
     "nodemon": {
@@ -4309,6 +4321,11 @@
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
+    "resize-image": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/resize-image/-/resize-image-0.1.0.tgz",
+      "integrity": "sha512-78cWCEX/IupMCwKi5Gg5gxjOZKoN6UXinL2eVOB4xzyG2QNjq64z6pJBnyBKg5/BsjEosLz1co5e3DHr99TgFg=="
+    },
     "resolve": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.0.tgz",
@@ -4944,6 +4961,16 @@
         "mkdirp": "^0.5.0",
         "safe-buffer": "^5.1.2",
         "yallist": "^3.0.3"
+      },
+      "dependencies": {
+        "mkdirp": {
+          "version": "0.5.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz",
+          "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==",
+          "requires": {
+            "minimist": "^1.2.5"
+          }
+        }
       }
     },
     "term-size": {
@@ -5290,17 +5317,17 @@
       },
       "dependencies": {
         "browserify": {
-          "version": "16.5.0",
-          "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.5.0.tgz",
-          "integrity": "sha512-6bfI3cl76YLAnCZ75AGu/XPOsqUhRyc0F/olGIJeCxtfxF2HvPKEcmjU9M8oAPxl4uBY1U7Nry33Q6koV3f2iw==",
+          "version": "16.5.2",
+          "resolved": "https://registry.npmjs.org/browserify/-/browserify-16.5.2.tgz",
+          "integrity": "sha512-TkOR1cQGdmXU9zW4YukWzWVSJwrxmNdADFbqbE3HFgQWe5wqZmOawqZ7J/8MPCwk/W8yY7Y0h+7mOtcZxLP23g==",
           "dev": true,
           "requires": {
             "JSONStream": "^1.0.3",
             "assert": "^1.4.0",
             "browser-pack": "^6.0.1",
-            "browser-resolve": "^1.11.0",
+            "browser-resolve": "^2.0.0",
             "browserify-zlib": "~0.2.0",
-            "buffer": "^5.0.2",
+            "buffer": "~5.2.1",
             "cached-path-relative": "^1.0.0",
             "concat-stream": "^1.6.0",
             "console-browserify": "^1.1.0",
@@ -5318,8 +5345,8 @@
             "inherits": "~2.0.1",
             "insert-module-globals": "^7.0.0",
             "labeled-stream-splicer": "^2.0.0",
-            "mkdirp": "^0.5.0",
-            "module-deps": "^6.0.0",
+            "mkdirp-classic": "^0.5.2",
+            "module-deps": "^6.2.3",
             "os-browserify": "~0.3.0",
             "parents": "^1.0.1",
             "path-browserify": "~0.0.0",
@@ -5343,6 +5370,28 @@
             "util": "~0.10.1",
             "vm-browserify": "^1.0.0",
             "xtend": "^4.0.0"
+          },
+          "dependencies": {
+            "browser-resolve": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz",
+              "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==",
+              "dev": true,
+              "requires": {
+                "resolve": "^1.17.0"
+              },
+              "dependencies": {
+                "resolve": {
+                  "version": "1.17.0",
+                  "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+                  "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+                  "dev": true,
+                  "requires": {
+                    "path-parse": "^1.0.6"
+                  }
+                }
+              }
+            }
           }
         },
         "browserify-zlib": {
@@ -5355,9 +5404,9 @@
           }
         },
         "buffer": {
-          "version": "5.4.3",
-          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.4.3.tgz",
-          "integrity": "sha512-zvj65TkFeIt3i6aj5bIvJDzjjQQGs4o/sNoezg1F1kYap9Nu2jcUdpwzRSJTHMMzG0H7bZkn4rNQpImhuxWX2A==",
+          "version": "5.2.1",
+          "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.2.1.tgz",
+          "integrity": "sha512-c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg==",
           "dev": true,
           "requires": {
             "base64-js": "^1.0.2",
@@ -5406,13 +5455,13 @@
           "dev": true
         },
         "module-deps": {
-          "version": "6.2.2",
-          "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.2.tgz",
-          "integrity": "sha512-a9y6yDv5u5I4A+IPHTnqFxcaKr4p50/zxTjcQJaX2ws9tN/W6J6YXnEKhqRyPhl494dkcxx951onSKVezmI+3w==",
+          "version": "6.2.3",
+          "resolved": "https://registry.npmjs.org/module-deps/-/module-deps-6.2.3.tgz",
+          "integrity": "sha512-fg7OZaQBcL4/L+AK5f4iVqf9OMbCclXfy/znXRxTVhJSeW5AIlS9AwheYwDaXM3lVW7OBeaeUEY3gbaC6cLlSA==",
           "dev": true,
           "requires": {
             "JSONStream": "^1.0.3",
-            "browser-resolve": "^1.7.0",
+            "browser-resolve": "^2.0.0",
             "cached-path-relative": "^1.0.2",
             "concat-stream": "~1.6.0",
             "defined": "^1.0.0",
@@ -5426,6 +5475,28 @@
             "subarg": "^1.0.0",
             "through2": "^2.0.0",
             "xtend": "^4.0.0"
+          },
+          "dependencies": {
+            "browser-resolve": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-2.0.0.tgz",
+              "integrity": "sha512-7sWsQlYL2rGLy2IWm8WL8DCTJvYLc/qlOnsakDac87SOoCd16WLsaAMdCiAqsTNHIe+SXfaqyxyo6THoWqs8WQ==",
+              "dev": true,
+              "requires": {
+                "resolve": "^1.17.0"
+              },
+              "dependencies": {
+                "resolve": {
+                  "version": "1.17.0",
+                  "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.17.0.tgz",
+                  "integrity": "sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==",
+                  "dev": true,
+                  "requires": {
+                    "path-parse": "^1.0.6"
+                  }
+                }
+              }
+            }
           }
         },
         "os-browserify": {
@@ -5441,21 +5512,21 @@
           "dev": true
         },
         "stream-http": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.1.0.tgz",
-          "integrity": "sha512-cuB6RgO7BqC4FBYzmnvhob5Do3wIdIsXAgGycHJnW+981gHqoYcYz9lqjJrk8WXRddbwPuqPYRl+bag6mYv4lw==",
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/stream-http/-/stream-http-3.1.1.tgz",
+          "integrity": "sha512-S7OqaYu0EkFpgeGFb/NPOoPLxFko7TPqtEeFg5DXPB4v/KETHG0Ln6fRFrNezoelpaDKmycEmmZ81cC9DAwgYg==",
           "dev": true,
           "requires": {
             "builtin-status-codes": "^3.0.0",
-            "inherits": "^2.0.1",
-            "readable-stream": "^3.0.6",
-            "xtend": "^4.0.0"
+            "inherits": "^2.0.4",
+            "readable-stream": "^3.6.0",
+            "xtend": "^4.0.2"
           },
           "dependencies": {
             "readable-stream": {
-              "version": "3.5.0",
-              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.5.0.tgz",
-              "integrity": "sha512-gSz026xs2LfxBPudDuI41V1lka8cxg64E66SGe78zJlsUofOg/yqwezdIcdfwik6B4h8LFmWPA9ef9X3FiNFLA==",
+              "version": "3.6.0",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz",
+              "integrity": "sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==",
               "dev": true,
               "requires": {
                 "inherits": "^2.0.3",

package.json

@@ -31,12 +31,13 @@
     "d3": "4.10.0",
     "dotenv": "^2.0.0",
     "express": "^4.17.1",
-    "jquery": "^3.4.1",
+    "jquery": "^3.5.1",
     "mkdirp": "^0.5.1",
     "morgan": "^1.7.0",
     "multer": "^1.1.0",
     "node-ffprobe": "^1.2.2",
     "redis": "^2.4.2",
+    "resize-image": "^0.1.0",
     "rimraf": "^2.5.0",
     "smartquotes": "^1.0.0",
     "subtitle": "^2.0.3",

renderer/index.js

@@ -31,11 +31,6 @@ module.exports = function(t) {
     if (typeof theme.waveLeft !== "number") theme.waveLeft = 0;
     if (typeof theme.waveRight !== "number") theme.waveRight = theme.width;
 
-    /*if (location.pathname === "/theme") {
-      const tf = (theme.noPattern === undefined) ? false : theme.noPattern;
-      d3.select("#chkNoPattern").property("checked", tf);
-    }*/
-
     wrapText = textWrapper(theme);
 
     return this;

server/index.js

@@ -84,9 +84,13 @@ app.post("/theme/upload/", [multer(newThemeFileOptions).single("newTheme"), func
       res.send(JSON.stringify({status: 500, error: err}));
     } else {
       var caption = req.body.newCaption;
+      var width = req.body.newWidth;
+      var height = req.body.newHeight;
       var themes = JSON.parse(data);
       themes[caption] = {
-        "backgroundImage": req.file.filename
+        "backgroundImage": req.file.filename,
+        "width": parseInt(width),
+        "height": parseInt(height)
       };
       var jt = JSON.stringify(themes);
       fs.writeFile(themesFile, jt, "utf8", function (err) {