Skip to content

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

Merge branch '0.8' 

Conflicts:
	CONTRIBUTING.rst
	Makefile
	README.rst
	bower.json
	docs/CHANGES.rst
	docs/doctrees/index.doctree
	docs/html/_sources/index.txt
	docs/html/index.html
	docs/html/searchindex.js
	docs/source/index.rst
parents e6cff4e8 eca42fbb
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2824 additions and 1483 deletions
.gitignore
View file @ 1dff3ac0
...@@ -12,7 +12,8 @@ node_modules ...@@ -12,7 +12,8 @@ node_modules
components components
docs/doctrees/environment.pickle docs/doctrees/environment.pickle
tags tags
test-reports stamp-npm
stamp-bower
# OSX # OSX
.DS_Store .DS_Store
CONTRIBUTING.rst
View file @ 1dff3ac0
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
Contribution Guidelines Contribution Guidelines
======================= =======================
Firstly, thanks for contributing to Converse.js_. Thanks for contributing to `Converse.js <http://conversejs.org>`_.
Support questions Support questions
================= =================
...@@ -20,21 +20,18 @@ Before submitting a pull request ...@@ -20,21 +20,18 @@ Before submitting a pull request
Add tests for your bugfix or feature Add tests for your bugfix or feature
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Add a test for any bug fixed or feature added. We use Jasmine Add a test for any bug fixed or feature added. We use Jasmine
for testing. for testing.
Take a look at ``tests.html`` and ``spec/MainSpec.js`` to see how Take a look at `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
the tests are implemented. and the `spec files <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
to see how tests are implemented.
Check that the tests pass Check that the tests pass
~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~
Check that the Jasmine tests complete sucessfully. Open
Check that the Jasmine tests complete sucessfully. Open tests.html in your `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
browser, and the tests will run automatically. in your browser, and the tests will run automatically.
On the command line you can run ``grunt test`` (if you have before run ``npm
install``).
Check your code for errors or bad habits by running JSHint Check your code for errors or bad habits by running JSHint
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
...@@ -42,5 +39,3 @@ If you haven't yet done so, run ``npm install`` to install all development ...@@ -42,5 +39,3 @@ If you haven't yet done so, run ``npm install`` to install all development
dependencies. dependencies.
Then run ``grunt jshint`` and check the output. Then run ``grunt jshint`` and check the output.
.. _Converse.js: http://conversejs.org
Makefile
View file @ 1dff3ac0
# You can set these variables from the command line. # You can set these variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
BUILDDIR = ./docs
BOWER ?= node_modules/.bin/bower BOWER ?= node_modules/.bin/bower
BUILDDIR = ./docs
PAPER =
PHANTOMJS ?= node_modules/.bin/phantomjs
SPHINXBUILD = sphinx-build
SPHINXOPTS =
# Internal variables. # Internal variables.
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source
# the i18n builder cannot share the environment and doctrees with the others # the i18n builder cannot share the environment and doctrees with the others
I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) ./docs/source
...@@ -19,34 +17,34 @@ all: dev ...@@ -19,34 +17,34 @@ all: dev
help: help:
@echo "Please use \`make <target>' where <target> is one of" @echo "Please use \`make <target>' where <target> is one of"
@echo " changes to make an overview of all changed/added/deprecated items" @echo " dev to set up the development environment"
@echo " devhelp to make HTML files and a Devhelp project"
@echo " dirhtml to make HTML files named index.html in directories"
@echo " doctest to run all doctests embedded in the documentation (if enabled)"
@echo " epub to export the documentation to epub"
@echo " gettext to make PO message catalogs of the documentation" @echo " gettext to make PO message catalogs of the documentation"
@echo " html to make standalone HTML files of the documentation" @echo " html to make standalone HTML files of the documentation"
@echo " htmlhelp to make HTML files and a HTML help project from the documentation" @echo " pot to generate a gettext POT file to be used for translations"
@echo " info to make Texinfo files and run them through makeinfo" @echo " po to generate gettext PO files for each i18n language"
@echo " json to make JSON files" @echo " po2json to generate JSON files from the language PO files"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@echo " latexpdf to make LaTeX files and run them through pdflatex"
@echo " linkcheck to check all external links for integrity"
@echo " pot generates a gettext POT file to be used for translations"
@echo " release to make a new minified release" @echo " release to make a new minified release"
@echo " linkcheck to check all documentation external links for integrity" @echo " linkcheck to check all documentation external links for integrity"
@echo " epub to export the documentation to epub" @echo " epub to export the documentation to epub"
@echo " changes to make an overview of all changed/added/deprecated items added to the documentation" @echo " changes to make an overview of all changed/added/deprecated items added to the documentation"
pot: ########################################################################
## Translation machinery
pot:
xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot converse.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=0.7.0 -c --language="python"; xgettext --keyword=__ --keyword=___ --from-code=UTF-8 --output=locale/converse.pot converse.js --package-name=Converse.js --copyright-holder="Jan-Carel Brand" --package-version=0.7.0 -c --language="python";
merge: po:
find ./locale -maxdepth 1 -mindepth 1 -type d -exec msgmerge {}/LC_MESSAGES/converse.po ./locale/converse.pot -U \; find ./locale -maxdepth 1 -mindepth 1 -type d -exec msgmerge {}/LC_MESSAGES/converse.po ./locale/converse.pot -U \;
merge: po
po2json: po2json:
find ./locale -maxdepth 1 -mindepth 1 -type d -exec po2json {}/LC_MESSAGES/converse.po {}/LC_MESSAGES/converse.json \; find ./locale -maxdepth 1 -mindepth 1 -type d -exec po2json {}/LC_MESSAGES/converse.po {}/LC_MESSAGES/converse.json \;
########################################################################
## Release management
release: release:
sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ bower.json sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ bower.json
sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ package.json sed -i s/\"version\":\ \"[0-9]\.[0-9]\.[0-9]\"/\"version\":\ \"$(VERSION)\"/ package.json
...@@ -57,13 +55,36 @@ release: ...@@ -57,13 +55,36 @@ release:
sed -i "s/(Unreleased)/(`date +%Y-%m-%d`)/" docs/CHANGES.rst sed -i "s/(Unreleased)/(`date +%Y-%m-%d`)/" docs/CHANGES.rst
grunt minify grunt minify
dev: ########################################################################
## Install dependencies
stamp-npm: package.json
npm install npm install
${BOWER} update; touch stamp-npm
stamp-bower: stamp-npm bower.json
$(BOWER) install
touch stamp-bower
clean: clean::
rm -f stamp-npm stamp-bower
rm -rf node_modules components
-rm -rf $(BUILDDIR)/* -rm -rf $(BUILDDIR)/*
dev: clean
npm install
${BOWER} update;
########################################################################
## Tests
check:: stamp-npm
$(PHANTOMJS) node_modules/phantom-jasmine/lib/run_jasmine_test.coffee tests.html
########################################################################
## Documentation
html: html:
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
@echo @echo
......
README.rst
View file @ 1dff3ac0
...@@ -52,6 +52,8 @@ Integration into other frameworks ...@@ -52,6 +52,8 @@ Integration into other frameworks
`roundcube-converse.js-xmpp-plugin <https://github.com/priyadi/roundcube-converse.js-xmpp-plugin>`_ is a plugin for Roundcube Webmail. `roundcube-converse.js-xmpp-plugin <https://github.com/priyadi/roundcube-converse.js-xmpp-plugin>`_ is a plugin for Roundcube Webmail.
* `Wordpress <http://wordpress.org>`_: * `Wordpress <http://wordpress.org>`_:
`ConverseJS <http://wordpress.org/plugins/conversejs>`_ `ConverseJS <http://wordpress.org/plugins/conversejs>`_
* `Patternslib <http://patternslib.com>`_:
`patterns.converse`_: `patterns.converse <https://github.com/jcbrand/patterns.converse>`_ provides a Patternslib pattern for Converse.js
---- ----
Demo Demo
...@@ -64,7 +66,9 @@ Tests ...@@ -64,7 +66,9 @@ Tests
----- -----
We use behavior-driven tests written with `jasmine.js <http://pivotal.github.io/jasmine>`_. We use behavior-driven tests written with `jasmine.js <http://pivotal.github.io/jasmine>`_.
They can run in your browser or in the command line via `phantom.js <http://phantomjs.org>`_.
Open `tests.html <https://github.com/jcbrand/converse.js/blob/master/tests.html>`_
in your browser, and the tests will run automatically.
------------- -------------
Documentation Documentation
...@@ -76,8 +80,7 @@ The developer/integrator documentation can be found at `<https://conversejs.org/ ...@@ -76,8 +80,7 @@ The developer/integrator documentation can be found at `<https://conversejs.org/
Licence Licence
------- -------
``Converse.js`` is released under both the `MIT <http://opensource.org/licenses/mit-license.php>`_ ``Converse.js`` is released under the `Mozilla Public License (MPL) <https://www.mozilla.org/MPL/2.0/index.txt>`_.
and `GPL <http://opensource.org/licenses/gpl-license.php>`_ licenses.
------- -------
Support Support
......
bower.json
View file @ 1dff3ac0
{ {
"name": "converse", "name": "converse",
"version": "0.7.4", "version": "0.8.0",
"devDependencies": { "devDependencies": {
"jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x", "jasmine": "https://github.com/jcbrand/jasmine.git#1_3_x",
"otr": "0.2.7" "otr": "0.2.12",
"requirejs-text": "~2.0.10",
"requirejs-tpl-jcbrand": "*"
}, },
"dependencies": { "dependencies": {
"requirejs": "2.1.8", "requirejs": "2.1.11",
"jquery": "1.8.3", "jquery": "1.11.0",
"jed": "0.5.4", "jed": "0.5.4",
"tinysort": "git://github.com/Sjeiti/TinySort.git", "tinysort": "git://github.com/Sjeiti/TinySort.git",
"underscore": "1.5.1", "underscore": "1.6.0",
"backbone": "1.0.0", "backbone": "1.1.2",
"backbone.localStorage": "1.1.6", "backbone.localStorage": "1.1.7",
"strophe": "https://github.com/jcbrand/strophejs.git#converse", "strophe": "git@github.com:strophe/strophejs-bower.git#v1.1.3",
"strophe.roster": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/roster/strophe.roster.js", "strophe.roster": "https://raw.github.com/strophe/strophejs-plugins/b1f364eb6e854ffe844c57add38e885cfeb9b498/roster/strophe.roster.js",
"strophe.vcard": "https://raw.github.com/jcbrand/strophejs-plugins/75c8693992bc357c699b6d615eeb396e799f5c02/vcard/strophe.vcard.js", "strophe.vcard": "https://raw.github.com/strophe/strophejs-plugins/f5c9e16b463610d501591452cded0359f53aae48/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/strophe/strophejs-plugins/02310ad1b8da2962cd05b0f4bceaecca134efed4/muc/strophe.muc.js", "strophe.muc": "https://raw.github.com/strophe/strophejs-plugins/02310ad1b8da2962cd05b0f4bceaecca134efed4/muc/strophe.muc.js",
"otr": "0.2.7", "otr": "0.2.12",
"crypto-js-evanvosberg": "~3.1.2", "crypto-js-evanvosberg": "~3.1.2",
"almond": "~0.2.6" "almond": "~0.2.9",
"requirejs-text": "~2.0.12",
"requirejs-tpl-jcbrand": "*",
"momentjs": "~2.6.0",
"jquery.browser": "~0.0.6"
}, },
"exportsOverride": {} "exportsOverride": {}
} }
converse.css
View file @ 1dff3ac0
...@@ -347,27 +347,15 @@ span.spinner.hor_centered { ...@@ -347,27 +347,15 @@ span.spinner.hor_centered {
text-align: center; text-align: center;
} }
#conversejs {
z-index: 99; /*--Keeps the panel on top of all other elements--*/
position: fixed;
bottom: 0; right: 0;
height: 332px;
width: auto;
}
#toggle-controlbox { #toggle-controlbox {
position: fixed; float: right;
font-size: 70%; font-size: 85%;
bottom: 0;
right: 0;
border-top-right-radius: 4px; border-top-right-radius: 4px;
border-top-left-radius: 4px; border-top-left-radius: 4px;
background: #e3e2e2; background-color: rgba(83, 144, 200, 100);
border: 1px solid #c3c3c3; padding: 4px 8px;
border-bottom: none;
padding: 1px 3px;
margin-right: 15px; margin-right: 15px;
height: 16px; color: white;
} }
#connecting-to-chat { #connecting-to-chat {
...@@ -393,27 +381,34 @@ span.spinner.hor_centered { ...@@ -393,27 +381,34 @@ span.spinner.hor_centered {
background-color: #2D617A; background-color: #2D617A;
} }
.chatroom .chat-body { .chat-body {
height: 274px;
background-color: white; background-color: white;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
border-top: 0; border-top: 0;
} }
.chatbox .chat-body {
height: -moz-calc(100% - 38px);
height: -o-calc(100% - 38px);
height: calc(100% - 38px);
}
.chatroom .chat-body {
height: -moz-calc(100% - 38px);
height: -o-calc(100% - 38px);
height: calc(100% - 38px);
}
.chatroom .chat-area { .chatroom .chat-area {
float: left; float: left;
width: 200px; width: 200px;
} height: 100%;
.chatroom .chat {
overflow: auto;
height: 400px;
} }
.chatroom .participants { .chatroom .participants {
float: left; float: left;
height: 274px; height: 100%;
background-color: white; background-color: white;
overflow: auto; overflow: auto;
border-left: 1px solid #AAA; border-left: 1px solid #AAA;
...@@ -451,12 +446,18 @@ ul.participant-list li.moderator { ...@@ -451,12 +446,18 @@ ul.participant-list li.moderator {
padding: 4px; padding: 4px;
font-size: 13px; font-size: 13px;
color: rgb(79, 79, 79); color: rgb(79, 79, 79);
height:190px;
width: 192px;
overflow-y:auto; overflow-y:auto;
border: 0; border: 0;
background-color: #ffffff; background-color: #ffffff;
line-height: 1.3em; line-height: 1.3em;
box-sizing: border-box;
-moz-box-sizing: border-box;
}
.chat-content {
height: -moz-calc(100% - 76px);
height: -o-calc(100% - 76px);
height: calc(100% - 76px);
} }
.chat-info { .chat-info {
...@@ -508,11 +509,6 @@ li.chat-info { ...@@ -508,11 +509,6 @@ li.chat-info {
padding-top: 10px; padding-top: 10px;
} }
div#chatrooms,
div#login-dialog {
height: 274px;
}
p.not-implemented { p.not-implemented {
margin-top: 3em; margin-top: 3em;
margin-left: 0.3em; margin-left: 0.3em;
...@@ -560,6 +556,10 @@ div.chat-title { ...@@ -560,6 +556,10 @@ div.chat-title {
height: 1em; height: 1em;
} }
div.chat-title a {
color: white;
}
.chat-head-chatbox, .chat-head-chatbox,
.chat-head-chatroom { .chat-head-chatroom {
background: linear-gradient(top, rgba(206,220,231,1) 0%,rgba(79,106,114,1) 100%); background: linear-gradient(top, rgba(206,220,231,1) 0%,rgba(79,106,114,1) 100%);
...@@ -578,6 +578,9 @@ p.chatroom-topic { ...@@ -578,6 +578,9 @@ p.chatroom-topic {
margin: 0; margin: 0;
} }
div.chat-head-chatbox a.user-custom-message {
color: white;
}
.activated{ .activated{
display: block !important; display: block !important;
} }
...@@ -623,6 +626,7 @@ dl.add-converse-contact { ...@@ -623,6 +626,7 @@ dl.add-converse-contact {
float: right; float: right;
clear: right; clear: right;
height: 22px; height: 22px;
width: 12px;
padding: 0px 5px 0 0; padding: 0px 5px 0 0;
color: rgb(79, 79, 79); color: rgb(79, 79, 79);
} }
...@@ -642,7 +646,7 @@ form.search-xmpp-contact input { ...@@ -642,7 +646,7 @@ form.search-xmpp-contact input {
width: 8em; width: 8em;
} }
.oc-chat-head { .controlbox-head {
margin: 0; margin: 0;
color: #FFF; color: #FFF;
border-top-right-radius: 4px; border-top-right-radius: 4px;
...@@ -653,8 +657,30 @@ form.search-xmpp-contact input { ...@@ -653,8 +657,30 @@ form.search-xmpp-contact input {
padding: 3px 0 0 0; padding: 3px 0 0 0;
} }
.chat-head-message-count {
font-weight: bold;
position: absolute;
left: -6px;
top: -6px;
background: -webkit-gradient(linear, left top, left bottom, color-stop(0.35, #f6f6f6), color-stop(1, grey) );
background: -moz-linear-gradient(center top, yellow 5%, #f6f6f6 100%);
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='yellow', endColorstr='#f6f6f6');
border: 3px solid rgb(79, 106, 114);
text-shadow: 1px 1px 0 #ccc;
color: darkred;
border-radius: 20%;
padding: 2px 10px;
font-size: 18px;
text-align: center;
display: none;
}
.chat-head-chatroom .chat-head-message-count {
border: 3px solid #2D617A;
}
a.configure-chatroom-button, a.configure-chatroom-button,
a.minimize-chatbox-button, a.toggle-chatbox-button,
a.close-chatbox-button { a.close-chatbox-button {
font-size: 10px; font-size: 10px;
padding: 3px 3px 2px 3px; padding: 3px 3px 2px 3px;
...@@ -664,8 +690,8 @@ a.close-chatbox-button { ...@@ -664,8 +690,8 @@ a.close-chatbox-button {
-moz-box-shadow:inset 0 1px 0 0 #ffffff; -moz-box-shadow:inset 0 1px 0 0 #ffffff;
-webkit-box-shadow:inset 0 1px 0 0 #ffffff; -webkit-box-shadow:inset 0 1px 0 0 #ffffff;
box-shadow:inset 0 1px 0 0 #ffffff; box-shadow:inset 0 1px 0 0 #ffffff;
background:-webkit-gradient( linear, left top, left bottom, color-stop(0.05, #ffffff), color-stop(1, #f6f6f6) ); background:-webkit-gradient(linear, left top, left bottom, color-stop(0.05, #ffffff), color-stop(1, #f6f6f6) );
background:-moz-linear-gradient( center top, #ffffff 5%, #f6f6f6 100% ); background:-moz-linear-gradient(center top, #ffffff 5%, #f6f6f6 100%);
filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f6f6f6'); filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f6f6f6');
-moz-border-radius:6px; -moz-border-radius:6px;
-webkit-border-radius:6px; -webkit-border-radius:6px;
...@@ -678,21 +704,20 @@ a.close-chatbox-button { ...@@ -678,21 +704,20 @@ a.close-chatbox-button {
} }
a.configure-chatroom-button:active, a.configure-chatroom-button:active,
a.minimize-chatbox-button:active, a.toggle-chatbox-button:active,
a.close-chatbox-button:active { a.close-chatbox-button:active {
position:relative; position:relative;
top:1px; top:1px;
} }
.oc-chat-content dt { .controlbox-pane dt {
margin: 0; margin: 0;
padding-top: 0.5em; padding-top: 0.5em;
} }
.chatroom-form-container { .chatroom-form-container {
height: 100%;
color: #666; color: #666;
padding: 5px;
height: 262px;
overflow-y: auto; overflow-y: auto;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
...@@ -760,15 +785,14 @@ a.close-chatbox-button:active { ...@@ -760,15 +785,14 @@ a.close-chatbox-button:active {
} }
#converse-roster { #converse-roster {
height: 200px;
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
width: 100%; width: 100%;
margin: 0;
position: relative; position: relative;
top: 0; margin: 0.5em 0 0 0;
border: none; height: -moz-calc(100% - 70px);
margin-top: 0.5em; height: -o-calc(100% - 70px);
height: calc(100% - 70px);
} }
#conversejs dd.available-chatroom { #conversejs dd.available-chatroom {
...@@ -876,12 +900,10 @@ dd.available-chatroom:hover a.room-info { ...@@ -876,12 +900,10 @@ dd.available-chatroom:hover a.room-info {
.chatbox, .chatbox,
.chatroom { .chatroom {
box-shadow: 1px 1px 5px 1px rgba(0,0,0,0.4); height: 25px;
display:none;
float: right; float: right;
margin-right: 15px; margin-right: 15px;
z-index: 20; /* So that it's higher than the content actions */ display: block;
border-radius: 4px;
} }
.chatbox { .chatbox {
...@@ -892,37 +914,22 @@ dd.available-chatroom:hover a.room-info { ...@@ -892,37 +914,22 @@ dd.available-chatroom:hover a.room-info {
width: 300px; width: 300px;
} }
.oc-chat-content { .controlbox-pane {
height:274px;
padding: 0; padding: 0;
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
} }
.oc-chat-content dd { .controlbox-pane dd {
margin-left: 0; margin-left: 0;
margin-bottom: 0; margin-bottom: 0;
padding: 1em; padding: 1em;
} }
.oc-chat-content dd.odd { .controlbox-pane dd.odd {
background-color: #DCEAC5; background-color: #DCEAC5;
} }
#conversejs div.controlbox-panes {
background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(240,240,240,1) 100%); /* FF3.6+ */
background: -ms-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* IE10+ */
background: -o-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* Opera 11.10+ */
background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,255,255,1)), color-stop(100%,rgba(240,240,240,1))); /* Chrome,Safari4+ */
background: -webkit-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* Chrome10+,Safari5.1+ */
background: linear-gradient(top, rgba(255,255,255,1) 0%,rgba(240,240,240,1) 100%); /* W3C */
background-color: white;
border-bottom-left-radius: 4px;
border-bottom-right-radius: 4px;
width: 200px;
}
form#converse-login { form#converse-login {
background: white; background: white;
padding: 2em 0 0.3em 0.5em; padding: 2em 0 0.3em 0.5em;
...@@ -975,7 +982,7 @@ select#select-xmpp-status { ...@@ -975,7 +982,7 @@ select#select-xmpp-status {
/* single tab */ /* single tab */
.chat-head #controlbox-tabs li { .chat-head #controlbox-tabs li {
float:left; float: left;
list-style: none; list-style: none;
padding-left: 0; padding-left: 0;
text-shadow: white 0 1px 0; text-shadow: white 0 1px 0;
...@@ -983,16 +990,16 @@ select#select-xmpp-status { ...@@ -983,16 +990,16 @@ select#select-xmpp-status {
} }
ul#controlbox-tabs li a { ul#controlbox-tabs li a {
display:block; display: block;
font-size:12px; font-size: 12px;
height: 34px; height: 34px;
line-height:34px; line-height: 34px;
margin: 0; margin: 0;
text-align:center; text-align: center;
text-decoration:none; text-decoration: none;
border-top-right-radius: 5px; border-top-right-radius: 5px;
border-top-left-radius: 5px; border-top-left-radius: 5px;
color:#666; color: #666;
text-shadow: 0 1px 0 rgba(250, 250, 250, 1); text-shadow: 0 1px 0 rgba(250, 250, 250, 1);
} }
...@@ -1024,6 +1031,11 @@ div#settings { ...@@ -1024,6 +1031,11 @@ div#settings {
border-bottom-right-radius: 4px; border-bottom-right-radius: 4px;
border-bottom-left-radius: 4px; border-bottom-left-radius: 4px;
width: 100%; width: 100%;
height: -moz-calc(100% - 38px);
height: -o-calc(100% - 38px);
height: calc(100% - 38px);
overflow-y: hidden;
position: absolute;
} }
div#chatrooms { div#chatrooms {
...@@ -1191,6 +1203,10 @@ form#set-custom-xmpp-status { ...@@ -1191,6 +1203,10 @@ form#set-custom-xmpp-status {
padding: 1px 2px 1px 1px; padding: 1px 2px 1px 1px;
} }
#controlbox {
display: none;
}
#controlbox div.xmpp-status { #controlbox div.xmpp-status {
display: inline; display: inline;
} }
...@@ -1205,7 +1221,7 @@ form#set-custom-xmpp-status { ...@@ -1205,7 +1221,7 @@ form#set-custom-xmpp-status {
.chatbox .dropdown dd { position:relative; } .chatbox .dropdown dd { position:relative; }
input.custom-xmpp-status { input.custom-xmpp-status {
width: 138px; width: 124px;
} }
form.add-xmpp-contact { form.add-xmpp-contact {
...@@ -1214,7 +1230,7 @@ form.add-xmpp-contact { ...@@ -1214,7 +1230,7 @@ form.add-xmpp-contact {
} }
form.add-xmpp-contact input { form.add-xmpp-contact input {
width: 120px; width: 108px;
} }
.chatbox .dropdown dt a span { .chatbox .dropdown dt a span {
...@@ -1240,17 +1256,14 @@ form.add-xmpp-contact input { ...@@ -1240,17 +1256,14 @@ form.add-xmpp-contact input {
padding-left: 0; padding-left: 0;
} }
.set-xmpp-status .dropdown dd ul {
z-index: 22;
}
.chatbox .dropdown a { .chatbox .dropdown a {
height: 22px; height: 22px;
width: 148px;
display: inline-block; display: inline-block;
line-height: 24px; line-height: 24px;
} }
.chatbox .dropdown dd ul a:hover { .chatbox .dropdown dd ul li:hover {
background-color: #bed6e5; background-color: #bed6e5;
} }
...@@ -1263,3 +1276,51 @@ form.add-xmpp-contact input { ...@@ -1263,3 +1276,51 @@ form.add-xmpp-contact input {
color: rgb(79, 79, 79); color: rgb(79, 79, 79);
} }
.set-xmpp-status .dropdown dd ul {
z-index: 22;
}
#conversejs {
bottom: 1px;
direction: ltr;
height: 25px;
left: 0;
position: fixed;
right: 0;
z-index: 30;
display: block;
}
.box-flyout {
background: white;
position: absolute;
display: block;
bottom: 1px;
box-shadow: 1px 1px 5px 1px rgba(0,0,0,0.4);
border-radius: 4px;
height: 324px;
}
.box-flyout.minimized {
height: auto;
}
.chatbox .box-flyout {
width: 200px;
}
.chatroom .box-flyout {
width: 300px;
}
.dragresize {
position: absolute;
width: 200px;
height: 5px;
background: transparent;
border: 0;
top: 0;
margin-left: 0;
cursor: n-resize;
z-index: 20;
}
converse.js
View file @ 1dff3ac0
This diff is collapsed.
docs/CHANGES.rst
View file @ 1dff3ac0
Changelog Changelog
========= =========
0.8 (Unreleased)
----------------
* Chat boxes and rooms can now be resized vertically. [jcbrand]
* Upgraded many dependencies to their latest versions. [jcbrand]
* Add new configuration setting `forward_messages <https://conversejs.org/docs/html/index.html#forward_messages>`_
Message forwarding was before default behavior but is now optional (and disabled by default).
[jcbrand]
* #71 Chat boxes and rooms can be minimized. [jcbrand]
* #132 Support for `XEP-0280: Message Carbons <https://xmpp.org/extensions/xep-0280.html'>`_.
Configured via `enable_message_carbons <https://conversejs.org/docs/html/index.html#enable_message_carbons>`_
[hejazee]
0.7.4 (2014-03-05) 0.7.4 (2014-03-05)
------------------ ------------------
.. note:: .. note:: This release contains an important security fix.
This release contains an important security fix. Thanks to Renaud Dubourguais from `Synacktiv <http://synacktiv.com>`_ for reporting the vulnerability.
Thanks to Renaud Dubourguais from `Synacktiv http://synacktiv.com`_ for reporting the vulnerability.
* #125 Bugfix: crypto dependencies loaded in wrong order [jcbrand] * #125 Bugfix: crypto dependencies loaded in wrong order [jcbrand]
* Bugfix: action messages (i.e. /me) didn't work in OTR mode. [jcbrand] * Bugfix: action messages (i.e. /me) didn't work in OTR mode. [jcbrand]
...@@ -26,8 +38,7 @@ Changelog ...@@ -26,8 +38,7 @@ Changelog
0.7.2 (2013-12-18) 0.7.2 (2013-12-18)
------------------ ------------------
.. note:: .. note:: This release contains an important security fix.
This release contains an important security fix.
Thanks to hejsan for reporting the vulnerability. Thanks to hejsan for reporting the vulnerability.
* #48 Add event emitter support and emit events. [jcbrand] * #48 Add event emitter support and emit events. [jcbrand]
...@@ -116,9 +127,8 @@ Bugfixes: ...@@ -116,9 +127,8 @@ Bugfixes:
0.6.3 (2013-09-12) 0.6.3 (2013-09-12)
------------------ ------------------
.. note:: NB: This release contains an important security fix. Please don't use older
This release contains an important security fix. Please don't use older versions of the 0.6 branch.
versions of the 0.6 branch.
* French translations. [tdesvenain] * French translations. [tdesvenain]
* Bugfix: Messages were stored against buddy JID and not own JID. [jcbrand] * Bugfix: Messages were stored against buddy JID and not own JID. [jcbrand]
...@@ -128,7 +138,7 @@ Bugfixes: ...@@ -128,7 +138,7 @@ Bugfixes:
* Bugfix. The remove icon wasn't appearing in the contacts roster. [jcbrand] * Bugfix. The remove icon wasn't appearing in the contacts roster. [jcbrand]
* Bugfix. With auto_subscribe=True, the "Pending Contacts" header didn't disappear * Bugfix. With auto_subscribe=True, the "Pending Contacts" header didn't disappear
after a new user was accepted. [jcbrand] after a new user was accepted. [jcbrand]
0.6.1 (2013-08-28) 0.6.1 (2013-08-28)
------------------ ------------------
......
docs/LICENSE.txt 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
docs/LICENSE_GPL.txt deleted 100644 → 0
View file @ e6cff4e8
Converse.js
A web-based XMPP instant messaging client.
Copyright (C) 2012 Jan-Carel Brand.
http://opkode.com
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
docs/LICENSE_MIT.txt deleted 100644 → 0
View file @ e6cff4e8
Converse.js
A web-based XMPP instant messaging client.
Copyright (C) 2012 Jan-Carel Brand.
http://opkode.com
Permission is hereby granted, free of charge, to any person obtaining
a copy of this software and associated documentation files (the "Software"),
to deal in the Software without restriction, including without limitation
the rights to use, copy, modify, merge, publish, distribute, sublicense,
and/or sell copies of the Software, and to permit persons to whom the
Software is furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included
in all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE
OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
docs/html/.buildinfo
View file @ 1dff3ac0
# Sphinx build info version 1 # Sphinx build info version 1
# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done.
config: 0660e50cf30718622673fcf0e779dfd4 config: ec38a6fc765fb5f09e06d01a6497e5a9
tags: fbb0d17656682115ca4d033fb2f83ba1 tags: fbb0d17656682115ca4d033fb2f83ba1
docs/html/_sources/index.txt
View file @ 1dff3ac0
...@@ -392,8 +392,8 @@ follow the instructions below to create this folder and fetch Converse's ...@@ -392,8 +392,8 @@ follow the instructions below to create this folder and fetch Converse's
3rd-party dependencies. 3rd-party dependencies.
Install Node.js and development dependencies Install the development and front-end dependencies
============================================ ==================================================
We use development tools (`Grunt <http://gruntjs.com>`_ and `Bower <http://bower.io>`_) We use development tools (`Grunt <http://gruntjs.com>`_ and `Bower <http://bower.io>`_)
which depend on Node.js and npm (the Node package manager). which depend on Node.js and npm (the Node package manager).
...@@ -401,43 +401,38 @@ which depend on Node.js and npm (the Node package manager). ...@@ -401,43 +401,38 @@ which depend on Node.js and npm (the Node package manager).
If you don't have Node.js installed, you can download and install the latest If you don't have Node.js installed, you can download and install the latest
version `here <https://nodejs.org/download>`_. version `here <https://nodejs.org/download>`_.
Once you have Node.js installed, run the following command inside the Converse.js Also make sure you have ``git`` installed. `Details <http://git-scm.com/book/en/Getting-Started-Installing-Git>`_.
Once you have *Node.js* and *git* installed, run the following command inside the Converse.js
directory: directory:
:: ::
npm install make dev
This will install all the development dependencies for Converse.js. If you are
curious to know what these are, take a look at whats under the *devDependencies* key in
`package.json <https://github.com/jcbrand/converse.js/blob/master/package.json>`_.
Install 3rd party dependencies
==============================
Make sure you have ``git`` installed. `Details <http://git-scm.com/book/en/Getting-Started-Installing-Git>`_.
After running ``npm install``, you will now have Grunt and Bower installed. This will first install the Node.js development tools (like Grunt and Bower)
and then use Bower to install all of Converse.js's front-end dependencies.
We use Bower to manage Converse's front-end dependencies (e.g. Javascript that The front-end dependencies are those javascript files on which
should get loaded in the browser). Converse.js directly depends and which will therefore be loaded in the browser.
To fetch these dependencies, run: If you are curious to know what the different dependencies are:
:: * Development dependencies:
Take a look at whats under the *devDependencies* key in
grunt fetch `package.json <https://github.com/jcbrand/converse.js/blob/master/package.json>`_.
If you don't have grunt installed globally, you need to specify the relative * Front-end dependencies:
path: See *dependencies* in
`bower.json <https://github.com/jcbrand/converse.js/blob/master/bower.json>`_.
::
./node_modules/.bin/grunt fetch .. Note:
After running ```make dev```, you should now have a new directory *components*,
which contains all the front-end dependencies of Converse.js.
If this directory does NOT exist, something must have gone wrong.
Double-check the output of ```make dev``` to see if there are any errors
listed.
This will call Bower in the background to fetch all the front-end
dependencies (like backbone.js, strophe.js etc.) and then put them in the
*components* folder.
With AMD and require.js (recommended) With AMD and require.js (recommended)
===================================== =====================================
...@@ -580,7 +575,7 @@ To do this for ALL languages, run: ...@@ -580,7 +575,7 @@ To do this for ALL languages, run:
:: ::
make merge make po
The resulting PO file is then what gets translated. The resulting PO file is then what gets translated.
...@@ -807,6 +802,12 @@ Here are the different events that are emitted: ...@@ -807,6 +802,12 @@ Here are the different events that are emitted:
Triggered whenever the roster view (i.e. the rendered HTML) has changed. Triggered whenever the roster view (i.e. the rendered HTML) has changed.
* **onChatBoxClosed**
``converse.on('onChatBoxClosed', function (chatbox) { ... });``
Triggered when a chat box has been closed.
* **onChatBoxFocused** * **onChatBoxFocused**
``converse.on('onChatBoxFocused', function (chatbox) { ... });`` ``converse.on('onChatBoxFocused', function (chatbox) { ... });``
...@@ -819,11 +820,11 @@ Here are the different events that are emitted: ...@@ -819,11 +820,11 @@ Here are the different events that are emitted:
Triggered when a chat box has been opened. Triggered when a chat box has been opened.
* **onChatBoxClosed** * **onChatBoxToggled**
``converse.on('onChatBoxClosed', function (chatbox) { ... });`` ``converse.on('onChatBoxToggled', function (chatbox) { ... });``
Triggered when a chat box has been closed. Triggered when a chat box has been minimized or maximized.
* **onStatusChanged** * **onStatusChanged**
...@@ -967,9 +968,18 @@ Default = ``false`` ...@@ -967,9 +968,18 @@ Default = ``false``
If set to true, debugging output will be logged to the browser console. If set to true, debugging output will be logged to the browser console.
enable_message_carbons
----------------------
Default = ``false``
Support for `XEP-0280: Message Carbons <https://xmpp.org/extensions/xep-0280.html>`_
expose_rid_and_sid expose_rid_and_sid
------------------ ------------------
Default = ``false``
Allow the prebind tokens, RID (request ID) and SID (session ID), to be exposed Allow the prebind tokens, RID (request ID) and SID (session ID), to be exposed
globally via the API. This allows other scripts served on the same page to use globally via the API. This allows other scripts served on the same page to use
these values. these values.
...@@ -977,6 +987,19 @@ these values. ...@@ -977,6 +987,19 @@ these values.
*Beware*: a malicious script could use these tokens to assume your identity *Beware*: a malicious script could use these tokens to assume your identity
and inject fake chat messages. and inject fake chat messages.
forward_messages
----------------
Default = ``false``
If set to ``true``, sent messages will also be forwarded to other connected
XMPP resources (e.g. chat clients) of the same user.
This is useful for example if converse.js is running in multiple tabs of the
browser and you want sent messages to appear in all of them.
See also `XEP 0297: Stanza Forwarding <http://www.xmpp.org/extensions/xep-0297.html>`_
fullname fullname
-------- --------
......
docs/html/genindex.html
View file @ 1dff3ac0
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Index &mdash; Converse.js 0.7.4 documentation</title> <title>Index &mdash; Converse.js 0.8.0 documentation</title>
<link rel="stylesheet" href="_static/stylesheet.css" type="text/css" /> <link rel="stylesheet" href="_static/stylesheet.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: '', URL_ROOT: '',
VERSION: '0.7.4', VERSION: '0.8.0',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
<script type="text/javascript" src="_static/jquery.js"></script> <script type="text/javascript" src="_static/jquery.js"></script>
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<link rel="top" title="Converse.js 0.7.4 documentation" href="index.html" /> <link rel="top" title="Converse.js 0.8.0 documentation" href="index.html" />
</head> </head>
<body> <body>
<div id="header_wrap" class="outer"> <div id="header_wrap" class="outer">
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="#" title="General Index" <a href="#" title="General Index"
accesskey="I">index</a></li> accesskey="I">index</a></li>
<li><a href="index.html">Converse.js 0.7.4 documentation</a> &raquo;</li> <li><a href="index.html">Converse.js 0.8.0 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<section id="main_content" class="inner"> <section id="main_content" class="inner">
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="#" title="General Index" <a href="#" title="General Index"
>index</a></li> >index</a></li>
<li><a href="index.html">Converse.js 0.7.4 documentation</a> &raquo;</li> <li><a href="index.html">Converse.js 0.8.0 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
</div> </div>
......
docs/html/index.html
View file @ 1dff3ac0
This diff is collapsed.
docs/html/objects.inv
View file @ 1dff3ac0
# Sphinx inventory version 2 # Sphinx inventory version 2
# Project: Converse.js # Project: Converse.js
# Version: 0.7.4 # Version: 0.8.0
# The remainder of this file is compressed using zlib. # The remainder of this file is compressed using zlib.
xm xm
{"]; {"];
......
docs/html/search.html
View file @ 1dff3ac0
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>Search &mdash; Converse.js 0.7.4 documentation</title> <title>Search &mdash; Converse.js 0.8.0 documentation</title>
<link rel="stylesheet" href="_static/stylesheet.css" type="text/css" /> <link rel="stylesheet" href="_static/stylesheet.css" type="text/css" />
<link rel="stylesheet" href="_static/pygments.css" type="text/css" /> <link rel="stylesheet" href="_static/pygments.css" type="text/css" />
...@@ -15,7 +15,7 @@ ...@@ -15,7 +15,7 @@
<script type="text/javascript"> <script type="text/javascript">
var DOCUMENTATION_OPTIONS = { var DOCUMENTATION_OPTIONS = {
URL_ROOT: '', URL_ROOT: '',
VERSION: '0.7.4', VERSION: '0.8.0',
COLLAPSE_INDEX: false, COLLAPSE_INDEX: false,
FILE_SUFFIX: '.html', FILE_SUFFIX: '.html',
HAS_SOURCE: true HAS_SOURCE: true
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<script type="text/javascript" src="_static/underscore.js"></script> <script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script> <script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="_static/searchtools.js"></script> <script type="text/javascript" src="_static/searchtools.js"></script>
<link rel="top" title="Converse.js 0.7.4 documentation" href="index.html" /> <link rel="top" title="Converse.js 0.8.0 documentation" href="index.html" />
<script type="text/javascript"> <script type="text/javascript">
jQuery(function() { Search.loadIndex("searchindex.js"); }); jQuery(function() { Search.loadIndex("searchindex.js"); });
</script> </script>
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index" <a href="genindex.html" title="General Index"
accesskey="I">index</a></li> accesskey="I">index</a></li>
<li><a href="index.html">Converse.js 0.7.4 documentation</a> &raquo;</li> <li><a href="index.html">Converse.js 0.8.0 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
<section id="main_content" class="inner"> <section id="main_content" class="inner">
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
<li class="right" style="margin-right: 10px"> <li class="right" style="margin-right: 10px">
<a href="genindex.html" title="General Index" <a href="genindex.html" title="General Index"
>index</a></li> >index</a></li>
<li><a href="index.html">Converse.js 0.7.4 documentation</a> &raquo;</li> <li><a href="index.html">Converse.js 0.8.0 documentation</a> &raquo;</li>
</ul> </ul>
</div> </div>
</div> </div>
......
docs/html/searchindex.js
View file @ 1dff3ac0
This diff is collapsed.
docs/source/conf.py
View file @ 1dff3ac0
...@@ -48,9 +48,9 @@ copyright = u'2013, JC Brand' ...@@ -48,9 +48,9 @@ copyright = u'2013, JC Brand'
# built documents. # built documents.
# #
# The short X.Y version. # The short X.Y version.
version = '0.7.4' version = '0.8.0'
# The full version, including alpha/beta/rc tags. # The full version, including alpha/beta/rc tags.
release = '0.7.4' release = '0.8.0'
# The language for content autogenerated by Sphinx. Refer to documentation # The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages. # for a list of supported languages.
......
docs/source/index.rst
View file @ 1dff3ac0
...@@ -392,8 +392,8 @@ follow the instructions below to create this folder and fetch Converse's ...@@ -392,8 +392,8 @@ follow the instructions below to create this folder and fetch Converse's
3rd-party dependencies. 3rd-party dependencies.
Install Node.js and development dependencies Install the development and front-end dependencies
============================================ ==================================================
We use development tools (`Grunt <http://gruntjs.com>`_ and `Bower <http://bower.io>`_) We use development tools (`Grunt <http://gruntjs.com>`_ and `Bower <http://bower.io>`_)
which depend on Node.js and npm (the Node package manager). which depend on Node.js and npm (the Node package manager).
...@@ -401,43 +401,38 @@ which depend on Node.js and npm (the Node package manager). ...@@ -401,43 +401,38 @@ which depend on Node.js and npm (the Node package manager).
If you don't have Node.js installed, you can download and install the latest If you don't have Node.js installed, you can download and install the latest
version `here <https://nodejs.org/download>`_. version `here <https://nodejs.org/download>`_.
Once you have Node.js installed, run the following command inside the Converse.js Also make sure you have ``git`` installed. `Details <http://git-scm.com/book/en/Getting-Started-Installing-Git>`_.
Once you have *Node.js* and *git* installed, run the following command inside the Converse.js
directory: directory:
:: ::
npm install make dev
This will install all the development dependencies for Converse.js. If you are
curious to know what these are, take a look at whats under the *devDependencies* key in
`package.json <https://github.com/jcbrand/converse.js/blob/master/package.json>`_.
Install 3rd party dependencies
==============================
Make sure you have ``git`` installed. `Details <http://git-scm.com/book/en/Getting-Started-Installing-Git>`_.
After running ``npm install``, you will now have Grunt and Bower installed. This will first install the Node.js development tools (like Grunt and Bower)
and then use Bower to install all of Converse.js's front-end dependencies.
We use Bower to manage Converse's front-end dependencies (e.g. Javascript that The front-end dependencies are those javascript files on which
should get loaded in the browser). Converse.js directly depends and which will therefore be loaded in the browser.
To fetch these dependencies, run: If you are curious to know what the different dependencies are:
:: * Development dependencies:
Take a look at whats under the *devDependencies* key in
grunt fetch `package.json <https://github.com/jcbrand/converse.js/blob/master/package.json>`_.
If you don't have grunt installed globally, you need to specify the relative * Front-end dependencies:
path: See *dependencies* in
`bower.json <https://github.com/jcbrand/converse.js/blob/master/bower.json>`_.
::
./node_modules/.bin/grunt fetch .. Note:
After running ```make dev```, you should now have a new directory *components*,
which contains all the front-end dependencies of Converse.js.
If this directory does NOT exist, something must have gone wrong.
Double-check the output of ```make dev``` to see if there are any errors
listed.
This will call Bower in the background to fetch all the front-end
dependencies (like backbone.js, strophe.js etc.) and then put them in the
*components* folder.
With AMD and require.js (recommended) With AMD and require.js (recommended)
===================================== =====================================
...@@ -580,7 +575,7 @@ To do this for ALL languages, run: ...@@ -580,7 +575,7 @@ To do this for ALL languages, run:
:: ::
make merge make po
The resulting PO file is then what gets translated. The resulting PO file is then what gets translated.
...@@ -807,6 +802,12 @@ Here are the different events that are emitted: ...@@ -807,6 +802,12 @@ Here are the different events that are emitted:
Triggered whenever the roster view (i.e. the rendered HTML) has changed. Triggered whenever the roster view (i.e. the rendered HTML) has changed.
* **onChatBoxClosed**
``converse.on('onChatBoxClosed', function (chatbox) { ... });``
Triggered when a chat box has been closed.
* **onChatBoxFocused** * **onChatBoxFocused**
``converse.on('onChatBoxFocused', function (chatbox) { ... });`` ``converse.on('onChatBoxFocused', function (chatbox) { ... });``
...@@ -819,11 +820,11 @@ Here are the different events that are emitted: ...@@ -819,11 +820,11 @@ Here are the different events that are emitted:
Triggered when a chat box has been opened. Triggered when a chat box has been opened.
* **onChatBoxClosed** * **onChatBoxToggled**
``converse.on('onChatBoxClosed', function (chatbox) { ... });`` ``converse.on('onChatBoxToggled', function (chatbox) { ... });``
Triggered when a chat box has been closed. Triggered when a chat box has been minimized or maximized.
* **onStatusChanged** * **onStatusChanged**
...@@ -967,9 +968,18 @@ Default = ``false`` ...@@ -967,9 +968,18 @@ Default = ``false``
If set to true, debugging output will be logged to the browser console. If set to true, debugging output will be logged to the browser console.
enable_message_carbons
----------------------
Default = ``false``
Support for `XEP-0280: Message Carbons <https://xmpp.org/extensions/xep-0280.html>`_
expose_rid_and_sid expose_rid_and_sid
------------------ ------------------
Default = ``false``
Allow the prebind tokens, RID (request ID) and SID (session ID), to be exposed Allow the prebind tokens, RID (request ID) and SID (session ID), to be exposed
globally via the API. This allows other scripts served on the same page to use globally via the API. This allows other scripts served on the same page to use
these values. these values.
...@@ -977,6 +987,19 @@ these values. ...@@ -977,6 +987,19 @@ these values.
*Beware*: a malicious script could use these tokens to assume your identity *Beware*: a malicious script could use these tokens to assume your identity
and inject fake chat messages. and inject fake chat messages.
forward_messages
----------------
Default = ``false``
If set to ``true``, sent messages will also be forwarded to other connected
XMPP resources (e.g. chat clients) of the same user.
This is useful for example if converse.js is running in multiple tabs of the
browser and you want sent messages to appear in all of them.
See also `XEP 0297: Stanza Forwarding <http://www.xmpp.org/extensions/xep-0297.html>`_
fullname fullname
-------- --------
......
index.html
View file @ 1dff3ac0
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
<meta name="description" content="Converse.js: A chat client for your website" /> <meta name="description" content="Converse.js: A chat client for your website" />
<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.css"> <link rel="stylesheet" type="text/css" media="screen" href="converse.css">
<!--<script data-main="main" src="components/requirejs/require.js"></script>--> <script data-main="main" src="components/requirejs/require.js"></script>
<script src="builds/converse.min.js"></script> <!-- <script src="builds/converse.min.js"></script> -->
<title>Converse.js</title> <title>Converse.js</title>
</head> </head>
...@@ -149,8 +149,7 @@ ...@@ -149,8 +149,7 @@
</ul> </ul>
<h2>Licence</h2> <h2>Licence</h2>
<p><strong>Converse.js</strong> is released under both the <a href="http://opensource.org/licenses/mit-license.php" target="_blank">MIT</a> <p><strong>Converse.js</strong> is released under the <a href="https://www.mozilla.org/MPL/2.0/index.txt" target="_blank">Mozilla Public License (MPL)</a>.
and <a href="http://opensource.org/licenses/GPL-2.0" target="_blank">GPL</a> licenses.</p>
<h2>Tips</h2> <h2>Tips</h2>
<p><strong>Bitcoin address:</strong> 16FsPqE9DhFTryxrUenpsGX4LJ1TPu8GqS</p> <p><strong>Bitcoin address:</strong> 16FsPqE9DhFTryxrUenpsGX4LJ1TPu8GqS</p>
......
main.js
View file @ 1dff3ac0
require.config({ config = {
paths: { paths: {
"jquery": "components/jquery/jquery", "jquery": "components/jquery/dist/jquery",
"locales": "locale/locales",
"jquery.tinysort": "components/tinysort/src/jquery.tinysort", "jquery.tinysort": "components/tinysort/src/jquery.tinysort",
"jquery.browser": "components/jquery.browser/dist/jquery.browser",
"locales": "locale/locales",
"underscore": "components/underscore/underscore", "underscore": "components/underscore/underscore",
"backbone": "components/backbone/backbone", "backbone": "components/backbone/backbone",
"backbone.localStorage": "components/backbone.localStorage/backbone.localStorage", "backbone.localStorage": "components/backbone.localStorage/backbone.localStorage",
"text": 'components/requirejs-text/text',
"tpl": 'components/requirejs-tpl-jcbrand/tpl',
"converse-templates": "src/templates",
"strophe": "components/strophe/strophe", "strophe": "components/strophe/strophe",
"strophe.muc": "components/strophe.muc/index", "strophe.muc": "components/strophe.muc/index",
"strophe.roster": "components/strophe.roster/index", "strophe.roster": "components/strophe.roster/index",
...@@ -26,10 +30,19 @@ require.config({ ...@@ -26,10 +30,19 @@ require.config({
"crypto.mode-ctr": "components/otr/vendor/cryptojs/mode-ctr", "crypto.mode-ctr": "components/otr/vendor/cryptojs/mode-ctr",
"crypto": "src/crypto", "crypto": "src/crypto",
"eventemitter": "components/otr/build/dep/eventemitter", "eventemitter": "components/otr/build/dep/eventemitter",
"moment": "components/momentjs/moment",
"otr": "components/otr/build/otr", "otr": "components/otr/build/otr",
"converse-dependencies": "src/deps-full" "converse-dependencies": "src/deps-full"
}, },
tpl: {
// Use Mustache style syntax for variable interpolation
templateSettings: {
evaluate : /\{\[([\s\S]+?)\]\}/g,
interpolate : /\{\{([\s\S]+?)\}\}/g
}
},
// define module dependencies for modules not using define // define module dependencies for modules not using define
shim: { shim: {
'backbone': { 'backbone': {
...@@ -61,8 +74,11 @@ require.config({ ...@@ -61,8 +74,11 @@ require.config({
'strophe.roster': { deps: ['strophe'] }, 'strophe.roster': { deps: ['strophe'] },
'strophe.vcard': { deps: ['strophe'] } 'strophe.vcard': { deps: ['strophe'] }
} }
}); };
require(["jquery", "converse"], function(require, $, converse) { if (typeof(require) !== 'undefined') {
window.converse = converse; require.config(config);
}); require(["jquery", "converse"], function(require, $, converse) {
window.converse = converse;
});
}
mockup.html → mockup/index.html
View file @ 1dff3ac0
This diff is collapsed.
mockup/minimized.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
package.json
View file @ 1dff3ac0
{ {
"name": "converse.js", "name": "converse.js",
"version": "0.7.4", "version": "0.8.0",
"description": "Browser based XMPP instant messaging client", "description": "Browser based XMPP instant messaging client",
"main": "main.js", "main": "main.js",
"directories": { "directories": {
...@@ -27,16 +27,16 @@ ...@@ -27,16 +27,16 @@
"url": "https://github.com/jcbrand/converse.js/issues" "url": "https://github.com/jcbrand/converse.js/issues"
}, },
"devDependencies": { "devDependencies": {
"grunt-cli": "~0.1.9", "grunt-cli": "~0.1.13",
"grunt": "~0.4.1", "grunt": "~0.4.4",
"grunt-contrib-jshint": "~0.6.0", "grunt-contrib-jshint": "~0.10.0",
"phantomjs": "~1.9.1-0", "phantom-jasmine": "0.1.8",
"jasmine-reporters": "~0.2.1", "phantomjs": "~1.9.7-1",
"bower": "~1.0.0", "bower": "latest",
"grunt-contrib-requirejs": "~0.4.1", "grunt-contrib-requirejs": "~0.4.3",
"grunt-contrib-cssmin": "~0.6.1" "grunt-contrib-cssmin": "~0.9.0"
}, },
"dependencies": { "dependencies": {
"requirejs": "~2.1.8" "requirejs": "~2.1.11"
} }
} }
spec/chatbox.js
View file @ 1dff3ac0
This diff is collapsed.
spec/chatroom.js
View file @ 1dff3ac0
This diff is collapsed.
spec/controlbox.js
View file @ 1dff3ac0
This diff is collapsed.
spec/otr.js
View file @ 1dff3ac0
This diff is collapsed.
src/deps-full.js
View file @ 1dff3ac0
This diff is collapsed.
src/deps-no-otr.js
View file @ 1dff3ac0
This diff is collapsed.
src/templates.js 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/action.html 0 → 100644
View file @ 1dff3ac0
<div class="chat-message {{extra_classes}}">
<span class="chat-message-{{sender}}">{{time}} **{{username}} </span>
<span class="chat-message-content">{{message}}</span>
</div>
src/templates/add_contact_dropdown.html 0 → 100644
View file @ 1dff3ac0
<dl class="add-converse-contact dropdown">
<dt id="xmpp-contact-search" class="fancy-dropdown">
<a class="toggle-xmpp-contact-form" href="#"
title="{{label_click_to_chat}}">
<span class="icon-plus"></span>{{label_add_contact}}</a>
</dt>
<dd class="search-xmpp" style="display:none"><ul></ul></dd>
</dl>
src/templates/add_contact_form.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/change_status_message.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/chat_status.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/chatarea.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/chatbox.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/chatroom.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/chatrooms_tab.html 0 → 100644
View file @ 1dff3ac0
<li><a class="s" href="#chatrooms">{{label_rooms}}</a></li>
src/templates/choose_status.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/contacts.html 0 → 100644
View file @ 1dff3ac0
<dt id="xmpp-contacts">{{label_contacts}}</dt>
src/templates/contacts_panel.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/contacts_tab.html 0 → 100644
View file @ 1dff3ac0
<li><a class="s current" href="#users">{{label_contacts}}</a></li>
src/templates/controlbox.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/controlbox_toggle.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/field.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/form_checkbox.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/form_input.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/form_select.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/info.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/login_panel.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/login_tab.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/message.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/new_day.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/occupant.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/pending_contact.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/pending_contacts.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/requesting_contact.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/requesting_contacts.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/room_description.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/room_item.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/room_panel.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/roster_item.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/search_contact.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/select_option.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/status_option.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
src/templates/toolbar.html 0 → 100644
View file @ 1dff3ac0
This diff is collapsed.
tests.html
View file @ 1dff3ac0
This diff is collapsed.
tests/utils.js
View file @ 1dff3ac0
This diff is collapsed.
tests_main.js
View file @ 1dff3ac0
This diff is collapsed.
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