Merge pull request #263 from benlangfeld/feature/ejabberd_bookmarks

ejabberd *does* support Bookmarks
candy-chat · Jul 8, 2014 · df951c9 · df951c9
2 parents 6118049 + 8bb01d3
commit df951c9
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/candy.bundle.js b/candy.bundle.js
diff --git a/src/core.js b/src/core.js
@@ -53,7 +53,7 @@ Candy.Core = (function(self, Strophe, $) {
 		 */
 		_options = {
 			/** Boolean: autojoin
-			 * If set to `true` try to get the bookmarks and autojoin the rooms (supported by Openfire).
+			 * If set to `true` try to get the bookmarks and autojoin the rooms (supported by ejabberd, Openfire).
 			 * You may want to define an array of rooms to autojoin: `['[email protected]', 'room2...]` (ejabberd, Openfire, ...)
 			 */
 			autojoin: undefined,

diff --git a/src/core/event.js b/src/core/event.js
@@ -171,7 +171,7 @@ Candy.Core.Event = (function(self, Strophe, $) {
 		 */
 		Bookmarks: function(msg) {
 			Candy.Core.log('[Jabber] Bookmarks');
-			// Autojoin bookmarks (Openfire)
+			// Autojoin bookmarks
 			$('conference', msg).each(function() {
 				var item = $(this);
 				if(item.attr('autojoin')) {