Skip to content

C
converse.js
Commit f1555774 authored by JC Brand's avatar JC Brand
Browse files
Options

Add typeahead.js as dependency and integrate. updates #215.

parent 28827428
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 11 deletions
bower.json
View file @ f1555774
...@@ -29,7 +29,8 @@ ...@@ -29,7 +29,8 @@
"jquery.browser": "~0.0.6", "jquery.browser": "~0.0.6",
"jquery-easing-original": "~1.3.1", "jquery-easing-original": "~1.3.1",
"bootstrap": "~3.2.0", "bootstrap": "~3.2.0",
"fontawesome": "~4.1.0" "fontawesome": "~4.1.0",
"typeahead.js": "~0.10.5"
}, },
"exportsOverride": {} "exportsOverride": {}
} }
css/converse.css
View file @ f1555774
...@@ -581,7 +581,7 @@ span.spinner.hor_centered { ...@@ -581,7 +581,7 @@ span.spinner.hor_centered {
#conversejs .chatroom #invited-contact { #conversejs .chatroom #invited-contact {
margin: 1px; margin: 1px;
margin-top: 2px; margin-top: 2px;
width: 92px; width: 96px;
} }
#conversejs .participants ul.participant-list li { #conversejs .participants ul.participant-list li {
overflow: hidden; overflow: hidden;
......
index.html
View file @ f1555774
...@@ -11,14 +11,8 @@ ...@@ -11,14 +11,8 @@
<link type="text/css" rel="stylesheet" media="screen" href="components/bootstrap/dist/css/bootstrap.min.css" /> <link type="text/css" rel="stylesheet" media="screen" href="components/bootstrap/dist/css/bootstrap.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" /> <link type="text/css" rel="stylesheet" media="screen" href="components/fontawesome/css/font-awesome.min.css" />
<link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" /> <link type="text/css" rel="stylesheet" media="screen" href="css/theme.css" />
<link type="text/css" rel="stylesheet" media="screen" href="css/converse.min.css" /> <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
<!-- Only for development: <script data-main="main" src="components/requirejs/require.js"></script> --> <script data-main="main" src="components/requirejs/require.js"></script>
<![if gte IE 9]>
<script src="builds/converse.website.min.js"></script>
<![endif]>
<!--[if lt IE 9]>
<script src="builds/converse.website-no-otr.min.js"></script>
<![endif]-->
</head> </head>
<body id="page-top" data-spy="scroll" data-target=".navbar-custom"> <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
...@@ -241,6 +235,7 @@ ...@@ -241,6 +235,7 @@
play_sounds: true, play_sounds: true,
prebind: false, prebind: false,
show_controlbox_by_default: true, show_controlbox_by_default: true,
debug: true,
roster_groups: true roster_groups: true
}); });
}); });
......
less/converse.less
View file @ f1555774
...@@ -626,7 +626,7 @@ span.spinner.hor_centered { ...@@ -626,7 +626,7 @@ span.spinner.hor_centered {
#conversejs .chatroom #invited-contact { #conversejs .chatroom #invited-contact {
margin: 1px; margin: 1px;
margin-top: 2px; margin-top: 2px;
width: 92px; width: 96px;
} }
#conversejs .participants ul.participant-list li { #conversejs .participants ul.participant-list li {
......
main.js
View file @ f1555774
...@@ -11,6 +11,7 @@ config = { ...@@ -11,6 +11,7 @@ config = {
"backbone": "components/backbone/backbone", "backbone": "components/backbone/backbone",
"backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage", "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
"backbone.overview": "components/backbone.overview/backbone.overview", "backbone.overview": "components/backbone.overview/backbone.overview",
"typeahead": 'components/typeahead.js/dist/typeahead.jquery',
"text": 'components/requirejs-text/text', "text": 'components/requirejs-text/text',
"tpl": 'components/requirejs-tpl-jcbrand/tpl', "tpl": 'components/requirejs-tpl-jcbrand/tpl',
"converse-templates": "src/templates", "converse-templates": "src/templates",
...@@ -73,6 +74,7 @@ config = { ...@@ -73,6 +74,7 @@ config = {
'crypto.sha1': { deps: ['crypto.core'] }, 'crypto.sha1': { deps: ['crypto.core'] },
'crypto.sha256': { deps: ['crypto.core'] }, 'crypto.sha256': { deps: ['crypto.core'] },
'bigint': { deps: ['crypto'] }, 'bigint': { deps: ['crypto'] },
'typeahead': { deps: ['jquery'] },
'jquery.browser': { deps: ['jquery'] }, 'jquery.browser': { deps: ['jquery'] },
'jquery.easing': { deps: ['jquery'] }, 'jquery.easing': { deps: ['jquery'] },
'utils': { deps: ['jquery'] }, 'utils': { deps: ['jquery'] },
......
src/deps-full.js
View file @ f1555774
...@@ -5,6 +5,7 @@ define("converse-dependencies", [ ...@@ -5,6 +5,7 @@ define("converse-dependencies", [
"backbone.browserStorage", "backbone.browserStorage",
"backbone.overview", "backbone.overview",
"jquery.browser", "jquery.browser",
"typeahead",
"utils", "utils",
"strophe", "strophe",
"strophe.muc", "strophe.muc",
......
src/deps-no-otr.js
View file @ f1555774
...@@ -4,6 +4,7 @@ define("converse-dependencies", [ ...@@ -4,6 +4,7 @@ define("converse-dependencies", [
"backbone.browserStorage", "backbone.browserStorage",
"backbone.overview", "backbone.overview",
"jquery.browser", "jquery.browser",
"typeahead",
"utils", "utils",
"strophe", "strophe",
"strophe.muc", "strophe.muc",
......
src/deps-website-no-otr.js
View file @ f1555774
...@@ -6,6 +6,7 @@ define("converse-dependencies", [ ...@@ -6,6 +6,7 @@ define("converse-dependencies", [
"backbone.overview", "backbone.overview",
"jquery.browser", "jquery.browser",
"jquery.easing", // XXX: Can be removed, only for https://conversejs.org "jquery.easing", // XXX: Can be removed, only for https://conversejs.org
"typeahead",
"utils", "utils",
"strophe", "strophe",
"strophe.muc", "strophe.muc",
......
src/deps-website.js
View file @ f1555774
...@@ -7,6 +7,7 @@ define("converse-dependencies", [ ...@@ -7,6 +7,7 @@ define("converse-dependencies", [
"backbone.overview", "backbone.overview",
"jquery.browser", "jquery.browser",
"jquery.easing", // XXX: Only for https://conversejs.org "jquery.easing", // XXX: Only for https://conversejs.org
"typeahead",
"utils", "utils",
"strophe", "strophe",
"strophe.muc", "strophe.muc",
......
src/templates/chatarea.html
View file @ f1555774
...@@ -9,5 +9,8 @@ ...@@ -9,5 +9,8 @@
</form> </form>
</div> </div>
<div class="participants"> <div class="participants">
<form class="room-invite">
<input id="invited-contact" placeholder="Invite someone" type="text"/>
</form>
<ul class="participant-list"></ul> <ul class="participant-list"></ul>
</div> </div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7