Marking private methods

src/app.js

@@ -743,7 +743,7 @@ class ViewCollection {
             this.raise('active-view-changed', { activeView: this._activeView });
         });
         this._views.push(view);
-        this.updateActiveView();
+        this._updateActiveView();
         return view;
     }
 
@@ -753,7 +753,7 @@ class ViewCollection {
                 this._views.splice(i, 1);
             }
         }
-        this.updateActiveView();
+        this._updateActiveView();
     }
 
     find(path) {
@@ -764,15 +764,6 @@ class ViewCollection {
         return this._views.find(view => view && view.window && view.window.webContents && view.window.webContents == contents);
     }
 
-    updateActiveView() {
-        var window = electron.BrowserWindow.getFocusedWindow();
-        var view = this._views.find(view => view.window == window) || null;
-        if (view != this._activeView) {
-            this._activeView = view;
-            this.raise('active-view-changed', { activeView: this._activeView });        
-        }
-    }
-
     get activeView() {
         return this._activeView;
     }
@@ -790,6 +781,15 @@ class ViewCollection {
             });
         }
     }
+
+    _updateActiveView() {
+        var window = electron.BrowserWindow.getFocusedWindow();
+        var view = this._views.find(view => view.window == window) || null;
+        if (view != this._activeView) {
+            this._activeView = view;
+            this.raise('active-view-changed', { activeView: this._activeView });        
+        }
+    }
 }
 
 class ConfigurationService {
@@ -852,12 +852,7 @@ class MenuService {
                 }
             });
         });
-        this.rebuild();
-    }
-
-    rebuild() {
-        this._menu = electron.Menu.buildFromTemplate(this._menuTemplate);
-        electron.Menu.setApplicationMenu(this._menu);
+        this._rebuild();
     }
 
     update(context) {
@@ -880,7 +875,7 @@ class MenuService {
             }
         });
         if (rebuild) {
-            this.rebuild();
+            this._rebuild();
         }
         Object.keys(this._commandTable).forEach((id) => {
             var menuItem = this._menu.getMenuItemById(id);
@@ -897,6 +892,11 @@ class MenuService {
             }
         });
     }
+
+    _rebuild() {
+        this._menu = electron.Menu.buildFromTemplate(this._menuTemplate);
+        electron.Menu.setApplicationMenu(this._menu);
+    }
 }
 
 var application = new Application();

src/view-browser.js

@@ -13,24 +13,24 @@ class BrowserHost {
         this._view = view;
 
         window.addEventListener('keydown', (e) => {
-            this.keyHandler(e);
+            this._keyHandler(e);
         });
 
         var fileElement = Array.from(document.getElementsByTagName('meta')).filter(e => e.name == 'file').shift();
         if (fileElement && fileElement.content && fileElement.content.length > 0) {
-            this.openModel('/data', fileElement.content.split('/').pop());
+            this._openModel('/data', fileElement.content.split('/').pop());
             return;
         }
 
-        var urlParam = this.getQueryParameter('url');
+        var urlParam = this._getQueryParameter('url');
         if (urlParam && urlParam.length > 0) {
-            this.openModel(urlParam, urlParam.split('/').pop());
+            this._openModel(urlParam, urlParam.split('/').pop());
             return;
         }
 
-        var modelParam = this.getQueryParameter('model');
+        var modelParam = this._getQueryParameter('model');
         if (modelParam && modelParam.length > 0) {
-            this.openModel(modelParam, modelParam.split('/').pop());
+            this._openModel(modelParam, modelParam.split('/').pop());
             return;
         }
         
@@ -44,7 +44,7 @@ class BrowserHost {
             });
             openFileDialog.addEventListener('change', (e) => {
                 if (e.target && e.target.files && e.target.files.length == 1) {
-                    this.openFile(e.target.files[0]);
+                    this._openFile(e.target.files[0]);
                 }
             });
         }
@@ -57,7 +57,7 @@ class BrowserHost {
         document.body.addEventListener('drop', (e) => { 
             e.preventDefault();
             if (e.dataTransfer && e.dataTransfer.files && e.dataTransfer.files.length == 1) {
-                this.openFile(e.dataTransfer.files[0]);
+                this._openFile(e.dataTransfer.files[0]);
             }
             return false;
         });
@@ -72,7 +72,7 @@ class BrowserHost {
     }
 
     import(file, callback) {
-        var url = this.url(file);
+        var url = this._url(file);
         for (var i = 0; i < document.scripts.length; i++) {
             if (url == document.scripts[i]) {
                 callback(null);
@@ -95,7 +95,7 @@ class BrowserHost {
     }
 
     request(file, callback) {
-        var url = this.url(file);
+        var url = this._url(file);
         var request = new XMLHttpRequest();
         if (file.endsWith('.pb')) {
             request.responseType = 'arraybuffer';
@@ -120,7 +120,11 @@ class BrowserHost {
         request.send();
     }
 
-    url(file) {
+    openURL(url) {
+        window.open(url, '_target');
+    }
+
+    _url(file) {
         var url = file;
         if (window && window.location && window.location.href) {
             var location = window.location.href.split('?').shift();
@@ -129,10 +133,10 @@ class BrowserHost {
             }
             url = location + file;
         }
-        return url;        
+        return url;
     }
 
-    getQueryParameter(name) {
+    _getQueryParameter(name) {
         var url = window.location.href;
         name = name.replace(/[\[\]]/g, "\\$&");
         var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)");
@@ -146,7 +150,7 @@ class BrowserHost {
         return decodeURIComponent(results[2].replace(/\+/g, " "));
     }
 
-    openModel(url, file) {
+    _openModel(url, file) {
         this._view.show('spinner');
         var request = new XMLHttpRequest();
         request.responseType = 'arraybuffer';
@@ -174,13 +178,9 @@ class BrowserHost {
         request.send();
     }
 
-    openURL(url) {
-        window.open(url, '_target');
-    }
-
-    openFile(file) {
+    _openFile(file) {
         this._view.show('spinner');
-        this.openBuffer(file, (err, model) => {
+        this._openBuffer(file, (err, model) => {
             this._view.show(null);
             if (err) {
                 this.error(err.name, err.message);
@@ -191,7 +191,7 @@ class BrowserHost {
         });
     }
 
-    openBuffer(file, callback) {
+    _openBuffer(file, callback) {
         var size = file.size;
         var reader = new FileReader();
         reader.onloadend = () => {
@@ -207,7 +207,7 @@ class BrowserHost {
         reader.readAsArrayBuffer(file);
     }
 
-    keyHandler(e) {
+    _keyHandler(e) {
         if (!e.altKey && !e.shiftKey && (e.ctrlKey || e.metaKey)) {
             switch (e.keyCode) {
                 case 70: // F

src/view-electron.js

@@ -18,7 +18,7 @@ class ElectronHost {
         this._view.show('welcome');
 
         electron.ipcRenderer.on('open', (event, data) => {
-            this.openFile(data.file);
+            this._openFile(data.file);
         });
         electron.ipcRenderer.on('export', (event, data) => {
             this._view.export(data.file);
@@ -37,11 +37,11 @@ class ElectronHost {
         });
         electron.ipcRenderer.on('toggle-details', (event, data) => {
             this._view.toggleDetails();
-            this.update('show-details', this._view.showDetails);
+            this._update('show-details', this._view.showDetails);
         });
         electron.ipcRenderer.on('toggle-names', (event, data) => {
             this._view.toggleNames();
-            this.update('show-names', this._view.showNames);
+            this._update('show-names', this._view.showNames);
         });
         electron.ipcRenderer.on('zoom-in', (event, data) => {
             document.getElementById('zoom-in-button').click();
@@ -79,19 +79,11 @@ class ElectronHost {
             for (var i = 0; i < e.dataTransfer.files.length; i++) {
                 files.push(e.dataTransfer.files[i].path);
             }
-            this.dropFiles(files);
+            electron.ipcRenderer.send('drop-files', { files: files });
             return false;
         });
     }
 
-    update(name, value) {
-        electron.ipcRenderer.send('update', { name: name, value: value });
-    }
-
-    dropFiles(files) {
-        electron.ipcRenderer.send('drop-files', { files: files });
-    }
-
     error(message, detail) {
         var owner = electron.remote.BrowserWindow.getFocusedWindow();
         var options = {
@@ -181,33 +173,33 @@ class ElectronHost {
         electron.shell.openExternal(url);
     }
 
-    openFile(file) {
+    _openFile(file) {
         if (file) {
             this._view.show('spinner');
-            this.readFile(file, (err, buffer) => {
+            this._readFile(file, (err, buffer) => {
                 if (err) {
                     this._view.show(null);
                     this.error('Error while reading file.', err.message);
-                    this.update('path', null);
+                    this._update('path', null);
                     return;
                 }
                 this._view.openBuffer(buffer, path.basename(file), (err, model) => {
                     this._view.show(null);
                     if (err) {
                         this.error(err.name, err.message);
-                        this.update('path', null);
+                        this._update('path', null);
                     }
                     if (model) {
-                        this.update('path', file);
+                        this._update('path', file);
                     }
-                    this.update('show-details', this._view.showDetails);
-                    this.update('show-names', this._view.showNames);
+                    this._update('show-details', this._view.showDetails);
+                    this._update('show-names', this._view.showNames);
                 });
             });
         }
     }
 
-    readFile(file, callback) {
+    _readFile(file, callback) {
         fs.exists(file, (exists) => {
             if (!exists) {
                 callback(new Error('The file \'' + file + '\' does not exist.'), null);
@@ -242,6 +234,10 @@ class ElectronHost {
             });
         });
     }
+
+    _update(name, value) {
+        electron.ipcRenderer.send('update', { name: name, value: value });
+    }
 }
 
 window.host = new ElectronHost();