diff options
| -rw-r--r-- | electron_js/main.js | 92 | ||||
| -rw-r--r-- | www/js/DataModel.js | 6 | ||||
| -rw-r--r-- | www/js/DevOptionsCtrl.js | 1 | ||||
| -rw-r--r-- | www/js/app.js | 1 | ||||
| -rw-r--r-- | www/templates/events-modal.html | 14 |
5 files changed, 57 insertions, 57 deletions
diff --git a/electron_js/main.js b/electron_js/main.js index 65093313..ae3ad75a 100644 --- a/electron_js/main.js +++ b/electron_js/main.js @@ -1,24 +1,20 @@ -var app = require('app'); // Module to control application life. -app.commandLine.appendSwitch ('ignore-certificate-errors', 'true'); -var BrowserWindow = require('browser-window'); // Module to create native browser window. - -// Report crashes to our server. -//require('crash-reporter').start(); +const electron = require('electron'); +// Module to control application life. +const {app} = electron; +// Module to create native browser window. +const {BrowserWindow} = electron; // Keep a global reference of the window object, if you don't, the window will -// be closed automatically when the JavaScript object is GCed. -var mainWindow = null; - +// be closed automatically when the JavaScript object is garbage collected. +let win; +app.commandLine.appendSwitch ('ignore-certificate-errors', 'true'); -// Make sure zmNinja is a single instance app, even if launched from -// terminal -var shouldQuit = app.makeSingleInstance(function(commandLine, workingDirectory) { - // Someone tried to run a second instance, we should focus our window - if (mainWindow) { - if (mainWindow.isMinimized()) mainWindow.restore(); - mainWindow.focus(); +const shouldQuit = app.makeSingleInstance((commandLine, workingDirectory) => { + // Someone tried to run a second instance, we should focus our window. + if (win) { + if (win.isMinimized()) win.restore(); + win.focus(); } - return true; }); if (shouldQuit) { @@ -26,46 +22,44 @@ if (shouldQuit) { return; } -// Quit when all windows are closed. -app.on('window-all-closed', function() { - // On OS X it is common for applications and their menu bar - // to stay active until the user quits explicitly with Cmd + Q - if (process.platform != 'darwin') { - app.quit(); - } - -}); - -// OSX only callback - takes care of spawning -// a new app window if needed -app.on('activate', function() -{ - if (mainWindow==null) - { - mainWindow = new BrowserWindow({ 'node-integration':false, 'width':1024, 'height':900}); - mainWindow.loadUrl('file://' + __dirname + '/index.html'); - mainWindow.on('closed', function() { - mainWindow = null; - }); - } -}); - -// This method will be called when Electron has finished -// initialization and is ready to create browser windows. -app.on('ready', function() { +function createWindow() { // Create the browser window. - mainWindow = new BrowserWindow({'node-integration':false, 'width':1024, 'height':900}); + win = new BrowserWindow({width: 1024, height: 900, webPreferences:{nodeIntegration:false}}); // and load the index.html of the app. - mainWindow.loadUrl('file://' + __dirname + '/index.html'); + win.loadURL(`file://${__dirname}/index.html`); + + // Open the DevTools. + //win.webContents.openDevTools(); // Emitted when the window is closed. - mainWindow.on('closed', function() { + win.on('closed', () => { // Dereference the window object, usually you would store windows // in an array if your app supports multi windows, this is the time // when you should delete the corresponding element. - - mainWindow = null; + win = null; }); +} + +// This method will be called when Electron has finished +// initialization and is ready to create browser windows. +// Some APIs can only be used after this event occurs. +app.on('ready', createWindow); + +// Quit when all windows are closed. +app.on('window-all-closed', () => { + // On macOS it is common for applications and their menu bar + // to stay active until the user quits explicitly with Cmd + Q + if (process.platform !== 'darwin') { + app.quit(); + } +}); + +app.on('activate', () => { + // On macOS it's common to re-create a window in the app when the + // dock icon is clicked and there are no other windows open. + if (win === null) { + createWindow(); + } }); diff --git a/www/js/DataModel.js b/www/js/DataModel.js index 9bb1c7e0..5602f7eb 100644 --- a/www/js/DataModel.js +++ b/www/js/DataModel.js @@ -91,7 +91,7 @@ angular.module('zmApp.controllers') 'resumeDelay': 300, 'language': 'en', 'reachability': true, - 'forceImageModePath': true, + 'forceImageModePath': false, @@ -427,8 +427,8 @@ angular.module('zmApp.controllers') } if (typeof loginData.forceImageModePath == 'undefined') { - zmDebug("forceImageModePath does not exist. Setting to true"); - loginData.forceImageModePath = true; + zmDebug("forceImageModePath does not exist. Setting to false"); + loginData.forceImageModePath = false; } if (typeof loginData.reachability == 'undefined') { diff --git a/www/js/DevOptionsCtrl.js b/www/js/DevOptionsCtrl.js index 580e1214..502c02d0 100644 --- a/www/js/DevOptionsCtrl.js +++ b/www/js/DevOptionsCtrl.js @@ -86,6 +86,7 @@ angular.module('zmApp.controllers').controller('zmApp.DevOptionsCtrl', ['$scope' ZMDataModel.zmDebug("SaveDevOptions: Saving to disk"); ZMDataModel.setLogin($scope.loginData); + ZMDataModel.getMonitors(1); } diff --git a/www/js/app.js b/www/js/app.js index cb7ba822..3d0a8168 100644 --- a/www/js/app.js +++ b/www/js/app.js @@ -81,6 +81,7 @@ angular.module('zmApp', [ }) +// https://forum.ionicframework.com/t/ng-src-not-updated-in-video-tag/7540/6 .directive('dynamicUrl', function () { return { restrict: 'A', diff --git a/www/templates/events-modal.html b/www/templates/events-modal.html index 5c030c99..2b5a1bd6 100644 --- a/www/templates/events-modal.html +++ b/www/templates/events-modal.html @@ -31,15 +31,20 @@ <div ng-if="defaultVideo!==undefined && defaultVideo!='' && loginData.enableh264 == true"> <div ng-if="videoIsReady" class="videogular-full-container" > - <!--<video controls="controls" preload="metadata" autoplay="autoplay" webkit-playsinline="webkit-playsinline" class="videoPlayer"><source src="" dynamic-url dynamic-url-src="{{video_url}}" type="video/mp4"/></video>--> + <!--<video width="320" height="240" controls> + <source src="" dynamic-url dynamic-url-src="{{video_url}}"> + + </video>--> + + - <videogular vg-theme="videoObject.config.theme" vg-complete="playbackFinished()" on-double-tap="closeModal();" vg-autoplay="true" vg-responsive="true"> + <videogular vg-theme="videoObject.config.theme" vg-complete="playbackFinished()" on-double-tap="closeModal();" vg-autoplay="true" vg-responsive="true"> <vg-media vg-src="videoObject.config.sources" vg-native-controls="false"> </vg-media> <vg-overlay-play></vg-overlay-play> - <!-- <vg-buffering></vg-buffering>--> + <vg-controls> <vg-play-pause-button></vg-play-pause-button> @@ -52,8 +57,7 @@ <vg-mute-button></vg-mute-button> </vg-volume> </vg-controls> - - + </videogular> |