From e863e3f56d4a05b1901c867a21d47fbbf0fb1e04 Mon Sep 17 00:00:00 2001 From: yuri Date: Mon, 12 Nov 2018 10:53:55 +0200 Subject: [PATCH] jquery length instead of size --- client/modules/crm/src/views/calendar/calendar.js | 4 ++-- .../modules/crm/src/views/dashlets/abstract/chart.js | 4 ++-- client/src/ui.js | 8 ++++---- client/src/views/admin/layouts/grid.js | 2 +- client/src/views/fields/base.js | 8 ++++---- client/src/views/fields/duration.js | 2 +- client/src/views/fields/email.js | 10 +++++----- client/src/views/fields/formula.js | 2 +- client/src/views/fields/link-multiple-with-columns.js | 2 +- client/src/views/fields/link-multiple-with-primary.js | 6 +++--- client/src/views/fields/link-multiple-with-role.js | 2 +- client/src/views/fields/phone.js | 10 +++++----- client/src/views/fields/wysiwyg.js | 2 +- client/src/views/modals/image-crop.js | 2 +- client/src/views/modals/mass-update.js | 2 +- client/src/views/note/fields/post.js | 2 +- client/src/views/notification/badge.js | 4 ++-- client/src/views/record/kanban.js | 2 +- client/src/views/record/list.js | 4 ++-- client/src/views/record/panels/side.js | 2 +- client/src/views/record/search.js | 2 +- client/src/views/role/record/table.js | 2 +- client/src/views/site/navbar.js | 10 +++++----- client/src/views/stream/panel.js | 4 ++-- client/src/views/stream/record/edit.js | 2 +- 25 files changed, 50 insertions(+), 50 deletions(-) diff --git a/client/modules/crm/src/views/calendar/calendar.js b/client/modules/crm/src/views/calendar/calendar.js index 488901efaa..6af33e1602 100644 --- a/client/modules/crm/src/views/calendar/calendar.js +++ b/client/modules/crm/src/views/calendar/calendar.js @@ -457,7 +457,7 @@ Espo.define('crm:views/calendar/calendar', ['view', 'lib!full-calendar'], functi }, getCalculatedHeight: function () { - if (this.$container && this.$container.size()) { + if (this.$container && this.$container.length) { return this.$container.height(); } var height = $(window).height(); @@ -727,7 +727,7 @@ Espo.define('crm:views/calendar/calendar', ['view', 'lib!full-calendar'], functi setTimeout(function () { $calendar.fullCalendar(options); this.updateDate(); - if (this.$container && this.$container.size()) { + if (this.$container && this.$container.length) { this.adjustSize(); } }.bind(this), 150); diff --git a/client/modules/crm/src/views/dashlets/abstract/chart.js b/client/modules/crm/src/views/dashlets/abstract/chart.js index 44fdda2c29..9b9368b18d 100644 --- a/client/modules/crm/src/views/dashlets/abstract/chart.js +++ b/client/modules/crm/src/views/dashlets/abstract/chart.js @@ -184,7 +184,7 @@ Espo.define('crm:views/dashlets/abstract/chart', ['views/dashlets/abstract/base' var width = Math.floor((containerWidth - dashletChartLegendBoxWidth * number) / number); - var columnNumber = this.$legendContainer.find('> table tr:first-child > td').size() / 2; + var columnNumber = this.$legendContainer.find('> table tr:first-child > td').length / 2; var tableWidth = (width + dashletChartLegendBoxWidth) * columnNumber; @@ -215,7 +215,7 @@ Espo.define('crm:views/dashlets/abstract/chart', ['views/dashlets/abstract/base' this.adjustContainer(); setTimeout(function () { - if (!this.$container.size() || !this.$container.is(":visible")) return; + if (!this.$container.length || !this.$container.is(":visible")) return; this.draw(); }.bind(this), 1); }); diff --git a/client/src/ui.js b/client/src/ui.js index 055730ef97..ef83df4fa6 100644 --- a/client/src/ui.js +++ b/client/src/ui.js @@ -229,7 +229,7 @@ Espo.define('ui', [], function () { var $body = $(document.body); this.$el.on('hidden.bs.modal', function (e) { - if ($('.modal:visible').size() > 0) { + if ($('.modal:visible').length > 0) { $body.addClass('modal-open'); } }); @@ -244,14 +244,14 @@ Espo.define('ui', [], function () { var $modalBackdrop = $('.modal-backdrop'); $modalBackdrop.each(function (i, el) { - if (i < $modalBackdrop.size() - 1) { + if (i < $modalBackdrop.length - 1) { $(el).addClass('hidden'); } }.bind(this)); var $modalConainer = $('.modal-container'); $modalConainer.each(function (i, el) { - if (i < $modalConainer.size() - 1) { + if (i < $modalConainer.length - 1) { $(el).addClass('overlaid'); } }.bind(this)); @@ -276,7 +276,7 @@ Espo.define('ui', [], function () { $modalBackdrop.last().removeClass('hidden'); var $modalConainer = $('.modal-container'); - $($modalConainer.get($modalConainer.size() - 2)).removeClass('overlaid'); + $($modalConainer.get($modalConainer.length - 2)).removeClass('overlaid'); this.$el.modal('hide'); $(this).trigger('dialog:close'); diff --git a/client/src/views/admin/layouts/grid.js b/client/src/views/admin/layouts/grid.js index 55078ea098..433576222e 100644 --- a/client/src/views/admin/layouts/grid.js +++ b/client/src/views/admin/layouts/grid.js @@ -140,7 +140,7 @@ Espo.define('views/admin/layouts/grid', 'views/admin/layouts/base', function (De var count = 0; var isEmpty = false; - if ($ul.children('li:not(.empty)').size() == 0) { + if ($ul.children('li:not(.empty)').length == 0) { isEmpty = true; } diff --git a/client/src/views/fields/base.js b/client/src/views/fields/base.js index 93c6524f30..2c523b4569 100644 --- a/client/src/views/fields/base.js +++ b/client/src/views/fields/base.js @@ -154,7 +154,7 @@ Espo.define('views/fields/base', 'view', function (Dep) { * {jQuery} */ getLabelElement: function () { - if (!this.$label || !this.$label.size()) { + if (!this.$label || !this.$label.length) { this.$label = this.$el.parent().children('label'); } return this.$label; @@ -351,7 +351,7 @@ Espo.define('views/fields/base', 'view', function (Dep) { var $label = this.getLabelElement(); var $sign = $label.find('span.required-sign'); - if ($label.size() && !$sign.size()) { + if ($label.length && !$sign.length) { $text = $label.find('span.label-text'); $(' *').insertAfter($text); $sign = $label.find('span.required-sign'); @@ -385,7 +385,7 @@ Espo.define('views/fields/base', 'view', function (Dep) { var $cell = this.getCellElement(); var $editLink = $(''); - if ($cell.size() == 0) { + if ($cell.length == 0) { this.listenToOnce(this, 'after:render', this.initInlineEdit, this); return; } @@ -552,7 +552,7 @@ Espo.define('views/fields/base', 'view', function (Dep) { $el = $(target); } - if (!$el.size() && this.$element) { + if (!$el.length && this.$element) { $el = this.$element; } $el.popover({ diff --git a/client/src/views/fields/duration.js b/client/src/views/fields/duration.js index f5798d24e5..ee6842bd8c 100644 --- a/client/src/views/fields/duration.js +++ b/client/src/views/fields/duration.js @@ -220,7 +220,7 @@ Espo.define('views/fields/duration', 'views/fields/enum', function (Dep) { return $(el).val() >= seconds; }).first(); - if ($found.size()) { + if ($found.length) { if ($found.val() != seconds) { $o.insertBefore($found); }; diff --git a/client/src/views/fields/email.js b/client/src/views/fields/email.js index c515adcb3f..b087f63414 100644 --- a/client/src/views/fields/email.js +++ b/client/src/views/fields/email.js @@ -155,7 +155,7 @@ Espo.define('views/fields/email', 'views/fields/varchar', function (Dep) { 'click [data-action="removeEmailAddress"]': function (e) { var $block = $(e.currentTarget).closest('div.email-address-block'); - if ($block.parent().children().size() == 1) { + if ($block.parent().children().length == 1) { $block.find('input.email-address').val(''); } else { this.removeEmailAddressBlock($block); @@ -168,7 +168,7 @@ Espo.define('views/fields/email', 'views/fields/varchar', function (Dep) { var $block = $input.closest('div.email-address-block'); if ($input.val() == '') { - if ($block.parent().children().size() == 1) { + if ($block.parent().children().length == 1) { $block.find('input.email-address').val(''); } else { this.removeEmailAddressBlock($block); @@ -273,7 +273,7 @@ Espo.define('views/fields/email', 'views/fields/varchar', function (Dep) { } }); - if (c == $input.size()) { + if (c == $input.length) { this.$el.find('[data-action="addEmailAddress"]').removeClass('disabled').removeAttr('disabled'); } else { this.$el.find('[data-action="addEmailAddress"]').addClass('disabled').attr('disabled', 'disabled'); @@ -283,7 +283,7 @@ Espo.define('views/fields/email', 'views/fields/varchar', function (Dep) { manageButtonsVisibility: function () { var $primary = this.$el.find('button[data-property-type="primary"]'); var $remove = this.$el.find('button[data-action="removeEmailAddress"]'); - if ($primary.size() > 1) { + if ($primary.length > 1) { $primary.removeClass('hidden'); $remove.removeClass('hidden'); } else { @@ -387,7 +387,7 @@ Espo.define('views/fields/email', 'views/fields/varchar', function (Dep) { var $list = this.$el.find('div.email-address-block'); - if ($list.size()) { + if ($list.length) { $list.each(function (i, d) { var row = {}; var $d = $(d); diff --git a/client/src/views/fields/formula.js b/client/src/views/fields/formula.js index e606793096..8f644c8306 100644 --- a/client/src/views/fields/formula.js +++ b/client/src/views/fields/formula.js @@ -89,7 +89,7 @@ Espo.define('views/fields/formula', 'views/fields/text', function (Dep) { this.$editor = this.$el.find('#' + this.containerId); - if (this.$editor.size() && (this.mode === 'edit' || this.mode == 'detail')) { + if (this.$editor.length && (this.mode === 'edit' || this.mode == 'detail')) { this.$editor .css('height', this.height + 'px') .css('fontSize', '14px'); diff --git a/client/src/views/fields/link-multiple-with-columns.js b/client/src/views/fields/link-multiple-with-columns.js index c849bd8156..0cbb86b50d 100644 --- a/client/src/views/fields/link-multiple-with-columns.js +++ b/client/src/views/fields/link-multiple-with-columns.js @@ -282,7 +282,7 @@ Espo.define('views/fields/link-multiple-with-columns', 'views/fields/link-multip if (this.mode == 'edit') { columnFormElementJQList.forEach(function ($column) { var fetch = function ($target) { - if (!$target || !$target.size()) return; + if (!$target || !$target.length) return; var column = $target.data('column'); var value = $target.val().toString().trim(); var id = $target.data('id'); diff --git a/client/src/views/fields/link-multiple-with-primary.js b/client/src/views/fields/link-multiple-with-primary.js index 40daa85b31..5a1937e6d1 100644 --- a/client/src/views/fields/link-multiple-with-primary.js +++ b/client/src/views/fields/link-multiple-with-primary.js @@ -160,15 +160,15 @@ Espo.define('views/fields/link-multiple-with-primary', 'views/fields/link-multip managePrimaryButton: function () { var $primary = this.$el.find('button[data-action="switchPrimary"]'); - if ($primary.size() > 1) { + if ($primary.length > 1) { $primary.removeClass('hidden'); } else { $primary.addClass('hidden'); } - if ($primary.filter('.active').size() == 0) { + if ($primary.filter('.active').length == 0) { var $first = $primary.first(); - if ($first.size()) { + if ($first.length) { $first.addClass('active').children().removeClass('text-muted'); this.setPrimaryId($first.data('id')); } diff --git a/client/src/views/fields/link-multiple-with-role.js b/client/src/views/fields/link-multiple-with-role.js index 89943f7f88..0945c1322e 100644 --- a/client/src/views/fields/link-multiple-with-role.js +++ b/client/src/views/fields/link-multiple-with-role.js @@ -182,7 +182,7 @@ Espo.define('views/fields/link-multiple-with-role', 'views/fields/link-multiple' if (this.mode == 'edit') { if ($role) { var fetch = function ($target) { - if (!$target || !$target.size()) return; + if (!$target || !$target.length) return; var value = $target.val().toString().trim(); var id = $target.data('id'); diff --git a/client/src/views/fields/phone.js b/client/src/views/fields/phone.js index d2055339aa..07a435f86f 100644 --- a/client/src/views/fields/phone.js +++ b/client/src/views/fields/phone.js @@ -133,7 +133,7 @@ Espo.define('views/fields/phone', 'views/fields/varchar', function (Dep) { 'click [data-action="removePhoneNumber"]': function (e) { var $block = $(e.currentTarget).closest('div.phone-number-block'); - if ($block.parent().children().size() == 1) { + if ($block.parent().children().length == 1) { $block.find('input.phone-number').val(''); } else { this.removePhoneNumberBlock($block); @@ -146,7 +146,7 @@ Espo.define('views/fields/phone', 'views/fields/varchar', function (Dep) { var $block = $input.closest('div.phone-number-block'); if ($input.val() == '') { - if ($block.parent().children().size() == 1) { + if ($block.parent().children().length == 1) { $block.find('input.phone-number').val(''); } else { this.removePhoneNumberBlock($block); @@ -214,7 +214,7 @@ Espo.define('views/fields/phone', 'views/fields/varchar', function (Dep) { } }); - if (c == $input.size()) { + if (c == $input.length) { this.$el.find('[data-action="addPhoneNumber"]').removeClass('disabled').removeAttr('disabled'); } else { this.$el.find('[data-action="addPhoneNumber"]').addClass('disabled').attr('disabled', 'disabled'); @@ -224,7 +224,7 @@ Espo.define('views/fields/phone', 'views/fields/varchar', function (Dep) { manageButtonsVisibility: function () { var $primary = this.$el.find('button[data-property-type="primary"]'); var $remove = this.$el.find('button[data-action="removePhoneNumber"]'); - if ($primary.size() > 1) { + if ($primary.length > 1) { $primary.removeClass('hidden'); $remove.removeClass('hidden'); } else { @@ -253,7 +253,7 @@ Espo.define('views/fields/phone', 'views/fields/varchar', function (Dep) { var $list = this.$el.find('div.phone-number-block'); - if ($list.size()) { + if ($list.length) { $list.each(function (i, d) { var row = {}; var $d = $(d); diff --git a/client/src/views/fields/wysiwyg.js b/client/src/views/fields/wysiwyg.js index f4f1947f25..7af8ce25e9 100644 --- a/client/src/views/fields/wysiwyg.js +++ b/client/src/views/fields/wysiwyg.js @@ -374,7 +374,7 @@ Espo.define('views/fields/wysiwyg', ['views/fields/text', 'lib!Summernote'], fun options.height = this.height; } else { var $scrollable = this.$el.closest('.modal-body'); - if (!$scrollable.size()) { + if (!$scrollable.length) { $scrollable = $(window); } this.$scrollable = $scrollable; diff --git a/client/src/views/modals/image-crop.js b/client/src/views/modals/image-crop.js index 043d1fd450..6e18c69574 100644 --- a/client/src/views/modals/image-crop.js +++ b/client/src/views/modals/image-crop.js @@ -59,7 +59,7 @@ Espo.define('views/modals/image-crop', ['views/modal', 'lib!Cropper'], function ]; this.on('remove', function () { - if (this.$img.size()) { + if (this.$img.length) { this.$img.cropper('destroy'); this.$img.parent().empty(); } diff --git a/client/src/views/modals/mass-update.js b/client/src/views/modals/mass-update.js index 012a3aa4bc..a489496ba4 100644 --- a/client/src/views/modals/mass-update.js +++ b/client/src/views/modals/mass-update.js @@ -104,7 +104,7 @@ Espo.define('views/modals/mass-update', 'views/modal', function (Dep) { this.$el.find('ul.filter-list li[data-name="'+name+'"]').addClass('hidden'); - if (this.$el.find('ul.filter-list li:not(.hidden)').size() == 0) { + if (this.$el.find('ul.filter-list li:not(.hidden)').length == 0) { this.$el.find('button.select-field').addClass('disabled').attr('disabled', 'disabled'); } diff --git a/client/src/views/note/fields/post.js b/client/src/views/note/fields/post.js index 2911680e73..13359c5d44 100644 --- a/client/src/views/note/fields/post.js +++ b/client/src/views/note/fields/post.js @@ -138,7 +138,7 @@ Espo.define('views/note/fields/post', ['views/fields/text', 'lib!Textcomplete'], }); this.once('remove', function () { - if (this.$element.size()) { + if (this.$element.length) { this.$element.textcomplete('destroy'); } }, this); diff --git a/client/src/views/notification/badge.js b/client/src/views/notification/badge.js index c21fd71674..0a45147e16 100644 --- a/client/src/views/notification/badge.js +++ b/client/src/views/notification/badge.js @@ -97,7 +97,7 @@ Espo.define('views/notification/badge', 'view', function (Dep) { this.runCheckUpdates(true); this.$popupContainer = $('#popup-notifications-container'); - if (!$(this.$popupContainer).size()) { + if (!$(this.$popupContainer).length) { this.$popupContainer = $('
').attr('id', 'popup-notifications-container').addClass('hidden').appendTo('body'); } @@ -275,7 +275,7 @@ Espo.define('views/notification/badge', 'view', function (Dep) { $document = $(document); $document.on('mouseup.notification', function (e) { if (!$container.is(e.target) && $container.has(e.target).length === 0) { - if (!$(e.target).closest('div.modal-dialog').size()) { + if (!$(e.target).closest('div.modal-dialog').length) { this.closeNotifications(); } } diff --git a/client/src/views/record/kanban.js b/client/src/views/record/kanban.js index ebdfc5b290..34732269e9 100644 --- a/client/src/views/record/kanban.js +++ b/client/src/views/record/kanban.js @@ -584,7 +584,7 @@ Espo.define('views/record/kanban', ['views/record/list'], function (Dep) { var $item = this.$el.find('.item[data-id="'+id+'"]'); var $column = this.$el.find('.group-column[data-name="'+group+'"] .group-column-list'); - if ($column.size()) { + if ($column.length) { $column.prepend($item); } else { $item.remove(); diff --git a/client/src/views/record/list.js b/client/src/views/record/list.js index 47123a8a84..0851ffc6d6 100644 --- a/client/src/views/record/list.js +++ b/client/src/views/record/list.js @@ -209,7 +209,7 @@ Espo.define('views/record/list', 'view', function (Dep) { var top; - if (this.$el.closest('.modal-body').size()) { + if (this.$el.closest('.modal-body').length) { $scrollable = this.$el.closest('.modal-body'); top = 0; } else { @@ -1176,7 +1176,7 @@ Espo.define('views/record/list', 'view', function (Dep) { checkRecord: function (id, $target, isSilent) { $target = $target || this.$el.find('.record-checkbox[data-id="' + id + '"]'); - if (!$target.size()) return; + if (!$target.length) return; $target.get(0).checked = true; diff --git a/client/src/views/record/panels/side.js b/client/src/views/record/panels/side.js index f4eced38e2..5049d4d301 100644 --- a/client/src/views/record/panels/side.js +++ b/client/src/views/record/panels/side.js @@ -121,7 +121,7 @@ Espo.define('views/record/panels/side', 'view', function (Dep) { }, afterRender: function () { - if (this.$el.children().size() === 0) { + if (this.$el.children().length === 0) { this.$el.parent().addClass('hidden'); } }, diff --git a/client/src/views/record/search.js b/client/src/views/record/search.js index defed6b7d9..4d5f8cc937 100644 --- a/client/src/views/record/search.js +++ b/client/src/views/record/search.js @@ -462,7 +462,7 @@ Espo.define('views/record/search', 'view', function (Dep) { updateAddFilterButton: function () { var $ul = this.$el.find('ul.filter-list'); - if ($ul.children().not('.hide').size() == 0) { + if ($ul.children().not('.hide').length == 0) { this.$el.find('button.add-filter-button').addClass('disabled'); } else { this.$el.find('button.add-filter-button').removeClass('disabled'); diff --git a/client/src/views/role/record/table.js b/client/src/views/role/record/table.js index 9cefea3560..63e8961502 100644 --- a/client/src/views/role/record/table.js +++ b/client/src/views/role/record/table.js @@ -375,7 +375,7 @@ Espo.define('views/role/record/table', 'view', function (Dep) { var fieldObj = {}; this.fieldActionList.forEach(function (action) { var $select = this.$el.find('select[data-scope="'+scope+'"][data-field="'+field+'"][data-action="'+action+'"]'); - if (!$select.size()) return; + if (!$select.length) return; fieldObj[action] = $select.val(); }, this); scopeObj[field] = fieldObj; diff --git a/client/src/views/site/navbar.js b/client/src/views/site/navbar.js index 08b48b1ce4..80d61a8695 100644 --- a/client/src/views/site/navbar.js +++ b/client/src/views/site/navbar.js @@ -188,14 +188,14 @@ Espo.define('views/site/navbar', 'view', function (Dep) { }); var hideOneTab = function () { - var count = $tabs.children().size(); + var count = $tabs.children().length; if (count <= 1) return; var $one = $tabs.children().eq(count - 2); $one.prependTo($more); }; var unhideOneTab = function () { var $one = $more.children().eq(0); - if ($one.size()) { + if ($one.length) { $one.insertBefore($moreDropdown); } }; @@ -242,7 +242,7 @@ Espo.define('views/site/navbar', 'view', function (Dep) { } } - if ($more.children().size() > 0) { + if ($more.children().length > 0) { $moreDropdown.removeClass('hidden'); } }.bind(this); @@ -265,7 +265,7 @@ Espo.define('views/site/navbar', 'view', function (Dep) { } }; - if ($navbar.height() <= navbarNeededHeight && $more.children().size() === 0) { + if ($navbar.height() <= navbarNeededHeight && $more.children().length === 0) { $more.parent().addClass('hidden'); } @@ -278,7 +278,7 @@ Espo.define('views/site/navbar', 'view', function (Dep) { var $more = $tabs.find('li.more > ul'); - if ($more.children().size() === 0) { + if ($more.children().length === 0) { $more.parent().addClass('hidden'); } diff --git a/client/src/views/stream/panel.js b/client/src/views/stream/panel.js index 74527c887c..5b3b9bd182 100644 --- a/client/src/views/stream/panel.js +++ b/client/src/views/stream/panel.js @@ -187,7 +187,7 @@ Espo.define('views/stream/panel', ['views/record/panels/relationship', 'lib!Text }, storeControl: function () { - if (this.$textarea && this.$textarea.size()) { + if (this.$textarea && this.$textarea.length) { var text = this.$textarea.val(); if (text.length) { this.getSessionStorage().set(this.storageTextKey, text); @@ -327,7 +327,7 @@ Espo.define('views/stream/panel', ['views/record/panels/relationship', 'lib!Text }]); this.once('remove', function () { - if (this.$textarea.size()) { + if (this.$textarea.length) { this.$textarea.textcomplete('destroy'); } }, this); diff --git a/client/src/views/stream/record/edit.js b/client/src/views/stream/record/edit.js index d0c0518a84..bfeaa48ab2 100644 --- a/client/src/views/stream/record/edit.js +++ b/client/src/views/stream/record/edit.js @@ -185,7 +185,7 @@ Espo.define('views/stream/record/edit', 'views/record/base', function (Dep) { if (!this.postingMode) { $('body').off('click.stream-create-post'); $('body').on('click.stream-create-post', function (e) { - if ($.contains(window.document.body, e.target) && !$.contains(this.$el.get(0), e.target) && !$(e.target).closest('.modal-dialog').size()) { + if ($.contains(window.document.body, e.target) && !$.contains(this.$el.get(0), e.target) && !$(e.target).closest('.modal-dialog').length) { if (this.getFieldView('post') && this.getFieldView('post').$element.val() == '') { if (!(this.model.get('attachmentsIds') || []).length) { this.disablePostingMode();