Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
25
0
Fork 0
Code Issues Pull Requests Projects Releases Activity
2,892 Commits 2 Branches 109 Tags 304 MiB
aca5948109
Commit Graph

2892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
JC Brand
0aa0c02124 Add tests for src/converse-notification.js. updates #443 
In the process refactored the code being tested.

- Move notifications code in MUC to src/converse-notification.js
- Trigger the 'contactStatusChanged' event in RosterContact and not in
  ChatBoxView (which might not exist).
 2016-03-08 10:44:27 +00:00
JC Brand
9aed64d4bf updates #603. 
prevous fix wasn't correct. Rename handlers to make it clear which methods are
the event handlers, put them together and make sure docstrings are relevant.
 2016-03-08 08:44:45 +00:00
JC Brand
d7026a9a0e Not using data-main anymore 2016-03-08 08:27:58 +00:00
JC Brand
cc2d9a495c Regenerated dist files 2016-03-07 17:54:07 +00:00
JC Brand
d4c127e196 Fixes #608 
The no-jquery build was broken
 2016-03-07 17:52:36 +00:00
JC Brand
fd0c9cecb7 Log the err and call with null, then return. 2016-03-07 17:26:31 +00:00
JC Brand
efa4a9ff23 Fixes #577 Add a timeout config var for MAM 2016-03-07 17:16:57 +00:00
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
4624cc2dc7 Fixes #603 
Method has new arg signature now that it's an event handler
 2016-03-07 16:10:27 +00:00
JC Brand
c2212833a1 Fixes #607, view.model is undefined. 2016-03-07 14:29:45 +00:00
JC Brand
6c9fa90f84 update backbone.overview dependency. Fixes #602 2016-03-07 07:55:24 +00:00
JC Brand
ad857d77ab Merge pull request #605 from badfiles/patch-1 
Corrected spelling, punctuation and terminology.
 2016-03-07 08:29:07 +01:00
badfiles
56b0211b8f Corrected spelling, punctuation and terminology. 2016-03-06 22:38:20 +03:00
badfiles
2e76fea647 Update CHANGES.md 2016-03-06 22:07:50 +03:00
badfiles
29f339e9b4 Corrected spelling, punctuation and terminology. 2016-03-06 21:57:27 +03:00
JC Brand
3690d1c205 Fix. Used the wrong listenere. 2016-03-01 22:40:19 +00:00
JC Brand
23a1dc4f2b Some fixes concerning event emitting. 
Don't make the event "this" context the protected converse object.
Can't trigger multiple data parameters, need to pass an object if there are
multiple values to be sent.
 2016-03-01 22:39:45 +00:00
JC Brand
f7725943f8 Emit an event 'contactRequest' when a subscription request is received 2016-03-01 21:57:49 +00:00
JC Brand
8665c0ac1c Bugfix in converse-ping. this was wrong context. 2016-03-01 21:40:49 +00:00
JC Brand
bc42d50a86 Update docs to mention desktop notifications. updates #443 2016-03-01 09:43:44 +00:00
JC Brand
26cb98d963 Move playing of sounds to the notification plugin. 
Also add a config setting for the icon shown in HTML5 notificatins.

updates #443
 2016-03-01 08:58:36 +00:00
JC Brand
9cce0ff6ae Add plugin settings to default settings. 
So that they are retrievable via the API.
 2016-03-01 08:57:57 +00:00
JC Brand
14c66ff755 Also show HTML5 notifications for chat state changes. 
updates #443
 2016-02-29 21:59:56 +00:00
JC Brand
578ca540b3 Move RosterContact and RosterContacts back into core. 
They're independent of the controlbox and used by other core functions.
 2016-02-29 21:29:05 +00:00
JC Brand
7f5962a177 Add plugin for HTML5 notifications. updates #443 2016-02-29 20:59:11 +00:00
JC Brand
cd731ed699 Some refactoring to make plugins easier. 
- Refactored sound notification to make it a bit more generic
- Split up onMessage
 2016-02-29 20:54:34 +00:00
JC Brand
4ebed3c995 We still need the roster in core, so set it there. 
Still have to move the roster code out of src/converse-controlbox.js
 2016-02-29 20:05:01 +00:00
JC Brand
9fb1c2383e Bugfix. Restore code to get locale from browser. 2016-02-29 20:03:45 +00:00
JC Brand
dcd090ff31 Rip out the controlbox code and put it in src/converse-controlbox.js 
Also fixed an issue w.r.t the plugin architecture. Previously infinite
recursion would happen when more than one plugin was overriding a method.

Resolved now by using a wrapper function that lazily sets the correct super
method.
 2016-02-29 16:40:51 +00:00
JC Brand
9ae2f71747 Found more chatroom specific code in converse-core.js 2016-02-29 16:40:51 +00:00
JC Brand
a4fd252a30 Elaborate on the right way to call super methods in plugins. 2016-02-29 13:50:44 +00:00
JC Brand
c0c4cd9272 Rename builds directory to dist 
To conform with how many other projects name their directories.
 2016-02-28 09:00:22 +00:00
JC Brand
9f9b38f852 Some i18n fixes 
The __ translate method should only be run *after* converse.js has been
initialized and we know what the actual desired language is

Also fix bug in src/locales.js where wrong langs were assigned to wrong keys.
 2016-02-28 08:45:36 +00:00
JC Brand
c370b3e989 Remove the config file for the no-OTR build. 
Custom builds like this should rather be done by removing components in
converse.js and then running `make build`
 2016-02-28 08:29:23 +00:00
JC Brand
7eb453efa1 Somewhere along the way the code to build the locales got removed 
Adding it back again.
 2016-02-28 08:26:56 +00:00
JC Brand
d00f2d1c3d Figured out how to exclude the locales from the no deps build 2016-02-28 00:53:44 +00:00
JC Brand
450c6c7d38 templates are in the bundle, no need to load them again. 2016-02-28 00:38:47 +00:00
JC Brand
6524614491 Not going to use uglify.js. 
It doesn't properly preserve copyright headers from r.js builds.
 2016-02-28 00:37:57 +00:00
JC Brand
fb2e5e27c7 Let the utils work without Jed available. 2016-02-28 00:37:38 +00:00
JC Brand
9d104f17e6 Remove unused dependency in src/locales.js 2016-02-28 00:36:51 +00:00
JC Brand
21a501ca68 Rename src/templates.js to src/converse-templates.js 2016-02-28 00:33:50 +00:00
JC Brand
7e8a11df88 Some cleanup refactoring of how stuff is built. 
Strophe.ping.js was still in the no-dependencies build

Also clean up wrapper-end.js a bit as well as the grouping of dependencies in
non_amd.html

Remove locales from utils.js and include it in converse.js so that the locales
can more easily be removed from the build.
 2016-02-28 00:33:24 +00:00
JC Brand
77a563955e Move build instructions from Gruntfile to Makefile 
Also, remove build-no-locales-no-otr.js
 2016-02-27 15:57:30 +00:00
JC Brand
16cdd4444e Fix JSHint issues. 2016-02-26 18:23:30 +00:00
JC Brand
a392f3b769 Fix build of converse.js (build with all deps) 2016-02-26 17:35:01 +00:00
JC Brand
ba05d4e779 Add a build step to create a build of only the converse.js modules 
This is now used in non_amd.html and means that the individual converse.js
modules don't need to support the non-AMD case.
 2016-02-26 17:28:18 +00:00
JC Brand
d349bdc17c Add "make doc" alias to "make html" 2016-02-26 16:33:16 +00:00
JC Brand
e68c51d2fa Explicitly list dependencies for modules 
Instead of using the deps-*.js files. Builds will currently break, they still
need to be reworked.

Also moved the refreshWebkit method to utils.
 2016-02-23 07:15:37 +00:00
JC Brand
e79c204241 Refactor the API out into a separate module, src/convers-api.js 
Plugins are now also updated so that they can get the closured converse object
directly and don't need to rely on _super.
 2016-02-20 15:06:12 +00:00
JC Brand
8bf8c318aa Merge pull request #600 from davec82/master 
change xmpp status also on icon-status click
 2016-02-20 10:22:41 +01:00