Merge branch 'master' into gh-pages
Conflicts: CHANGES.rst docs/doctrees/environment.pickle index.html
This commit is contained in:
JC Brand
commit
e2ed7757ff
1
.gitignore
vendored
1
.gitignore
vendored
|
|
@ -8,6 +8,7 @@
|
|||
.svn/
|
||||
.project
|
||||
.pydevproject
|
||||
node_modules
|
||||
|
||||
# OSX
|
||||
.DS_Store
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@ Changelog
|
|||
|
||||
0.5 (Unreleased)
|
||||
----------------
|
||||
|
||||
- #9 Remove dependency on AMD/require.js [jcbrand]
|
||||
- #22 Fixed compare operator in strophe.muc [sonata82]
|
||||
- #23 Add Italian translations [ctrlaltca]
|
||||
- #24 Add Spanish translations [macagua]
|
||||
|
|
|
|||
20
Gruntfile.js
Normal file
20
Gruntfile.js
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
module.exports = function(grunt) {
|
||||
grunt.initConfig({
|
||||
jshint: {
|
||||
options: {
|
||||
trailing: true
|
||||
},
|
||||
target: {
|
||||
src : [
|
||||
'converse.js',
|
||||
'mock.js',
|
||||
'main.js',
|
||||
'tests_main.js',
|
||||
'spec/*.js'
|
||||
]
|
||||
}
|
||||
}
|
||||
});
|
||||
grunt.loadNpmTasks('grunt-contrib-jshint');
|
||||
grunt.registerTask('default', ['jshint']);
|
||||
};
|
||||
|
|
@ -552,6 +552,7 @@ p.room-info {
|
|||
a.room-info {
|
||||
background: url('images/information.png') no-repeat right top;
|
||||
width: 22px;
|
||||
height: 22px;
|
||||
float: right;
|
||||
display: none;
|
||||
clear: right;
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -166,15 +166,17 @@
|
|||
<script type="text/javascript">try { var pageTracker = _gat._getTracker("UA-2128260-8"); pageTracker._trackPageview(); } catch(err) {}</script>
|
||||
</body>
|
||||
<script>
|
||||
require(['converse'], function (converse) {
|
||||
converse.initialize({
|
||||
auto_list_rooms: false,
|
||||
auto_subscribe: false,
|
||||
bosh_service_url: 'https://bind.opkode.im', // Please use this connection manager only for testing purposes
|
||||
hide_muc_server: false,
|
||||
i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
|
||||
i18n: locales.de, // Refer to ./locale/locales.js to see which locales are supported
|
||||
prebind: false,
|
||||
show_controlbox_by_default: true,
|
||||
xhr_user_search: false
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</html>
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
(function (root, factory) {
|
||||
define("af", ['jed'], function () {
|
||||
var af = new Jed({
|
||||
"domain": "converse",
|
||||
"locale_data": {
|
||||
|
|
@ -452,8 +451,16 @@
|
|||
}
|
||||
}
|
||||
});
|
||||
if (typeof define === 'function' && define.amd) {
|
||||
define("af", ['jed'], function () {
|
||||
return factory(af);
|
||||
});
|
||||
} else {
|
||||
if (!window.locales) {
|
||||
window.locales = {};
|
||||
}
|
||||
window.locales.af = af;
|
||||
}
|
||||
}(this, function (af) {
|
||||
return af;
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
(function (root, factory) {
|
||||
define("de", ['jed'], function () {
|
||||
var de = new Jed({
|
||||
"domain": "converse",
|
||||
"locale_data": {
|
||||
|
|
@ -452,8 +451,16 @@
|
|||
}
|
||||
}
|
||||
});
|
||||
if (typeof define === 'function' && define.amd) {
|
||||
define("de", ['jed'], function () {
|
||||
return factory(de);
|
||||
});
|
||||
} else {
|
||||
if (!window.locales) {
|
||||
window.locales = {};
|
||||
}
|
||||
window.locales.de = de;
|
||||
}
|
||||
}(this, function (de) {
|
||||
return de;
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
(function (root, factory) {
|
||||
define("en", ['jed'], function () {
|
||||
var en = new Jed({
|
||||
"domain": "converse",
|
||||
"locale_data": {
|
||||
|
|
@ -12,8 +11,16 @@
|
|||
}
|
||||
}
|
||||
});
|
||||
if (typeof define === 'function' && define.amd) {
|
||||
define("en", ['jed'], function () {
|
||||
return factory(en);
|
||||
});
|
||||
} else {
|
||||
if (!window.locales) {
|
||||
window.locales = {};
|
||||
}
|
||||
window.locales.en = en;
|
||||
}
|
||||
}(this, function (en) {
|
||||
return en;
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -1,6 +1,5 @@
|
|||
(function (root, factory) {
|
||||
define("es", ['jed'], function () {
|
||||
var de = new Jed({
|
||||
var es = new Jed({
|
||||
"domain": "converse",
|
||||
"locale_data": {
|
||||
"converse": {
|
||||
|
|
@ -452,8 +451,16 @@
|
|||
}
|
||||
}
|
||||
});
|
||||
return factory(de);
|
||||
if (typeof define === 'function' && define.amd) {
|
||||
define("es", ['jed'], function () {
|
||||
return factory(es);
|
||||
});
|
||||
}(this, function (de) {
|
||||
return de;
|
||||
} else {
|
||||
if (!window.locales) {
|
||||
window.locales = {};
|
||||
}
|
||||
window.locales.es = es;
|
||||
}
|
||||
}(this, function (es) {
|
||||
return es;
|
||||
}));
|
||||
|
|
|
|||
|
|
@ -1,5 +1,4 @@
|
|||
(function (root, factory) {
|
||||
define("it", ['jed'], function () {
|
||||
var it = new Jed({
|
||||
"domain": "converse",
|
||||
"locale_data": {
|
||||
|
|
@ -463,8 +462,16 @@
|
|||
}
|
||||
}
|
||||
});
|
||||
if (typeof define === 'function' && define.amd) {
|
||||
define("it", ['jed'], function () {
|
||||
return factory(it);
|
||||
});
|
||||
} else {
|
||||
if (!window.locales) {
|
||||
window.locales = {};
|
||||
}
|
||||
window.locales.it = it;
|
||||
}
|
||||
}(this, function (it) {
|
||||
return it;
|
||||
}));
|
||||
23
locale/single_locale.js
Normal file
23
locale/single_locale.js
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
/*
|
||||
* This file specifies a single language dependency (for English).
|
||||
*
|
||||
* Translations take up a lot of space and you are therefore advised to remove
|
||||
* from here any languages that you don't need.
|
||||
*/
|
||||
|
||||
(function (root, factory) {
|
||||
require.config({
|
||||
paths: {
|
||||
"jed": "Libraries/jed",
|
||||
"en": "locale/en/LC_MESSAGES/en"
|
||||
}
|
||||
});
|
||||
|
||||
define("locales", [
|
||||
'jed',
|
||||
'en'
|
||||
], function (jed, en) {
|
||||
root.locales = {};
|
||||
root.locales.en = en;
|
||||
});
|
||||
})(this);
|
||||
35
package.json
35
package.json
|
|
@ -1,5 +1,34 @@
|
|||
{
|
||||
"name": "Converse.js",
|
||||
"description": "Converse.js is a web based XMPP/Jabber instant messaging client",
|
||||
"version": "0.4.1"
|
||||
"name": "converse.js",
|
||||
"version": "0.5.0",
|
||||
"description": "Browser based XMPP instant messaging client",
|
||||
"main": "main.js",
|
||||
"directories": {
|
||||
"doc": "docs"
|
||||
},
|
||||
"scripts": {
|
||||
"test": ""
|
||||
},
|
||||
"repository": {
|
||||
"type": "git",
|
||||
"url": "git://github.com/jcbrand/converse.js.git"
|
||||
},
|
||||
"keywords": [
|
||||
"XMPP",
|
||||
"Jabber",
|
||||
"chat",
|
||||
"messaging",
|
||||
"chatrooms",
|
||||
"webchat"
|
||||
],
|
||||
"author": "JC Brand",
|
||||
"license": "MIT",
|
||||
"bugs": {
|
||||
"url": "https://github.com/jcbrand/converse.js/issues"
|
||||
},
|
||||
"devDependencies": {
|
||||
"grunt-cli": "~0.1.9",
|
||||
"grunt": "~0.4.1",
|
||||
"grunt-contrib-jshint": "~0.6.0"
|
||||
}
|
||||
}
|
||||
|
|
@ -121,7 +121,7 @@
|
|||
var i, t, is_last;
|
||||
spyOn(this.rosterview, 'render').andCallThrough();
|
||||
for (i=0; i<pend_names.length; i++) {
|
||||
is_last = i==(pend_names.length-1);
|
||||
is_last = i===(pend_names.length-1);
|
||||
this.roster.create({
|
||||
jid: pend_names[i].replace(' ','.').toLowerCase() + '@localhost',
|
||||
subscription: 'none',
|
||||
|
|
@ -162,7 +162,7 @@
|
|||
subscription: 'both',
|
||||
ask: null,
|
||||
fullname: cur_names[i],
|
||||
is_last: i==(cur_names.length-1)
|
||||
is_last: i===(cur_names.length-1)
|
||||
});
|
||||
expect(this.rosterview.render).toHaveBeenCalled();
|
||||
// Check that they are sorted alphabetically
|
||||
|
|
@ -291,7 +291,7 @@
|
|||
subscription: 'none',
|
||||
ask: 'request',
|
||||
fullname: req_names[i],
|
||||
is_last: i==(req_names.length-1)
|
||||
is_last: i===(req_names.length-1)
|
||||
});
|
||||
expect(this.rosterview.render).toHaveBeenCalled();
|
||||
// Check that they are sorted alphabetically
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user