Skip to content

Commit

Permalink
JSHint discovered fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
slusarz committed May 2, 2014
1 parent a3f2544 commit 0330f8a
Show file tree
Hide file tree
Showing 23 changed files with 56 additions and 55 deletions.
8 changes: 4 additions & 4 deletions framework/Core/js/colorpicker.js
Expand Up @@ -233,12 +233,12 @@ var ColorPicker = Class.create({
}

if (o == 'color-picker-resize') {
oX = -(e.pointerX()),
oY = -(e.pointerY()),
oX = -(e.pointerX());
oY = -(e.pointerY());
oH = parseInt($('color-picker-sphere').getStyle('height'), 10);
} else {
oX = parseInt($(o).getStyle('left'), 10) - e.pointerX(),
oY = parseInt($(o).getStyle('top'), 10) - e.pointerY(),
oX = parseInt($(o).getStyle('left'), 10) - e.pointerX();
oY = parseInt($(o).getStyle('top'), 10) - e.pointerY();
oH = null;
}

Expand Down
2 changes: 1 addition & 1 deletion framework/Core/js/hordeblocks.js
Expand Up @@ -24,4 +24,4 @@ var HordeBlocks = {
}
);
}
}
};
2 changes: 1 addition & 1 deletion framework/Core/js/hordecore.js
Expand Up @@ -387,7 +387,7 @@ var HordeCore = {
this._desktopNotify({
icon: alarms.params.desktop.icon,
title: message,
text: HordeCore.text['dismissed']
text: HordeCore.text.dismissed
});
if (alarms.params.desktop.url) {
window.open(alarms.params.desktop.url, '__blank');
Expand Down
13 changes: 6 additions & 7 deletions framework/Core/js/inplaceeditor.js
Expand Up @@ -135,7 +135,7 @@ InPlaceEditor = Class.create(
},

checkEmpty: function() {
if (this.element.innerHTML.length == 0) {
if (this.element.innerHTML === 0) {
emptyNode = new Element('span', {className: this.options.emptyClassName}).update(this.options.emptyText);
this.element.appendChild(emptyNode);
}
Expand Down Expand Up @@ -176,8 +176,7 @@ InPlaceEditor = Class.create(

createEditField: function()
{
var text = (this.options.loadTextURL ? this.options.loadingText : this.getText());
var fld;
var text = (this.options.loadTextURL ? this.options.loadingText : this.getText()), fld, w;
if (this.options.rows <= 1 && !/\r|\n/.test(this.getText())) {
fld = new Element('input', { type: 'text' });
var size = this.options.size || this.options.cols || 0;
Expand All @@ -192,9 +191,9 @@ InPlaceEditor = Class.create(
fld.value = text; // No HTML breaks conversion anymore
fld.className = 'editor_field';
if (this.options.width) {
var w = this.options.width + 'px';
w = this.options.width + 'px';
} else if (this.options.autoWidth) {
var w = this.element.up().getWidth() + 'px';
w = this.element.up().getWidth() + 'px';
}
fld.setStyle({ width: w });
if (this.options.submitOnBlur) {
Expand All @@ -215,7 +214,7 @@ InPlaceEditor = Class.create(
var text = ipe.options['text' + mode + 'Controls'];
if (!text || condition === false) return;
ipe._form.appendChild(text);
};
}

this._form = new Element('form', { id: this.options.formId, className: this.options.formClassName });
this._form.observe('submit', this._boundSubmitHandler);
Expand Down Expand Up @@ -461,4 +460,4 @@ InPlaceEditor = Class.create(
this.leaveEditMode();
this.triggerCallback('onComplete', transport);
}
});
});
2 changes: 1 addition & 1 deletion horde/js/contextsensitive.js
Expand Up @@ -313,7 +313,7 @@ var ContextSensitive = Class.create({

// Get window/element dimensions
elt.setStyle({ visibility: 'hidden' }).show();
eltL = elt.getLayout(),
eltL = elt.getLayout();
h = eltL.get('border-box-height');
w = eltL.get('border-box-width');
elt.hide().setStyle({ visibility: 'visible' });
Expand Down
2 changes: 1 addition & 1 deletion horde/js/dragdrop2.js
Expand Up @@ -654,7 +654,7 @@ Drag = Class.create({
}

delta = document.viewport.getScrollOffsets();
p = s.viewportOffset(),
p = s.viewportOffset();
speed = [ 0, 0 ];
vp = document.viewport.getDimensions();

Expand Down
4 changes: 2 additions & 2 deletions horde/js/smartmobile-login.js
Expand Up @@ -7,10 +7,10 @@

$(document).bind("pageinit", function() {
$("#login form").on('submit', function() {
if ($("#horde_user").val() == "") {
if ($("#horde_user").val() === "") {
window.alert(HordeLogin.user_error);
$("#horde_user").focus();
} else if ($("#horde_pass").val() == "") {
} else if ($("#horde_pass").val() === "") {
window.alert(HordeLogin.pass_error);
$("#horde_pass").focus();
} else {
Expand Down
4 changes: 2 additions & 2 deletions horde/js/twitterclient.js
Expand Up @@ -251,7 +251,7 @@ var Horde_Twitter = Class.create({
var h, content = response.c;
if (response.o) {
this.oldestId = response.o;
h = $(this.opts.content).scrollHeight
h = $(this.opts.content).scrollHeight;
$(this.opts.content).insert(content);
$(this.opts.content).scrollTop = h;
}
Expand All @@ -268,7 +268,7 @@ var Horde_Twitter = Class.create({
// If no more available, the oldest id will be null
if (response.o) {
this.oldestMention = response.o;
h = $(this.opts.mentions).scrollHeight
h = $(this.opts.mentions).scrollHeight;
$(this.opts.mentions).insert(content);
$(this.opts.mentions).scrollTop = h;
}
Expand Down
6 changes: 3 additions & 3 deletions imp/js/ckeditor/pasteattachment.js
Expand Up @@ -24,7 +24,7 @@ CKEDITOR.plugins.add('pasteattachment', {
elt.parentNode.removeChild(elt);
}
});
};
}

function uploadAtc(files)
{
Expand All @@ -44,7 +44,7 @@ CKEDITOR.plugins.add('pasteattachment', {
};
fr.readAsDataURL(file.value);
});
};
}

function fireEventInParent(type)
{
Expand All @@ -57,7 +57,7 @@ CKEDITOR.plugins.add('pasteattachment', {
evt.initEvent(type, true, true);
}
editor.getThemeSpace('contents').$.dispatchEvent(evt);
};
}

editor.on('contentDom', function(e1) {
editor.document.on('drop', function(e2) {
Expand Down
8 changes: 4 additions & 4 deletions imp/js/compose-dimp.js
Expand Up @@ -965,8 +965,8 @@ var DimpCompose = {
this.uniqueSubmit('addAttachment');
u.up().hide();
$('upload_wait').update(DimpCore.text.uploading + ' (' +
((u.files && u.files.length > 1) ? DimpCore.text.multiple_atc.sub('%d', u.files.length) : $F(u).escapeHTML())
+ ')').show();
((u.files && u.files.length > 1) ? DimpCore.text.multiple_atc.sub('%d', u.files.length) : $F(u).escapeHTML()) +
')').show();
},

uploadAttachmentAjax: function(data, params, callback)
Expand Down Expand Up @@ -1029,8 +1029,8 @@ var DimpCompose = {
input: 'save_sent_mail_mbox',
label: 'sent_mail_label'
});
this.knl['sm'].knl.setSelected($F('save_sent_mail_mbox'));
this.knl['sm'].knl.show();
this.knl.sm.knl.setSelected($F('save_sent_mail_mbox'));
this.knl.sm.knl.show();
},

/* Open the addressbook window. */
Expand Down
2 changes: 1 addition & 1 deletion imp/js/compose.js
Expand Up @@ -352,7 +352,7 @@ var ImpCompose = {
if (ImpComposeBase.editor_on) {
config = Object.clone(IMP.ckeditor_config);
config.extraPlugins = 'pasteignore';
CKEDITOR.replace('composeMessage', config)
CKEDITOR.replace('composeMessage', config);

document.observe('SpellChecker:after', this._onAfterSpellCheck.bind(this));
document.observe('SpellChecker:before', this._onBeforeSpellCheck.bind(this));
Expand Down
4 changes: 2 additions & 2 deletions imp/js/dimpbase.js
Expand Up @@ -1449,7 +1449,7 @@ var DimpBase = {

if (this.viewport.getMetaData('drafts') ||
this.viewport.getMetaData('templates')) {
$('ctx_message_innocent', 'ctx_message_spam').compact().invoke('hide')
$('ctx_message_innocent', 'ctx_message_spam').compact().invoke('hide');
} else {
[ $('ctx_message_innocent') ].compact().invoke(this.viewport.getMetaData('innocent_show') ? 'show' : 'hide');
[ $('ctx_message_spam') ].compact().invoke(this.viewport.getMetaData('spam_show') ? 'show' : 'hide');
Expand Down Expand Up @@ -4165,7 +4165,7 @@ var DimpBase = {
if ($('dimpmain_iframe').visible()) {
$('dimpmain_iframe').down('IFRAME').setStyle({
height: $('horde-page').getHeight() + 'px'
})
});
}
},

Expand Down
3 changes: 2 additions & 1 deletion imp/js/dimpcore.js
Expand Up @@ -306,11 +306,12 @@ var DimpCore = {
switch (e.memo) {
case 'ctx_contacts':
tmp = $(e.memo).down('DIV');
tmp2 = e.element().retrieve('email');
tmp.hide().childElements().invoke('remove');

// Add e-mail info to context menu if personal name is shown on
// page.
if (tmp2 = e.element().retrieve('email')) {
if (tmp2) {
this.doAction('getContactsImage', {
addr: tmp2.b
}, {
Expand Down
3 changes: 2 additions & 1 deletion imp/js/imp.js
Expand Up @@ -119,7 +119,8 @@ var IMP_JS = {
delete Event.element(e).onload;
}

if (id = $(id)) {
id = $(id);
if (id) {
body = (id.contentDocument || id.contentWindow.document).body;
html = body.parentNode;

Expand Down
2 changes: 1 addition & 1 deletion imp/js/remoteprefs.js
Expand Up @@ -11,7 +11,7 @@ var ImpRemotePrefs = {

_sendData: function(a, d, c)
{
$('remote_action').setValue(a)
$('remote_action').setValue(a);
$('remote_data').setValue(d);
if (c) {
$('prefs').getInputs('hidden', 'actionID').first().clear();
Expand Down
2 changes: 1 addition & 1 deletion imp/js/smartmobile.js
Expand Up @@ -1298,7 +1298,7 @@ var ImpMobile = {

if (cmlist.find(':selected').hasClass('flistCreate')) {
opts.newmbox = $.trim($('#imp-copymove-new').val());
if (opts.newmbox == "") {
if (opts.newmbox === "") {
window.alert(IMP.text.move_nombox);
return;
}
Expand Down
10 changes: 5 additions & 5 deletions kronolith/js/dragdrop2.js
Expand Up @@ -328,8 +328,8 @@ Drag = Class.create({
.addClassName(this.options.classname)
.setStyle({ position: 'absolute', height: layout.get('height') + 'px', width: layout.get('width') + 'px' });

var p = this.element.viewportOffset();
var delta = document.body.viewportOffset();
p = this.element.viewportOffset();
delta = document.body.viewportOffset();
delta[0] -= document.body.offsetLeft;
delta[1] -= document.body.offsetTop;
this.ghost.style.left = (p[0] - delta[0]) + 'px';
Expand All @@ -343,7 +343,7 @@ Drag = Class.create({
this.dim = {
width: layout.get('margin-box-width'),
height: layout.get('margin-box-height')
}
};

if (this.options.ghosting) {
var z = parseInt(this.element.getStyle('zIndex'), 10);
Expand Down Expand Up @@ -436,7 +436,7 @@ Drag = Class.create({
}
try {
this.ghost.remove();
} catch (e) {}
} catch (ex) {}
this.ghost = null;
}

Expand Down Expand Up @@ -601,7 +601,7 @@ Drag = Class.create({
}

delta = document.viewport.getScrollOffsets();
p = s.viewportOffset(),
p = s.viewportOffset();
speed = [ 0, 0 ];
vp = document.viewport.getDimensions();

Expand Down
4 changes: 2 additions & 2 deletions kronolith/js/edit.js
Expand Up @@ -418,10 +418,10 @@ var KronolithEdit =
$('end_month').selectedIndex = endDate.getMonth();
$('end_day').selectedIndex = endDate.getDate() - 1;

endHour = endDate.getHours()
endHour = endDate.getHours();
if (!KronolithVar.twentyFour) {
if (endHour < 12) {
if (endHour == 0) {
if (endHour === 0) {
endHour = 12;
}
$('eam').setValue(1);
Expand Down
12 changes: 6 additions & 6 deletions kronolith/js/kronolith.js
Expand Up @@ -2165,7 +2165,7 @@ KronolithCore = {
var calendar = event.calendar.split('|'),
span = new Element('span'),
time;
opts = Object.extend({ time: false }, opts || {}),
opts = Object.extend({ time: false }, opts || {});

div.update();
if (event.ic) {
Expand Down Expand Up @@ -3194,7 +3194,7 @@ KronolithCore = {
$('kronolithCalendarremotePassword').setValue(info.password);
break;
case 'resourcegroup':
$('kronolithCalendarresourcegroupDescription').setValue(info.desc)
$('kronolithCalendarresourcegroupDescription').setValue(info.desc);
$('kronolithCalendarresourcegroupmembers').setValue(info.members);
break;
case 'resource':
Expand Down Expand Up @@ -4493,8 +4493,8 @@ KronolithCore = {
break;
case 'kronolithEventConflictNo':
$('kronolithConflictDiv').hide();
$('kronolithEventDiv').show()
e.stop()
$('kronolithEventDiv').show();
e.stop();
break;
case 'kronolithEventSaveAsNew':
if (!elt.disabled) {
Expand Down Expand Up @@ -5900,7 +5900,7 @@ KronolithCore = {
if (!Object.isUndefined(ev.rs)) {
var rs = $H(ev.rs);
HordeImple.AutoCompleter.kronolithEventResources.reset(rs.values().pluck('name'));
rs.each(function(r) { this.addResource(r.value, r.key) }.bind(this));
rs.each(function(r) { this.addResource(r.value, r.key); }.bind(this));
if (this.fbLoading) {
$('kronolithResourceFBLoading').show();
}
Expand Down Expand Up @@ -6887,7 +6887,7 @@ KronolithCore = {
this.updateView(this.date, Kronolith.conf.login_view);
$('kronolithView' + Kronolith.conf.login_view.capitalize()).show();
}
HordeCore.doAction('listCalendars', {}, { callback: this.initialize.bind(this, tmp) })
HordeCore.doAction('listCalendars', {}, { callback: this.initialize.bind(this, tmp) });

RedBox.onDisplay = function() {
this.redBoxLoading = false;
Expand Down
4 changes: 2 additions & 2 deletions kronolith/js/smartmobile.js
Expand Up @@ -155,7 +155,7 @@ var KronolithMobile = {
insertEvents: function(dates, view, cal)
{
var key = dates[0].dateString() + dates[1].dateString() + view + cal,
d = [dates[0].clone(), dates[1].clone()], date, events, list, key, day;
d = [dates[0].clone(), dates[1].clone()], date, events, list, day;

// Make sure all calendars are loaded before rendering the view.
// @TODO: Implement LIFO queue as in kronolith.js
Expand Down Expand Up @@ -473,7 +473,7 @@ var KronolithMobile = {
} else if (today.clone().addDays(1).dateString() == d.dateString()) {
text = Kronolith.text.tomorrow;
} else {
text = d.toString('ddd') + ' ' + d.toString('d')
text = d.toString('ddd') + ' ' + d.toString('d');
}
$('#kronolithDayDetailHeader h3').text(text);
$('.kronolith-selected').removeClass('kronolith-selected');
Expand Down
2 changes: 1 addition & 1 deletion kronolith/js/views.js
Expand Up @@ -2,7 +2,7 @@ var eventTabs = null;

function ShowTab(tab)
{
if (eventTabs == null) {
if (eventTabs === null) {
eventTabs = $('page').select('.tabset ul li');
}

Expand Down
6 changes: 3 additions & 3 deletions turba/js/browse.js
Expand Up @@ -25,14 +25,14 @@ function Add(select)
}

key = select[select.selectedIndex].value;
if (key == '') {
if (key === '') {
window.alert(TurbaBrowse.contact2);
return false;
}

if (key.indexOf(':') == -1 || key.lastIndexOf(':') == key.length - 1) {
var newList = window.prompt(TurbaBrowse.contact3, '');
if (newList != null && newList != '') {
if (newList !== null && newList !== '') {
if (key.lastIndexOf(':') == key.length - 1) {
key = key.substr(0, key.length - 1);
}
Expand All @@ -57,7 +57,7 @@ function CopyMove(action, select)
}

key = select[select.selectedIndex].value;
if (key == '') {
if (key === '') {
window.alert(TurbaBrowse.copymove);
return false;
}
Expand Down

0 comments on commit 0330f8a

Please sign in to comment.