summaryrefslogtreecommitdiff
path: root/public-src
diff options
context:
space:
mode:
Diffstat (limited to 'public-src')
-rw-r--r--public-src/3rd-party/yarn.lock2
-rw-r--r--public-src/main.js9
-rw-r--r--public-src/require.config.js2
3 files changed, 11 insertions, 2 deletions
diff --git a/public-src/3rd-party/yarn.lock b/public-src/3rd-party/yarn.lock
index 00f0295..bd3011f 100644
--- a/public-src/3rd-party/yarn.lock
+++ b/public-src/3rd-party/yarn.lock
@@ -14,7 +14,7 @@ golden-layout@^1.5.9:
"jarmon@git://git.lukeshu.com/2git/jarmon#lukeshu/master":
version "0.0.0"
- resolved "git://git.lukeshu.com/2git/jarmon#2836159a6a67e659e6634cc8d4505829596fc614"
+ resolved "git://git.lukeshu.com/2git/jarmon#1f15793cd594f533715f96ba90310dbc4a502c51"
"javascriptrrd@git://git.lukeshu.com/2git/javascriptrrd#v1.1.1":
version "0.0.0"
diff --git a/public-src/main.js b/public-src/main.js
index a86a815..f084d0b 100644
--- a/public-src/main.js
+++ b/public-src/main.js
@@ -2,12 +2,14 @@ define([
'golden-layout',
'jarmon',
'./cfg/jarmon-winston.js',
+ './cfg/jarmon-mav.js',
'./components/gl/jarmon-tabbed-chart-ui.js',
'./components/gl/html.js',
], function(
GoldenLayout,
jarmon,
cfgWinston,
+ cfgMav,
glJarmon,
glHTML,
) {
@@ -35,6 +37,13 @@ define([
componentState: cfgWinston,
},
{
+ title: 'mav',
+ isClosable: false,
+ type: 'component',
+ componentName: 'jarmon:tabbed-chart-ui',
+ componentState: cfgMav,
+ },
+ {
title: 'TLS',
isClosable: false,
type: 'component',
diff --git a/public-src/require.config.js b/public-src/require.config.js
index ca9cca8..db3a0db 100644
--- a/public-src/require.config.js
+++ b/public-src/require.config.js
@@ -25,7 +25,7 @@ var require = {
"flot/jquery.flot.stack" : { deps: ["flot/jquery.flot"] },
// Jarmon configs
"cfg/jarmon-winston": { deps: ["jquery", "jarmon"] },
- "cfg/jarmon-proton": { deps: ["jquery", "jarmon"] },
+ "cfg/jarmon-mav": { deps: ["jquery", "jarmon"] },
},
paths: {
"flot" : "/3rd-party/yarn/flot",