diff --git a/docs/THIRDPARTY b/docs/THIRDPARTY index fe7258deab..716fc1faf6 100644 --- a/docs/THIRDPARTY +++ b/docs/THIRDPARTY @@ -272,7 +272,7 @@ Files: web/third/bootstrap/css/bootstrap-btn.css Copyright: 2011-2014 Twitter, Inc. License: Expat -Files: web/third/bootstrap-typeahead/* +Files: web/src/bootstrap_typeahead.js Copyright: 2012 Twitter, Inc. License: Apache-2.0 Comment: Bootstrap typeahead. The software has been modified. diff --git a/tools/test-js-with-node b/tools/test-js-with-node index a43c2e40a1..a47dedab76 100755 --- a/tools/test-js-with-node +++ b/tools/test-js-with-node @@ -61,6 +61,7 @@ EXEMPT_FILES = make_set( "web/src/billing/helpers.ts", "web/src/blueslip.ts", "web/src/blueslip_stacktrace.ts", + "web/src/bootstrap_typeahead.js", "web/src/browser_history.ts", "web/src/buddy_list.ts", "web/src/click_handlers.js", diff --git a/web/third/bootstrap-typeahead/typeahead.js b/web/src/bootstrap_typeahead.js similarity index 99% rename from web/third/bootstrap-typeahead/typeahead.js rename to web/src/bootstrap_typeahead.js index 70a72cad88..5057baf84e 100644 --- a/web/third/bootstrap-typeahead/typeahead.js +++ b/web/src/bootstrap_typeahead.js @@ -135,7 +135,7 @@ import $ from "jquery"; import {insertTextIntoField} from "text-field-edit"; -import {get_string_diff} from "../../src/util"; +import {get_string_diff} from "./util"; function get_pseudo_keycode(event) { const isComposing = (event.originalEvent && event.originalEvent.isComposing) || false; diff --git a/web/src/bundles/app.ts b/web/src/bundles/app.ts index b8baf7982a..d98c0e74c8 100644 --- a/web/src/bundles/app.ts +++ b/web/src/bundles/app.ts @@ -1,7 +1,7 @@ import "./common"; // Import third party jQuery plugins -import "../../third/bootstrap-typeahead/typeahead"; +import "../bootstrap_typeahead"; import "jquery-caret-plugin/dist/jquery.caret"; import "../../third/jquery-idle/jquery.idle"; import "spectrum-colorpicker";