Merge pull request #412 from afshin/completion-fix

Switch to inline source map, fix console example, clean up conventions.

examples/console/src/index.ts

@@ -34,6 +34,9 @@ import {
   Widget
 } from 'phosphor-widget';
 
+import 'jupyterlab/lib/console/base.css';
+import 'jupyterlab/lib/default-theme/completion.css';
+import 'jupyterlab/lib/default-theme/console.css';
 import 'jupyterlab/lib/dialog/index.css';
 import 'jupyterlab/lib/dialog/theme.css';
 import 'jupyterlab/lib/iframe/index.css';
@@ -125,6 +128,11 @@ function startApp(session: ISession) {
       selector: '.jp-Console',
       sequence: ['Shift Enter'],
       handler: () => { consolePanel.content.execute(); }
+    },
+    {
+      selector: 'body',
+      sequence: ['Escape'],
+      handler: () => { consolePanel.content.dismissOverlays(); }
     }
   ];
   keymap.add(bindings);

examples/console/webpack.conf.js

@@ -2,25 +2,25 @@
 module.exports = {
   entry: './build/index.js',
   output: {
-    path: __dirname + "/build",
-    filename: "bundle.js",
-    publicPath: "./build/"
+    path: __dirname + '/build',
+    filename: 'bundle.js',
+    publicPath: './build/'
   },
   debug: true,
-  devtool: 'source-map',
+  devtool: 'inline-source-map',
   module: {
     loaders: [
       { test: /\.css$/, loader: 'style-loader!css-loader' },
       { test: /\.json$/, loader: 'json-loader' },
-      { test: /\.html$/, loader: 'file'},
+      { test: /\.html$/, loader: 'file' },
       // jquery-ui loads some images
-      { test: /\.(jpg|png|gif)$/, loader: "file" },
+      { test: /\.(jpg|png|gif)$/, loader: 'file' },
       // required to load font-awesome
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/octet-stream" },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file" },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=image/svg+xml" }
+      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/octet-stream' },
+      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file' },
+      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=image/svg+xml' }
     ]
   }
 }

examples/filebrowser/webpack.conf.js

@@ -3,12 +3,12 @@
 module.exports = {
   entry: './build/index.js',
   output: {
-    path: __dirname + "/build",
-    filename: "bundle.js",
-    publicPath: "./build/"
+    path: __dirname + '/build',
+    filename: 'bundle.js',
+    publicPath: './build/'
   },
   node: {
-    fs: "empty"
+    fs: 'empty'
   },
   bail: true,
   debug: true,
@@ -17,15 +17,15 @@ module.exports = {
     loaders: [
       { test: /\.css$/, loader: 'style-loader!css-loader' },
       { test: /\.json$/, loader: 'json-loader' },
-      { test: /\.html$/, loader: 'file'},
+      { test: /\.html$/, loader: 'file' },
       // jquery-ui loads some images
-      { test: /\.(jpg|png|gif)$/, loader: "file" },
+      { test: /\.(jpg|png|gif)$/, loader: 'file' },
       // required to load font-awesome
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/octet-stream" },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file" },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=image/svg+xml" }
+      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/octet-stream' },
+      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file' },
+      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=image/svg+xml' }
     ]
   }
 }

examples/lab/webpack.conf.js

@@ -8,12 +8,12 @@ require('es6-promise').polyfill();
 module.exports = {
   entry: './index.js',
   output: {
-    path: __dirname + "/build",
-    filename: "bundle.js",
+    path: __dirname + '/build',
+    filename: 'bundle.js',
     publicPath: "lab/"
   },
   node: {
-    fs: "empty"
+    fs: 'empty'
   },
   debug: true,
   bail: true,
@@ -22,15 +22,15 @@ module.exports = {
     loaders: [
       { test: /\.css$/, loader: 'style-loader!css-loader' },
       { test: /\.json$/, loader: 'json-loader' },
-      { test: /\.html$/, loader: 'file'},
+      { test: /\.html$/, loader: 'file' },
       // jquery-ui loads some images
-      { test: /\.(jpg|png|gif)$/, loader: "file" },
+      { test: /\.(jpg|png|gif)$/, loader: 'file' },
       // required to load font-awesome
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/octet-stream" },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file" },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=image/svg+xml" }
+      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/octet-stream' },
+      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file' },
+      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=image/svg+xml' }
     ]
   },
   externals: {

examples/notebook/webpack.conf.js

@@ -2,25 +2,25 @@
 module.exports = {
   entry: './build/index.js',
   output: {
-    path: __dirname + "/build",
-    filename: "bundle.js",
-    publicPath: "./build/"
+    path: __dirname + '/build',
+    filename: 'bundle.js',
+    publicPath: './build/'
   },
   debug: true,
-  devtool: 'source-map',
+  devtool: 'inline-source-map',
   module: {
     loaders: [
       { test: /\.css$/, loader: 'style-loader!css-loader' },
       { test: /\.json$/, loader: 'json-loader' },
-      { test: /\.html$/, loader: 'file'},
+      { test: /\.html$/, loader: 'file' },
       // jquery-ui loads some images
-      { test: /\.(jpg|png|gif)$/, loader: "file" },
+      { test: /\.(jpg|png|gif)$/, loader: 'file' },
       // required to load font-awesome
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/octet-stream" },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file" },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=image/svg+xml" }
+      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/octet-stream' },
+      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file' },
+      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=image/svg+xml' }
     ]
   }
 }

examples/terminal/webpack.conf.js

@@ -2,28 +2,28 @@
 module.exports = {
   entry: './build/index.js',
   output: {
-    path: __dirname + "/build",
-    filename: "bundle.js",
-    publicPath: "./build/"
+    path: __dirname + '/build',
+    filename: 'bundle.js',
+    publicPath: './build/'
   },
   node: {
     fs: "empty"
   },
   bail: true,
-  devtool: 'source-map',
+  devtool: 'inline-source-map',
   module: {
     loaders: [
       { test: /\.css$/, loader: 'style-loader!css-loader' },
       { test: /\.json$/, loader: 'json-loader' },
-      { test: /\.html$/, loader: 'file'},
+      { test: /\.html$/, loader: 'file' },
       // jquery-ui loads some images
-      { test: /\.(jpg|png|gif)$/, loader: "file" },
+      { test: /\.(jpg|png|gif)$/, loader: 'file' },
       // required to load font-awesome
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/octet-stream" },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file" },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=image/svg+xml" }
+      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/octet-stream' },
+      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file' },
+      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=image/svg+xml' }
     ]
   }
 }

jupyterlab/webpack.conf.js

@@ -8,12 +8,12 @@ require('es6-promise').polyfill();
 module.exports = {
   entry: './index.js',
   output: {
-    path: __dirname + "/build",
-    filename: "bundle.js",
-    publicPath: "lab/"
+    path: __dirname + '/build',
+    filename: 'bundle.js',
+    publicPath: 'lab/'
   },
   node: {
-    fs: "empty"
+    fs: 'empty'
   },
   debug: true,
   bail: true,
@@ -22,15 +22,15 @@ module.exports = {
     loaders: [
       { test: /\.css$/, loader: 'style-loader!css-loader' },
       { test: /\.json$/, loader: 'json-loader' },
-      { test: /\.html$/, loader: 'file'},
+      { test: /\.html$/, loader: 'file' },
       // jquery-ui loads some images
-      { test: /\.(jpg|png|gif)$/, loader: "file" },
+      { test: /\.(jpg|png|gif)$/, loader: 'file' },
       // required to load font-awesome
-      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/font-woff" },
-      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=application/octet-stream" },
-      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: "file" },
-      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: "url?limit=10000&minetype=image/svg+xml" }
+      { test: /\.woff2(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.woff(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/font-woff' },
+      { test: /\.ttf(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=application/octet-stream' },
+      { test: /\.eot(\?v=\d+\.\d+\.\d+)?$/, loader: 'file' },
+      { test: /\.svg(\?v=\d+\.\d+\.\d+)?$/, loader: 'url?limit=10000&mimetype=image/svg+xml' }
     ]
   },
   externals: {