Revert "Upgraded typeahead library. (jupyter#4944)"

This reverts commit 33548e1.

Author: Steven Silvester

bower.json

@@ -12,7 +12,7 @@
     "google-caja": "5669",
     "jed": "~1.1.1",
     "jquery": "components/jquery#~3.4.1",
-    "jquery-typeahead": "~2.10.6",
+    "jquery-typeahead": "~2.0.0",
     "jquery-ui": "components/jqueryui#~1.12",
     "marked": "~0.4",
     "MathJax": "^2.7.4",

notebook/static/notebook/js/commandpalette.js

@@ -44,20 +44,20 @@ define([
         // typeahead lib need a specific layout with specific class names.
         // the following just does that
         var form = $('<form/>');
-        var container = $('<div/>').addClass('typeahead__container');
-        var field = $('<div/>').addClass('typeahead__field');
+        var container = $('<div/>').addClass('typeahead-container');
+        var field = $('<div/>').addClass('typeahead-field');
         var input = $('<input/>').attr('type', 'search');
 
         field
           .append(
-            $('<span>').addClass('typeahead__query').append(
+            $('<span>').addClass('typeahead-query').append(
               input
             )
           )
           .append(
-            $('<span/>').addClass('typeahead__button').append(
+            $('<span/>').addClass('typeahead-button').append(
               $('<button/>').attr('type', 'submit').append(
-                $('<span/>').addClass('typeahead__search-icon')
+                $('<span/>').addClass('typeahead-search-icon')
               )
             )
           );
@@ -185,9 +185,7 @@ define([
           maxItem: 1e3,
           minLength: 0,
           hint: true,
-          group: {
-            template:"{{group}} command group"
-          },
+          group: ["group", "{{group}} command group"],
           searchOnFocus: true,
           mustSelectItem: true,
           template: '<i class="fa fa-icon {{icon}}"></i>{{display}}  <div title={{key}} class="pull-right {{mode_shortcut}}">{{shortcut}}</div>',

notebook/static/notebook/js/main.js

@@ -19,13 +19,6 @@ var bind = function bind(obj) {
 };
 Function.prototype.bind = Function.prototype.bind || bind ;
 
-requirejs.config({
-  map: {
-    "*": {
-      "typeahead": "jquery-typeahead"
-    }
-  }
-})
 
 requirejs([
     'jquery',

notebook/static/notebook/less/commandpalette.less

@@ -1,12 +1,14 @@
-div.typeahead__container {
-  font: revert;
+ul.typeahead-list i{
+    margin-left: -10px;
+    width: 18px;
 }
 
-ul.typeahead__list i {
-    width: 18px;
+[dir="rtl"] ul.typeahead-list i {
+    margin-left: 0;
+    margin-right: -10px;
 }
 
-ul.typeahead__list {
+ul.typeahead-list {
   max-height: 80vh;
   overflow:auto;
 
@@ -17,11 +19,11 @@ ul.typeahead__list {
     }
 }
 
-ul.typeahead__list & > li > a.pull-right {
+ul.typeahead-list & > li > a.pull-right {
     .pull-left();
 }
 
-[dir="rtl"] .typeahead__list {
+[dir="rtl"] .typeahead-list {
     text-align : right;
 }
 

tools/build-main.js

@@ -25,18 +25,21 @@ var rjs_config = {
     moment: 'components/moment/min/moment-with-locales',
     codemirror: 'components/codemirror',
     xterm: 'components/xterm.js/index',
-    "xtermjs-fit": 'components/xterm.js-fit/index',
-    "jquery-typeahead": 'components/jquery-typeahead/dist/jquery.typeahead.min',
+    'xtermjs-fit': 'components/xterm.js-fit/index',
+    typeahead: 'components/jquery-typeahead/dist/jquery.typeahead',
     contents: 'empty:',
     custom: 'empty:',
   },
   map: { // for backward compatibility
     "*": {
         "jqueryui": "jquery-ui",
-        "typeahead": "jquery-typeahead"
     }
   },
   shim: {
+    typeahead: {
+            deps: ["jquery"],
+            exports: "typeahead"
+          },
     underscore: {
       exports: '_'
     },