Commit Graph

17 Commits

Author SHA1 Message Date
JC Brand
4a9146460d Fix random fails in FF due to different module loading times
According to the require.js documentation, if you are using "require" in HTML,
then the data-main attribute should not be used.

http://www.requirejs.org/docs/api.html#data-main

So merged main.js into converse.js, which appears to solve the problem.
2016-03-07 16:35:08 +00:00
JC Brand
27cce2c229 Refactor to store number of unread messages 2014-06-29 15:59:39 +02:00
JC Brand
38e0668372 Fix tests. 2014-05-27 19:18:02 +02:00
JC Brand
364c340ab5 Stub trimChat for PhantomJS and move tests_main.js to tests/main.js 2014-05-06 09:56:04 +02:00
JC Brand
9849daacf9 Merge branch 'master' into 0.8
Conflicts:
	bower.json
	converse.js
	docs/CHANGES.rst
	spec/chatbox.js
	tests/utils.js
	tests_main.js
2014-03-09 08:18:00 +02:00
JC Brand
9b3af57d13 Release version 0.7.4 2014-03-05 08:44:01 +02:00
JC Brand
55b9a4e568 Initial support for external HTMl templates. Updates #77 2013-12-31 01:07:11 +02:00
JC Brand
2bd27282ce Use newer simpler markup in tests.html 2013-10-27 22:33:07 +02:00
JC Brand
38c26013d0 Simplify the boilerplate HTML require even more.
Use id 'conversejs' instead of 'chatpanel'.

The controlbox toggle is now generated via a backbone view, you don't need to
manually include it in your markup.
2013-10-20 22:42:34 +02:00
JC Brand
fb9fc87952 Fixed paths in tests_main.js and tests.html 2013-07-30 00:16:04 +02:00
JC Brand
143875bf32 Add jasmine and jasmine-html as require deps. Also add Console reporter 2013-07-28 21:20:36 +02:00
JC Brand
7066e70b68 Initialize converse inside main.js 2013-04-20 11:37:53 +02:00
JC Brand
7a0620060f Add google analytics 2013-04-20 11:30:53 +02:00
JC Brand
fdd369eddd Make the heading clickable (returns to home) 2013-04-19 22:11:25 +02:00
JC Brand
abe85c8b90 Update tests
The chat toggle element is now determined by class, not id.
2013-04-19 00:32:46 +02:00
JC Brand
7852f67a03 Split the contacts up into distinct groups.
This reduces some hoops that had to be jumped through to get the proper indexes
to retrieve contacts
2013-04-14 02:00:30 +02:00
JC Brand
85e419afc5 Add test.html for loading tests in browser and tests_main.js for calling them
Also add flush method to converse.js (used in ClientStorage tests)
2012-12-08 07:24:34 +02:00