Merge branch 'develop'

CHANGELOG.md

@@ -3,6 +3,10 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/),
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## [1.11.3] - 2021-4-10
+### Fixed
+* Fixes an error when `searchsquare` is undefined and `alwaysopen == true`
+
 ## [1.11.2] - 2020-8-8
 ### Changed
 * Made duckduckgo the default search engine in the default config
@@ -51,6 +55,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/).
   * `filter`: An optional filter, e.g. `opacity(0.2)`
 
 
+[1.11.3]: https://github.com/etacarinaea/startpage/compare/v1.11.2...v1.11.3
 [1.11.2]: https://github.com/etacarinaea/startpage/compare/v1.11.1...v1.11.2
 [1.11.1]: https://github.com/etacarinaea/startpage/compare/v1.11.0...v1.11.1
 [1.11.0]: https://github.com/etacarinaea/startpage/compare/v1.10.0...v1.11.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "startpage",
-  "version": "1.11.2",
+  "version": "1.11.3",
   "description": "Overrides the browsers newtab page with a custom startpage.",
   "main": "src/index.js",
   "devDependencies": {

src/js/load-config.js

@@ -373,7 +373,8 @@ function applyConfig(data, callback) {
   while(container.firstChild) {
     container.removeChild(container.firstChild);
   }
-  normalSquares = [];
+  let normalSquares = [];
+  let searchsquare = undefined;
   for(let i = 0; i < data.squares.length; i++) {
     if(data.squares[i].links) {
       normalSquares[i] = new Square(data.squares[i].name,
@@ -418,9 +419,11 @@ function applyConfig(data, callback) {
         maxHeight = normalSquares[i].maxHeight();
       }
     }
-    let sMaxHeight = searchsquare.maxHeight();
-    if(searchsquare && sMaxHeight > maxHeight) {
-      maxHeight = sMaxHeight;
+    if(searchsquare) {
+      let sMaxHeight = searchsquare.maxHeight();
+      if(sMaxHeight > maxHeight) {
+        maxHeight = sMaxHeight;
+      }
     }
     sqr.css("height", px(maxHeight));
   } else {

src/manifest.json

@@ -2,7 +2,7 @@
   "manifest_version": 2,
   "name": "startpage",
   "short_name": "startpage",
-  "version": "1.11.2",
+  "version": "1.11.3",
   "description": "Overrides the browsers newtab page with a custom startpage.",
   "author": "etacarinaea",