Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Add OTR to bower.json and converse.js

Browse Source
This commit is contained in:
JC Brand 2013-08-09 19:22:49 +02:00
parent b681c3e58e
commit f7c579e7e6
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bower.json
View File

@ -17,8 +17,8 @@
"strophe.roster": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/roster/strophe.roster.js", "strophe.roster": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/roster/strophe.roster.js",
"strophe.vcard": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/vcard/strophe.vcard.js", "strophe.vcard": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/vcard/strophe.vcard.js",
"strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js", "strophe.disco": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/disco/strophe.disco.js",
"strophe.muc": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/muc/strophe.muc.js" "strophe.muc": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/muc/strophe.muc.js",
"otr": "~0.2.1"
}, },
"exportsOverride": { "exportsOverride": {}
}
} }

9
converse.js
View File

@ -13,6 +13,7 @@
} }
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
define("converse", [ define("converse", [
"components/otr/build/otr",
"locales", "locales",
"localstorage", "localstorage",
"tinysort", "tinysort",
@ -22,13 +23,13 @@
"strophe.roster", "strophe.roster",
"strophe.vcard", "strophe.vcard",
"strophe.disco" "strophe.disco"
], function() { ], function(otr) {
// Use Mustache style syntax for variable interpolation // Use Mustache style syntax for variable interpolation
_.templateSettings = { _.templateSettings = {
evaluate : /\{\[([\s\S]+?)\]\}/g, evaluate : /\{\[([\s\S]+?)\]\}/g,
interpolate : /\{\{([\s\S]+?)\}\}/g interpolate : /\{\{([\s\S]+?)\}\}/g
}; };
return factory(jQuery, _, console); return factory(jQuery, _, otr, console);
} }
); );
} else { } else {
@ -37,9 +38,9 @@
evaluate : /\{\[([\s\S]+?)\]\}/g, evaluate : /\{\[([\s\S]+?)\]\}/g,
interpolate : /\{\{([\s\S]+?)\}\}/g interpolate : /\{\{([\s\S]+?)\}\}/g
}; };
root.converse = factory(jQuery, _, console || {log: function(){}}); root.converse = factory(jQuery, _, otr, console || {log: function(){}});
} }
}(this, function ($, _, console) { }(this, function ($, _, otr, console) {
var converse = {}; var converse = {};
converse.initialize = function (settings) { converse.initialize = function (settings) {
// Default values // Default values

4
index.html
View File

@ -6,8 +6,8 @@
<meta name="description" content="Converse.js: Open Source Browser-Based Instant Messaging" /> <meta name="description" content="Converse.js: Open Source Browser-Based Instant Messaging" />
<link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css"> <link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
<link rel="stylesheet" type="text/css" media="screen" href="converse.min.css"> <link rel="stylesheet" type="text/css" media="screen" href="converse.min.css">
<script src="converse.min.js"></script> <!-- <script src="converse.min.js"></script> -->
<!-- For development <script data-main="main" src="components/requirejs/require.js"></script> --> <script data-main="main" src="components/requirejs/require.js"></script>
<title>Converse.js</title> <title>Converse.js</title>
</head> </head>