Skip to content

C
converse.js
Commit 2d4a14ac authored by JC Brand's avatar JC Brand
Browse files
Options

Don't expose the Strophe connection object globally. 

Instead, expose only the initialize and onConnected functions.
Updated the tests to work with this.
parent a13a69c4
Expand all Show whitespace changes
Inline Side-by-side
Showing with 155 additions and 128 deletions
CHANGES.rst
View file @ 2d4a14ac
Changelog
=========
0.5.2 (Unreleased)
------------------
- Important security update. Don't expose the Strophe connection object globally. [jcbrand]
0.5.1 (2013-08-04)
------------------
......
converse.js
View file @ 2d4a14ac
......@@ -43,6 +43,7 @@
var converse = {};
converse.initialize = function (settings) {
// Default values
var converse = this;
this.animate = true;
this.auto_list_rooms = false;
this.auto_subscribe = false;
......@@ -54,15 +55,14 @@
this.xhr_user_search = false;
_.extend(this, settings);
var __ = function (str) {
var t = converse.i18n.translate(str);
var __ = $.proxy(function (str) {
var t = this.i18n.translate(str);
if (arguments.length>1) {
return t.fetch.apply(t, [].slice.call(arguments,1));
} else {
return t.fetch();
}
};
}, this);
this.msg_counter = 0;
this.autoLink = function (text) {
// Convert URLs into hyperlinks
......@@ -2646,7 +2646,7 @@
},this));
this.giveFeedback(__('Online Contacts'));
if (callback) {
callback();
callback(this);
}
}, this));
};
......@@ -2664,5 +2664,13 @@
this.toggleControlBox();
}
};
return converse;
return {
'initialize': function (settings) {
converse.initialize(settings);
},
'onConnected': function (connection, callback) {
// onConnected can only be called after initialize has been called.
converse.onConnected(connection, callback);
}
};
}));
converse.min.js
View file @ 2d4a14ac
This diff is collapsed.
index.html
View file @ 2d4a14ac
......@@ -19,8 +19,8 @@
<h1 id="project_title"><a href="http://conversejs.org">Converse.js</a></h1>
<h2 id="project_tagline">An XMPP chat client for your website</h2>
<section id="downloads">
<a class="zip_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.5.1.zip">Download the latest release as a .zip file</a>
<a class="tar_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.5.1.tar.gz">Download the latest release as a tar.gz file</a>
<a class="zip_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.5.2.zip">Download the latest release as a .zip file</a>
<a class="tar_download_link" href="https://github.com/jcbrand/converse.js/archive/v0.5.2.tar.gz">Download the latest release as a tar.gz file</a>
</section>
</header>
</div>
......@@ -29,7 +29,7 @@
<div id="main_content_wrap" class="outer">
<section id="main_content" class="inner">
<p><strong>Converse.js</strong> is an open source, webchat client, that
<p><strong>Converse.js</strong> is an open source webchat client, that
runs in the browser and can be integrated into any website.</p>
<p>It's similar to <a href="https://www.facebook.com/sitetour/chat.php" target="_blank">Facebook chat</a>, but also supports multi-user chatrooms.</p>
......
spec/ChatRoomSpec.js
View file @ 2d4a14ac
(function (root, factory) {
define([
"converse",
"mock"
], function (converse, mock_connection) {
return factory(converse, mock_connection);
], function (mock_connection) {
return factory(mock_connection);
}
);
} (this, function (converse, mock_connection) {
} (this, function (mock_connection) {
return describe("ChatRooms", $.proxy(function() {
var chatroom_names = [
'Dyon van de Wege', 'Thomas Kalb', 'Dirk Theissen', 'Felix Hofmann', 'Ka Lek', 'Anne Ebersbacher'
......
spec/MainSpec.js
View file @ 2d4a14ac
(function (root, factory) {
define([
"converse",
"mock"
], function (converse, mock_connection) {
return factory(converse, mock_connection);
], function (mock_connection) {
return factory(mock_connection);
}
);
} (this, function (converse, mock_connection) {
return describe("Converse.js", $.proxy(function() {
} (this, function (mock_connection) {
return describe("Converse.js", function() {
// Names from http://www.fakenamegenerator.com/
var req_names = [
'Louw Spekman', 'Mohamad Stet', 'Dominik Beyer'
......@@ -651,5 +650,5 @@
}, converse));
}, converse));
}, converse));
}, converse));
});
}));
test_minified.html
View file @ 2d4a14ac
......@@ -7,8 +7,8 @@
<link rel="shortcut icon" type="image/png" href="components/jasmine/images/jasmine_favicon.png">
<link rel="stylesheet" type="text/css" href="components/jasmine/src/html/jasmine.css">
<link rel="stylesheet" type="text/css" media="screen" href="stylesheets/stylesheet.css">
<link rel="stylesheet" type="text/css" media="screen" href="converse-0.5.0.min.css">
<script src="converse-0.5.0.min.js"></script>
<link rel="stylesheet" type="text/css" media="screen" href="converse.min.css">
<script src="converse.min.js"></script>
<script src="components/jasmine/lib/jasmine-core/jasmine.js"></script>
<script src="components/jasmine/lib/jasmine-core/jasmine-html.js"></script>
<script src="node_modules/jasmine-reporters/src/jasmine.console_reporter.js"></script>
......@@ -33,11 +33,6 @@
</div>
<script>
require([
'converse',
"spec/MainSpec",
"spec/ChatRoomSpec"],
function (converse) {
var mock_connection = {
'muc': {
'listRooms': function () {},
......@@ -81,7 +76,10 @@
'items': function () {}
}
};
require([
"jquery",
"converse",
], function($, converse) {
// Set up converse.js
window.localStorage.clear();
converse.initialize({
......@@ -90,8 +88,14 @@
auto_subscribe: false,
animate: false
});
converse.onConnected(mock_connection);
converse.onConnected(
mock_connection,
function (converse) {
window.converse = converse;
require([
"spec/MainSpec",
"spec/ChatRoomSpec"
], function () {
// Jasmine stuff
var jasmineEnv = jasmine.getEnv();
if (/PhantomJS/.test(navigator.userAgent)) {
......@@ -110,6 +114,10 @@
}
jasmineEnv.execute();
});
}
);
}
);
</script>
</body>
</html>
tests_main.js
View file @ 2d4a14ac
......@@ -60,13 +60,8 @@ require([
"jquery",
"converse",
"mock",
"jasmine-html",
"jasmine-console-reporter",
"jasmine-junit-reporter",
"spec/MainSpec",
"spec/ChatRoomSpec"
"jasmine-html"
], function($, converse, mock_connection, jasmine) {
// Set up converse.js
window.localStorage.clear();
converse.initialize({
......@@ -75,7 +70,16 @@ require([
auto_subscribe: false,
animate: false
});
converse.onConnected(
mock_connection,
function (converse) {
window.converse = converse;
require([
"jasmine-console-reporter",
"jasmine-junit-reporter",
"spec/MainSpec",
"spec/ChatRoomSpec"
], function () {
// Jasmine stuff
var jasmineEnv = jasmine.getEnv();
if (/PhantomJS/.test(navigator.userAgent)) {
......@@ -92,5 +96,9 @@ require([
};
jasmineEnv.updateInterval = 200;
}
converse.onConnected(mock_connection, $.proxy(jasmineEnv.execute, jasmineEnv));
});
jasmineEnv.execute();
});
}
);
}
);
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