diff --git a/gulpfile.js b/gulpfile.js index f5a8f227..55fe654f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -319,7 +319,8 @@ function dist_rollup() { // I will be picked up by rollup and bundled accordingly. 'components/init': 'src/components/init.js', 'js/main_cordova': 'src/js/main_cordova.js', - 'js/utils/common': 'src/js/utils/common.js' + 'js/utils/common': 'src/js/utils/common.js', + 'js/tabs/logging': 'src/js/tabs/logging.js' }, plugins: [ alias({ diff --git a/src/js/tabs/logging.js b/src/js/tabs/logging.js index d8fe3870..2fcc37ca 100644 --- a/src/js/tabs/logging.js +++ b/src/js/tabs/logging.js @@ -1,7 +1,7 @@ -'use strict'; +import { millitime } from '../utils/common.js'; -TABS.logging = {}; -TABS.logging.initialize = function (callback) { +const logging = {}; +logging.initialize = function (callback) { if (GUI.active_tab != 'logging') { GUI.active_tab = 'logging'; @@ -319,6 +319,9 @@ TABS.logging.initialize = function (callback) { } }; -TABS.logging.cleanup = function (callback) { +logging.cleanup = function (callback) { if (callback) callback(); }; + +// TODO: only for transition to modules, drop this eventually +window.TABS.logging = logging; diff --git a/src/js/utils/common.js b/src/js/utils/common.js index 1d0df3c4..006a0991 100644 --- a/src/js/utils/common.js +++ b/src/js/utils/common.js @@ -79,8 +79,8 @@ export function generateVirtualApiVersions() { } } +// TODO: these are temp binding while transition to module happens window.microtime = microtime; -window.millitime = millitime; window.degToRad = degToRad; window.bytesToSize = bytesToSize; window.checkChromeRuntimeError = checkChromeRuntimeError; diff --git a/src/main.html b/src/main.html index 604a0b71..e8498ffd 100644 --- a/src/main.html +++ b/src/main.html @@ -123,7 +123,8 @@ - + +