diff options
| author | Debian Python Modules Team <python-modules-team@lists.alioth.debian.org> | 2019-03-09 16:21:07 +0000 |
|---|---|---|
| committer | Andrej Shadura <andrewsh@debian.org> | 2019-03-09 16:21:07 +0000 |
| commit | 8daa7923efa8dbd886cc3b8a7f32f9862f89908c (patch) | |
| tree | 21650ffc559f64c142823b07dce1add3956649ca | |
| parent | 01e672e01dadf75c0e2b249a0dd29d43db757c19 (diff) | |
use-term.jsHEADarchive/debian/5.7.4-2master
Gbp-Pq: Name 0012-use-term.js.patch
| -rw-r--r-- | bower.json | 4 | ||||
| -rw-r--r-- | notebook/static/terminal/js/main.js | 2 | ||||
| -rw-r--r-- | notebook/static/terminal/js/terminado.js | 2 | ||||
| -rw-r--r-- | notebook/templates/page.html | 2 | ||||
| -rw-r--r-- | setupbase.py | 4 | ||||
| -rw-r--r-- | tools/build-main.js | 2 |
6 files changed, 5 insertions, 11 deletions
@@ -24,8 +24,6 @@ "requirejs-plugins": "~1.0.3", "text-encoding": "~0.1", "underscore": "components/underscore#~1.8.3", - "xterm.js": "https://unpkg.com/xterm@~3.1.0/dist/xterm.js", - "xterm.js-css": "https://unpkg.com/xterm@~3.1.0/dist/xterm.css", - "xterm.js-fit": "https://unpkg.com/xterm@~3.1.0/dist/addons/fit/fit.js" + "term.js": "chjj/term.js#~0.0.7" } } diff --git a/notebook/static/terminal/js/main.js b/notebook/static/terminal/js/main.js index 03ea2ab..c55e3d4 100644 --- a/notebook/static/terminal/js/main.js +++ b/notebook/static/terminal/js/main.js @@ -14,7 +14,7 @@ requirejs([ page, loginwidget, configmod, - terminado + terminado, ){ "use strict"; requirejs(['custom/custom'], function() {}); diff --git a/notebook/static/terminal/js/terminado.js b/notebook/static/terminal/js/terminado.js index 0ffc59b..d7b5e56 100644 --- a/notebook/static/terminal/js/terminado.js +++ b/notebook/static/terminal/js/terminado.js @@ -1,4 +1,4 @@ -define (["xterm"], function(Terminal) { +define ([], function(Terminal) { "use strict"; function make_terminal(element, ws_url) { var ws = new WebSocket(ws_url); diff --git a/notebook/templates/page.html b/notebook/templates/page.html index cf8ff5c..8e69c1b 100644 --- a/notebook/templates/page.html +++ b/notebook/templates/page.html @@ -42,7 +42,7 @@ 'jquery-ui': 'components/jquery-ui/jquery-ui.min', moment: 'components/moment/min/moment-with-locales', codemirror: 'components/codemirror', - termjs: 'components/xterm.js/xterm', + termjs: 'components/term.js/src/term', typeahead: 'components/jquery-typeahead/dist/jquery.typeahead.min', }, map: { // for backward compatibility diff --git a/setupbase.py b/setupbase.py index b98e956..08bbc2f 100644 --- a/setupbase.py +++ b/setupbase.py @@ -157,10 +157,8 @@ def find_package_data(): pjoin(components, "underscore", "underscore-min.js"), pjoin(components, "moment", "moment.js"), pjoin(components, "moment", "min", "*.js"), - pjoin(components, "xterm.js", "index.js"), - pjoin(components, "xterm.js-css", "index.css"), - pjoin(components, "xterm.js-fit", "index.js"), pjoin(components, "text-encoding", "lib", "encoding.js"), + pjoin(components, "term.js" , "term.js"), ]) # Ship all of Codemirror's CSS and JS diff --git a/tools/build-main.js b/tools/build-main.js index 0a792f0..98f74f1 100644 --- a/tools/build-main.js +++ b/tools/build-main.js @@ -24,8 +24,6 @@ var rjs_config = { "jquery-ui": 'components/jquery-ui/jquery-ui.min', moment: 'components/moment/min/moment-with-locales', codemirror: 'components/codemirror', - xterm: 'components/xterm.js/index', - 'xtermjs-fit': 'components/xterm.js-fit/index', typeahead: 'components/jquery-typeahead/dist/jquery.typeahead', contents: 'empty:', custom: 'empty:', |