fixed mistMode

interface/client/lib/helpers/helperFunctions.js

@@ -12,6 +12,14 @@ The Helpers class containing helper functions
 **/
 Helpers = {};
 
+/**
+The preloader dirname
+
+@property preloaderDirname
+**/
+Helpers.preloaderDirname = window.dirname + '/modules/preloader';
+
+
 /**
 Reruns functions reactively, based on an interval. Use it like so:
 

interface/client/lib/helpers/templateHelpers.js

@@ -29,14 +29,6 @@ Template.registerHelper('CurrentBlock', function(){
     return EthBlocks.latest;
 });
 
-/**
-Return the preload modules dirname.
-
-@method (preload_dirname)
-**/
-Template.registerHelper('preload_dirname', function(){
-    return window.dirname + '/modules/preloader';
-});
 
 /**
 Return the dirname.

interface/client/templates/views/webview.html

@@ -1,13 +1,9 @@
 <template name="views_webview">
     <div class="webview {{isVisible}} {{#if appBar}}app-bar-{{appBar}}{{/if}}">
-        {{#if $eq _id "browser"}}
-            <webview src="{{checkedUrl}}" useragent="{{useragent}}" data-id="{{_id}}" preload="file://{{preload_dirname}}/browser.js" autosize="on"></webview> 
+        {{#if $eq _id "tests"}}
+            <webview src="file://{{dirname}}/tests/mocha-in-browser/runner.html" useragent="{{useragent}}" data-id="{{_id}}" preload="file://{{preload_dirname}}/tests.js" autosize="on"></webview> 
         {{else}}
-            {{#if $eq _id "tests"}}
-                <webview src="file://{{dirname}}/tests/mocha-in-browser/runner.html" useragent="{{useragent}}" data-id="{{_id}}" preload="file://{{preload_dirname}}/tests.js" autosize="on"></webview> 
-            {{else}}
-                <webview src="{{checkedUrl}}" useragent="{{useragent}}" data-id="{{_id}}" preload="file://{{preload_dirname}}/dapps.js" autosize="on"></webview> 
-            {{/if}}
+            <webview src="{{checkedUrl}}" useragent="{{useragent}}" data-id="{{_id}}" preload="{{preloaderFile}}" autosize="on"></webview> 
         {{/if}}
     </div>
 </template>

interface/client/templates/views/webview.js

@@ -88,6 +88,21 @@ Template['views_webview'].onRendered(function(){
 
 
 Template['views_webview'].helpers({
+    /**
+    Gets the correct preloader file
+
+    @method (preloaderFile)
+    */
+    'preloaderFile': function(){
+        switch(this._id) {
+            case 'browser':
+                return 'file://'+ Helpers.preloaderDirname +'/browser.js';
+            case 'wallet':
+                return 'file://'+ Helpers.preloaderDirname +'/wallet.js';
+            default:
+                return 'file://'+ Helpers.preloaderDirname +'/dapps.js';
+        }
+    },
     /**
     Determines if the current tab is visible
 

main.js

@@ -218,7 +218,7 @@ let onReady = () => {
                 width: 1100,
                 height: 720,
                 webPreferences: {
-                    preload: `${__dirname}/modules/preloader/wallet.js`,
+                    preload: `${__dirname}/modules/preloader/walletMain.js`,
                     'overlay-fullscreen-video': true,
                     'overlay-scrollbars': true,
                 },

modules/preloader/browser.js

@@ -2,7 +2,7 @@
 @module preloader browser
 */
 require('./include/common')('browser');
-const { ipcRenderer, remote } = require('electron');
+const { ipcRenderer } = require('electron');
 const mist = require('./include/mistAPI.js');
 const BigNumber = require('bignumber.js');
 const ipcProviderWrapper = require('../ipc/ipcProviderWrapper.js');
@@ -28,7 +28,6 @@ process.on('loaded',function () {
 
 
 window.mist = mist();
-window.mistMode = remote.getGlobal('mode');
 window.BigNumber = BigNumber;
 window.web3 = new Web3(new Web3.providers.IpcProvider('', ipcProviderWrapper));
 

modules/preloader/wallet.js

@@ -2,24 +2,6 @@
 @module preloader wallet
 */
 
-require('./browser.js');
-require('./include/openExternal.js');
-require('./include/setBasePath')('interface/wallet');
+require('./dapps.js');
 
-const web3Admin = require('../web3Admin.js');
-
-// make the wallet respond to the mode
 window.mistMode = 'mist';
-
-// make variables globally accessable
-// window.dirname = __dirname;
-
-// add admin later
-setTimeout(() => {
-    web3Admin.extend(window.web3);
-}, 1000);
-
-setTimeout(() => {
-    if (document.getElementsByTagName('html')[0])
-        { document.getElementsByTagName('html')[0].className = window.platform; }
-}, 500);