Merge branch 'v.0.47.2'

Author: dziudek

README.md

@@ -9,7 +9,7 @@
 [Publii](https://getpublii.com/) is a desktop-based CMS for Windows, Mac and Linux that makes creating static websites fast
 and hassle-free, even for beginners.
 
-**Current version: 0.47.1 (build 17302)**
+**Current version: 0.47.2 (build 17336)**
 
 ## Why Publii?
 Unlike static-site generators that are often unwieldy and difficult to use, Publii provides an

app/back-end/app-preload.js

@@ -102,7 +102,8 @@ contextBridge.exposeInMainWorld('mainProcessAPI', {
             'app-close',
             'app-set-ui-zoom-level',
             'app-set-notifications-center-state',
-            'app-get-notifications-file'
+            'app-get-notifications-file',
+            'app-pages-hierarchy-update'
         ];
 
         if (validChannels.includes(channel)) {

app/back-end/app.js

@@ -609,7 +609,11 @@ class App {
         this.mainWindow.removeMenu();
 
         // Register search shortcut listener
-        this.mainWindow.webContents.on('before-input-event', (e, input) => {
+        this.mainWindow.webContents.on('before-input-event', (event, input) => {
+            if (input.type === 'mouseDown' && (input.button === 'back' || input.button === 'forward')) {
+                event.preventDefault();
+            }
+
             if (input.key === 'f' && (input.meta || input.control)) {
                 this.mainWindow.webContents.send('app-show-search-form');
             } else if (input.key === 'z' && (input.meta || input.control) && !input.shift) {

app/back-end/builddata.json

@@ -1,4 +1,4 @@
 {
-  "version": "0.47.1",
-  "build": 17302
+  "version": "0.47.2",
+  "build": 17336
 }

app/back-end/events/page.js

@@ -103,13 +103,13 @@ class PageEvents {
         });
 
         // Update pages hierarchy during post conversion
-        ipcMain.on('app-pages-hierarchy-update', (event, postIDs) => {
-            let pagesFile = path.join(this.app.sitesDir, pagesData.siteName, 'input', 'config', 'pages.config.json');
+        ipcMain.on('app-pages-hierarchy-update', (event, conversionData) => {
+            let pagesFile = path.join(this.app.sitesDir, conversionData.siteName, 'input', 'config', 'pages.config.json');
             let pagesHierarchy = JSON.parse(FileHelper.readFileSync(pagesFile, { encoding: 'utf8' }));
 
-            for (let i = 0; i < postIDs.length; i++) {
+            for (let i = 0; i < conversionData.postIDs.length; i++) {
                 pagesHierarchy.push({
-                    id: postIDs[i],
+                    id: conversionData.postIDs[i],
                     subpages: []
                 });
             }

app/back-end/events/preview.js

@@ -85,17 +85,13 @@ class PreviewEvents {
                         errorTitle = {
                             translation: 'core.rendering.renderingProcessFailed'
                         };
-                        errorDesc = data.result[0].message + "\n\n" + data.result[0].desc;
-                    }
-
-                    if (typeof errorDesc === 'object') {
-                        errorDesc = errorDesc.translation;
+                        errorDesc = stripTags((data.result[0].message + "\n\n" + data.result[0].desc).toString());
                     }
 
                     event.sender.send('app-preview-render-error', {
                         message: [{
                             message: errorTitle,
-                            desc: stripTags((errorDesc).toString())
+                            desc: errorDesc
                         }]
                     });
                 }
@@ -134,7 +130,7 @@ class PreviewEvents {
                         errorTitle = {
                             translation: 'core.rendering.renderingProcessFailed'
                         };
-                        errorDesc = data.result[0].message + "\n\n" + data.result[0].desc;
+                        errorDesc = stripTags((data.result[0].message + "\n\n" + data.result[0].desc).toString());
                     }
 
                     event.sender.send('app-preview-render-error', {

app/back-end/modules/render-html/handlebars/helpers/_modules.js

@@ -7,6 +7,7 @@ module.exports = {
     fontHelper: require('./font.js').fontHelper,
     dateHelper: require('./date.js'),
     is: require('./is.js'),
+    isNot: require('./is-not.js'),
     isCurrentPage: require('./is-current-page.js'),
     encodeUrl: require('./encode-url.js'),
     encodeUrlFragment: require('./encode-url-fragment.js'),

app/back-end/modules/render-html/handlebars/helpers/is-not.js

@@ -0,0 +1,31 @@
+/**
+ * Helper for detecting contexts - opposite to #is helper
+ *
+ * {{#isNot 'index'}}
+ *
+ * {{#isNot 'tag,post'}}
+ *
+ * Available phrases: index, blogindex, tag, post, page, author, 404, search, pagination, index-pagination, tag-pagination, author-pagination
+ *
+ * @returns {callback}
+ */
+function isNot (conditional, options) {
+    let contextIsCorrect = false;
+    let contextsToCheck = conditional.split(',');
+    contextsToCheck = contextsToCheck.map(context => context.trim());
+
+    for (let context of contextsToCheck) {
+        if (options.data.context.indexOf(context) > -1) {
+            contextIsCorrect = true;
+            break;
+        }
+    }
+
+    if (!contextIsCorrect) {
+        return options.fn(this);
+    } else {
+        return options.inverse(this);
+    }
+}
+
+module.exports = isNot;

app/back-end/modules/render-html/renderer-cache.js

@@ -124,7 +124,8 @@ class RendererCache {
             WHERE
                 p.status LIKE '%published%' AND
                 p.status NOT LIKE '%hidden%' AND
-                p.status NOT LIKE '%trashed%'
+                p.status NOT LIKE '%trashed%' AND
+                p.status NOT LIKE '%is-page%' 
                 ${includeFeaturedPosts}
             GROUP BY
                 pt.tag_id;
@@ -238,7 +239,7 @@ class RendererCache {
                 p.status LIKE '%published%' AND
                 p.status NOT LIKE '%hidden%' AND
                 p.status NOT LIKE '%trashed%' AND
-                p.status NOT LIKE '%is-page%'
+                p.status NOT LIKE '%is-page%' 
                 ${includeFeaturedPosts}
             GROUP BY
                 a.id

app/back-end/modules/render-html/renderer-context.js

@@ -782,6 +782,15 @@ class RendererContext {
                 return this.siteConfig.domain + '/';    
             }
 
+            if (
+                !this.renderer.cachedItems || 
+                !this.renderer.cachedItems.pages || 
+                !this.renderer.cachedItems.pages[itemContext.page.id] ||
+                !this.renderer.cachedItems.pages[itemContext.page.id].url
+            ) {
+                return this.siteConfig.domain + '/' + itemSlug + '/';
+            }
+
             return this.renderer.cachedItems.pages[itemContext.page.id].url;
         }
     }