fix: new feature md always loads up in desktop win builds

Author: abose

src/brackets.js

@@ -38,9 +38,10 @@
 define(function (require, exports, module) {
 
     function _removePhoenixLoadingOverlay() {
-        if(!window.testEnvironment){
+        if(window.splashScreenPresent){
             document.getElementById('phoenix-loading-splash-screen-overlay').remove();
             document.getElementById('safari_splash_screen').remove();
+            window.splashScreenPresent = false;
         }
     }
 

src/extensions/default/Phoenix/newly-added-features.js

@@ -38,14 +38,6 @@ define(function (require, exports, module) {
         return Phoenix.VFS.getDefaultProjectDir() + "Newly_added_features.md";
     }
 
-    async function _digestMessage(message) {
-        const msgUint8 = new TextEncoder().encode(message);                           // encode as (utf-8) Uint8Array
-        const hashBuffer = await crypto.subtle.digest('SHA-256', msgUint8);           // hash the message
-        const hashArray = Array.from(new Uint8Array(hashBuffer));                     // convert buffer to byte array
-        const hashHex = hashArray.map(b => b.toString(16).padStart(2, '0')).join(''); // convert bytes to hex string
-        return hashHex;
-    }
-
     async function _getUpdateMarkdownText() {
         return new Promise((resolve, reject)=>{
             fetch(_getUpdateMarkdownURL())
@@ -88,11 +80,10 @@ define(function (require, exports, module) {
     }
 
     async function _showNewUpdatesIfPresent() {
-        let newMarkdownText = await _getUpdateMarkdownText();
-        let currentMarkdownText = await _readMarkdownTextFile();
-        const hash = await _digestMessage(newMarkdownText);
-        const lastShownHash = await _digestMessage(currentMarkdownText);
-        if(hash !== lastShownHash){
+        // codemirror documents are always \n instead of \r\n line endings. so we strip here too
+        let newMarkdownText = (await _getUpdateMarkdownText()).replace(/[\r]/g, '');
+        let currentMarkdownText = (await _readMarkdownTextFile()).replace(/[\r]/g, '');
+        if(newMarkdownText !== currentMarkdownText){
             let markdownFile = FileSystem.getFileForPath(_getUpdateMarkdownLocalPath());
             // if the user overwrites the markdown file, then the user edited content will be nuked here.
             FileUtils.writeText(markdownFile, newMarkdownText, true)
@@ -107,7 +98,6 @@ define(function (require, exports, module) {
     exports.init = function () {
         if(!Phoenix.firstBoot && !window.testEnvironment){
             _showNewUpdatesIfPresent();
-            return;
         }
     };
 });

src/index.html

@@ -137,15 +137,19 @@
             MIXPANEL_CUSTOM_LIB_URL:"file:"===f.location.protocol&&"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js".match(/^\/\//)?"https://cdn.mxpnl.com/libs/mixpanel-2-latest.min.js":"//cdn.mxpnl.com/libs/mixpanel-2-latest.min.js";g=f.getElementsByTagName("script")[0];g.parentNode.insertBefore(e,g)}})(document,window.mixpanel||[]);
     </script>
     <script>
-        function _removeSplashScreenIfTest() {
-            if(testEnvironment){
+        window.splashScreenPresent = true;
+
+        function _removeSplashScreenIfNeeded() {
+            if(testEnvironment || window.__TAURI__){
+                // tauri means local builds and, it loads up pretty fast, so splash screen
                 document.getElementById('phoenix-loading-splash-screen-overlay').remove();
                 document.getElementById('safari_splash_screen').remove();
+                window.splashScreenPresent = false;
             }
         }
 
         function _loadPhoenixAfterSplashScreen() {
-            _removeSplashScreenIfTest();
+            _removeSplashScreenIfNeeded();
             var loadJS = function(url, implementationCode, location, dataMainValue){
                 //url is URL of external file, implementationCode is the code
                 //to be called from the file, location is the location to