From f1555774f0ac2580b0f3ff9c05b2320bfd32d7e9 Mon Sep 17 00:00:00 2001 From: JC Brand Date: Tue, 26 Aug 2014 19:59:11 +0200 Subject: [PATCH] Add typeahead.js as dependency and integrate. updates #215. --- bower.json | 3 ++- css/converse.css | 2 +- index.html | 11 +++-------- less/converse.less | 2 +- main.js | 2 ++ src/deps-full.js | 1 + src/deps-no-otr.js | 1 + src/deps-website-no-otr.js | 1 + src/deps-website.js | 1 + src/templates/chatarea.html | 3 +++ 10 files changed, 16 insertions(+), 11 deletions(-) diff --git a/bower.json b/bower.json index e2559ca70..1fb0af468 100644 --- a/bower.json +++ b/bower.json @@ -29,7 +29,8 @@ "jquery.browser": "~0.0.6", "jquery-easing-original": "~1.3.1", "bootstrap": "~3.2.0", - "fontawesome": "~4.1.0" + "fontawesome": "~4.1.0", + "typeahead.js": "~0.10.5" }, "exportsOverride": {} } diff --git a/css/converse.css b/css/converse.css index 5352c4d6c..eefe9b09d 100644 --- a/css/converse.css +++ b/css/converse.css @@ -581,7 +581,7 @@ span.spinner.hor_centered { #conversejs .chatroom #invited-contact { margin: 1px; margin-top: 2px; - width: 92px; + width: 96px; } #conversejs .participants ul.participant-list li { overflow: hidden; diff --git a/index.html b/index.html index 6221992a2..07df247ba 100644 --- a/index.html +++ b/index.html @@ -11,14 +11,8 @@ - - - - - - + + @@ -241,6 +235,7 @@ play_sounds: true, prebind: false, show_controlbox_by_default: true, + debug: true, roster_groups: true }); }); diff --git a/less/converse.less b/less/converse.less index 5821a7257..11991021e 100644 --- a/less/converse.less +++ b/less/converse.less @@ -626,7 +626,7 @@ span.spinner.hor_centered { #conversejs .chatroom #invited-contact { margin: 1px; margin-top: 2px; - width: 92px; + width: 96px; } #conversejs .participants ul.participant-list li { diff --git a/main.js b/main.js index 7acd07ea7..567c6febf 100644 --- a/main.js +++ b/main.js @@ -11,6 +11,7 @@ config = { "backbone": "components/backbone/backbone", "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage", "backbone.overview": "components/backbone.overview/backbone.overview", + "typeahead": 'components/typeahead.js/dist/typeahead.jquery', "text": 'components/requirejs-text/text', "tpl": 'components/requirejs-tpl-jcbrand/tpl', "converse-templates": "src/templates", @@ -73,6 +74,7 @@ config = { 'crypto.sha1': { deps: ['crypto.core'] }, 'crypto.sha256': { deps: ['crypto.core'] }, 'bigint': { deps: ['crypto'] }, + 'typeahead': { deps: ['jquery'] }, 'jquery.browser': { deps: ['jquery'] }, 'jquery.easing': { deps: ['jquery'] }, 'utils': { deps: ['jquery'] }, diff --git a/src/deps-full.js b/src/deps-full.js index c2ba72ba6..40fa284db 100644 --- a/src/deps-full.js +++ b/src/deps-full.js @@ -5,6 +5,7 @@ define("converse-dependencies", [ "backbone.browserStorage", "backbone.overview", "jquery.browser", + "typeahead", "utils", "strophe", "strophe.muc", diff --git a/src/deps-no-otr.js b/src/deps-no-otr.js index 42adbea9d..8d72f8506 100644 --- a/src/deps-no-otr.js +++ b/src/deps-no-otr.js @@ -4,6 +4,7 @@ define("converse-dependencies", [ "backbone.browserStorage", "backbone.overview", "jquery.browser", + "typeahead", "utils", "strophe", "strophe.muc", diff --git a/src/deps-website-no-otr.js b/src/deps-website-no-otr.js index 0258b6c89..353cac1b4 100644 --- a/src/deps-website-no-otr.js +++ b/src/deps-website-no-otr.js @@ -6,6 +6,7 @@ define("converse-dependencies", [ "backbone.overview", "jquery.browser", "jquery.easing", // XXX: Can be removed, only for https://conversejs.org + "typeahead", "utils", "strophe", "strophe.muc", diff --git a/src/deps-website.js b/src/deps-website.js index 439cd50c0..db9fe51f3 100644 --- a/src/deps-website.js +++ b/src/deps-website.js @@ -7,6 +7,7 @@ define("converse-dependencies", [ "backbone.overview", "jquery.browser", "jquery.easing", // XXX: Only for https://conversejs.org + "typeahead", "utils", "strophe", "strophe.muc", diff --git a/src/templates/chatarea.html b/src/templates/chatarea.html index d77a840ef..69d1cd2b5 100644 --- a/src/templates/chatarea.html +++ b/src/templates/chatarea.html @@ -9,5 +9,8 @@
+
+ +