Преглед изворни кода

Merge pull request #2180 from ellisonbg/fix-getconfig

Fixing broken build on master.
Brian E. Granger пре 8 година
родитељ
комит
3352c97b71
2 измењених фајлова са 9 додато и 8 уклоњено
  1. 8 8
      jupyterlab/index.template.js
  2. 1 0
      jupyterlab/package.json

+ 8 - 8
jupyterlab/index.template.js

@@ -3,16 +3,16 @@ require('font-awesome/css/font-awesome.min.css');
 require('@jupyterlab/default-theme/style/index.css');
 
 var app = require('@jupyterlab/application').JupyterLab;
-var utils = require('@jupyterlab/services').utils;
+var PageConfig = require('@jupyterlab/coreutils').PageConfig;
 
 
 function main() {
-    var version = utils.getConfigOption('appVersion') || 'unknown';
-    var name = utils.getConfigOption('appName') || 'JupyterLab';
-    var namespace = utils.getConfigOption('appNamespace') || 'jupyterlab';
-    var devMode = utils.getConfigOption('devMode') || 'false';
-    var settingsDir = utils.getConfigOption('settingsDir') || '';
-    var assetsDir = utils.getConfigOption('assetsDir') || '';
+    var version = PageConfig.getOption('appVersion') || 'unknown';
+    var name = PageConfig.getOption('appName') || 'JupyterLab';
+    var namespace = PageConfig.getOption('appNamespace') || 'jupyterlab';
+    var devMode = PageConfig.getOption('devMode') || 'false';
+    var settingsDir = PageConfig.getOption('settingsDir') || '';
+    var assetsDir = PageConfig.getOption('assetsDir') || '';
 
     if (version[0] === 'v') {
         version = version.slice(1);
@@ -35,7 +35,7 @@ function main() {
     {{/each}}
     var ignorePlugins = [];
     try {
-        var option = utils.getConfigOption('ignorePlugins');
+        var option = PageConfig.getOption('ignorePlugins');
         ignorePlugins = JSON.parse(option);
     } catch (e) {
         console.error("Invalid ignorePlugins config:", option);

+ 1 - 0
jupyterlab/package.json

@@ -12,6 +12,7 @@
     "@jupyterlab/apputils-extension": "^0.4.0",
     "@jupyterlab/codemirror-extension": "^0.4.0",
     "@jupyterlab/completer-extension": "^0.4.0",
+    "@jupyterlab/coreutils": "^0.4.0",
     "@jupyterlab/console-extension": "^0.4.0",
     "@jupyterlab/csvviewer-extension": "^0.4.0",
     "@jupyterlab/docmanager-extension": "^0.4.0",