From 0330f8a3783355454cdc3e7bd7031af9c18e1d6e Mon Sep 17 00:00:00 2001 From: Michael M Slusarz Date: Thu, 1 May 2014 17:18:28 -0600 Subject: [PATCH] JSHint discovered fixes --- framework/Core/js/colorpicker.js | 8 ++++---- framework/Core/js/hordeblocks.js | 2 +- framework/Core/js/hordecore.js | 2 +- framework/Core/js/inplaceeditor.js | 13 ++++++------- horde/js/contextsensitive.js | 2 +- horde/js/dragdrop2.js | 2 +- horde/js/smartmobile-login.js | 4 ++-- horde/js/twitterclient.js | 4 ++-- imp/js/ckeditor/pasteattachment.js | 6 +++--- imp/js/compose-dimp.js | 8 ++++---- imp/js/compose.js | 2 +- imp/js/dimpbase.js | 4 ++-- imp/js/dimpcore.js | 3 ++- imp/js/imp.js | 3 ++- imp/js/remoteprefs.js | 2 +- imp/js/smartmobile.js | 2 +- kronolith/js/dragdrop2.js | 10 +++++----- kronolith/js/edit.js | 4 ++-- kronolith/js/kronolith.js | 12 ++++++------ kronolith/js/smartmobile.js | 4 ++-- kronolith/js/views.js | 2 +- turba/js/browse.js | 6 +++--- turba/js/search.js | 6 +++--- 23 files changed, 56 insertions(+), 55 deletions(-) diff --git a/framework/Core/js/colorpicker.js b/framework/Core/js/colorpicker.js index 715e6c56063..49a89b7dd59 100644 --- a/framework/Core/js/colorpicker.js +++ b/framework/Core/js/colorpicker.js @@ -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; } diff --git a/framework/Core/js/hordeblocks.js b/framework/Core/js/hordeblocks.js index 39ca3a2c14e..27d944e9aab 100644 --- a/framework/Core/js/hordeblocks.js +++ b/framework/Core/js/hordeblocks.js @@ -24,4 +24,4 @@ var HordeBlocks = { } ); } -} +}; diff --git a/framework/Core/js/hordecore.js b/framework/Core/js/hordecore.js index f5bb64d3208..6726cf53204 100644 --- a/framework/Core/js/hordecore.js +++ b/framework/Core/js/hordecore.js @@ -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'); diff --git a/framework/Core/js/inplaceeditor.js b/framework/Core/js/inplaceeditor.js index ef505a84526..3c3d1c9281d 100644 --- a/framework/Core/js/inplaceeditor.js +++ b/framework/Core/js/inplaceeditor.js @@ -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); } @@ -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; @@ -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) { @@ -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); @@ -461,4 +460,4 @@ InPlaceEditor = Class.create( this.leaveEditMode(); this.triggerCallback('onComplete', transport); } -}); \ No newline at end of file +}); diff --git a/horde/js/contextsensitive.js b/horde/js/contextsensitive.js index 64d8c6cd197..bcd027e7345 100644 --- a/horde/js/contextsensitive.js +++ b/horde/js/contextsensitive.js @@ -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' }); diff --git a/horde/js/dragdrop2.js b/horde/js/dragdrop2.js index c1ac6c6c3ba..88c1834138f 100644 --- a/horde/js/dragdrop2.js +++ b/horde/js/dragdrop2.js @@ -654,7 +654,7 @@ Drag = Class.create({ } delta = document.viewport.getScrollOffsets(); - p = s.viewportOffset(), + p = s.viewportOffset(); speed = [ 0, 0 ]; vp = document.viewport.getDimensions(); diff --git a/horde/js/smartmobile-login.js b/horde/js/smartmobile-login.js index ff171021035..d0d2a13a823 100644 --- a/horde/js/smartmobile-login.js +++ b/horde/js/smartmobile-login.js @@ -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 { diff --git a/horde/js/twitterclient.js b/horde/js/twitterclient.js index 855794f9710..0a2e87c25bc 100644 --- a/horde/js/twitterclient.js +++ b/horde/js/twitterclient.js @@ -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; } @@ -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; } diff --git a/imp/js/ckeditor/pasteattachment.js b/imp/js/ckeditor/pasteattachment.js index a652c946011..ecda6a7100c 100644 --- a/imp/js/ckeditor/pasteattachment.js +++ b/imp/js/ckeditor/pasteattachment.js @@ -24,7 +24,7 @@ CKEDITOR.plugins.add('pasteattachment', { elt.parentNode.removeChild(elt); } }); - }; + } function uploadAtc(files) { @@ -44,7 +44,7 @@ CKEDITOR.plugins.add('pasteattachment', { }; fr.readAsDataURL(file.value); }); - }; + } function fireEventInParent(type) { @@ -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) { diff --git a/imp/js/compose-dimp.js b/imp/js/compose-dimp.js index b7abaf281a9..87a7d847352 100644 --- a/imp/js/compose-dimp.js +++ b/imp/js/compose-dimp.js @@ -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) @@ -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. */ diff --git a/imp/js/compose.js b/imp/js/compose.js index 548c2967e0b..56a774c10cc 100644 --- a/imp/js/compose.js +++ b/imp/js/compose.js @@ -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)); diff --git a/imp/js/dimpbase.js b/imp/js/dimpbase.js index 218e0f3d3d8..f1e7d432a15 100644 --- a/imp/js/dimpbase.js +++ b/imp/js/dimpbase.js @@ -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'); @@ -4165,7 +4165,7 @@ var DimpBase = { if ($('dimpmain_iframe').visible()) { $('dimpmain_iframe').down('IFRAME').setStyle({ height: $('horde-page').getHeight() + 'px' - }) + }); } }, diff --git a/imp/js/dimpcore.js b/imp/js/dimpcore.js index 264562663e4..8ad360b9c9c 100644 --- a/imp/js/dimpcore.js +++ b/imp/js/dimpcore.js @@ -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 }, { diff --git a/imp/js/imp.js b/imp/js/imp.js index a820170a20b..f570d24f3fa 100644 --- a/imp/js/imp.js +++ b/imp/js/imp.js @@ -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; diff --git a/imp/js/remoteprefs.js b/imp/js/remoteprefs.js index c250fdc1207..0e9ed7fb73e 100644 --- a/imp/js/remoteprefs.js +++ b/imp/js/remoteprefs.js @@ -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(); diff --git a/imp/js/smartmobile.js b/imp/js/smartmobile.js index b423a343abf..2a594bd0f6b 100644 --- a/imp/js/smartmobile.js +++ b/imp/js/smartmobile.js @@ -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; } diff --git a/kronolith/js/dragdrop2.js b/kronolith/js/dragdrop2.js index bb2359cde0c..2d57b9286bb 100644 --- a/kronolith/js/dragdrop2.js +++ b/kronolith/js/dragdrop2.js @@ -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'; @@ -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); @@ -436,7 +436,7 @@ Drag = Class.create({ } try { this.ghost.remove(); - } catch (e) {} + } catch (ex) {} this.ghost = null; } @@ -601,7 +601,7 @@ Drag = Class.create({ } delta = document.viewport.getScrollOffsets(); - p = s.viewportOffset(), + p = s.viewportOffset(); speed = [ 0, 0 ]; vp = document.viewport.getDimensions(); diff --git a/kronolith/js/edit.js b/kronolith/js/edit.js index 30e3f87d786..dc779a0fa95 100644 --- a/kronolith/js/edit.js +++ b/kronolith/js/edit.js @@ -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); diff --git a/kronolith/js/kronolith.js b/kronolith/js/kronolith.js index bb96bccee42..e36b2e55a5e 100644 --- a/kronolith/js/kronolith.js +++ b/kronolith/js/kronolith.js @@ -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) { @@ -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': @@ -4493,8 +4493,8 @@ KronolithCore = { break; case 'kronolithEventConflictNo': $('kronolithConflictDiv').hide(); - $('kronolithEventDiv').show() - e.stop() + $('kronolithEventDiv').show(); + e.stop(); break; case 'kronolithEventSaveAsNew': if (!elt.disabled) { @@ -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(); } @@ -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; diff --git a/kronolith/js/smartmobile.js b/kronolith/js/smartmobile.js index 59a8f095c82..80923f3c0fd 100644 --- a/kronolith/js/smartmobile.js +++ b/kronolith/js/smartmobile.js @@ -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 @@ -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'); diff --git a/kronolith/js/views.js b/kronolith/js/views.js index 3dc2899063f..6fa18c4d611 100644 --- a/kronolith/js/views.js +++ b/kronolith/js/views.js @@ -2,7 +2,7 @@ var eventTabs = null; function ShowTab(tab) { - if (eventTabs == null) { + if (eventTabs === null) { eventTabs = $('page').select('.tabset ul li'); } diff --git a/turba/js/browse.js b/turba/js/browse.js index 23f69c21698..27146d748da 100644 --- a/turba/js/browse.js +++ b/turba/js/browse.js @@ -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); } @@ -57,7 +57,7 @@ function CopyMove(action, select) } key = select[select.selectedIndex].value; - if (key == '') { + if (key === '') { window.alert(TurbaBrowse.copymove); return false; } diff --git a/turba/js/search.js b/turba/js/search.js index c8be7e3cdbb..69666a8a67e 100644 --- a/turba/js/search.js +++ b/turba/js/search.js @@ -9,7 +9,7 @@ * @author Jan Schneider */ -TurbaSearch = { +var TurbaSearch = { // Vars set by calling code: advanced @@ -30,7 +30,7 @@ TurbaSearch = { }); if ($('vbook-form')) { - if (this.shareSources[$F(source_elt)] == true) { + if (this.shareSources[$F(source_elt)] === true) { $('vbook-form').show(); } else { $('vbook-form').hide(); @@ -53,6 +53,6 @@ TurbaSearch = { this.updateCriteria(); } -} +}; document.observe('dom:loaded', TurbaSearch.onDomLoad.bind(TurbaSearch));