Electron 8.

dscalzi · Mar 18, 2020 · 141a753 · 141a753
1 parent 8b5a7bb
commit 141a753
Show file tree

Hide file tree

Showing 5 changed files with 516 additions and 680 deletions.
diff --git a/app/assets/js/scripts/landing.js b/app/assets/js/scripts/landing.js
@@ -1076,56 +1076,54 @@ function loadNews(){
         const distroData = DistroManager.getDistribution()
         const newsFeed = distroData.getRSS()
         const newsHost = new URL(newsFeed).origin + '/'
-        $.ajax(
-            {
-                url: newsFeed,
-                success: (data) => {
-                    const items = $(data).find('item')
-                    const articles = []
-
-                    for(let i=0; i<items.length; i++){
-                    // JQuery Element
-                        const el = $(items[i])
-
-                        // Resolve date.
-                        const date = new Date(el.find('pubDate').text()).toLocaleDateString('en-US', {month: 'short', day: 'numeric', year: 'numeric', hour: 'numeric', minute: 'numeric'})
-
-                        // Resolve comments.
-                        let comments = el.find('slash\\:comments').text() || '0'
-                        comments = comments + ' Comment' + (comments === '1' ? '' : 's')
-
-                        // Fix relative links in content.
-                        let content = el.find('content\\:encoded').text()
-                        let regex = /src="(?!http:\/\/|https:\/\/)(.+?)"/g
-                        let matches
-                        while((matches = regex.exec(content))){
-                            content = content.replace(`"${matches[1]}"`, `"${newsHost + matches[1]}"`)
-                        }
-
-                        let link   = el.find('link').text()
-                        let title  = el.find('title').text()
-                        let author = el.find('dc\\:creator').text()
-
-                        // Generate article.
-                        articles.push(
-                            {
-                                link,
-                                title,
-                                date,
-                                author,
-                                content,
-                                comments,
-                                commentsLink: link + '#comments'
-                            }
-                        )
+        $.ajax({
+            url: newsFeed,
+            success: (data) => {
+                const items = $(data).find('item')
+                const articles = []
+
+                for(let i=0; i<items.length; i++){
+                // JQuery Element
+                    const el = $(items[i])
+
+                    // Resolve date.
+                    const date = new Date(el.find('pubDate').text()).toLocaleDateString('en-US', {month: 'short', day: 'numeric', year: 'numeric', hour: 'numeric', minute: 'numeric'})
+
+                    // Resolve comments.
+                    let comments = el.find('slash\\:comments').text() || '0'
+                    comments = comments + ' Comment' + (comments === '1' ? '' : 's')
+
+                    // Fix relative links in content.
+                    let content = el.find('content\\:encoded').text()
+                    let regex = /src="(?!http:\/\/|https:\/\/)(.+?)"/g
+                    let matches
+                    while((matches = regex.exec(content))){
+                        content = content.replace(`"${matches[1]}"`, `"${newsHost + matches[1]}"`)
                     }
-                    resolve({
-                        articles
-                    })
-                },
-                timeout: 2500
-            }
-        ).catch(err => {
+
+                    let link   = el.find('link').text()
+                    let title  = el.find('title').text()
+                    let author = el.find('dc\\:creator').text()
+
+                    // Generate article.
+                    articles.push(
+                        {
+                            link,
+                            title,
+                            date,
+                            author,
+                            content,
+                            comments,
+                            commentsLink: link + '#comments'
+                        }
+                    )
+                }
+                resolve({
+                    articles
+                })
+            },
+            timeout: 2500
+        }).catch(err => {
             resolve({
                 articles: null
             })

diff --git a/app/assets/js/scripts/uicore.js b/app/assets/js/scripts/uicore.js
@@ -34,7 +34,6 @@ remote.getCurrentWebContents().on('devtools-opened', () => {
 // Disable zoom, needed for darwin.
 webFrame.setZoomLevel(0)
 webFrame.setVisualZoomLevelLimits(1, 1)
-webFrame.setLayoutZoomLevelLimits(0, 0)
 
 // Initialize auto updates in production environments.
 let updateCheckListener

diff --git a/index.js b/index.js
@@ -86,6 +86,9 @@ ipcMain.on('distributionIndexDone', (event, res) => {
 // https://electronjs.org/docs/tutorial/offscreen-rendering
 app.disableHardwareAcceleration()
 
+// https://github.com/electron/electron/issues/18397
+app.allowRendererProcessReuse = true
+
 // Keep a global reference of the window object, if you don't, the window will
 // be closed automatically when the JavaScript object is garbage collected.
 let win