Etusivu Tutki Apua
Rekisteröidy Kirjaudu sisään
im-changing.ru
/
converse.js
peilaus alkaen https://github.com/conversejs/converse.js.git
2
0
Fork 0
Tiedostot Ongelmat 0 Wiki
Selaa lähdekoodia

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

JC Brand 10 vuotta sitten
vanhempi
28827428e7
commit
f1555774f0
10 muutettua tiedostoa jossa 16 lisäystä ja 11 poistoa
Jaettu näkymä Näytä diff tilastot
  1. 2 1
      bower.json
  2. 1 1
      css/converse.css
  3. 3 8
      index.html
  4. 1 1
      less/converse.less
  5. 2 0
      main.js
  6. 1 0
      src/deps-full.js
  7. 1 0
      src/deps-no-otr.js
  8. 1 0
      src/deps-website-no-otr.js
  9. 1 0
      src/deps-website.js
  10. 3 0
      src/templates/chatarea.html

+ 2 - 1
bower.json
Näytä tiedosto 

@@ -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": {}
 
 }

+ 1 - 1
css/converse.css
Näytä tiedosto 

@@ -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;

+ 3 - 8
index.html
Näytä tiedosto 

@@ -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/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/converse.min.css" />
 
-    <!-- Only for development: <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]-->
 
+    <link type="text/css" rel="stylesheet" media="screen" href="css/converse.css" />
 
+    <script data-main="main" src="components/requirejs/require.js"></script>
 
 </head>
 
 
 <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
 
@@ -241,6 +235,7 @@
 
             play_sounds: true,
 
             prebind: false,
 
             show_controlbox_by_default: true,
 
+            debug: true,
 
             roster_groups: true
 
         });
 
     });

+ 1 - 1
less/converse.less
Näytä tiedosto 

@@ -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 {

+ 2 - 0
main.js
Näytä tiedosto 

@@ -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'] },

+ 1 - 0
src/deps-full.js
Näytä tiedosto 

@@ -5,6 +5,7 @@ define("converse-dependencies", [
 
     "backbone.browserStorage",
 
     "backbone.overview",
 
     "jquery.browser",
 
+    "typeahead",
 
     "utils",
 
     "strophe",
 
     "strophe.muc",

+ 1 - 0
src/deps-no-otr.js
Näytä tiedosto 

@@ -4,6 +4,7 @@ define("converse-dependencies", [
 
     "backbone.browserStorage",
 
     "backbone.overview",
 
     "jquery.browser",
 
+    "typeahead",
 
     "utils",
 
     "strophe",
 
     "strophe.muc",

+ 1 - 0
src/deps-website-no-otr.js
Näytä tiedosto 

@@ -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",

+ 1 - 0
src/deps-website.js
Näytä tiedosto 

@@ -7,6 +7,7 @@ define("converse-dependencies", [
 
     "backbone.overview",
 
     "jquery.browser",
 
     "jquery.easing", // XXX: Only for https://conversejs.org
 
+    "typeahead",
 
     "utils",
 
     "strophe",
 
     "strophe.muc",

+ 3 - 0
src/templates/chatarea.html
Näytä tiedosto 

@@ -9,5 +9,8 @@
 
     </form>
 
 </div>
 
 <div class="participants">
 
+    <form class="room-invite">
 
+        <input id="invited-contact" placeholder="Invite someone" type="text"/>
 
+    </form>
 
     <ul class="participant-list"></ul>
 
 </div>