Merge pull request #152 from RRosio/dep-updates

Updating JS Dependencies

bower.json

@@ -5,24 +5,24 @@
  "backbone": "components/backbone#~1.2",
  "bootstrap": "bootstrap#~3.4",
  "bootstrap-tour": "0.9.0",
- "codemirror": "components/codemirror#5.56.0+components1",
+ "codemirror": "components/codemirror#5.58.2+components1",
  "create-react-class": "https://cdn.jsdelivr.net/npm/[email protected]/create-react-class.min.js",
  "es6-promise": "~1.0",
  "font-awesome": "components/font-awesome#~4.7.0",
  "google-caja": "5669",
  "jed": "~1.1.1",
  "jquery": "components/jquery#~3.5.0",
  "jquery-typeahead": "~2.10.6",
- "jquery-ui": "components/jqueryui#~1.12",
- "marked": "~0.7",
+ "jquery-ui": "jquery/jquery-ui#~1.13.2",
+ "marked": "~1.1.1",
  "MathJax": "^2.7.4",
  "moment": "~2.19.3",
  "react": "~16.0.0",
  "requirejs": "~2.2",
  "requirejs-text": "~2.0.15",
  "requirejs-plugins": "~1.0.3",
  "text-encoding": "~0.1",
- "underscore": "components/underscore#~1.8.3",
+ "underscore": "jashkenas/underscore#~1.13.4",
  "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"

nbclassic/templates/page.html

@@ -7,7 +7,7 @@
  <title>{% block title %}Jupyter Notebook{% endblock %}</title>
  {% block favicon %}<link id="favicon" rel="shortcut icon" type="image/x-icon" href="{{static_url("base/images/favicon.ico") }}">{% endblock %}
  <meta http-equiv="X-UA-Compatible" content="IE=edge" />
- <link rel="stylesheet" href="{{static_url("components/jquery-ui/themes/smoothness/jquery-ui.min.css") }}" type="text/css" />
+ <link rel="stylesheet" href="{{static_url("components/jquery-ui/dist/themes/smoothness/jquery-ui.min.css") }}" type="text/css" />
  <link rel="stylesheet" href="{{static_url("components/jquery-typeahead/dist/jquery.typeahead.min.css") }}" type="text/css" />
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
 
@@ -40,7 +40,7 @@
  text: 'components/requirejs-text/text',
  bootstrap: 'components/bootstrap/dist/js/bootstrap.min',
  bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min',
- 'jquery-ui': 'components/jquery-ui/jquery-ui.min',
+ 'jquery-ui': 'components/jquery-ui/dist/jquery-ui.min',
  moment: 'components/moment/min/moment-with-locales',
  codemirror: 'components/codemirror',
  termjs: 'components/xterm.js/xterm',

setupbase.py

@@ -142,9 +142,9 @@ def find_package_data():
  pjoin(components, "jquery", "jquery.min.js"),
  pjoin(components, "jquery-typeahead", "dist", "jquery.typeahead.min.js"),
  pjoin(components, "jquery-typeahead", "dist", "jquery.typeahead.min.css"),
- pjoin(components, "jquery-ui", "jquery-ui.min.js"),
- pjoin(components, "jquery-ui", "themes", "smoothness", "jquery-ui.min.css"),
- pjoin(components, "jquery-ui", "themes", "smoothness", "images", "*"),
+ pjoin(components, "jquery-ui", "dist", "jquery-ui.min.js"),
+ pjoin(components, "jquery-ui", "dist", "themes", "smoothness", "jquery-ui.min.css"),
+ pjoin(components, "jquery-ui",  "dist", "themes", "smoothness", "images", "*"),
  pjoin(components, "marked", "lib", "marked.js"),
  pjoin(components, "react", "react.production.min.js"),
  pjoin(components, "react", "react-dom.production.min.js"),

tools/build-main.js

@@ -21,7 +21,7 @@ var rjs_config = {
  text: 'components/requirejs-text/text',
  bootstrap: 'components/bootstrap/dist/js/bootstrap.min',
  bootstraptour: 'components/bootstrap-tour/build/js/bootstrap-tour.min',
- "jquery-ui": 'components/jquery-ui/jquery-ui.min',
+ "jquery-ui": 'components/jquery-ui/dist/jquery-ui.min',
  moment: 'components/moment/min/moment-with-locales',
  codemirror: 'components/codemirror',
  xterm: 'components/xterm.js/index',