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

Add space between function name and brackets

Browse Source 
to visually differentiate between function declarations and instantiations.
This commit is contained in:
JC Brand 2014-10-10 11:05:16 +02:00
parent 266f3da2f7
commit 8493b4f423
1 changed files with 18 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
converse.js
View File

@ -11,7 +11,7 @@
if (typeof define === 'function' && define.amd) { if (typeof define === 'function' && define.amd) {
define("converse", define("converse",
["converse-dependencies", "converse-templates"], ["converse-dependencies", "converse-templates"],
function(dependencies, templates) { function (dependencies, templates) {
var otr = dependencies.otr, var otr = dependencies.otr,
moment = dependencies.moment; moment = dependencies.moment;
if (typeof otr !== "undefined") { if (typeof otr !== "undefined") {
@ -42,9 +42,9 @@
}; };
// TODO: these non-backbone methods should all be moved to utils. // TODO: these non-backbone methods should all be moved to utils.
$.fn.addHyperlinks = function() { $.fn.addHyperlinks = function () {
if (this.length > 0) { if (this.length > 0) {
this.each(function(i, obj) { this.each(function (i, obj) {
var x = $(obj).html(); var x = $(obj).html();
var list = x.match(/\b(https?:\/\/|www\.|https?:\/\/www\.)[^\s<]{2,200}\b/g ); var list = x.match(/\b(https?:\/\/|www\.|https?:\/\/www\.)[^\s<]{2,200}\b/g );
if (list) { if (list) {
@ -99,10 +99,10 @@
} }
}; };
$.fn.addEmoticons = function() { $.fn.addEmoticons = function () {
if (converse.visible_toolbar_buttons.emoticons) { if (converse.visible_toolbar_buttons.emoticons) {
if (this.length > 0) { if (this.length > 0) {
this.each(function(i, obj) { this.each(function (i, obj) {
var text = $(obj).html(); var text = $(obj).html();
text = text.replace(/&gt;:\)/g, '<span class="emoticon icon-evil"></span>'); text = text.replace(/&gt;:\)/g, '<span class="emoticon icon-evil"></span>');
text = text.replace(/:\)/g, '<span class="emoticon icon-smiley"></span>'); text = text.replace(/:\)/g, '<span class="emoticon icon-smiley"></span>');
@ -136,16 +136,16 @@
var converse = { var converse = {
templates: templates, templates: templates,
emit: function(evt, data) { emit: function (evt, data) {
$(this).trigger(evt, data); $(this).trigger(evt, data);
}, },
once: function(evt, handler) { once: function (evt, handler) {
$(this).one(evt, handler); $(this).one(evt, handler);
}, },
on: function(evt, handler) { on: function (evt, handler) {
$(this).bind(evt, handler); $(this).bind(evt, handler);
}, },
off: function(evt, handler) { off: function (evt, handler) {
$(this).unbind(evt, handler); $(this).unbind(evt, handler);
}, },
refreshWebkit: function () { refreshWebkit: function () {
@ -588,7 +588,7 @@
}; };
this.registerGlobalEventHandlers = function () { this.registerGlobalEventHandlers = function () {
$(document).click(function() { $(document).click(function () {
if ($('.toggle-otr ul').is(':visible')) { if ($('.toggle-otr ul').is(':visible')) {
$('.toggle-otr ul', this).slideUp(); $('.toggle-otr ul', this).slideUp();
} }
@ -653,7 +653,7 @@
}) })
.c('enable', {xmlns: 'urn:xmpp:carbons:2'}); .c('enable', {xmlns: 'urn:xmpp:carbons:2'});
this.connection.send(carbons_iq); this.connection.send(carbons_iq);
this.connection.addHandler(function(iq) { this.connection.addHandler(function (iq) {
//TODO: check if carbons was enabled: //TODO: check if carbons was enabled:
}, null, "iq", null, "enablecarbons"); }, null, "iq", null, "enablecarbons");
}; };
@ -1550,7 +1550,7 @@
} }
var ctx = canvas.getContext('2d'); var ctx = canvas.getContext('2d');
var img = new Image(); // Create new Image object var img = new Image(); // Create new Image object
img.onload = function() { img.onload = function () {
var ratio = img.width/img.height; var ratio = img.width/img.height;
ctx.drawImage(img, 0,0, 35*ratio, 35); ctx.drawImage(img, 0,0, 35*ratio, 35);
}; };
@ -2911,7 +2911,7 @@
}, this); }, this);
}, },
_ensureElement: function() { _ensureElement: function () {
/* Override method from backbone.js /* Override method from backbone.js
* If the #conversejs element doesn't exist, create it. * If the #conversejs element doesn't exist, create it.
*/ */
@ -3085,14 +3085,10 @@
return this; return this;
}, },
restore: function(ev) { restore: _.debounce(function (ev) {
if (ev && ev.preventDefault) { if (ev && ev.preventDefault) {
ev.preventDefault(); ev.preventDefault();
} }
this._restore();
},
_restore: _.debounce(function () {
this.remove(); this.remove();
this.model.maximize(); this.model.maximize();
}, 200) }, 200)
@ -4240,7 +4236,7 @@
'desc_change_status': __('Click to change your chat status') 'desc_change_status': __('Click to change your chat status')
})); }));
// iterate through all the <option> elements and add option values // iterate through all the <option> elements and add option values
options.each(function(){ options.each(function (){
options_list.push(converse.templates.status_option({ options_list.push(converse.templates.status_option({
'value': $(this).val(), 'value': $(this).val(),
'text': this.text 'text': this.text
@ -4652,13 +4648,13 @@
} }
return null; return null;
}, },
'once': function(evt, handler) { 'once': function (evt, handler) {
converse.once(evt, handler); converse.once(evt, handler);
}, },
'on': function(evt, handler) { 'on': function (evt, handler) {
converse.on(evt, handler); converse.on(evt, handler);
}, },
'off': function(evt, handler) { 'off': function (evt, handler) {
converse.off(evt, handler); converse.off(evt, handler);
}, },
'jQuery': $ 'jQuery': $