Chapril/xmpp.chapril.org-conversejs
Chapril/xmpp.chapril.org-conversejs
24
0
Fork 0
Code Issues Pull Requests Projects Releases Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2017-11-17 11:13:31 +01:00
commit 58bd0c551e
7 changed files with 1241 additions and 819 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
.babelrc
View File

@ -1,9 +1,9 @@
{
"presets": [
["env", {
"targets": {
"browsers": ["last 2 versions", "safari >= 10", "IE 11"]
}
}]
["@babel/preset-env", {
"targets": {
"browsers": ["last 2 versions", "safari >= 10", "IE >= 11"]
}
}]
]
}

4
Makefile
View File

@ -153,7 +153,9 @@ watchjs: stamp-npm
$(BABEL) --source-maps --watch=./src --out-dir=./builds
transpile: stamp-npm src
$(BABEL) --source-maps --out-dir=./builds ./src && touch transpile
$(BABEL) --source-maps --out-dir=./builds ./src
$(BABEL) --source-maps --out-dir=./builds ./node_modules/backbone.vdomview/backbone.vdomview.js
touch transpile
BUILDS = dist/converse.js \
dist/converse.min.js \

1989
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

9
package.json
View File

@ -8,9 +8,6 @@
"locale": "locale",
"src": "src"
},
"scripts": {
"test": ""
},
"repository": {
"type": "git",
"url": "git://github.com/jcbrand/converse.js.git"
@ -32,11 +29,11 @@
"browser": "*"
},
"devDependencies": {
"@babel/core": "^7.0.0-beta.32",
"@babel/preset-env": "^7.0.0-beta.32",
"almond": "~0.3.3",
"awesomplete-avoid-xss": "^1.1.2",
"babel-cli": "^6.18.0",
"babel-preset-env": "^1.5.2",
"babel-preset-latest": "^6.16.0",
"babel-cli": "^7.0.0-beta.3",
"backbone": "1.3.3",
"backbone.browserStorage": "0.0.3",
"backbone.overview": "0.0.3",

46
spec/chatbox.js
View File

@ -385,45 +385,43 @@
test_utils.openControlBox();
test_utils.openContactsPanel(_converse);
var contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@localhost',
view, $toolbar, $textarea;
var contact_jid = mock.cur_names[2].replace(/ /g,'.').toLowerCase() + '@localhost';
test_utils.openChatBoxFor(_converse, contact_jid);
view = _converse.chatboxviews.get(contact_jid);
$toolbar = view.$el.find('ul.chat-toolbar');
$textarea = view.$el.find('textarea.chat-textarea');
expect($toolbar.children('li.toggle-smiley').length).toBe(1);
var view = _converse.chatboxviews.get(contact_jid);
var toolbar = view.el.querySelector('ul.chat-toolbar');
expect(toolbar.querySelectorAll('li.toggle-smiley').length).toBe(1);
// Register spies
spyOn(view, 'toggleEmojiMenu').and.callThrough();
spyOn(view, 'insertEmoji').and.callThrough();
view.delegateEvents(); // We need to rebind all events otherwise our spy won't be called
$toolbar.children('li.toggle-smiley').click();
toolbar.querySelector('li.toggle-smiley').click();
test_utils.waitUntil(function () {
var $picker = view.$el.find('.toggle-smiley .emoji-picker-container');
return $picker.is(':visible');
}, 300).then(function () {
var $picker = view.$el.find('.toggle-smiley .emoji-picker-container');
var $items = $picker.find('.emoji-picker li');
$items.first().click();
return utils.isVisible(view.el.querySelector('.toggle-smiley .emoji-picker-container'));
}, 150).then(function () {
var picker = view.el.querySelector('.toggle-smiley .emoji-picker-container');
var items = picker.querySelectorAll('.emoji-picker li');
items[0].click()
expect(view.insertEmoji).toHaveBeenCalled();
test_utils.waitUntil(function () {
toolbar.querySelector('li.toggle-smiley').click(); // Close the panel again
return test_utils.waitUntil(function () {
return !view.el.querySelector('.toggle-smiley .toolbar-menu').offsetHeight;
}, 300)
.then(function () {
$toolbar.children('li.toggle-smiley').click();
}, 300);
}).then(function () {
toolbar.querySelector('li.toggle-smiley').click();
expect(view.toggleEmojiMenu).toHaveBeenCalled();
test_utils.waitUntil(function () {
return test_utils.waitUntil(function () {
var $picker = view.$el.find('.toggle-smiley .emoji-picker-container');
return $picker.is(':visible');
}, 300)
.then(function () {
view.$el.find('.toggle-smiley ul').children('li').last().click();
expect(view.$el.find('textarea.chat-textarea').val()).toBe(':grinning: ');
}, 300);
}).then(function () {
var nodes = view.el.querySelectorAll('.toggle-smiley ul li');
nodes[nodes.length-1].click();
expect(view.el.querySelector('textarea.chat-textarea').value).toBe(':grinning: ');
expect(view.insertEmoji).toHaveBeenCalled();
done();
}); }); });
}).catch(_.partial(_converse.log, _, Strophe.LogLevel.FATAL));
}));
it("contains a button for starting an encrypted chat session",

1
src/build-no-dependencies.js
View File

@ -21,6 +21,7 @@
"lodash.noconflict"
],
paths: {
"backbone.vdomview": "builds/backbone.vdomview",
"converse-bookmarks": "builds/converse-bookmarks",
"converse-chatboxes": "builds/converse-chatboxes",
"converse-chatview": "builds/converse-chatview",

1
src/build.js
View File

@ -3,6 +3,7 @@
name: "almond",
mainConfigFile: 'config.js',
paths: {
"backbone.vdomview": "builds/backbone.vdomview",
"converse-bookmarks": "builds/converse-bookmarks",
"converse-chatboxes": "builds/converse-chatboxes",
"converse-chatview": "builds/converse-chatview",