Skip to content

C
converse.js
Commit 7cf8dc6b authored by JC Brand's avatar JC Brand
Browse files
Options

Fixed Non-AMD example. fixes #220

parent 6b4b94d4
Show whitespace changes
Inline Side-by-side
Showing with 119 additions and 39 deletions
Makefile
View file @ 7cf8dc6b
......@@ -18,6 +18,7 @@ all: dev
help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " dev to set up the development environment"
@echo " build create minified builds containing converse.js and all its dependencies"
@echo " gettext to make PO message catalogs of the documentation"
@echo " html to make standalone HTML files of the documentation"
@echo " pot to generate a gettext POT file to be used for translations"
......@@ -90,6 +91,7 @@ css::
./node_modules/.bin/lessc less/converse.less > css/converse.css
build::
./node_modules/.bin/grunt jst
./node_modules/.bin/grunt minify
########################################################################
......
builds/templates.js
View file @ 7cf8dc6b
......@@ -97,7 +97,7 @@ __p += '\n <ul class="chat-toolbar no-text-select"></ul>\n ';
} ;
__p += '\n <textarea type="text" class="chat-textarea" \n placeholder="' +
((__t = (label_message)) == null ? '' : __t) +
'"/>\n </form>\n</div>\n<div class="participants">\n <ul class="participant-list"></ul>\n</div>\n';
'"/>\n </form>\n</div>\n';
}
return __p
......@@ -153,54 +153,73 @@ __p += '>\n <div class="dragresize dragresize-tm"></div>\n <div class="cha
return __p
};
this["JST"]["chatrooms_tab"] = function(obj) {
this["JST"]["chatroom_password_form"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<li><a class="s" href="#chatrooms">' +
((__t = (label_rooms)) == null ? '' : __t) +
'</a></li>\n';
__p += '<div class="chatroom-form-container">\n <form class="chatroom-form">\n <legend>' +
((__t = (heading)) == null ? '' : __t) +
'</legend>\n <label>' +
((__t = (label_password)) == null ? '' : __t) +
'<input type="password" name="password"/></label>\n <input type="submit" value="' +
((__t = (label_submit)) == null ? '' : __t) +
'"/>\n </form>\n</div>\n';
}
return __p
};
this["JST"]["chats_panel"] = function(obj) {
this["JST"]["chatroom_sidebar"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<div id="minimized-chats">\n <a id="toggle-minimized-chats" href="#"></a>\n <div class="minimized-chats-flyout"></div>\n</div>\n';
__p += '<!-- <div class="participants"> -->\n<form class="room-invite">\n <input class="invited-contact" placeholder="' +
((__t = (label_invitation)) == null ? '' : __t) +
'" type="text"/>\n</form>\n<label>' +
((__t = (label_occupants)) == null ? '' : __t) +
':</label>\n<ul class="participant-list"></ul>\n<!-- </div> -->\n';
}
return __p
};
this["JST"]["choose_status"] = function(obj) {
this["JST"]["chatrooms_tab"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<dl id="target" class="dropdown">\n <dt id="fancy-xmpp-status-select" class="fancy-dropdown"></dt>\n <dd><ul class="xmpp-status-menu"></ul></dd>\n</dl>\n';
__p += '<li><a class="s" href="#chatrooms">' +
((__t = (label_rooms)) == null ? '' : __t) +
'</a></li>\n';
}
return __p
};
this["JST"]["contacts"] = function(obj) {
this["JST"]["chats_panel"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<dt id="xmpp-contacts">' +
((__t = (label_contacts)) == null ? '' : __t) +
'</dt>\n';
__p += '<div id="minimized-chats">\n <a id="toggle-minimized-chats" href="#"></a>\n <div class="minimized-chats-flyout"></div>\n</div>\n';
}
return __p
};
this["JST"]["contacts_panel"] = function(obj) {
this["JST"]["choose_status"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<dl id="target" class="dropdown">\n <dt id="fancy-xmpp-status-select" class="fancy-dropdown"></dt>\n <dd><ul class="xmpp-status-menu"></ul></dd>\n</dl>\n';
}
return __p
};
this["JST"]["contacts_panel"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape, __j = Array.prototype.join;
function print() { __p += __j.call(arguments, '') }
with (obj) {
__p += '<form class="set-xmpp-status" action="" method="post">\n <span id="xmpp-status-holder">\n <select id="select-xmpp-status" style="display:none">\n <option value="online">' +
((__t = (label_online)) == null ? '' : __t) +
'</option>\n <option value="dnd">' +
......@@ -209,7 +228,13 @@ __p += '<form class="set-xmpp-status" action="" method="post">\n <span id="xm
((__t = (label_away)) == null ? '' : __t) +
'</option>\n <option value="offline">' +
((__t = (label_offline)) == null ? '' : __t) +
'</option>\n </select>\n </span>\n</form>\n';
'</option>\n ';
if (allow_logout) { ;
__p += '\n <option value="logout">' +
((__t = (label_logout)) == null ? '' : __t) +
'</option>\n ';
} ;
__p += '\n </select>\n </span>\n</form>\n';
}
return __p
......@@ -317,6 +342,22 @@ __p += '<label>' +
return __p
};
this["JST"]["group_header"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<a href="#" class="group-toggle icon-' +
((__t = (toggle_state)) == null ? '' : __t) +
'" title="' +
((__t = (desc_group_toggle)) == null ? '' : __t) +
'">' +
((__t = (label_group)) == null ? '' : __t) +
'</a>\n';
}
return __p
};
this["JST"]["info"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
......@@ -333,13 +374,13 @@ this["JST"]["login_panel"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<form id="converse-login">\n <label>' +
__p += '<form id="converse-login" method="post">\n <label>' +
((__t = (label_username)) == null ? '' : __t) +
'</label>\n <input type="username" name="jid">\n <label>' +
'</label>\n <input type="username" name="jid" placeholder="Username">\n <label>' +
((__t = (label_password)) == null ? '' : __t) +
'</label>\n <input type="password" name="password">\n <input class="login-submit" type="submit" value="' +
'</label>\n <input type="password" name="password" placeholder="Password">\n <input class="login-submit" type="submit" value="' +
((__t = (label_login)) == null ? '' : __t) +
'">\n</form">\n';
'">\n <span class="conn-feedback"></span>\n</form">\n';
}
return __p
......@@ -428,7 +469,7 @@ this["JST"]["pending_contact"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<span>' +
__p += '<span class="pending-contact-name">' +
((__t = (fullname)) == null ? '' : __t) +
'</span> <a class="remove-xmpp-contact icon-remove" title="' +
((__t = (desc_remove)) == null ? '' : __t) +
......@@ -442,9 +483,13 @@ this["JST"]["pending_contacts"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<dt id="pending-xmpp-contacts">' +
__p += '<dt id="pending-xmpp-contacts"><a href="#" class="group-toggle icon-' +
((__t = (toggle_state)) == null ? '' : __t) +
'" title="' +
((__t = (desc_group_toggle)) == null ? '' : __t) +
'">' +
((__t = (label_pending_contacts)) == null ? '' : __t) +
'</dt>\n';
'</a></dt>\n';
}
return __p
......@@ -454,13 +499,13 @@ this["JST"]["requesting_contact"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<div>' +
__p += '<span class="req-contact-name">' +
((__t = (fullname)) == null ? '' : __t) +
'</div>\n<button type="button" class="accept-xmpp-request">' +
((__t = (label_accept)) == null ? '' : __t) +
'</button>\n<button type="button" class="decline-xmpp-request">' +
((__t = (label_decline)) == null ? '' : __t) +
'</button>\n';
'</span>\n<span class="request-actions">\n <a class="accept-xmpp-request icon-checkmark" title="' +
((__t = (desc_accept)) == null ? '' : __t) +
'" href="#"></a>\n <a class="decline-xmpp-request icon-close" title="' +
((__t = (desc_decline)) == null ? '' : __t) +
'" href="#"></a>\n</span>\n';
}
return __p
......@@ -470,9 +515,13 @@ this["JST"]["requesting_contacts"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<dt id="xmpp-contact-requests">' +
__p += '<dt id="xmpp-contact-requests"><a href="#" class="group-toggle icon-' +
((__t = (toggle_state)) == null ? '' : __t) +
'" title="' +
((__t = (desc_group_toggle)) == null ? '' : __t) +
'">' +
((__t = (label_contact_requests)) == null ? '' : __t) +
'</dt>\n';
'</a></dt>\n';
}
return __p
......@@ -607,6 +656,22 @@ __p += '<form class="add-chatroom" action="" method="post">\n <input type="te
return __p
};
this["JST"]["roster"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
with (obj) {
__p += '<input class="roster-filter" placeholder="' +
((__t = (placeholder)) == null ? '' : __t) +
'">\n<select class="filter-type">\n <option value="contacts">' +
((__t = (label_contacts)) == null ? '' : __t) +
'</option>\n <option value="groups">' +
((__t = (label_groups)) == null ? '' : __t) +
'</option>\n</select>\n<dl class="roster-contacts"></dl>\n';
}
return __p
};
this["JST"]["roster_item"] = function(obj) {
obj || (obj = {});
var __t, __p = '', __e = _.escape;
......@@ -705,11 +770,21 @@ __p += '\n <li class="toggle-smiley icon-happy" title="Insert a smilery">\n
} ;
__p += '\n';
if (show_call_button) { ;
__p += '\n <li class="toggle-call"><a class="icon-phone" title="Start a call"></a></li>\n';
__p += '\n<li class="toggle-call"><a class="icon-phone" title="' +
((__t = (label_start_call)) == null ? '' : __t) +
'"></a></li>\n';
} ;
__p += '\n';
if (show_participants_toggle) { ;
__p += '\n<li class="toggle-participants"><a class="icon-hide-users" title="' +
((__t = (label_hide_participants)) == null ? '' : __t) +
'"></a></li>\n';
} ;
__p += '\n';
if (show_clear_button) { ;
__p += '\n <li class="toggle-clear"><a class="icon-remove" title="Clear all messages"></a></li>\n';
__p += '\n<li class="toggle-clear"><a class="icon-remove" title="' +
((__t = (label_clear)) == null ? '' : __t) +
'"></a></li>\n';
} ;
__p += '\n';
if (allow_otr) { ;
......
docs/CHANGES.rst
View file @ 7cf8dc6b
......@@ -18,7 +18,10 @@ Changelog
* #212 Bugfix. Groups weren't being show again after the live filter was cleared. [jcbrand]
* #215 (and also #75) XEP-0249: Direct MUC Invitations. [jcbrand]
* #216 Contacts tab empty when using xhr_user_search. [hcderaad and jcbrand]
* #219 New contacts added need page refresh to be accepted and become visible [hcderaad and jcbrand]
* #219 New contacts added need page refresh to be accepted and become visible. [hcderaad and jcbrand]
* #220 Non-AMD example page was not working. [xavier83ar and jcbrand]
* #222 Control box state not remembered. [priyadi and jcbrand]
* #223 Provide API to query buddy status. [priyadi and jcbrand]
0.8.1 (2014-08-23)
------------------
......
non_amd.html
View file @ 7cf8dc6b
......@@ -36,9 +36,11 @@
<script type="text/javascript" src="components/backbone.overview/backbone.overview.js"></script>
<script type="text/javascript" src="components/momentjs/moment.js"></script>
<script type="text/javascript" src="components/jquery.browser/dist/jquery.browser.js"></script>
<script type="text/javascript" src="components/typeahead.js/dist/typeahead.jquery.js"></script>
<script type="text/javascript" src="components/jed/jed.js"></script>
<script type="text/javascript" src="locale/en/LC_MESSAGES/en.js"></script>
<script type="text/javascript" src="builds/templates.js"></script>
<script type="text/javascript" src="src/utils.js"></script>
<script type="text/javascript" src="converse.js"></script>
<title>Converse.js</title>
</head>
......@@ -192,14 +194,12 @@
</body>
<script>
converse.initialize({
auto_list_rooms: false,
auto_subscribe: false,
bosh_service_url: 'http://devbox:8890/http-bind', // Please use this connection manager only for testing purposes
hide_muc_server: false,
bosh_service_url: 'https://bind.conversejs.org', // Please use this connection manager only for testing purposes
i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
prebind: false,
show_controlbox_by_default: true,
xhr_user_search: false
debug: true,
roster_groups: true
});
</script>
</html>
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