From 85f446656a61e29078cfd1a8691f958b372405d7 Mon Sep 17 00:00:00 2001 From: Mike Date: Tue, 25 May 2021 09:10:18 +0200 Subject: [PATCH 1/2] Reformatted source + fixed spelling in comments Reformatted JS source according to current eslint rules. Fixed some spelling errors in JS comments. Translation change: 'Field should be at least NN characters.' -> 'Field should be at least XX characters.' ... to be consistent with other replacements in translation strings. --- src/w2compat.js | 201 +++++---- src/w2event.js | 16 +- src/w2field.js | 332 +++++++------- src/w2form.js | 6 +- src/w2grid.js | 1104 +++++++++++++++++++++++----------------------- src/w2layout.js | 6 +- src/w2popup.js | 156 +++---- src/w2sidebar.js | 150 +++---- src/w2tabs.js | 95 ++-- src/w2toolbar.js | 54 +-- src/w2utils.js | 192 ++++---- 11 files changed, 1155 insertions(+), 1157 deletions(-) diff --git a/src/w2compat.js b/src/w2compat.js index 469a5a58c..e2ead5846 100644 --- a/src/w2compat.js +++ b/src/w2compat.js @@ -50,22 +50,22 @@ import { w2toolbar } from './w2toolbar' }) } - $.fn.w2form = function(options) { return proc.call(this, options, 'w2form') } - $.fn.w2grid = function(options) { return proc.call(this, options, 'w2grid') } - $.fn.w2layout = function(options) { return proc.call(this, options, 'w2layout') } - $.fn.w2sidebar = function(options) { return proc.call(this, options, 'w2sidebar') } - $.fn.w2tabs = function(options) { return proc.call(this, options, 'w2tabs') } - $.fn.w2toolbar = function(options) { return proc.call(this, options, 'w2toolbar') } + $.fn.w2form = function(options) { return proc.call(this, options, 'w2form') } + $.fn.w2grid = function(options) { return proc.call(this, options, 'w2grid') } + $.fn.w2layout = function(options) { return proc.call(this, options, 'w2layout') } + $.fn.w2sidebar = function(options) { return proc.call(this, options, 'w2sidebar') } + $.fn.w2tabs = function(options) { return proc.call(this, options, 'w2tabs') } + $.fn.w2toolbar = function(options) { return proc.call(this, options, 'w2toolbar') } function proc(options, type) { if ($.isPlainObject(options)) { let obj - if (type == 'w2form') obj = new w2form(options) - if (type == 'w2grid') obj = new w2grid(options) - if (type == 'w2layout') obj = new w2layout(options) - if (type == 'w2sidebar') obj = new w2sidebar(options) - if (type == 'w2tabs') obj = new w2tabs(options) - if (type == 'w2toolbar') obj = new w2toolbar(options) + if (type == 'w2form') obj = new w2form(options) + if (type == 'w2grid') obj = new w2grid(options) + if (type == 'w2layout') obj = new w2layout(options) + if (type == 'w2sidebar') obj = new w2sidebar(options) + if (type == 'w2tabs') obj = new w2tabs(options) + if (type == 'w2toolbar') obj = new w2toolbar(options) if ($(this).length !== 0) { obj.render(this[0]) } @@ -100,8 +100,8 @@ import { w2toolbar } from './w2toolbar' let tmp = str[s] if (typeof tmp !== 'string') tmp = String(tmp) // escape regex special chars - tmp = tmp.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&').replace(/&/g, '&').replace(//g, '<') - let regex = new RegExp(tmp + '(?!([^<]+)?>)', 'gi') // only outside tags + tmp = tmp.replace(/[-[\]{}()*+?.,\\^$|#\s]/g, '\\$&').replace(/&/g, '&').replace(//g, '<') + let regex = new RegExp(tmp + '(?!([^<]+)?>)', 'gi') // only outside tags el.innerHTML = el.innerHTML.replace(regex, replaceValue) } function replaceValue(matched) { // mark new @@ -335,53 +335,53 @@ import { w2toolbar } from './w2toolbar' } function getPos() { - let offset = $(tag.attachedTo).offset() + let offset = $(tag.attachedTo).offset() let posClass = 'w2ui-tag-right' - let posLeft = parseInt(offset.left + tag.attachedTo.offsetWidth + (tag.options.left ? tag.options.left : 0)) - let posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) - let tagBody = tag.box.find('.w2ui-tag-body') - let width = tagBody[0].offsetWidth - let height = tagBody[0].offsetHeight + let posLeft = parseInt(offset.left + tag.attachedTo.offsetWidth + (tag.options.left ? tag.options.left : 0)) + let posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) + let tagBody = tag.box.find('.w2ui-tag-body') + let width = tagBody[0].offsetWidth + let height = tagBody[0].offsetHeight if (typeof tag.options.position === 'string' && tag.options.position.indexOf('|') !== -1) { tag.options.position = tag.options.position.split('|') } if (tag.options.position === 'top') { posClass = 'w2ui-tag-top' - posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - 14 - posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) - height - 10 + posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - 14 + posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) - height - 10 } else if (tag.options.position === 'bottom') { posClass = 'w2ui-tag-bottom' - posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - 14 - posTop = parseInt(offset.top + tag.attachedTo.offsetHeight + (tag.options.top ? tag.options.top : 0)) + 10 + posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - 14 + posTop = parseInt(offset.top + tag.attachedTo.offsetHeight + (tag.options.top ? tag.options.top : 0)) + 10 } else if (tag.options.position === 'left') { posClass = 'w2ui-tag-left' - posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - width - 20 - posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) + posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - width - 20 + posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) } else if (Array.isArray(tag.options.position)) { // try to fit the tag on screen in the order defined in the array - let maxWidth = window.innerWidth + let maxWidth = window.innerWidth let maxHeight = window.innerHeight for (let i = 0; i < tag.options.position.length; i++) { let pos = tag.options.position[i] if (pos === 'right') { posClass = 'w2ui-tag-right' - posLeft = parseInt(offset.left + tag.attachedTo.offsetWidth + (tag.options.left ? tag.options.left : 0)) - posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) + posLeft = parseInt(offset.left + tag.attachedTo.offsetWidth + (tag.options.left ? tag.options.left : 0)) + posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) if (posLeft+width <= maxWidth) break } else if (pos === 'left') { posClass = 'w2ui-tag-left' - posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - width - 20 - posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) + posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - width - 20 + posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) if (posLeft >= 0) break } else if (pos === 'top') { posClass = 'w2ui-tag-top' - posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - 14 - posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) - height - 10 + posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - 14 + posTop = parseInt(offset.top + (tag.options.top ? tag.options.top : 0)) - height - 10 if(posLeft+width <= maxWidth && posTop >= 0) break } else if (pos === 'bottom') { posClass = 'w2ui-tag-bottom' - posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - 14 - posTop = parseInt(offset.top + tag.attachedTo.offsetHeight + (tag.options.top ? tag.options.top : 0)) + 10 + posLeft = parseInt(offset.left + (tag.options.left ? tag.options.left : 0)) - 14 + posTop = parseInt(offset.top + tag.attachedTo.offsetHeight + (tag.options.top ? tag.options.top : 0)) + 10 if (posLeft+width <= maxWidth && posTop+height <= maxHeight) break } } @@ -400,8 +400,8 @@ import { w2toolbar } from './w2toolbar' // w2overlay - appears under the element, there can be only one at a time $.fn.w2overlay = function(html, options) { - let obj = this - let name = '' + let obj = this + let name = '' let defaults = { name : null, // it not null, then allows multiple concurrent overlays html : '', // html text to display @@ -502,7 +502,7 @@ import { w2toolbar } from './w2toolbar' event.preventDefault() } }) - div1[0].hide = hide + div1[0].hide = hide div1[0].resize = resize // need time to display @@ -521,7 +521,7 @@ import { w2toolbar } from './w2toolbar' if (tmp.data('element') !== obj[0]) return // it if it different overlay if (tmp.length === 0) return let offset = $(obj).offset() || {} - let pos = offset.left + 'x' + offset.top + let pos = offset.left + 'x' + offset.top if (tmp.data('position') !== pos) { hide() } else { @@ -551,10 +551,10 @@ import { w2toolbar } from './w2toolbar' let div1 = $('#w2ui-overlay'+ name) let div2 = div1.find(' > div') let menu = $('#w2ui-overlay'+ name +' div.w2ui-menu') - let pos = {} + let pos = {} if (menu.length > 0) { menu.css('overflow-y', 'hidden') - pos.scrollTop = menu.scrollTop() + pos.scrollTop = menu.scrollTop() pos.scrollLeft = menu.scrollLeft() } // if goes over the screen, limit height and width @@ -562,8 +562,8 @@ import { w2toolbar } from './w2toolbar' div2.height('auto').width('auto') // width/height let overflowY = false - let h = div2.height() - let w = div2.width() + let h = div2.height() + let w = div2.width() if (options.width && options.width < w) w = options.width if (w < 30) w = 30 // if content of specific height @@ -595,16 +595,16 @@ import { w2toolbar } from './w2toolbar' } div2.find('div.w2ui-menu').css('width', '100%') // adjust position - let boxLeft = options.left + let boxLeft = options.left let boxWidth = options.width - let tipLeft = options.tipLeft + let tipLeft = options.tipLeft let minWidth = options.minWidth let maxWidth = options.maxWidth let objWidth = w2utils.getSize($(obj), 'width') // alignment switch (options.align) { case 'both': - boxLeft = 17 + boxLeft = 17 minWidth = 'input' maxWidth = 'input' break @@ -631,7 +631,7 @@ import { w2toolbar } from './w2toolbar' if(maxWidth) boxWidth = Math.min(boxWidth, maxWidth) if(options.align === 'right') { - let mw = Math.max(w - 10, minWidth - 17) + let mw = Math.max(w - 10, minWidth - 17) boxLeft = objWidth - mw tipLeft = mw - 30 } @@ -644,14 +644,14 @@ import { w2toolbar } from './w2toolbar' // Y coord let X, Y, offsetTop if (options.contextMenu) { // context menu - X = options.pageX + 8 - Y = options.pageY - 0 + X = options.pageX + 8 + Y = options.pageY - 0 offsetTop = options.pageY } else { let offset = obj.offset() || {} - X = ((offset.left > 25 ? offset.left : 25) + boxLeft) - Y = (offset.top + w2utils.getSize(obj, 'height') + options.top + 7) - offsetTop = offset.top + X = ((offset.left > 25 ? offset.left : 25) + boxLeft) + Y = (offset.top + w2utils.getSize(obj, 'height') + options.top + 7) + offsetTop = offset.top } div1.css({ left : X + 'px', @@ -662,12 +662,12 @@ import { w2toolbar } from './w2toolbar' 'min-height': options.height || 'auto' }) // $(window).height() - has a problem in FF20 - let offset = div2.offset() || {} + let offset = div2.offset() || {} let maxHeight = window.innerHeight + $(document).scrollTop() - offset.top - 7 - maxWidth = window.innerWidth + $(document).scrollLeft() - offset.left - 7 + maxWidth = window.innerWidth + $(document).scrollLeft() - offset.left - 7 if (options.contextMenu) { // context menu maxHeight = window.innerHeight + $(document).scrollTop() - options.pageY - 15 - maxWidth = window.innerWidth + $(document).scrollLeft() - options.pageX + maxWidth = window.innerWidth + $(document).scrollLeft() - options.pageX } if (((maxHeight > -50 && maxHeight < 210) || options.openAbove === true) && options.openAbove !== false) { @@ -706,7 +706,7 @@ import { w2toolbar } from './w2toolbar' ) } // check width - w = div2.width() + w = div2.width() maxWidth = window.innerWidth + $(document).scrollLeft() - offset.left - 7 if (options.maxWidth && maxWidth > options.maxWidth) maxWidth = options.maxWidth if (w > maxWidth && options.align !== 'both') { @@ -763,14 +763,14 @@ import { w2toolbar } from './w2toolbar' tmp : {} } let ret - let obj = this - let name = '' + let obj = this + let name = '' if (menu === 'refresh') { // if not show - call blur if ($.fn.w2menuOptions && $.fn.w2menuOptions.name) name = '-' + $.fn.w2menuOptions.name if (options.name) name = '-' + options.name if ($('#w2ui-overlay'+ name).length > 0) { - options = $.extend($.fn.w2menuOptions, options) + options = $.extend($.fn.w2menuOptions, options) let scrTop = $('#w2ui-overlay'+ name +' div.w2ui-menu').scrollTop() $('#w2ui-overlay'+ name +' div.w2ui-menu').html(getMenuHTML()) $('#w2ui-overlay'+ name +' div.w2ui-menu').scrollTop(scrTop) @@ -779,14 +779,14 @@ import { w2toolbar } from './w2toolbar' $(this).w2menu(options) } } else if (menu === 'refresh-index') { - let $menu = $('#w2ui-overlay'+ name +' div.w2ui-menu') - let cur = $menu.find('tr[index='+ options.index +']') + let $menu = $('#w2ui-overlay'+ name +' div.w2ui-menu') + let cur = $menu.find('tr[index='+ options.index +']') let scrTop = $menu.scrollTop() $menu.find('tr.w2ui-selected').removeClass('w2ui-selected') // clear all cur.addClass('w2ui-selected') // select current // scroll into view if (cur.length > 0) { - let top = cur[0].offsetTop - 5 // 5 is margin top + let top = cur[0].offsetTop - 5 // 5 is margin top let height = $menu.height() $menu.scrollTop(scrTop) if (top < scrTop || top + cur.height() > scrTop + height) { @@ -797,7 +797,7 @@ import { w2toolbar } from './w2toolbar' } else { if (arguments.length === 1) options = menu; else options.items = menu if (typeof options !== 'object') options = {} - options = $.extend({}, defaults, options) + options = $.extend({}, defaults, options) $.fn.w2menuOptions = options if (options.name) name = '-' + options.name if (typeof options.select === 'function' && typeof options.onSelect !== 'function') options.onSelect = options.select @@ -806,7 +806,7 @@ import { w2toolbar } from './w2toolbar' // since only one overlay can exist at a time $.fn.w2menuClick = function w2menuClick(event, index, parentIndex) { let keepOpen = false, items - let $tr = $(event.target).closest('tr') + let $tr = $(event.target).closest('tr') if (event.shiftKey || event.metaKey || event.ctrlKey) { keepOpen = true } @@ -905,20 +905,19 @@ import { w2toolbar } from './w2toolbar' } let html = '' if (options.search) { - html += - '
'+ + html += '
'+ '
'+ ' '+ '
' options.style += ';background-color: #ECECEC' - options.index = 0 + options.index = 0 for (let i = 0; i < options.items.length; i++) options.items[i].hidden = false } html += (options.topHTML || '') + '
' + getMenuHTML() + '
' - ret = $(this).w2overlay(html, options) + ret = $(this).w2overlay(html, options) setTimeout(() => { $('#w2ui-overlay'+ name +' #menu-search') .on('keyup', change) @@ -937,7 +936,7 @@ import { w2toolbar } from './w2toolbar' let div = $('#w2ui-overlay'+ name) if (div.length > 0) { div[0].mresize = mresize - div[0].change = change + div[0].change = change } } return ret @@ -946,20 +945,20 @@ import { w2toolbar } from './w2toolbar' setTimeout(() => { // show selected $('#w2ui-overlay'+ name +' tr.w2ui-selected').removeClass('w2ui-selected') - let cur = $('#w2ui-overlay'+ name +' tr[index='+ options.index +']') + let cur = $('#w2ui-overlay'+ name +' tr[index='+ options.index +']') let scrTop = $('#w2ui-overlay'+ name +' div.w2ui-menu').scrollTop() cur.addClass('w2ui-selected') if (options.tmp) { options.tmp.contentHeight = $('#w2ui-overlay'+ name +' table').height() + (options.search ? 50 : 10) + (parseInt($('#w2ui-overlay'+ name +' .w2ui-menu').css('top')) || 0) // it menu is moved with menuStyle + (parseInt($('#w2ui-overlay'+ name +' .w2ui-menu').css('bottom')) || 0) // it menu is moved with menuStyle - options.tmp.contentWidth = $('#w2ui-overlay'+ name +' table').width() + options.tmp.contentWidth = $('#w2ui-overlay'+ name +' table').width() } if ($('#w2ui-overlay'+ name).length > 0) $('#w2ui-overlay'+ name)[0].resize() // scroll into view if (cur.length > 0) { - let top = cur[0].offsetTop - 5 // 5 is margin top - let el = $('#w2ui-overlay'+ name +' div.w2ui-menu') + let top = cur[0].offsetTop - 5 // 5 is margin top + let el = $('#w2ui-overlay'+ name +' div.w2ui-menu') let height = el.height() $('#w2ui-overlay'+ name +' div.w2ui-menu').scrollTop(scrTop) if (top < scrTop || top + cur.height() > scrTop + height) { @@ -971,7 +970,7 @@ import { w2toolbar } from './w2toolbar' function change(event) { let search = this.value - let key = event.keyCode + let key = event.keyCode let cancel = false switch (key) { case 13: // enter @@ -1008,7 +1007,7 @@ import { w2toolbar } from './w2toolbar' if (!cancel) { let shown = 0 for (let i = 0; i < options.items.length; i++) { - let item = options.items[i] + let item = options.items[i] let prefix = '' let suffix = '' if (['is', 'begins with'].indexOf(options.match) !== -1) prefix = '^' @@ -1036,9 +1035,9 @@ import { w2toolbar } from './w2toolbar' '
'+ w2utils.lang('Loading...') +'
'+ '' } - let count = 0 + let count = 0 let menu_html = '' - let img = null, icon = null + let img = null, icon = null if (items == null) items = options.items if (!Array.isArray(items)) items = [] for (let f = 0; f < items.length; f++) { @@ -1049,7 +1048,7 @@ import { w2toolbar } from './w2toolbar' if (mitem.text != null && mitem.id == null) mitem.id = mitem.text if (mitem.text == null && mitem.id != null) mitem.text = mitem.id if (mitem.caption != null) mitem.text = mitem.caption - img = mitem.img + img = mitem.img icon = mitem.icon if (img == null) img = null // img might be undefined if (icon == null) icon = null // icon might be undefined @@ -1058,8 +1057,8 @@ import { w2toolbar } from './w2toolbar' if (mitem.checked === true) icon = 'w2ui-icon-check'; else icon = 'w2ui-icon-empty' } if (mitem.hidden !== true) { - let imgd = '' - let txt = mitem.text + let imgd = '' + let txt = mitem.text let subMenu_dsp = '' if (typeof options.render === 'function') txt = options.render(mitem, options) if (typeof txt == 'function') txt = txt(mitem, options) @@ -1083,7 +1082,7 @@ import { w2toolbar } from './w2toolbar' } else if (Array.isArray(mitem.items)) { _items = mitem.items } - count_dsp = '' + count_dsp = '' subMenu_dsp = ''+ ' '+ '' @@ -1111,7 +1110,7 @@ import { w2toolbar } from './w2toolbar' } else { // horizontal line let divText = txt.replace(/^-+/g, '') - menu_html += '' @@ -1129,7 +1128,7 @@ import { w2toolbar } from './w2toolbar' $.fn.w2color = function(options, callBack) { let $el = $(this) - let el = $el[0] + let el = $el[0] // no need to init if ($el.data('skipInit')) { $el.removeData('skipInit') @@ -1179,7 +1178,7 @@ import { w2toolbar } from './w2toolbar' .off('.w2color') .on('mousedown.w2color', (event) => { let color = $(event.originalEvent.target).attr('name') // should not have # - index = $(event.originalEvent.target).attr('index').split(':') + index = $(event.originalEvent.target).attr('index').split(':') if (el.tagName.toUpperCase() === 'INPUT') { if (options.fireChange) $(el).change() $(el).next().find('>div').css('background-color', color) @@ -1227,11 +1226,11 @@ import { w2toolbar } from './w2toolbar' $el.val(0) val = 0 } - let name = $el.attr('name') + let name = $el.attr('name') let color = {} if (['r', 'g', 'b', 'a'].indexOf(name) !== -1) { rgb[name] = val - hsv = w2utils.rgb2hsv(rgb) + hsv = w2utils.rgb2hsv(rgb) } else if (['h', 's', 'v'].indexOf(name) !== -1) { color[name] = val } @@ -1256,7 +1255,7 @@ import { w2toolbar } from './w2toolbar' rgb = w2utils.hsv2rgb(hsv) // console.log(rgb) let newColor = 'rgba('+ rgb.r +','+ rgb.g +','+ rgb.b +','+ rgb.a +')' - let cl = [ + let cl = [ Number(rgb.r).toString(16).toUpperCase(), Number(rgb.g).toString(16).toUpperCase(), Number(rgb.b).toString(16).toUpperCase(), @@ -1289,9 +1288,9 @@ import { w2toolbar } from './w2toolbar' } } function updateSlides() { - let $el1 = $('#w2ui-overlay .palette .value1') - let $el2 = $('#w2ui-overlay .rainbow .value2') - let $el3 = $('#w2ui-overlay .alpha .value2') + let $el1 = $('#w2ui-overlay .palette .value1') + let $el2 = $('#w2ui-overlay .rainbow .value2') + let $el3 = $('#w2ui-overlay .alpha .value2') let offset1 = parseInt($el1.width()) / 2 let offset2 = parseInt($el2.width()) / 2 $el1.css({ 'left': hsv.s * 150 / 100 - offset1, 'top': (100 - hsv.v) * 125 / 100 - offset1}) @@ -1299,13 +1298,13 @@ import { w2toolbar } from './w2toolbar' $el3.css('left', rgb.a*150 - offset2) } function refreshPalette() { - let cl = w2utils.hsv2rgb(hsv.h, 100, 100) + let cl = w2utils.hsv2rgb(hsv.h, 100, 100) let rgb = cl.r + ',' + cl.g + ',' + cl.b $('#w2ui-overlay .palette').css('background-image', 'linear-gradient(90deg, rgba('+ rgb +',0) 0%, rgba(' + rgb + ',1) 100%)') } function mouseDown(event) { - let $el = $(this).find('.value1, .value2') + let $el = $(this).find('.value1, .value2') let offset = parseInt($el.width()) / 2 if ($el.hasClass('move-x')) $el.css({ left: (event.offsetX - offset) + 'px' }) if ($el.hasClass('move-y')) $el.css({ top: (event.offsetY - offset) + 'px' }) @@ -1327,11 +1326,11 @@ import { w2toolbar } from './w2toolbar' $('body').off('.w2color') } function mouseMove (event) { - let $el = initial.$el - let divX = event.pageX - initial.x - let divY = event.pageY - initial.y - let newX = initial.left + divX - let newY = initial.top + divY + let $el = initial.$el + let divX = event.pageX - initial.x + let divY = event.pageY - initial.y + let newX = initial.left + divX + let newY = initial.top + divY let offset = parseInt($el.width()) / 2 if (newX < -offset) newX = -offset if (newY < -offset) newY = -offset @@ -1342,8 +1341,8 @@ import { w2toolbar } from './w2toolbar' // move let name = $el.parent().attr('name') - let x = parseInt($el.css('left')) + offset - let y = parseInt($el.css('top')) + offset + let x = parseInt($el.css('left')) + offset + let y = parseInt($el.css('top')) + offset if (name === 'palette') { setColor({ s: Math.round(x / initial.width * 100), @@ -1368,10 +1367,10 @@ import { w2toolbar } from './w2toolbar' updateSlides() // Events of iOS - let mUp = 'mouseup.w2color' + let mUp = 'mouseup.w2color' let mMove = 'mousemove.w2color' if (w2utils.isIOS) { - mUp = 'touchend.w2color' + mUp = 'touchend.w2color' mMove = 'touchmove.w2color' } $('#w2ui-overlay .palette') diff --git a/src/w2event.js b/src/w2event.js index 849b46c85..96bba4636 100644 --- a/src/w2event.js +++ b/src/w2event.js @@ -9,7 +9,7 @@ import { w2utils } from './w2utils.js' class w2event { constructor(name) { this.handlers = [] - // register globaly + // register globally if (name) { window.w2ui = window.w2ui || {} if (!w2utils.checkName(name)) return @@ -22,8 +22,8 @@ class w2event { // allow 'eventName.scope' syntax if (typeof edata === 'string' && edata.indexOf('.') !== -1) { let tmp = edata.split('.') - edata = tmp[0] - scope = tmp[1] + edata = tmp[0] + scope = tmp[1] } // allow 'eventName:after' syntax if (typeof edata === 'string' && edata.indexOf(':') !== -1) { @@ -50,8 +50,8 @@ class w2event { // allow 'eventName.scope' syntax if (typeof edata === 'string' && edata.indexOf('.') !== -1) { let tmp = edata.split('.') - edata = tmp[0] - scope = tmp[1] + edata = tmp[0] + scope = tmp[1] if (edata === '') edata = '*' } // allow 'eventName:after' syntax @@ -108,7 +108,7 @@ class w2event { edata = $.extend({}, item.edata, edata) // check handler arguments args = [] - tmp = new RegExp(/\((.*?)\)/).exec(item.handler) + tmp = new RegExp(/\((.*?)\)/).exec(item.handler) if (tmp) args = tmp[1].split(/\s*,\s*/) if (args.length === 2) { item.handler.call(this, edata.target, edata) // old way for back compatibility @@ -124,7 +124,7 @@ class w2event { fun = this[funName] // check handler arguments args = [] - tmp = new RegExp(/\((.*?)\)/).exec(fun) + tmp = new RegExp(/\((.*?)\)/).exec(fun) if (tmp) args = tmp[1].split(/\s*,\s*/) if (args.length === 2) { fun.call(this, edata.target, edata) // old way for back compatibility @@ -138,7 +138,7 @@ class w2event { fun = edata.object[funName] // check handler arguments args = [] - tmp = new RegExp(/\((.*?)\)/).exec(fun) + tmp = new RegExp(/\((.*?)\)/).exec(fun) if (tmp) args = tmp[1].split(/\s*,\s*/) if (args.length === 2) { fun.call(this, edata.target, edata) // old way for back compatibility diff --git a/src/w2field.js b/src/w2field.js index fbf1b077f..dca14d91c 100644 --- a/src/w2field.js +++ b/src/w2field.js @@ -32,7 +32,7 @@ import { w2utils } from './w2utils.js' let custom = {} function addType(type, handler) { - type = String(type).toLowerCase() + type = String(type).toLowerCase() custom[type] = handler return true } @@ -70,7 +70,7 @@ addType('myType', (options) => { class w2field extends w2event { constructor(type, options) { super() - // sanitazation + // sanitization if (typeof type == 'string' && options == null) { options = { type: type } } @@ -82,24 +82,24 @@ class w2field extends w2event { } options.type = String(options.type).toLowerCase() - this.options = options - this.el = null - this.helpers = {} // object or helper elements - this.type = options.type || 'text' - this.options = $.extend(true, {}, options) - this.onSearch = options.onSearch || null - this.onRequest = options.onRequest || null - this.onLoad = options.onLoad || null - this.onError = options.onError || null - this.onClick = options.onClick || null - this.onAdd = options.onAdd || null - this.onNew = options.onNew || null - this.onRemove = options.onRemove || null + this.options = options + this.el = null + this.helpers = {} // object or helper elements + this.type = options.type || 'text' + this.options = $.extend(true, {}, options) + this.onSearch = options.onSearch || null + this.onRequest = options.onRequest || null + this.onLoad = options.onLoad || null + this.onError = options.onError || null + this.onClick = options.onClick || null + this.onAdd = options.onAdd || null + this.onNew = options.onNew || null + this.onRemove = options.onRemove || null this.onMouseOver = options.onMouseOver || null - this.onMouseOut = options.onMouseOut || null + this.onMouseOut = options.onMouseOut || null this.onIconClick = options.onIconClick || null - this.onScroll = options.onScroll || null - this.tmp = {} // temp object + this.onScroll = options.onScroll || null + this.tmp = {} // temp object // clean up some options delete this.options.type delete this.options.onSearch @@ -123,7 +123,7 @@ class w2field extends w2event { } init() { - let obj = this + let obj = this let options = this.options let defaults @@ -148,7 +148,7 @@ class w2field extends w2event { case 'alphanumeric': case 'bin': case 'hex': - defaults = { + defaults = { min : null, max : null, step : 1, @@ -165,14 +165,14 @@ class w2field extends w2event { prefix : '', suffix : '' } - this.options = $.extend(true, {}, defaults, options) - options = this.options // since object is re-created, need to re-assign - options.numberRE = new RegExp('['+ options.groupSymbol + ']', 'g') - options.moneyRE = new RegExp('['+ options.currencyPrefix + options.currencySuffix + options.groupSymbol +']', 'g') + this.options = $.extend(true, {}, defaults, options) + options = this.options // since object is re-created, need to re-assign + options.numberRE = new RegExp('['+ options.groupSymbol + ']', 'g') + options.moneyRE = new RegExp('['+ options.currencyPrefix + options.currencySuffix + options.groupSymbol +']', 'g') options.percentRE = new RegExp('['+ options.groupSymbol + '%]', 'g') // no keyboard support needed if (['text', 'alphanumeric', 'hex', 'bin'].indexOf(this.type) !== -1) { - options.arrows = false + options.arrows = false options.keyboard = false } this.addPrefix() // only will add if needed @@ -180,7 +180,7 @@ class w2field extends w2event { break case 'color': - defaults = { + defaults = { prefix : '', suffix : '
 
', arrows : false, @@ -189,7 +189,7 @@ class w2field extends w2event { transparent : true } this.options = $.extend(true, {}, defaults, options) - options = this.options // since object is re-created, need to re-assign + options = this.options // since object is re-created, need to re-assign this.addPrefix() // only will add if needed this.addSuffix() // only will add if needed // additional checks @@ -197,7 +197,7 @@ class w2field extends w2event { break case 'date': - defaults = { + defaults = { format : w2utils.settings.dateFormat, // date format keyboard : true, silent : true, @@ -208,12 +208,12 @@ class w2field extends w2event { blockWeekDays : null // array of numbers of weekday to block } this.options = $.extend(true, {}, defaults, options) - options = this.options // since object is re-created, need to re-assign + options = this.options // since object is re-created, need to re-assign if ($(this.el).attr('placeholder') == null) $(this.el).attr('placeholder', options.format) break case 'time': - defaults = { + defaults = { format : w2utils.settings.timeFormat, keyboard : true, silent : true, @@ -222,12 +222,12 @@ class w2field extends w2event { noMinutes : false } this.options = $.extend(true, {}, defaults, options) - options = this.options // since object is re-created, need to re-assign + options = this.options // since object is re-created, need to re-assign if ($(this.el).attr('placeholder') == null) $(this.el).attr('placeholder', options.format) break case 'datetime': - defaults = { + defaults = { format : w2utils.settings.dateFormat + ' | ' + w2utils.settings.timeFormat, keyboard : true, silent : true, @@ -240,7 +240,7 @@ class w2field extends w2event { noMinutes : false } this.options = $.extend(true, {}, defaults, options) - options = this.options // since object is re-created, need to re-assign + options = this.options // since object is re-created, need to re-assign if ($(this.el).attr('placeholder') == null) $(this.el).attr('placeholder', options.placeholder || options.format) break @@ -300,7 +300,7 @@ class w2field extends w2event { } this.watchSize() } - options = $.extend({}, defaults, options) + options = $.extend({}, defaults, options) this.options = options if (!$.isPlainObject(options.selected)) options.selected = {} $(this.el).data('selected', options.selected) @@ -324,7 +324,7 @@ class w2field extends w2event { defaults = { items : [], selected : [], - max : 0, // max number of selected items, 0 - unlim + max : 0, // max number of selected items, 0 - unlimited url : null, // not implemented recId : null, // map retrieved data from url to id, can be string or function recText : null, // map retrieved data from url to text, can be string or function @@ -360,13 +360,13 @@ class w2field extends w2event { onMouseOut : null, // when an item is mouse out onScroll : null // when div with selected items is scrolled } - options = $.extend({}, defaults, options, { suffix: '' }) + options = $.extend({}, defaults, options, { suffix: '' }) if (typeof options.items == 'function') { options._items_fun = options.items } - options.items = w2utils.normMenu.call(this, options.items) + options.items = w2utils.normMenu.call(this, options.items) options.selected = w2utils.normMenu.call(this, options.selected) - this.options = options + this.options = options if (!Array.isArray(options.selected)) options.selected = [] $(this.el).data('selected', options.selected) if (options.url) { @@ -379,11 +379,11 @@ class w2field extends w2event { break case 'file': - defaults = { + defaults = { selected : [], max : 0, - maxSize : 0, // max size of all files, 0 - unlim - maxFileSize : 0, // max size of a single file, 0 -unlim + maxSize : 0, // max size of all files, 0 - unlimited + maxFileSize : 0, // max size of a single file, 0 -unlimited maxWidth : 250, // max width for a single item maxHeight : 350, // max height for input control to grow maxDropHeight : 350, // max height for drop down menu @@ -400,7 +400,7 @@ class w2field extends w2event { onMouseOver : null, // when an item is mouse over onMouseOut : null // when an item is mouse out } - options = $.extend({}, defaults, options) + options = $.extend({}, defaults, options) this.options = options if (!Array.isArray(options.selected)) options.selected = [] $(this.el).data('selected', options.selected) @@ -437,8 +437,8 @@ class w2field extends w2event { } watchSize() { - let obj = this - let tmp = $(obj.el).data('tmp') || {} + let obj = this + let tmp = $(obj.el).data('tmp') || {} tmp.sizeTimer = setInterval(() => { if ($(obj.el).parents('body').length > 0) { obj.resize() @@ -507,7 +507,7 @@ class w2field extends w2event { $(this.el).removeClass('w2ui-select') } this.type = 'clear' - let tmp = $(this.el).data('tmp') + let tmp = $(this.el).data('tmp') if (!this.tmp) return // restore paddings if (tmp != null) { @@ -531,10 +531,10 @@ class w2field extends w2event { } refresh() { - let obj = this - let options = this.options + let obj = this + let options = this.options let selected = $(this.el).data('selected') - let time = (new Date()).getTime() + let time = (new Date()).getTime() // enum if (['list'].indexOf(this.type) !== -1) { $(obj.el).parent().css('white-space', 'nowrap') // needs this for arrow always to appear on the right side @@ -590,7 +590,7 @@ class w2field extends w2event { let html = '' if (selected) { for (let s = 0; s < selected.length; s++) { - let it = selected[s] + let it = selected[s] let ren = '' if (typeof options.renderItem === 'function') { ren = options.renderItem(it, s, '
  
') @@ -603,7 +603,7 @@ class w2field extends w2event { } } let div = obj.helpers.multi - let ul = div.find('ul') + let ul = div.find('ul') div.attr('style', div.attr('style') + ';' + options.style) $(obj.el).css('z-index', '-1') if ($(obj.el).prop('readonly') || $(obj.el).prop('disabled')) { @@ -654,7 +654,7 @@ class w2field extends w2event { .data('mouse', 'out') .on('click', function(event) { let target = (event.target.tagName.toUpperCase() === 'LI' ? event.target : $(event.target).parents('LI')) - let item = selected[$(target).attr('index')] + let item = selected[$(target).attr('index')] if ($(target).hasClass('nomouse')) return event.stopPropagation() let edata @@ -692,8 +692,8 @@ class w2field extends w2event { ' >'+ '' } - let td1 = 'style="padding: 3px; text-align: right; color: #777;"' - let td2 = 'style="padding: 3px"' + let td1 = 'style="padding: 3px; text-align: right; color: #777;"' + let td2 = 'style="padding: 3px"' preview += '
'+ '
' + getMenuHTML(_items, true, !mitem.expanded, f) + '
'+ + menu_html += '
'+ '
'+ divText +'
'+ '
'+ divText +'
'+ '
'+ ' '+ @@ -768,13 +768,13 @@ class w2field extends w2event { // resizing width of list, enum, file controls resize() { - let obj = this - let new_width = $(obj.el).width() + let obj = this + let new_width = $(obj.el).width() let new_height = $(obj.el).height() if (obj.tmp.current_width == new_width && new_height > 0) return - let focus = this.helpers.focus - let multi = this.helpers.multi + let focus = this.helpers.focus + let multi = this.helpers.multi let suffix = this.helpers.suffix let prefix = this.helpers.prefix @@ -805,7 +805,7 @@ class w2field extends w2event { return val } let options = this.options - val = String(val).trim() + val = String(val).trim() // clean if (['int', 'float', 'money', 'currency', 'percent'].indexOf(this.type) !== -1) { if (typeof val === 'string') { @@ -849,12 +849,12 @@ class w2field extends w2event { } change(event) { - let obj = this + let obj = this let options = obj.options // numeric if (['int', 'float', 'money', 'currency', 'percent'].indexOf(this.type) !== -1) { // check max/min - let val = $(this.el).val() + let val = $(this.el).val() let new_val = this.format(this.clean($(this.el).val())) // if was modified if (val !== '' && val != new_val) { @@ -869,7 +869,7 @@ class w2field extends w2event { if (this.type === 'color') { let color = $(this.el).val() if (color.substr(0, 3).toLowerCase() !== 'rgb') { - color = '#' + color + color = '#' + color let len = $(this.el).val().length if (len !== 8 && len !== 6 && len !== 3) color = '' } @@ -930,7 +930,7 @@ class w2field extends w2event { obj.search() setTimeout(() => { obj.updateOverlay() }, 1) }, 1) - // regenerat items + // regenerate items if (typeof obj.options._items_fun == 'function') { obj.options.items = w2utils.normMenu.call(this, obj.options._items_fun) } @@ -942,9 +942,9 @@ class w2field extends w2event { } blur(event) { - let obj = this - let options = obj.options - let val = $(obj.el).val().trim() + let obj = this + let options = obj.options + let val = $(obj.el).val().trim() let $overlay = $('#w2ui-overlay') $(obj.el).removeClass('has-focus') @@ -1033,10 +1033,10 @@ class w2field extends w2event { } keyDown(event, extra) { - let obj = this + let obj = this let options = obj.options - let key = event.keyCode || (extra && extra.keyCode) - let cancel = false + let key = event.keyCode || (extra && extra.keyCode) + let cancel = false let val, inc, daymil, dt, newValue, newDT // numeric if (['int', 'float', 'money', 'currency', 'percent'].indexOf(obj.type) !== -1) { @@ -1070,7 +1070,7 @@ class w2field extends w2event { if (obj.type === 'date') { if (!options.keyboard || $(obj.el).prop('readonly') || $(obj.el).prop('disabled')) return daymil = 24*60*60*1000 - inc = 1 + inc = 1 if (event.ctrlKey || event.metaKey) inc = 10 dt = w2utils.isDate($(obj.el).val(), options.format, true) if (!dt) { dt = new Date(); daymil = 0 } @@ -1102,18 +1102,18 @@ class w2field extends w2event { // time if (obj.type === 'time') { if (!options.keyboard || $(obj.el).prop('readonly') || $(obj.el).prop('disabled')) return - inc = (event.ctrlKey || event.metaKey ? 60 : 1) - val = $(obj.el).val() + inc = (event.ctrlKey || event.metaKey ? 60 : 1) + val = $(obj.el).val() let time = obj.toMin(val) || obj.toMin((new Date()).getHours() + ':' + ((new Date()).getMinutes() - 1)) switch (key) { case 38: // up if (event.shiftKey) break // no action if shift key is pressed - time += inc + time += inc cancel = true break case 40: // down if (event.shiftKey) break // no action if shift key is pressed - time -= inc + time -= inc cancel = true break } @@ -1130,10 +1130,10 @@ class w2field extends w2event { if (obj.type === 'datetime') { if (!options.keyboard || $(obj.el).prop('readonly') || $(obj.el).prop('disabled')) return daymil = 24*60*60*1000 - inc = 1 + inc = 1 if (event.ctrlKey || event.metaKey) inc = 10 let str = $(obj.el).val() - dt = w2utils.isDateTime(str, this.options.format, true) + dt = w2utils.isDateTime(str, this.options.format, true) if (!dt) { dt = new Date(); daymil = 0 } switch (key) { case 38: // up @@ -1165,7 +1165,7 @@ class w2field extends w2event { if ($(obj.el).prop('readonly') || $(obj.el).prop('disabled')) return // paste if ((event.ctrlKey || event.metaKey) && !event.shiftKey) { - let dir = null + let dir = null let newColor = null switch (key) { case 38: // up @@ -1191,8 +1191,8 @@ class w2field extends w2event { // list/select/combo if (['list', 'combo', 'enum'].indexOf(obj.type) !== -1) { if ($(obj.el).prop('readonly') || $(obj.el).prop('disabled')) return - let selected = $(obj.el).data('selected') - let focus = $(obj.el) + let selected = $(obj.el).data('selected') + let focus = $(obj.el) let indexOnly = false if (['list', 'enum'].indexOf(obj.type) !== -1) { if (obj.type === 'list') { @@ -1247,7 +1247,7 @@ class w2field extends w2event { obj.trigger($.extend(edata, { phase: 'after' })) } else { // trigger event - item = { id: focus.val(), text: focus.val() } + item = { id: focus.val(), text: focus.val() } let edata = obj.trigger({ phase: 'before', type: 'new', target: obj.el, originalEvent: event.originalEvent, item: item }) if (edata.isCancelled === true) return item = edata.item // need to reassign because it could be recreated by user @@ -1351,7 +1351,7 @@ class w2field extends w2event { let obj = this if (['list', 'combo', 'enum'].indexOf(this.type) !== -1) { if ($(obj.el).prop('readonly') || $(obj.el).prop('disabled')) return - // need to be here for ipad compa + // need to be here for ipad compatibility if ([16, 17, 18, 20, 37, 39, 91].indexOf(event.keyCode) == -1) { // no refresh on crtl, shift, left/right arrows, etc let input = $(this.helpers.focus).find('input') if (input.length === 0) input = $(this.el) // for combo list @@ -1371,17 +1371,17 @@ class w2field extends w2event { } clearCache() { - let options = this.options - options.items = [] + let options = this.options + options.items = [] this.tmp.xhr_loading = false - this.tmp.xhr_search = '' - this.tmp.xhr_total = -1 + this.tmp.xhr_search = '' + this.tmp.xhr_total = -1 } request(interval) { - let obj = this + let obj = this let options = this.options - let search = $(obj.el).val() || '' + let search = $(obj.el).val() || '' // if no url - do nothing if (!options.url) return // -- @@ -1416,7 +1416,7 @@ class w2field extends w2event { clearTimeout(obj.tmp.timeout) obj.tmp.timeout = setTimeout(() => { // trigger event - let url = options.url + let url = options.url let postData = { search : search, max : options.cacheMax @@ -1424,8 +1424,8 @@ class w2field extends w2event { $.extend(postData, options.postData) let edata = obj.trigger({ phase: 'before', type: 'request', search: search, target: obj.el, url: url, postData: postData }) if (edata.isCancelled === true) return - url = edata.url - postData = edata.postData + url = edata.url + postData = edata.postData let ajaxOptions = { type : 'GET', url : url, @@ -1434,8 +1434,8 @@ class w2field extends w2event { } if (options.method) ajaxOptions.type = options.method if (w2utils.settings.dataType === 'JSON') { - ajaxOptions.type = 'POST' - ajaxOptions.data = JSON.stringify(ajaxOptions.data) + ajaxOptions.type = 'POST' + ajaxOptions.data = JSON.stringify(ajaxOptions.data) ajaxOptions.contentType = 'application/json' } if (w2utils.settings.dataType === 'HTTPJSON') { @@ -1474,10 +1474,10 @@ class w2field extends w2event { } // remember stats obj.tmp.xhr_loading = false - obj.tmp.xhr_search = search - obj.tmp.xhr_total = data.records.length - obj.tmp.lastError = '' - options.items = w2utils.normMenu(data.records) + obj.tmp.xhr_search = search + obj.tmp.xhr_total = data.records.length + obj.tmp.lastError = '' + options.items = w2utils.normMenu(data.records) if (search === '' && data.records.length === 0) obj.tmp.emptySet = true; else obj.tmp.emptySet = false // preset item let find_selected = $(obj.el).data('find_selected') @@ -1512,7 +1512,7 @@ class w2field extends w2event { .fail((xhr, status, error) => { // trigger event let errorObj = { status: status, error: error, rawResponseText: xhr.responseText } - let edata2 = obj.trigger({ phase: 'before', type: 'error', target: obj.el, search: search, error: errorObj, xhr: xhr }) + let edata2 = obj.trigger({ phase: 'before', type: 'error', target: obj.el, search: search, error: errorObj, xhr: xhr }) if (edata2.isCancelled === true) return // default behavior if (status !== 'abort') { @@ -1525,11 +1525,11 @@ class w2field extends w2event { } // reset stats obj.tmp.xhr_loading = false - obj.tmp.xhr_search = search - obj.tmp.xhr_total = 0 - obj.tmp.emptySet = true - obj.tmp.lastError = (edata2.error || 'Server communication failed') - options.items = [] + obj.tmp.xhr_search = search + obj.tmp.xhr_total = 0 + obj.tmp.emptySet = true + obj.tmp.lastError = (edata2.error || 'Server communication failed') + options.items = [] obj.clearCache() obj.search() obj.updateOverlay(false) @@ -1543,11 +1543,11 @@ class w2field extends w2event { } search() { - let obj = this - let options = this.options - let search = $(obj.el).val() - let target = obj.el - let ids = [] + let obj = this + let options = this.options + let search = $(obj.el).val() + let target = obj.el + let ids = [] let selected = $(obj.el).data('selected') if (obj.type === 'enum') { target = $(obj.helpers.multi).find('input') @@ -1603,7 +1603,7 @@ class w2field extends w2event { } updateOverlay(indexOnly) { - let obj = this + let obj = this let options = this.options let month, year, dt, params // color @@ -1643,8 +1643,8 @@ class w2field extends w2event { (function refreshCalendar(month, year) { if (!month && !year) { let dt = new Date() - month = dt.getMonth() - year = dt.getFullYear() + month = dt.getMonth() + year = dt.getFullYear() } $('#w2ui-overlay > div > div').html(obj.getMonthHTML(month, year, $(obj.el).val())) $('#w2ui-overlay .w2ui-calendar-title') @@ -1707,12 +1707,12 @@ class w2field extends w2event { }) $('#w2ui-overlay .previous').on('mousedown', function() { let tmp = obj.options.current.split('/') - tmp[0] = parseInt(tmp[0]) - 1 + tmp[0] = parseInt(tmp[0]) - 1 refreshCalendar(tmp[0], tmp[1]) }) $('#w2ui-overlay .next').on('mousedown', function() { let tmp = obj.options.current.split('/') - tmp[0] = parseInt(tmp[0]) + 1 + tmp[0] = parseInt(tmp[0]) + 1 refreshCalendar(tmp[0], tmp[1]) }) })(month, year) @@ -1869,12 +1869,12 @@ class w2field extends w2event { }) $('#w2ui-overlay .previous').on('mousedown', function() { let tmp = obj.options.current.split('/') - tmp[0] = parseInt(tmp[0]) - 1 + tmp[0] = parseInt(tmp[0]) - 1 refreshCalendar(tmp[0], tmp[1]) }) $('#w2ui-overlay .next').on('mousedown', function() { let tmp = obj.options.current.split('/') - tmp[0] = parseInt(tmp[0]) + 1 + tmp[0] = parseInt(tmp[0]) + 1 refreshCalendar(tmp[0], tmp[1]) }) // "now" button @@ -1894,10 +1894,10 @@ class w2field extends w2event { } // list if (['list', 'combo', 'enum'].indexOf(this.type) !== -1) { - let el = this.el + let el = this.el let input = this.el if (this.type === 'enum') { - el = $(this.helpers.multi) + el = $(this.helpers.multi) input = $(el).find('input') } if (this.type === 'list') { @@ -2008,10 +2008,10 @@ class w2field extends w2event { if (dt) { // enable range if (this.options.start || this.options.end) { - let st = (typeof this.options.start === 'string' ? this.options.start : $(this.options.start).val()) - let en = (typeof this.options.end === 'string' ? this.options.end : $(this.options.end).val()) - let start = w2utils.isDate(st, this.options.format, true) - let end = w2utils.isDate(en, this.options.format, true) + let st = (typeof this.options.start === 'string' ? this.options.start : $(this.options.start).val()) + let en = (typeof this.options.end === 'string' ? this.options.end : $(this.options.end).val()) + let start = w2utils.isDate(st, this.options.format, true) + let end = w2utils.isDate(en, this.options.format, true) let current = new Date(dt) if (!start) start = current if (!end) end = current @@ -2024,13 +2024,13 @@ class w2field extends w2event { /* clockWeekDay - type: array or integers. every element - number of week day. - number of weekday (1 - monday, 2 - tuesday, 3 - wensday, 4 - thursday, 5 - friday, 6 - saturday, 0 - sunday) + number of weekday (1 - monday, 2 - tuesday, 3 - wednesday, 4 - thursday, 5 - friday, 6 - saturday, 0 - sunday) for block in calendar (for example, block all sundays so user can't choose sunday in calendar) */ if (this.options.blockWeekDays !== null && this.options.blockWeekDays !== undefined && this.options.blockWeekDays.length != undefined){ let l = this.options.blockWeekDays.length - for (let i=0; i'+ '' $(obj.el).attr('tabindex', -1).before(html) - let helper = $(obj.el).prev() + let helper = $(obj.el).prev() obj.helpers.focus = helper helper.css({ width : $(obj.el).width(), @@ -2376,7 +2376,7 @@ class w2field extends w2event { // clean up & init $(obj.helpers.multi).remove() // build helper - let html = '' + let html = '' let margin = 'margin-top : 0px; ' + 'margin-bottom : 0px; ' + @@ -2420,9 +2420,9 @@ class w2field extends w2event { '' } // old bg and border - let tmp = $(obj.el).data('tmp') || {} + let tmp = $(obj.el).data('tmp') || {} tmp['old-background-color'] = $(obj.el).css('background-color') - tmp['old-border-color'] = $(obj.el).css('border-color') + tmp['old-border-color'] = $(obj.el).css('border-color') $(obj.el).data('tmp', tmp) $(obj.el) @@ -2432,7 +2432,7 @@ class w2field extends w2event { 'border-color' : 'transparent' }) - let div = $(obj.el).prev() + let div = $(obj.el).prev() obj.helpers.multi = div if (obj.type === 'enum') { $(obj.el).attr('tabindex', -1) @@ -2503,10 +2503,10 @@ class w2field extends w2event { } addFile(file) { - let obj = this - let options = this.options + let obj = this + let options = this.options let selected = $(obj.el).data('selected') - let newItem = { + let newItem = { name : file.name, type : file.type, modified : file.lastModifiedDate, @@ -2514,12 +2514,12 @@ class w2field extends w2event { content : null, file : file } - let size = 0 - let cnt = 0 + let size = 0 + let cnt = 0 let err if (selected) { for (let s = 0; s < selected.length; s++) { - // check for dups + // check for dupes if (selected[s].name == file.name && selected[s].size == file.size) return size += selected[s].size cnt++ @@ -2560,8 +2560,8 @@ class w2field extends w2event { // need a closure reader.onload = (function onload() { return function closure(event) { - let fl = event.target.result - let ind = fl.indexOf(',') + let fl = event.target.result + let ind = fl.indexOf(',') newItem.content = fl.substr(ind+1) obj.refresh() $(obj.el).trigger('input').trigger('change') @@ -2578,12 +2578,12 @@ class w2field extends w2event { } getMonthHTML(month, year, selected) { - let td = new Date() - let months = w2utils.settings.fullmonths + let td = new Date() + let months = w2utils.settings.fullmonths let daysCount = ['31', '28', '31', '30', '31', '30', '31', '31', '30', '31', '30', '31'] - let today = td.getFullYear() + '/' + (Number(td.getMonth()) + 1) + '/' + td.getDate() - let days = w2utils.settings.fulldays.slice() // creates copy of the array - let sdays = w2utils.settings.shortdays.slice() // creates copy of the array + let today = td.getFullYear() + '/' + (Number(td.getMonth()) + 1) + '/' + td.getDate() + let days = w2utils.settings.fulldays.slice() // creates copy of the array + let sdays = w2utils.settings.shortdays.slice() // creates copy of the array if (w2utils.settings.weekStarts !== 'M') { days.unshift(days.pop()) sdays.unshift(sdays.pop()) @@ -2591,7 +2591,7 @@ class w2field extends w2event { let options = this.options if (options == null) options = {} // normalize date - year = w2utils.isInt(year) ? parseInt(year) : td.getFullYear() + year = w2utils.isInt(year) ? parseInt(year) : td.getFullYear() month = w2utils.isInt(month) ? parseInt(month) : td.getMonth() + 1 if (month > 12) { month -= 12; year++ } if (month < 1 || month === 0) { month += 12; year-- } @@ -2599,8 +2599,8 @@ class w2field extends w2event { options.current = month + '/' + year // start with the required date - td = new Date(year, month-1, 1) - let weekDay = td.getDay() + td = new Date(year, month-1, 1) + let weekDay = td.getDay() let dayTitle = '' for (let i = 0; i < sdays.length; i++) dayTitle += '' @@ -2619,7 +2619,7 @@ class w2field extends w2event { if (w2utils.settings.weekStarts !== 'M') weekDay++ if(this.type === 'datetime') { let dt_sel = w2utils.isDateTime(selected, options.format, true) - selected = w2utils.formatDate(dt_sel, w2utils.settings.dateFormat) + selected = w2utils.formatDate(dt_sel, w2utils.settings.dateFormat) } for (let ci = 1; ci < 43; ci++) { if (weekDay === 0 && ci == 1) { @@ -2632,30 +2632,30 @@ class w2field extends w2event { continue } } - let dt = year + '/' + month + '/' + day - let DT = new Date(dt) + let dt = year + '/' + month + '/' + day + let DT = new Date(dt) let className = '' if (DT.getDay() === 6) className = ' w2ui-saturday' if (DT.getDay() === 0) className = ' w2ui-sunday' if (dt == today) className += ' w2ui-today' let dspDay = day - let col = '' - let bgcol = '' + let col = '' + let bgcol = '' let tmp_dt, tmp_dt_fmt if(this.type === 'datetime') { // var fm = options.format.split('|')[0].trim(); // tmp_dt = w2utils.formatDate(dt, fm); - tmp_dt = w2utils.formatDateTime(dt, options.format) + tmp_dt = w2utils.formatDateTime(dt, options.format) tmp_dt_fmt = w2utils.formatDate(dt, w2utils.settings.dateFormat) } else { - tmp_dt = w2utils.formatDate(dt, options.format) + tmp_dt = w2utils.formatDate(dt, options.format) tmp_dt_fmt = tmp_dt } if (options.colored && options.colored[tmp_dt_fmt] !== undefined) { // if there is predefined colors for dates let tmp = options.colored[tmp_dt_fmt].split(':') - bgcol = 'background-color: ' + tmp[0] + ';' - col = 'color: ' + tmp[1] + ';' + bgcol = 'background-color: ' + tmp[0] + ';' + col = 'color: ' + tmp[1] + ';' } html += '
'+ w2utils.lang('Name') +':'+ item.name +'
' + sdays[i] + ''+ @@ -2669,11 +2669,11 @@ class w2field extends w2event { } getYearHTML() { - let months = w2utils.settings.shortmonths + let months = w2utils.settings.shortmonths let start_year = w2utils.settings.dateStartYear - let end_year = w2utils.settings.dateEndYear - let mhtml = '' - let yhtml = '' + let end_year = w2utils.settings.dateEndYear + let mhtml = '' + let yhtml = '' for (let m = 0; m < months.length; m++) { mhtml += '
'+ months[m] + '
' } @@ -2684,7 +2684,7 @@ class w2field extends w2event { } getHourHTML() { - let tmp = [] + let tmp = [] let options = this.options if (options == null) options = { format: w2utils.settings.timeFormat } let h24 = (options.format.indexOf('h24') > -1) @@ -2697,8 +2697,8 @@ class w2field extends w2event { if (this.type === 'datetime') { let dt = w2utils.isDateTime(this.el.value, options.format, true) let fm = options.format.split('|')[0].trim() - tm1 = w2utils.formatDate(dt, fm) + ' ' + tm1 - tm2 = w2utils.formatDate(dt, fm) + ' ' + tm2 + tm1 = w2utils.formatDate(dt, fm) + ' ' + tm1 + tm2 = w2utils.formatDate(dt, fm) + ' ' + tm2 } tmp[Math.floor(a/8)] += '
'+ time +'
' } @@ -2722,13 +2722,13 @@ class w2field extends w2event { let tmp = [] for (let a = 0; a < 60; a += 5) { let time = (hour > 12 && !h24 ? hour - 12 : hour) + ':' + (a < 10 ? 0 : '') + a + ' ' + (!h24 ? (hour < 12 ? 'am' : 'pm') : '') - let tm = time - let ind = a < 20 ? 0 : (a < 40 ? 1 : 2) + let tm = time + let ind = a < 20 ? 0 : (a < 40 ? 1 : 2) if (!tmp[ind]) tmp[ind] = '' if (this.type === 'datetime') { let dt = w2utils.isDateTime(this.el.value, options.format, true) let fm = options.format.split('|')[0].trim() - tm = w2utils.formatDate(dt, fm) + ' ' + tm + tm = w2utils.formatDate(dt, fm) + ' ' + tm } tmp[ind] += '
'+ time +'
' } @@ -2761,8 +2761,8 @@ class w2field extends w2event { let ret = '' if (time >= 24 * 60) time = time % (24 * 60) if (time < 0) time = 24 * 60 + time - let hour = Math.floor(time/60) - let min = ((time % 60) < 10 ? '0' : '') + (time % 60) + let hour = Math.floor(time/60) + let min = ((time % 60) < 10 ? '0' : '') + (time % 60) let options = this.options if (options == null) options = { format: w2utils.settings.timeFormat } if (options.format.indexOf('h24') !== -1) { diff --git a/src/w2form.js b/src/w2form.js index 34759262b..0c74334f6 100644 --- a/src/w2form.js +++ b/src/w2form.js @@ -6,7 +6,7 @@ * - include delta on save * - form should read ' for (let s = -1; s < this.searches.length; s++) { - let search = this.searches[s] - let sField = (search ? search.field : null) - let column = this.getColumn(sField) + let search = this.searches[s] + let sField = (search ? search.field : null) + let column = this.getColumn(sField) let disable = false - let msg = 'This column is hidden' + let msg = 'This column is hidden' if (this.show.searchHiddenMsg == true && s != -1 && (column == null || (column.hidden === true && column.hideable !== false))) { disable = true if (column == null) { @@ -2334,7 +2334,7 @@ class w2grid extends w2event { el.w2field(st, $.extend({}, search.options, { suffix: '', autoFormat: false, selected: value })) if (['list', 'enum', 'date', 'time', 'datetime'].indexOf(search.type) != -1) { this.last.search = '' - this.last.item = '' + this.last.item = '' el.val('') $('#grid_'+ this.name +'_searchClear').hide() } @@ -2353,11 +2353,11 @@ class w2grid extends w2event { // clears records and related params clear(noRefresh) { - this.total = 0 - this.records = [] - this.summary = [] + this.total = 0 + this.records = [] + this.summary = [] this.last.xhr_offset = 0 // need this for reload button to work on remote data set - this.last.idCache = {} // optimization to free memory + this.last.idCache = {} // optimization to free memory this.reset(true) // refresh if (!noRefresh) this.refresh() @@ -2366,11 +2366,11 @@ class w2grid extends w2event { // clears scroll position, selection, ranges reset(noRefresh) { // position - this.last.scrollTop = 0 - this.last.scrollLeft = 0 - this.last.selection = { indexes: [], columns: {} } + this.last.scrollTop = 0 + this.last.scrollLeft = 0 + this.last.selection = { indexes: [], columns: {} } this.last.range_start = null - this.last.range_end = null + this.last.range_end = null // additional $('#grid_'+ this.name +'_records').prop('scrollTop', 0) // refresh @@ -2402,7 +2402,7 @@ class w2grid extends w2event { reload(callBack) { let grid = this - let url = (typeof this.url != 'object' ? this.url : this.url.get) + let url = (typeof this.url != 'object' ? this.url : this.url.get) grid.selectionSave() if (url) { // need to remember selection (not just last.selection object) @@ -2514,28 +2514,28 @@ class w2grid extends w2event { ajaxOptions.type = 'GET' if (cmd == 'save') ajaxOptions.type = 'PUT' // so far it is always update if (cmd == 'delete') ajaxOptions.type = 'DELETE' - ajaxOptions.data = JSON.stringify(ajaxOptions.data) + ajaxOptions.data = JSON.stringify(ajaxOptions.data) ajaxOptions.contentType = 'application/json' break case 'JSON': - ajaxOptions.type = 'POST' - ajaxOptions.data = JSON.stringify(ajaxOptions.data) + ajaxOptions.type = 'POST' + ajaxOptions.data = JSON.stringify(ajaxOptions.data) ajaxOptions.contentType = 'application/json' break } if (this.method) ajaxOptions.type = this.method - this.last.xhr_cmd = cmd + this.last.xhr_cmd = cmd this.last.xhr_start = (new Date()).getTime() - this.last.loaded = false - this.last.xhr = $.ajax(ajaxOptions) + this.last.loaded = false + this.last.xhr = $.ajax(ajaxOptions) .done((data, status, xhr) => { this.requestComplete(status, xhr, cmd, callBack) }) .fail((xhr, status, error) => { // trigger event let errorObj = { status: status, error: error, rawResponseText: xhr.responseText } - let edata2 = this.trigger({ phase: 'before', type: 'error', error: errorObj, xhr: xhr }) + let edata2 = this.trigger({ phase: 'before', type: 'error', error: errorObj, xhr: xhr }) if (edata2.isCancelled === true) return // default behavior if (status != 'abort') { // it can be aborted by the grid itself @@ -2564,7 +2564,7 @@ class w2grid extends w2event { this.status(w2utils.lang('Server Response XX sec').replace('XX', this.last.xhr_response)) } }, 10) - this.last.pull_more = false + this.last.pull_more = false this.last.pull_refresh = true // event before @@ -2622,14 +2622,14 @@ class w2grid extends w2event { data.records = [] } if (data.records.length == this.limit) { - let loaded = this.records.length + data.records.length + let loaded = this.records.length + data.records.length this.last.xhr_hasMore = (loaded == this.total ? false : true) } else { this.last.xhr_hasMore = false - this.total = this.offset + this.last.xhr_offset + data.records.length + this.total = this.offset + this.last.xhr_offset + data.records.length } if (!this.last.xhr_hasMore) { - // if no morerecords, then hide spinner + // if no more records, then hide spinner $('#grid_'+ this.name +'_rec_more, #grid_'+ this.name +'_frec_more').hide() } if (this.last.xhr_offset === 0) { @@ -2688,7 +2688,7 @@ class w2grid extends w2event { this.resize() } // call back - if (typeof callBack == 'function') callBack(data) // need to be befor event:after + if (typeof callBack == 'function') callBack(data) // need to be before event:after // after event this.trigger($.extend(edata, { phase: 'after' })) this.last.loaded = true @@ -2716,7 +2716,7 @@ class w2grid extends w2event { let rec = recordsBase[r] if (rec.w2ui) { if (rec.w2ui.changes != null) { - let obj = {} + let obj = {} obj[this.recid || 'recid'] = rec.recid changes.push($.extend(true, obj, rec.w2ui.changes)) } @@ -2764,7 +2764,7 @@ class w2grid extends w2event { save(callBack) { let changes = this.getChanges() - let url = (typeof this.url != 'object' ? this.url : this.url.save) + let url = (typeof this.url != 'object' ? this.url : this.url.save) // event before let edata = this.trigger({ phase: 'before', target: this.name, type: 'save', changes: changes }) if (edata.isCancelled === true) { @@ -2795,9 +2795,9 @@ class w2grid extends w2event { let obj = this, index if (this.last.inEditMode === true) { // already editing if (event.keyCode == 13) { - index = this.last._edit.index + index = this.last._edit.index column = this.last._edit.column - recid = this.last._edit.recid + recid = this.last._edit.recid this.editChange({ type: 'custom', value: this.last._edit.value }, this.get(recid, true), column, event) let next = event.shiftKey ? this.prevRow(index, column) : this.nextRow(index, column) if (next != null && next != index) { @@ -2821,11 +2821,11 @@ class w2grid extends w2event { } return } - index = this.get(recid, true) + index = this.get(recid, true) let edit = this.getCellEditable(index, column) if (!edit) return - let rec = this.records[index] - let col = this.columns[column] + let rec = this.records[index] + let col = this.columns[column] let prefix = (col.frozen === true ? '_f' : '_') if (['enum', 'file'].indexOf(edit.type) != -1) { console.log('ERROR: input types "enum" and "file" are not supported in inline editing.') @@ -2838,7 +2838,7 @@ class w2grid extends w2event { value = edata.value // default behaviour this.last.inEditMode = true - this.last._edit = { value: value, index: index, column: column, recid: recid } + this.last._edit = { value: value, index: index, column: column, recid: recid } this.selectNone() this.select({ recid: recid, column: column }) if (['checkbox', 'check'].indexOf(edit.type) != -1) return @@ -2983,7 +2983,7 @@ class w2grid extends w2event { document.execCommand('insertHTML', false, text) }) .on('keydown', function(event) { - let el = this + let el = this let val = (el.tagName.toUpperCase() == 'DIV' ? $(el).text() : $(el).val()) switch (event.keyCode) { case 8: // backspace; @@ -3105,8 +3105,8 @@ class w2grid extends w2event { function expand(event) { try { - let val = (this.tagName.toUpperCase() == 'DIV' ? $(this).text() : this.value) - let $sel = $('#grid_'+ obj.name + '_editable') + let val = (this.tagName.toUpperCase() == 'DIV' ? $(this).text() : this.value) + let $sel = $('#grid_'+ obj.name + '_editable') let style = 'font-family: '+ $(this).css('font-family') + '; font-size: '+ $(this).css('font-size') + '; white-space: pre;' let width = w2utils.getStrWidth(val, style) if (width + 20 > $sel.width()) { @@ -3125,14 +3125,14 @@ class w2grid extends w2event { }, 10) // all other fields let summary = index < 0 - index = index < 0 ? -index - 1 : index + index = index < 0 ? -index - 1 : index let records = summary ? this.summary : this.records - let rec = records[index] - let col = this.columns[column] - let tr = $('#grid_'+ this.name + (col.frozen === true ? '_frec_' : '_rec_') + w2utils.escapeId(rec.recid)) + let rec = records[index] + let col = this.columns[column] + let tr = $('#grid_'+ this.name + (col.frozen === true ? '_frec_' : '_rec_') + w2utils.escapeId(rec.recid)) let new_val = (el.tagName && el.tagName.toUpperCase() == 'DIV' ? $(el).text() : el.value) let old_val = this.parseField(rec, col.field) - let tmp = $(el).data('w2field') + let tmp = $(el).data('w2field') if (tmp) { if (tmp.type == 'list') new_val = $(el).data('selected') if ($.isEmptyObject(new_val) || new_val == null) new_val = '' @@ -3164,8 +3164,8 @@ class w2grid extends w2event { continue } // default action - rec.w2ui = rec.w2ui || {} - rec.w2ui.changes = rec.w2ui.changes || {} + rec.w2ui = rec.w2ui || {} + rec.w2ui.changes = rec.w2ui.changes || {} rec.w2ui.changes[col.field] = edata.value_new // event after this.trigger($.extend(edata, { phase: 'after' })) @@ -3283,12 +3283,12 @@ class w2grid extends w2event { } click(recid, event) { - let time = (new Date()).getTime() + let time = (new Date()).getTime() let column = null if (this.last.cancelClick == true || (event && event.altKey)) return if ((typeof recid == 'object') && (recid !== null)) { column = recid.column - recid = recid.recid + recid = recid.recid } if (event == null) event = {} // check for double click @@ -3301,8 +3301,8 @@ class w2grid extends w2event { $(this.last.bubbleEl).w2tag() this.last.bubbleEl = null } - this.last.click_time = time - let last_recid = this.last.click_recid + this.last.click_time = time + let last_recid = this.last.click_recid this.last.click_recid = recid // column user clicked on if (column == null && event.target) { @@ -3316,18 +3316,18 @@ class w2grid extends w2event { // default action let sel = this.getSelection() $('#grid_'+ this.name +'_check_all').prop('checked', false) - let ind = this.get(recid, true) - let selectColumns = [] - this.last.sel_ind = ind - this.last.sel_col = column + let ind = this.get(recid, true) + let selectColumns = [] + this.last.sel_ind = ind + this.last.sel_col = column this.last.sel_recid = recid - this.last.sel_type = 'click' - // multi select with shif key + this.last.sel_type = 'click' + // multi select with shift key let start, end, t1, t2 if (event.shiftKey && sel.length > 0 && this.multiSelect) { if (sel[0].recid) { start = this.get(sel[0].recid, true) - end = this.get(recid, true) + end = this.get(recid, true) if (column > sel[0].column) { t1 = sel[0].column t2 = column @@ -3338,7 +3338,7 @@ class w2grid extends w2event { for (let c = t1; c <= t2; c++) selectColumns.push(c) } else { start = this.get(last_recid, true) - end = this.get(recid, true) + end = this.get(recid, true) } let sel_add = [] if (start > end) { let tmp = start; start = end; end = tmp } @@ -3356,8 +3356,8 @@ class w2grid extends w2event { } this.select(sel_add) } else { - let last = this.last.selection - let flag = (last.indexes.indexOf(ind) != -1 ? true : false) + let last = this.last.selection + let flag = (last.indexes.indexOf(ind) != -1 ? true : false) let fselect = false // if clicked on the checkbox if ($(event.target).parents('td').hasClass('w2ui-col-select')) fselect = true @@ -3421,19 +3421,19 @@ class w2grid extends w2event { if (!event.shiftKey && !event.metaKey && !event.ctrlKey) { this.selectNone() } - let tmp = this.getSelection() + let tmp = this.getSelection() let column = this.getColumn(edata.field, true) - let sel = [] - let cols = [] + let sel = [] + let cols = [] // check if there was a selection before if (tmp.length != 0 && event.shiftKey) { let start = column - let end = tmp[0].column + let end = tmp[0].column if (start > end) { start = tmp[0].column - end = column + end = column } - for (let i=start; i<=end; i++) cols.push(i) + for (let i = start; i<=end; i++) cols.push(i) } else { cols.push(column) } @@ -3500,17 +3500,17 @@ class w2grid extends w2event { if (event.keyCode == 27) this.message() return } - let empty = false + let empty = false let records = $('#grid_'+ obj.name +'_records') - let sel = obj.getSelection() + let sel = obj.getSelection() if (sel.length === 0) empty = true - let recid = sel[0] || null + let recid = sel[0] || null let columns = [] - let recid2 = sel[sel.length-1] + let recid2 = sel[sel.length-1] if (typeof recid == 'object' && recid != null) { - recid = sel[0].recid + recid = sel[0].recid columns = [] - let ii = 0 + let ii = 0 while (true) { if (!sel[ii] || sel[ii].recid != recid) break columns.push(sel[ii].column) @@ -3518,11 +3518,11 @@ class w2grid extends w2event { } recid2 = sel[sel.length-1].recid } - let ind = obj.get(recid, true) - let ind2 = obj.get(recid2, true) - let recEL = $('#grid_'+ obj.name +'_rec_'+ (ind != null ? w2utils.escapeId(obj.records[ind].recid) : 'none')) - let cancel = false - let key = event.keyCode + let ind = obj.get(recid, true) + let ind2 = obj.get(recid2, true) + let recEL = $('#grid_'+ obj.name +'_rec_'+ (ind != null ? w2utils.escapeId(obj.records[ind].recid) : 'none')) + let cancel = false + let key = event.keyCode let shiftKey = event.shiftKey switch (key) { @@ -3594,9 +3594,9 @@ class w2grid extends w2event { if (prev != null) { if (shiftKey && obj.multiSelect) { if (tmpUnselect()) return - let tmp = [] + let tmp = [] let newSel = [] - let unSel = [] + let unSel = [] if (columns.indexOf(this.last.sel_col) === 0 && columns.length > 1) { for (let i = 0; i < sel.length; i++) { if (tmp.indexOf(sel[i].recid) == -1) tmp.push(sel[i].recid) @@ -3648,9 +3648,9 @@ class w2grid extends w2event { if (next != null) { if (shiftKey && key == 39 && obj.multiSelect) { if (tmpUnselect()) return - let tmp = [] + let tmp = [] let newSel = [] - let unSel = [] + let unSel = [] if (columns.indexOf(this.last.sel_col) == columns.length-1 && columns.length > 1) { for (let i = 0; i < sel.length; i++) { if (tmp.indexOf(sel[i].recid) == -1) tmp.push(sel[i].recid) @@ -3708,7 +3708,7 @@ class w2grid extends w2event { } } else { if (obj.last.sel_ind > prev && obj.last.sel_ind != ind2) { - prev = ind2 + prev = ind2 let tmp = [] for (let c = 0; c < columns.length; c++) tmp.push({ recid: obj.records[prev].recid, column: columns[c] }) obj.unselect(tmp) @@ -3759,7 +3759,7 @@ class w2grid extends w2event { } } else { if (this.last.sel_ind < next && this.last.sel_ind != ind) { - next = ind + next = ind let tmp = [] for (let c = 0; c < columns.length; c++) tmp.push({ recid: obj.records[next].recid, column: columns[c] }) obj.unselect(tmp) @@ -3826,15 +3826,15 @@ class w2grid extends w2event { } break } - let tmp = [32, 187, 189, 192, 219, 220, 221, 186, 222, 188, 190, 191] // other typable chars - for (let i=48; i<=111; i++) tmp.push(i) // 0-9,a-z,A-Z,numpad + let tmp = [32, 187, 189, 192, 219, 220, 221, 186, 222, 188, 190, 191] // other typeable chars + for (let i = 48; i<=111; i++) tmp.push(i) // 0-9,a-z,A-Z,numpad if (tmp.indexOf(key) != -1 && !event.ctrlKey && !event.metaKey && !cancel) { if (columns.length === 0) columns.push(0) cancel = false // move typed key into edit setTimeout(() => { let focus = $('#grid_'+ obj.name + '_focus') - let key = focus.val() + let key = focus.val() focus.val('') obj.editField(recid, columns[0], key, event) }, 1) @@ -3886,7 +3886,7 @@ class w2grid extends w2event { let sel = this.getSelection() if (sel.length === 0) return if ($.isPlainObject(sel[0])) { - ind = sel[0].index + ind = sel[0].index column = sel[0].column } else { ind = this.get(sel[0], true) @@ -3936,7 +3936,7 @@ class w2grid extends w2event { for (let i = 0; i <= column; i++) { let col = this.columns[i] if (col.frozen || col.hidden) continue - x1 = x2 + x1 = x2 x2 += parseInt(col.sizeCalculated) } if (records.width() < x2 - records.scrollLeft()) { // right @@ -3960,7 +3960,7 @@ class w2grid extends w2event { let column = null if ((typeof recid == 'object') && (recid !== null)) { column = recid.column - recid = recid.recid + recid = recid.recid } if (event == null) event = {} // column user clicked on @@ -3970,7 +3970,7 @@ class w2grid extends w2event { column = parseInt($(tmp).attr('col')) } let index = this.get(recid, true) - let rec = this.records[index] + let rec = this.records[index] // event before let edata = this.trigger({ phase: 'before', target: this.name, type: 'dblClick', recid: recid, column: column, originalEvent: event }) if (edata.isCancelled === true) return @@ -4002,9 +4002,9 @@ class w2grid extends w2event { let $tmp = $(event.target) if ($tmp[0].tagName.toUpperCase() != 'TD') $tmp = $(event.target).parents('td') let selected = false - column = $tmp.attr('col') + column = $tmp.attr('col') // check if any selected sel in the right row/column - for (let i=0; i { - child.w2ui = child.w2ui || {} + child.w2ui = child.w2ui || {} child.w2ui.parent_recid = rec.recid if (child.w2ui.children == null) child.w2ui.children = [] }) this.records.splice.apply(this.records, [ind + 1, 0].concat(children)) this.total += children.length - let url = (typeof this.url != 'object' ? this.url : this.url.get) + let url = (typeof this.url != 'object' ? this.url : this.url.get) if (!url) { this.localSort(true, true) if (this.searchData.length > 0) { @@ -4107,8 +4107,8 @@ class w2grid extends w2event { return false } // expand column - let row1 = $(this.box).find('#grid_'+ this.name +'_rec_'+ recid +'_expanded') - let row2 = $(this.box).find('#grid_'+ this.name +'_frec_'+ recid +'_expanded') + let row1 = $(this.box).find('#grid_'+ this.name +'_rec_'+ recid +'_expanded') + let row2 = $(this.box).find('#grid_'+ this.name +'_frec_'+ recid +'_expanded') let innerHeight = row1.find('> div:first-child').height() if (row1.height() < innerHeight) { row1.css({ height: innerHeight + 'px' }) @@ -4130,10 +4130,10 @@ class w2grid extends w2event { } collapse(recid) { - let ind = this.get(recid, true) - let rec = this.records[ind] - rec.w2ui = rec.w2ui || {} - let id = w2utils.escapeId(recid) + let ind = this.get(recid, true) + let rec = this.records[ind] + rec.w2ui = rec.w2ui || {} + let id = w2utils.escapeId(recid) let children = rec.w2ui.children let edata if (Array.isArray(children)) { @@ -4146,7 +4146,7 @@ class w2grid extends w2event { stops.push(r.w2ui.parent_recid) // stops contains 'undefined' plus the ID of all nodes in the path from 'rec' to the tree root let start = ind + 1 - let end = start + let end = start while (true) { if (this.records.length <= end + 1 || this.records[end+1].w2ui == null || stops.indexOf(this.records[end+1].w2ui.parent_recid) >= 0) { @@ -4156,7 +4156,7 @@ class w2grid extends w2event { } this.records.splice(start, end - start + 1) this.total -= end - start + 1 - let url = (typeof this.url != 'object' ? this.url : this.url.get) + let url = (typeof this.url != 'object' ? this.url : this.url.get) if (!url) { if (this.searchData.length > 0) { this.localSearch(true) @@ -4227,7 +4227,7 @@ class w2grid extends w2event { if (multiField != true) { this.sortData = []; sortIndex = 0 } // set new sort if (this.sortData[sortIndex] == null) this.sortData[sortIndex] = {} - this.sortData[sortIndex].field = field + this.sortData[sortIndex].field = field this.sortData[sortIndex].direction = direction } else { this.sortData = [] @@ -4265,7 +4265,7 @@ class w2grid extends w2event { // find min/max column let minCol = sel[0].column let maxCol = sel[0].column - let recs = [] + let recs = [] for (let s = 0; s < sel.length; s++) { if (sel[s].column < minCol) minCol = sel[s].column if (sel[s].column > maxCol) maxCol = sel[s].column @@ -4279,7 +4279,7 @@ class w2grid extends w2event { if (col.hidden === true) continue text += this.getCellCopy(ind, c) + '\t' } - text = text.substr(0, text.length-1) // remove last \t + text = text.substr(0, text.length-1) // remove last \t text += '\n' } } else { // row copy @@ -4291,7 +4291,7 @@ class w2grid extends w2event { if (col.text && col.text.length < 3 && col.tooltip) colName = col.tooltip // if column name is less then 3 char and there is tooltip - use it text += '"' + w2utils.stripTags(colName) + '"\t' } - text = text.substr(0, text.length-1) // remove last \t + text = text.substr(0, text.length-1) // remove last \t text += '\n' // copy selected text for (let s = 0; s < sel.length; s++) { @@ -4301,7 +4301,7 @@ class w2grid extends w2event { if (col.hidden === true) continue text += '"' + this.getCellCopy(ind, c) + '"\t' } - text = text.substr(0, text.length-1) // remove last \t + text = text.substr(0, text.length-1) // remove last \t text += '\n' } } @@ -4354,11 +4354,11 @@ class w2grid extends w2event { return } let newSel = [] - text = text.split('\n') + text = text.split('\n') for (let t = 0; t < text.length; t++) { - let tmp = text[t].split('\t') - let cnt = 0 - let rec = this.records[ind] + let tmp = text[t].split('\t') + let cnt = 0 + let rec = this.records[ind] let cols = [] if (rec == null) continue for (let dt = 0; dt < tmp.length; dt++) { @@ -4384,9 +4384,9 @@ class w2grid extends w2event { * @param paste sub part of the pasted text */ setCellPaste(rec, col_ind, paste) { - let field = this.columns[col_ind].field - rec.w2ui = rec.w2ui || {} - rec.w2ui.changes = rec.w2ui.changes || {} + let field = this.columns[col_ind].field + rec.w2ui = rec.w2ui || {} + rec.w2ui.changes = rec.w2ui.changes || {} rec.w2ui.changes[field] = paste } @@ -4422,7 +4422,7 @@ class w2grid extends w2event { let rec = this.records[index] || {} if (!rec.w2ui) rec.w2ui = {} for (let column = 0; column < this.columns.length; column++) { - let row = $(this.box).find('#grid_'+ this.name +'_rec_'+ w2utils.escapeId(rec.recid)) + let row = $(this.box).find('#grid_'+ this.name +'_rec_'+ w2utils.escapeId(rec.recid)) let cell = $(this.box).find('#grid_'+ this.name + '_data_'+ index +'_'+ column) cell.replaceWith(this.getCellHTML(index, column, false)) cell = $(this.box).find('#grid_'+ this.name + '_data_'+ index +'_'+ column) // need to reselect as it was replaced @@ -4452,15 +4452,15 @@ class w2grid extends w2event { } else { for (let i = 0; i < cells.length; i++) { - let index = cells[i].index + let index = cells[i].index let column = cells[i].column if (index < 0) continue if (index == null || column == null) { console.log('ERROR: Wrong argument for grid.update(cells), cells should be [{ index: X, column: Y }, ...]') continue } - let rec = this.records[index] || {} - let row = $(this.box).find('#grid_'+ this.name +'_rec_'+ w2utils.escapeId(rec.recid)) + let rec = this.records[index] || {} + let row = $(this.box).find('#grid_'+ this.name +'_rec_'+ w2utils.escapeId(rec.recid)) let cell = $(this.box).find('#grid_'+ this.name + '_data_'+ index +'_'+ column) if (!rec.w2ui) rec.w2ui = {} cell.replaceWith(this.getCellHTML(index, column, false)) @@ -4491,10 +4491,10 @@ class w2grid extends w2event { } refreshCell(recid, field) { - let index = this.get(recid, true) - let col_ind = this.getColumn(field, true) + let index = this.get(recid, true) + let col_ind = this.getColumn(field, true) let isSummary = (this.records[index] && this.records[index].recid == recid ? false : true) - let cell = $(this.box).find((isSummary ? '.w2ui-grid-summary ' : '') + '#grid_'+ this.name + '_data_'+ index +'_'+ col_ind) + let cell = $(this.box).find((isSummary ? '.w2ui-grid-summary ' : '') + '#grid_'+ this.name + '_data_'+ index +'_'+ col_ind) if (cell.length == 0) return false // set cell html and changed flag cell.replaceWith(this.getCellHTML(index, col_ind, isSummary)) @@ -4505,7 +4505,7 @@ class w2grid extends w2event { let tr2 = $(this.box).find('#grid_'+ this.name +'_rec_'+ w2utils.escapeId(recid)) if (tr1.length > 0) { if (ind == null) ind = this.get(recid, true) - let line = tr1.attr('line') + let line = tr1.attr('line') let isSummary = (this.records[ind] && this.records[ind].recid == recid ? false : true) // if it is searched, find index in search array let url = (typeof this.url != 'object' ? this.url : this.url.get) @@ -4534,7 +4534,7 @@ class w2grid extends w2event { refresh() { let time = (new Date()).getTime() - let url = (typeof this.url != 'object' ? this.url : this.url.get) + let url = (typeof this.url != 'object' ? this.url : this.url.get) if (this.total <= 0 && !url && this.searchData.length === 0) { this.total = this.records.length } @@ -4551,7 +4551,7 @@ class w2grid extends w2event { } // -- toolbar if (this.show.toolbar) { - // if select-collumn is checked - no toolbar refresh + // if select-column is checked - no toolbar refresh if (this.toolbar && this.toolbar.get('w2ui-column-on-off') && this.toolbar.get('w2ui-column-on-off').checked) { // no action } else { @@ -4637,7 +4637,7 @@ class w2grid extends w2event { let search = [] for (let s = 0; s < this.searchData.length; s++) { let sdata = this.searchData[s] - let fld = this.getSearch(sdata.field) + let fld = this.getSearch(sdata.field) if (!fld || fld.hidden) continue let ind = this.getColumn(sdata.field, true) search.push({ field: sdata.field, search: sdata.value, col: ind }) @@ -4680,9 +4680,9 @@ class w2grid extends w2event { } // -- body - this.scroll() // need to calculate virtual scolling for columns - let recHTML = this.getRecordsHTML() - let colHTML = this.getColumnsHTML() + this.scroll() // need to calculate virtual scrolling for columns + let recHTML = this.getRecordsHTML() + let colHTML = this.getColumnsHTML() let bodyHTML = '
'+ recHTML[0] + @@ -4702,7 +4702,7 @@ class w2grid extends w2event { let gridBody = $('#grid_'+ this.name +'_body', this.box).html(bodyHTML), records = $('#grid_'+ this.name +'_records', this.box) let frecords = $('#grid_'+ this.name +'_frecords', this.box) - let self = this + let self = this if (this.selectType == 'row') { records .on('mouseover mouseout', 'tr', function(event) { @@ -4745,7 +4745,7 @@ class w2grid extends w2event { scrolldata.lastDelta = 0 } - scrolldata.lastTime = scrolldata.time + scrolldata.lastTime = scrolldata.time scrolldata.lastDelta += amount if (Math.abs(scrolldata.lastDelta) < 1) { @@ -4778,7 +4778,7 @@ class w2grid extends w2event { } render(box) { - let obj = this + let obj = this let time = (new Date()).getTime() if (box != null) { if ($(this.box).find('#grid_'+ this.name +'_body').length > 0) { @@ -4834,7 +4834,7 @@ class w2grid extends w2event { // init toolbar this.initToolbar() if (this.toolbar != null) this.toolbar.render($('#grid_'+ this.name +'_toolbar')[0]) - // reinit search_all + // re-init search_all if (this.last.field && this.last.field != 'all') { let sd = this.searchData setTimeout(() => { this.initAllField(this.last.field, (sd.length == 1 ? sd[0].value : null)) }, 1) @@ -4920,11 +4920,11 @@ class w2grid extends w2event { if (event.altKey) { $(obj.box).find('.w2ui-grid-body').css(w2utils.cssPrefix('user-select', 'text')) obj.selectNone() - obj.last.move = { type: 'text-select' } + obj.last.move = { type: 'text-select' } obj.last.userSelect = 'text' } else { - let tmp = event.target - let pos = { + let tmp = event.target + let pos = { x: event.offsetX - 10, y: event.offsetY - 10 } @@ -4958,14 +4958,14 @@ class w2grid extends w2event { let $input = $(obj.box).find('#grid_'+ obj.name + '_focus') // move input next to cursor so screen does not jump if (obj.last.move) { - let sLeft = obj.last.move.focusX - let sTop = obj.last.move.focusY + let sLeft = obj.last.move.focusX + let sTop = obj.last.move.focusY let $owner = $(target).parents('table').parent() if ($owner.hasClass('w2ui-grid-records') || $owner.hasClass('w2ui-grid-frecords') || $owner.hasClass('w2ui-grid-columns') || $owner.hasClass('w2ui-grid-fcolumns') || $owner.hasClass('w2ui-grid-summary')) { sLeft = obj.last.move.focusX - $(obj.box).find('#grid_'+ obj.name +'_records').scrollLeft() - sTop = obj.last.move.focusY - $(obj.box).find('#grid_'+ obj.name +'_records').scrollTop() + sTop = obj.last.move.focusY - $(obj.box).find('#grid_'+ obj.name +'_records').scrollTop() } if ($(target).hasClass('w2ui-grid-footer') || $(target).parents('div.w2ui-grid-footer').length > 0) { sTop = $(obj.box).find('#grid_'+ obj.name +'_footer').position().top @@ -4998,7 +4998,7 @@ class w2grid extends w2event { if ($(el).hasClass('w2ui-col-number') || $(el).hasClass('w2ui-col-order')) { obj.selectNone() obj.last.move.reorder = true - // supress hover + // suppress hover let eColor = $(obj.box).find('.w2ui-even.w2ui-empty-record').css('background-color') let oColor = $(obj.box).find('.w2ui-odd.w2ui-empty-record').css('background-color') $(obj.box).find('.w2ui-even td').not('.w2ui-col-number').css('background-color', eColor) @@ -5006,12 +5006,12 @@ class w2grid extends w2event { // display empty record and ghost record let mv = obj.last.move if (!mv.ghost) { - let row = $('#grid_'+ obj.name + '_rec_'+ mv.recid) - let tmp = row.parents('table').find('tr:first-child').clone() + let row = $('#grid_'+ obj.name + '_rec_'+ mv.recid) + let tmp = row.parents('table').find('tr:first-child').clone() mv.offsetY = event.offsetY - mv.from = mv.recid - mv.pos = row.position() - mv.ghost = $(row).clone(true) + mv.from = mv.recid + mv.pos = row.position() + mv.ghost = $(row).clone(true) mv.ghost.removeAttr('id') row.find('td').remove() row.append('
') @@ -5021,7 +5021,7 @@ class w2grid extends w2event { $('#grid_'+ obj.name + '_ghost').append(tmp).append(mv.ghost) } let ghost = $('#grid_'+ obj.name + '_ghost') - let recs = $(obj.box).find('.w2ui-grid-records') + let recs = $(obj.box).find('.w2ui-grid-records') ghost.css({ top : mv.pos.top + recs.scrollTop(), left : mv.pos.left, @@ -5047,8 +5047,8 @@ class w2grid extends w2event { if (Math.abs(mv.divX) <= 1 && Math.abs(mv.divY) <= 1) return // only if moved more then 1px obj.last.cancelClick = true if (obj.reorderRows == true && obj.last.move.reorder) { - let recs = $(obj.box).find('.w2ui-grid-records') - let tmp = $(event.target).parents('tr') + let recs = $(obj.box).find('.w2ui-grid-records') + let tmp = $(event.target).parents('tr') let recid = tmp.attr('recid') if (recid == '-none-') recid = 'bottom' if (recid != mv.from) { @@ -5059,9 +5059,9 @@ class w2grid extends w2event { // MOVABLE GHOST // if (event.screenY - mv.lastY < 0) row1.after(row2); else row2.after(row1); mv.lastY = event.screenY - mv.to = recid + mv.to = recid // line to insert before - let pos = row2.position() + let pos = row2.position() let ghost_line = $('#grid_'+ obj.name + '_ghost_line') if (pos) { ghost_line.css({ @@ -5086,8 +5086,8 @@ class w2grid extends w2event { obj.selectNone() mv.start = false } - let newSel= [] - let recid = (event.target.tagName.toUpperCase() == 'TR' ? $(event.target).attr('recid') : $(event.target).parents('tr').attr('recid')) + let newSel = [] + let recid = (event.target.tagName.toUpperCase() == 'TR' ? $(event.target).attr('recid') : $(event.target).parents('tr').attr('recid')) if (recid == null) { // select by dragging columns if (obj.selectType == 'row') return @@ -5105,7 +5105,7 @@ class w2grid extends w2event { if (mv.column > col) newRange = col + '-' + mv.column // array of selected columns let cols = [] - let tmp = newRange.split('-') + let tmp = newRange.split('-') for (let ii = parseInt(tmp[0]); ii <= parseInt(tmp[1]); ii++) { cols.push(ii) } @@ -5302,7 +5302,7 @@ class w2grid extends w2event { '' } let url = (typeof this.url != 'object' ? this.url : this.url.get) - // devider + // divider if ((url && this.show.skipRecords) || this.show.saveRestoreState) { col_html += '' } @@ -5329,7 +5329,7 @@ class w2grid extends w2event { '
'+ w2utils.lang('Restore Default State') + '
'+ '' } - col_html += '
' + col_html += '
' this.toolbar.get('w2ui-column-on-off').html = col_html } @@ -5342,7 +5342,7 @@ class w2grid extends w2event { //throw error if using column groups if (this.columnGroups && this.columnGroups.length) throw 'Draggable columns are not currently supported with column groups.' - let obj = this, + let obj = this, _dragData = {} _dragData.lastInt = undefined _dragData.pressed = false @@ -5363,7 +5363,7 @@ class w2grid extends w2event { */ function dragColStart (event) { if (_dragData.timeout) clearTimeout(_dragData.timeout) - let self = this + let self = this _dragData.pressed = true _dragData.timeout = setTimeout(() => { @@ -5372,8 +5372,8 @@ class w2grid extends w2event { // but can no longer be docked back into the header. It simply floats and you // can no longer interact with it. // The erronius event thats fired will have _dragData.numberPreColumnsPresent === 0 - // populated, wheras a valid event will not. - // if we see the erronius event, dont allow that second click to register, which results + // populated, whereas a valid event will not. + // if we see the erronius event, do not allow that second click to register, which results // in the floating column remaining under the mouse's control. if (!_dragData.pressed || _dragData.numberPreColumnsPresent === 0) return @@ -5399,9 +5399,9 @@ class w2grid extends w2event { _dragData.numberPreColumnsPresent = $(obj.box).find(preColHeadersSelector).length //start event for drag start - _dragData.columnHead = origColumn = $(event.originalEvent.target).parents('.w2ui-head') + _dragData.columnHead = origColumn = $(event.originalEvent.target).parents('.w2ui-head') _dragData.originalPos = origColumnNumber = parseInt(origColumn.attr('col'), 10) - edata = obj.trigger({ type: 'columnDragStart', phase: 'before', originalEvent: event, origColumnNumber: origColumnNumber, target: origColumn[0] }) + edata = obj.trigger({ type: 'columnDragStart', phase: 'before', originalEvent: event, origColumnNumber: origColumnNumber, target: origColumn[0] }) if (edata.isCancelled === true) return false columns = _dragData.columns = $(obj.box).find('.w2ui-head:not(.w2ui-head-last)') @@ -5438,13 +5438,13 @@ class w2grid extends w2event { opacity: 0.8 }, 0) - //establish current offsets + // establish current offsets _dragData.offsets = [] for (let i = 0, l = columns.length; i < l; i++) { _dragData.offsets.push($(columns[ i ]).offset().left) } - //conclude event + // conclude event obj.trigger($.extend(edata, { phase: 'after' })) }, 150)//end timeout wrapper } @@ -5477,10 +5477,10 @@ class w2grid extends w2event { edata = obj.trigger({ type: 'columnDragEnd', phase: 'before', originalEvent: event, target: _dragData.columnHead[0] }) if (edata.isCancelled === true) return false - selected = obj.columns[ _dragData.originalPos ] + selected = obj.columns[ _dragData.originalPos ] columnConfig = obj.columns targetColumn = $(_dragData.columns[ Math.min(_dragData.lastInt, _dragData.columns.length - 1) ]) - target = (_dragData.lastInt < _dragData.columns.length) ? parseInt(targetColumn.attr('col')) : columnConfig.length + target = (_dragData.lastInt < _dragData.columns.length) ? parseInt(targetColumn.attr('col')) : columnConfig.length if (target !== _dragData.originalPos + 1 && target !== _dragData.originalPos && targetColumn && targetColumn.length) { $(_dragData.ghost).animate({ @@ -5517,7 +5517,7 @@ class w2grid extends w2event { function markIntersection(intersection){ if (!_dragData.marker && !_dragData.markerLeft) { - _dragData.marker = $('
' + + _dragData.marker = $('
' + '
' + '
' + '
') @@ -5559,7 +5559,7 @@ class w2grid extends w2event { for (let i = 0, l = offsets.length; i < l; i++) { let thisOffset = offsets[ i ] let nextOffset = offsets[ i + 1 ] || offsets[ i ] + lastWidth - let midpoint = (nextOffset - offsets[ i ]) / 2 + offsets[ i ] + let midpoint = (nextOffset - offsets[ i ]) / 2 + offsets[ i ] if (cursorX > thisOffset && cursorX <= midpoint) { return i @@ -5595,7 +5595,7 @@ class w2grid extends w2event { let edata = this.trigger({ phase: 'before', target: this.name, type: 'columnOnOff', field: field, originalEvent: event }) if (edata.isCancelled === true) return // regular processing - let obj = this + let obj = this let hide = (!event.shiftKey && !event.metaKey && !event.ctrlKey && !$(event.target).hasClass('w2ui-column-check')) // collapse expanded rows let rows = obj.find({ 'w2ui.expanded': true }, true) @@ -5642,7 +5642,7 @@ class w2grid extends w2event { if (field == null) return let sWidth = 0 - let found = false + let found = false for (let i = 0; i < this.columns.length; i++) { let col = this.columns[i] if (col.field == field) { @@ -5652,7 +5652,7 @@ class w2grid extends w2event { if (col.frozen || col.hidden) continue let cSize = parseInt(col.sizeCalculated ? col.sizeCalculated : col.size) - sWidth += cSize + sWidth += cSize } if (!found) return @@ -5663,9 +5663,9 @@ class w2grid extends w2event { initToolbar() { // -- if toolbar is true if (this.toolbar.render == null) { - let tmp_items = this.toolbar.items || [] + let tmp_items = this.toolbar.items || [] this.toolbar.items = [] - this.toolbar = new w2toolbar($.extend(true, {}, this.toolbar, { name: this.name +'_toolbar', owner: this })) + this.toolbar = new w2toolbar($.extend(true, {}, this.toolbar, { name: this.name +'_toolbar', owner: this })) // ============================================= // ------ Toolbar Generic buttons @@ -5781,7 +5781,7 @@ class w2grid extends w2event { setTimeout(() => { $().w2tag() }, 20) break case 'w2ui-edit': { - let sel = this.getSelection() + let sel = this.getSelection() let recid = null if (sel.length == 1) recid = sel[0] // events @@ -5824,7 +5824,7 @@ class w2grid extends w2event { .on('mousedown.grid-col-resize', function(event) { if (!event) event = window.event obj.last.colResizing = true - obj.last.tmp = { + obj.last.tmp = { x : event.screenX, y : event.screenY, gx : event.screenX, @@ -5843,7 +5843,7 @@ class w2grid extends w2event { obj.columns[c].size = obj.columns[c].sizeCalculated } let edata = { phase: 'before', type: 'columnResize', target: obj.name, column: obj.last.tmp.col, field: obj.columns[obj.last.tmp.col].field } - edata = obj.trigger($.extend(edata, { resizeBy: 0, originalEvent: event })) + edata = obj.trigger($.extend(edata, { resizeBy: 0, originalEvent: event })) // set move event let timer let mouseMove = function(event) { @@ -5853,9 +5853,9 @@ class w2grid extends w2event { edata = obj.trigger($.extend(edata, { resizeBy: (event.screenX - obj.last.tmp.gx), originalEvent: event })) if (edata.isCancelled === true) { edata.isCancelled = false; return } // default action - obj.last.tmp.x = (event.screenX - obj.last.tmp.x) - obj.last.tmp.y = (event.screenY - obj.last.tmp.y) - let newWidth =(parseInt(obj.columns[obj.last.tmp.col].size) + obj.last.tmp.x) + 'px' + obj.last.tmp.x = (event.screenX - obj.last.tmp.x) + obj.last.tmp.y = (event.screenY - obj.last.tmp.y) + let newWidth = (parseInt(obj.columns[obj.last.tmp.col].size) + obj.last.tmp.x) + 'px' obj.columns[obj.last.tmp.col].size = newWidth if (timer) clearTimeout(timer) timer = setTimeout(() => { @@ -5903,7 +5903,7 @@ class w2grid extends w2event { // event before let edata = { phase: 'before', type: 'columnAutoResize', target: obj.name, column: col, field: col.field } - edata = obj.trigger($.extend(edata, { resizeBy: Math.abs(maxDiff), originalEvent: event })) + edata = obj.trigger($.extend(edata, { resizeBy: Math.abs(maxDiff), originalEvent: event })) if (edata.isCancelled === true) { edata.isCancelled = false; return } if (maxDiff < 0) { @@ -5927,12 +5927,12 @@ class w2grid extends w2event { resizeBoxes() { // elements - let header = $('#grid_'+ this.name +'_header') - let toolbar = $('#grid_'+ this.name +'_toolbar') + let header = $('#grid_'+ this.name +'_header') + let toolbar = $('#grid_'+ this.name +'_toolbar') let fsummary = $('#grid_'+ this.name +'_fsummary') - let summary = $('#grid_'+ this.name +'_summary') - let footer = $('#grid_'+ this.name +'_footer') - let body = $('#grid_'+ this.name +'_body') + let summary = $('#grid_'+ this.name +'_summary') + let footer = $('#grid_'+ this.name +'_footer') + let body = $('#grid_'+ this.name +'_body') if (this.show.header) { header.css({ @@ -5978,30 +5978,30 @@ class w2grid extends w2event { // remove empty records $(this.box).find('.w2ui-empty-record').remove() // -- Calculate Column size in PX - let box = $(this.box) - let grid = $(this.box).find('> div.w2ui-grid-box') - let header = $('#grid_'+ this.name +'_header') - let toolbar = $('#grid_'+ this.name +'_toolbar') - let summary = $('#grid_'+ this.name +'_summary') - let fsummary = $('#grid_'+ this.name +'_fsummary') - let footer = $('#grid_'+ this.name +'_footer') - let body = $('#grid_'+ this.name +'_body') - let columns = $('#grid_'+ this.name +'_columns') - let fcolumns = $('#grid_'+ this.name +'_fcolumns') - let records = $('#grid_'+ this.name +'_records') - let frecords = $('#grid_'+ this.name +'_frecords') - let scroll1 = $('#grid_'+ this.name +'_scroll1') + let box = $(this.box) + let grid = $(this.box).find('> div.w2ui-grid-box') + let header = $('#grid_'+ this.name +'_header') + let toolbar = $('#grid_'+ this.name +'_toolbar') + let summary = $('#grid_'+ this.name +'_summary') + let fsummary = $('#grid_'+ this.name +'_fsummary') + let footer = $('#grid_'+ this.name +'_footer') + let body = $('#grid_'+ this.name +'_body') + let columns = $('#grid_'+ this.name +'_columns') + let fcolumns = $('#grid_'+ this.name +'_fcolumns') + let records = $('#grid_'+ this.name +'_records') + let frecords = $('#grid_'+ this.name +'_frecords') + let scroll1 = $('#grid_'+ this.name +'_scroll1') let lineNumberWidth = String(this.total).length * 8 + 10 if (lineNumberWidth < 34) lineNumberWidth = 34 // 3 digit width if (this.lineNumberWidth != null) lineNumberWidth = this.lineNumberWidth let bodyOverflowX = false let bodyOverflowY = false - let sWidth = 0 + let sWidth = 0 for (let i = 0; i < this.columns.length; i++) { if (this.columns[i].frozen || this.columns[i].hidden) continue let cSize = parseInt(this.columns[i].sizeCalculated ? this.columns[i].sizeCalculated : this.columns[i].size) - sWidth += cSize + sWidth += cSize } if (records.width() < sWidth) bodyOverflowX = true if (body.height() - columns.height() < $(records).find('>table').height() + (bodyOverflowX ? w2utils.scrollBarSize() : 0)) bodyOverflowY = true @@ -6012,7 +6012,7 @@ class w2grid extends w2event { let calculatedHeight = w2utils.getSize(columns, 'height') + w2utils.getSize($('#grid_'+ this.name +'_records table'), 'height') + (bodyOverflowX ? w2utils.scrollBarSize() : 0) - this.height = calculatedHeight + this.height = calculatedHeight + w2utils.getSize(grid, '+height') + (this.show.header ? w2utils.getSize(header, 'height') : 0) + (this.show.toolbar ? w2utils.getSize(toolbar, 'height') : 0) @@ -6032,7 +6032,7 @@ class w2grid extends w2event { } let buffered = this.records.length - let url = (typeof this.url != 'object' ? this.url : this.url.get) + let url = (typeof this.url != 'object' ? this.url : this.url.get) if (this.searchData.length != 0 && !url) buffered = this.last.searchIds.length // apply overflow if (!this.fixedBody) { bodyOverflowY = false } @@ -6061,7 +6061,7 @@ class w2grid extends w2event { } frecords.css({ overflow: 'hidden', top: records.css('top') }) if (this.show.emptyRecords && !bodyOverflowY) { - let max = Math.floor(records.height() / this.recordHeight) - 1 + let max = Math.floor(records.height() / this.recordHeight) - 1 let leftover = 0 if (records[0]) leftover = records[0].scrollHeight - max * this.recordHeight if (leftover >= this.recordHeight) { @@ -6080,8 +6080,8 @@ class w2grid extends w2event { let html1 = '' let html2 = '' let htmlp = '' - html1 += '' - html2 += '' + html1 += '' + html2 += '' if (grid.show.lineNumbers) html1 += '' if (grid.show.selectColumn) html1 += '' if (grid.show.expandColumn) html1 += '' @@ -6107,8 +6107,8 @@ class w2grid extends w2event { - (this.show.selectColumn ? 26 : 0) - (this.show.expandColumn ? 26 : 0) - 1 // left is 1xp due to border width - width_box = width_max - percent = 0 + width_box = width_max + percent = 0 // gridMinWidth processing let restart = false for (let i = 0; i < this.columns.length; i++) { @@ -6116,11 +6116,11 @@ class w2grid extends w2event { if (col.gridMinWidth > 0) { if (col.gridMinWidth > width_box && col.hidden !== true) { col.hidden = true - restart = true + restart = true } if (col.gridMinWidth < width_box && col.hidden === true) { col.hidden = false - restart = true + restart = true } } } @@ -6133,11 +6133,11 @@ class w2grid extends w2event { let col = this.columns[i] if (col.hidden) continue if (String(col.size).substr(String(col.size).length-2).toLowerCase() == 'px') { - width_max -= parseFloat(col.size) + width_max -= parseFloat(col.size) this.columns[i].sizeCalculated = col.size - this.columns[i].sizeType = 'px' + this.columns[i].sizeType = 'px' } else { - percent += parseFloat(col.size) + percent += parseFloat(col.size) this.columns[i].sizeType = '%' delete col.sizeCorrected } @@ -6329,15 +6329,15 @@ class w2grid extends w2event { } getSearchesHTML() { - let html = '' + let html = '
' let showBtn = false for (let i = 0; i < this.searches.length; i++) { - let s = this.searches[i] + let s = this.searches[i] s.type = String(s.type).toLowerCase() if (s.hidden) continue let btn = '' if (showBtn == false) { - btn = '' + btn = '' showBtn = true } if (s.inTag == null) s.inTag = '' @@ -6435,9 +6435,9 @@ class w2grid extends w2event { initOperator(el, search_ind) { let search = this.searches[search_ind] - let range = $('#grid_'+ this.name + '_range_'+ search_ind) - let fld1 = $('#grid_'+ this.name +'_field_'+ search_ind) - let fld2 = fld1.parent().find('span input') + let range = $('#grid_'+ this.name + '_range_'+ search_ind) + let fld1 = $('#grid_'+ this.name +'_field_'+ search_ind) + let fld2 = fld1.parent().find('span input') fld1.show() range.hide() switch ($(el).val()) { @@ -6458,9 +6458,9 @@ class w2grid extends w2event { let obj = this // init searches for (let s = 0; s < this.searches.length; s++) { - let search = this.searches[s] - let sdata = this.getSearchData(search.field) - search.type = String(search.type).toLowerCase() + let search = this.searches[s] + let sdata = this.getSearchData(search.field) + search.type = String(search.type).toLowerCase() let operators = this.operators[this.operatorsMap[search.type]] || [] if (search.operators) operators = search.operators let operator = operators[0] // default operator @@ -6561,7 +6561,7 @@ class w2grid extends w2event { } getColumnsHTML() { - let obj = this + let obj = this let html1 = '' let html2 = '' if (this.show.columnHeaders) { @@ -6569,12 +6569,12 @@ class w2grid extends w2event { let tmp1 = getColumns(true) let tmp2 = getGroups() let tmp3 = getColumns(false) - html1 = tmp1[0] + tmp2[0] + tmp3[0] - html2 = tmp1[1] + tmp2[1] + tmp3[1] + html1 = tmp1[0] + tmp2[0] + tmp3[0] + html2 = tmp1[1] + tmp2[1] + tmp3[1] } else { let tmp = getColumns(true) - html1 = tmp[0] - html2 = tmp[1] + html1 = tmp[0] + html2 = tmp[1] } } return [html1, html2] @@ -6582,7 +6582,7 @@ class w2grid extends w2event { function getGroups () { let html1 = '' let html2 = '' - let tmpf = '' + let tmpf = '' // add empty group at the end let tmp = obj.columnGroups.length - 1 if (obj.columnGroups[tmp].text == null && obj.columnGroups[tmp].caption != null) { @@ -6613,9 +6613,9 @@ class w2grid extends w2event { '
 
'+ '' } - for (let i=0; i' } let text = (typeof col.text == 'function' ? col.text(col) : col.text) - tmpf = '' + + html2 += '' + ' '+ ''+ ''+ @@ -6850,19 +6850,19 @@ class w2grid extends w2event { ''+ '
'+ '
'+ (!gText ? ' ' : gText) + @@ -6723,7 +6723,7 @@ class w2grid extends w2event { if (col.size == null) col.size = '100%' if (i == id) { // always true on first iteration colg = obj.columnGroups[ii++] || {} - id = id + colg.span + id = id + colg.span } if ((i < obj.last.colStart || i > obj.last.colEnd) && !col.frozen) continue @@ -6756,7 +6756,7 @@ class w2grid extends w2event { } } // col selected - let tmp = this.last.selection.columns + let tmp = this.last.selection.columns let selected = false for (let t in tmp) { for (let si = 0; si < tmp[t].length; si++) { @@ -6783,9 +6783,9 @@ class w2grid extends w2event { columnTooltipShow(ind) { if (this.columnTooltip == 'normal') return - let $el = $(this.box).find('#grid_'+ this.name + '_column_'+ ind) + let $el = $(this.box).find('#grid_'+ this.name + '_column_'+ ind) let item = this.columns[ind] - let pos = this.columnTooltip + let pos = this.columnTooltip $el.prop('_mouse_over', true) setTimeout(() => { if ($el.prop('_mouse_over') === true && $el.prop('_mouse_tooltip') !== true) { @@ -6811,17 +6811,17 @@ class w2grid extends w2event { getRecordsHTML() { let buffered = this.records.length - let url = (typeof this.url != 'object' ? this.url : this.url.get) + let url = (typeof this.url != 'object' ? this.url : this.url.get) if (this.searchData.length != 0 && !url) buffered = this.last.searchIds.length // larger number works better with chrome, smaller with FF. if (buffered > this.vs_start) this.last.show_extra = this.vs_extra; else this.last.show_extra = this.vs_start let records = $('#grid_'+ this.name +'_records') - let limit = Math.floor((records.height() || 0) / this.recordHeight) + this.last.show_extra + 1 + let limit = Math.floor((records.height() || 0) / this.recordHeight) + this.last.show_extra + 1 if (!this.fixedBody || limit > buffered) limit = buffered // always need first record for resizing purposes let rec_html = this.getRecordHTML(-1, 0) - let html1 = '' + rec_html[0] - let html2 = '
' + rec_html[1] + let html1 = '
' + rec_html[0] + let html2 = '
' + rec_html[1] // first empty row with height html1 += ''+ ' '+ @@ -6831,18 +6831,18 @@ class w2grid extends w2event { '' for (let i = 0; i < limit; i++) { rec_html = this.getRecordHTML(i, i+1) - html1 += rec_html[0] - html2 += rec_html[1] + html1 += rec_html[0] + html2 += rec_html[1] } - let h2 = (buffered - limit) * this.recordHeight - html1 += '' + + let h2 = (buffered - limit) * this.recordHeight + html1 += '' + ' '+ ''+ ''+ ' '+ ''+ '
' - html2 += '
' this.last.range_start = 0 - this.last.range_end = limit + this.last.range_end = limit return [html1, html2] } getSummaryHTML() { if (this.summary.length === 0) return let rec_html = this.getRecordHTML(-1, 0) // need this in summary too for colspan to work properly - let html1 = '' + rec_html[0] - let html2 = '
' + rec_html[1] + let html1 = '
' + rec_html[0] + let html2 = '
' + rec_html[1] for (let i = 0; i < this.summary.length; i++) { rec_html = this.getRecordHTML(i, i+1, true) - html1 += rec_html[0] - html2 += rec_html[1] + html1 += rec_html[0] + html2 += rec_html[1] } html1 += '
' html2 += '' @@ -6870,19 +6870,19 @@ class w2grid extends w2event { } scroll(event) { - let obj = this - let url = (typeof this.url != 'object' ? this.url : this.url.get) - let records = $('#grid_'+ this.name +'_records') + let obj = this + let url = (typeof this.url != 'object' ? this.url : this.url.get) + let records = $('#grid_'+ this.name +'_records') let frecords = $('#grid_'+ this.name +'_frecords') // sync scroll positions if (event) { - let sTop = event.target.scrollTop - let sLeft = event.target.scrollLeft - this.last.scrollTop = sTop - this.last.scrollLeft = sLeft + let sTop = event.target.scrollTop + let sLeft = event.target.scrollLeft + this.last.scrollTop = sTop + this.last.scrollLeft = sLeft $('#grid_'+ this.name +'_columns')[0].scrollLeft = sLeft $('#grid_'+ this.name +'_summary')[0].scrollLeft = sLeft - frecords[0].scrollTop = sTop + frecords[0].scrollTop = sTop } // hide bubble if (this.last.bubbleEl) { @@ -6891,14 +6891,14 @@ class w2grid extends w2event { } // column virtual scroll let colStart = null - let colEnd = null + let colEnd = null if (this.disableCVS || this.columnGroups.length > 0) { // disable virtual scroll colStart = 0 - colEnd = this.columns.length - 1 + colEnd = this.columns.length - 1 } else { let sWidth = records.width() - let cLeft = 0 + let cLeft = 0 for (let i = 0; i < this.columns.length; i++) { if (this.columns[i].frozen || this.columns[i].hidden) continue let cSize = parseInt(this.columns[i].sizeCalculated ? this.columns[i].sizeCalculated : this.columns[i].size) @@ -6916,17 +6916,17 @@ class w2grid extends w2event { } // --------- if (colStart != this.last.colStart || colEnd != this.last.colEnd) { - let $box = $(this.box) + let $box = $(this.box) let deltaStart = Math.abs(colStart - this.last.colStart) - let deltaEnd = Math.abs(colEnd - this.last.colEnd) + let deltaEnd = Math.abs(colEnd - this.last.colEnd) // add/remove columns for small jumps if (deltaStart < 5 && deltaEnd < 5) { let $cfirst = $box.find('.w2ui-grid-columns #grid_'+ this.name +'_column_start') - let $clast = $box.find('.w2ui-grid-columns .w2ui-head-last') + let $clast = $box.find('.w2ui-grid-columns .w2ui-head-last') let $rfirst = $box.find('#grid_'+ this.name +'_records .w2ui-grid-data-spacer') - let $rlast = $box.find('#grid_'+ this.name +'_records .w2ui-grid-data-last') + let $rlast = $box.find('#grid_'+ this.name +'_records .w2ui-grid-data-last') let $sfirst = $box.find('#grid_'+ this.name +'_summary .w2ui-grid-data-spacer') - let $slast = $box.find('#grid_'+ this.name +'_summary .w2ui-grid-data-last') + let $slast = $box.find('#grid_'+ this.name +'_summary .w2ui-grid-data-last') // remove on left if (colStart > this.last.colStart) { for (let i = this.last.colStart; i < colStart; i++) { @@ -6951,14 +6951,14 @@ class w2grid extends w2event { // record $rfirst.each((ind, el) => { let index = $(el).parent().attr('index') - let td = '' // width column + let td = '' // width column if (index != null) td = this.getCellHTML(parseInt(index), i, false) $(el).after(td) }) // summary $sfirst.each((ind, el) => { let index = $(el).parent().attr('index') - let td = '' // width column + let td = '' // width column if (index != null) td = this.getCellHTML(parseInt(index), i, true) $(el).after(td) }) @@ -6972,32 +6972,32 @@ class w2grid extends w2event { // record $rlast.each((ind, el) => { let index = $(el).parent().attr('index') - let td = '' // width column + let td = '' // width column if (index != null) td = this.getCellHTML(parseInt(index), i, false) $(el).before(td) }) // summary $slast.each((ind, el) => { let index = $(el).parent().attr('index') || -1 - let td = this.getCellHTML(parseInt(index), i, true) + let td = this.getCellHTML(parseInt(index), i, true) $(el).before(td) }) } } this.last.colStart = colStart - this.last.colEnd = colEnd + this.last.colEnd = colEnd this.resizeRecords() } else { this.last.colStart = colStart - this.last.colEnd = colEnd + this.last.colEnd = colEnd // dot not just call this.refresh(); - let colHTML = this.getColumnsHTML() - let recHTML = this.getRecordsHTML() - let sumHTML = this.getSummaryHTML() - let $columns = $box.find('#grid_'+ this.name +'_columns') - let $records = $box.find('#grid_'+ this.name +'_records') + let colHTML = this.getColumnsHTML() + let recHTML = this.getRecordsHTML() + let sumHTML = this.getSummaryHTML() + let $columns = $box.find('#grid_'+ this.name +'_columns') + let $records = $box.find('#grid_'+ this.name +'_records') let $frecords = $box.find('#grid_'+ this.name +'_frecords') - let $summary = $box.find('#grid_'+ this.name +'_summary') + let $summary = $box.find('#grid_'+ this.name +'_summary') $columns.find('tbody').html(colHTML[1]) $frecords.html(recHTML[0]) $records.prepend(recHTML[1]) @@ -7034,12 +7034,12 @@ class w2grid extends w2event { if (!url && (!this.fixedBody || (this.total != -1 && this.total <= this.vs_start))) return // regular processing let start = Math.floor(records[0].scrollTop / this.recordHeight) - this.last.show_extra - let end = start + Math.floor(records.height() / this.recordHeight) + this.last.show_extra * 2 + 1 + let end = start + Math.floor(records.height() / this.recordHeight) + this.last.show_extra * 2 + 1 // let div = start - this.last.range_start; if (start < 1) start = 1 if (end > this.total && this.total != -1) end = this.total - let tr1 = records.find('#grid_'+ this.name +'_rec_top') - let tr2 = records.find('#grid_'+ this.name +'_rec_bottom') + let tr1 = records.find('#grid_'+ this.name +'_rec_top') + let tr2 = records.find('#grid_'+ this.name +'_rec_bottom') let tr1f = frecords.find('#grid_'+ this.name +'_frec_top') let tr2f = frecords.find('#grid_'+ this.name +'_frec_bottom') // if row is expanded @@ -7052,7 +7052,7 @@ class w2grid extends w2event { tr2f.prev().remove() } let first = parseInt(tr1.next().attr('line')) - let last = parseInt(tr2.prev().attr('line')) + let last = parseInt(tr2.prev().attr('line')) //$('#log').html('buffer: '+ this.buffered +' start-end: ' + start + '-'+ end + ' ===> first-last: ' + first + '-' + last); let tmp, tmp1, tmp2, rec_start, rec_html if (first < start || first == 1 || this.last.pull_refresh) { // scroll down @@ -7066,7 +7066,7 @@ class w2grid extends w2event { if (parseInt(tmp2.attr('line')) < start) { tmp1.remove(); tmp2.remove() } else break } // add at bottom - tmp = records.find('#grid_'+ this.name +'_rec_bottom').prev() + tmp = records.find('#grid_'+ this.name +'_rec_bottom').prev() rec_start = tmp.attr('line') if (rec_start == 'top') rec_start = start for (let i = parseInt(rec_start) + 1; i <= end; i++) { @@ -7091,7 +7091,7 @@ class w2grid extends w2event { if (parseInt(tmp2.attr('line')) > end) { tmp1.remove(); tmp2.remove() } else break } // add at top - tmp = records.find('#grid_'+ this.name +'_rec_top').next() + tmp = records.find('#grid_'+ this.name +'_rec_top').next() rec_start = tmp.attr('line') if (rec_start == 'bottom') rec_start = end for (let i = parseInt(rec_start) - 1; i >= start; i--) { @@ -7116,13 +7116,13 @@ class w2grid extends w2event { tr2.css('height', h2 + 'px') tr2f.css('height', h2 + 'px') this.last.range_start = start - this.last.range_end = end + this.last.range_end = end // load more if needed let s = Math.floor(records[0].scrollTop / this.recordHeight) let e = s + Math.floor(records.height() / this.recordHeight) if (e + 10 > buffered && this.last.pull_more !== true && (buffered < this.total - this.offset || (this.total == -1 && this.last.xhr_hasMore))) { if (this.autoLoad === true) { - this.last.pull_more = true + this.last.pull_more = true this.last.xhr_offset += this.limit this.request('get') } @@ -7135,7 +7135,7 @@ class w2grid extends w2event { // show spinner $(this).find('td').html('
') // load more - obj.last.pull_more = true + obj.last.pull_more = true obj.last.xhr_offset += obj.limit obj.request('get') }) @@ -7155,7 +7155,7 @@ class w2grid extends w2event { let search = [] for (let s = 0; s < obj.searchData.length; s++) { let sdata = obj.searchData[s] - let fld = obj.getSearch(sdata.field) + let fld = obj.getSearch(sdata.field) if (!fld || fld.hidden) continue let ind = obj.getColumn(sdata.field, true) search.push({ field: sdata.field, search: sdata.value, col: ind }) @@ -7170,10 +7170,10 @@ class w2grid extends w2event { } getRecordHTML(ind, lineNum, summary) { - let tmph = '' + let tmph = '' let rec_html1 = '' let rec_html2 = '' - let sel = this.last.selection + let sel = this.last.selection let record // first record needs for resize purposes if (ind == -1) { @@ -7186,7 +7186,7 @@ class w2grid extends w2event { if (this.show.orderColumn) rec_html2 += '' for (let i = 0; i < this.columns.length; i++) { let col = this.columns[i] - tmph = '' + tmph = '' if (col.frozen && !col.hidden) { rec_html1 += tmph } else { @@ -7205,7 +7205,7 @@ class w2grid extends w2event { if (summary !== true) { if (this.searchData.length > 0 && !url) { if (ind >= this.last.searchIds.length) return '' - ind = this.last.searchIds[ind] + ind = this.last.searchIds[ind] record = this.records[ind] } else { if (ind >= this.records.length) return '' @@ -7286,11 +7286,11 @@ class w2grid extends w2event { (summary !== true ? '
 
' : '' ) + '' } - let col_ind = 0 + let col_ind = 0 let col_skip = 0 while (true) { let col_span = 1 - let col = this.columns[col_ind] + let col = this.columns[col_ind] if (col == null) break if (col.hidden) { col_ind++ @@ -7349,16 +7349,16 @@ class w2grid extends w2event { let obj = this let col = this.columns[col_ind] if (col == null) return '' - let record = (summary !== true ? this.records[ind] : this.summary[ind]) + let record = (summary !== true ? this.records[ind] : this.summary[ind]) let data = (ind !== -1 ? this.getCellValue(ind, col_ind, summary) : '') let edit = (ind !== -1 ? this.getCellEditable(ind, col_ind) : '') - let style = 'max-height: '+ parseInt(this.recordHeight) +'px;' + (col.clipboardCopy ? 'margin-right: 20px' : '') - let isChanged = !summary && record && record.w2ui && record.w2ui.changes && record.w2ui.changes[col.field] != null - let addStyle = '' - let addClass = '' - let sel = this.last.selection + let style = 'max-height: '+ parseInt(this.recordHeight) +'px;' + (col.clipboardCopy ? 'margin-right: 20px' : '') + let isChanged = !summary && record && record.w2ui && record.w2ui.changes && record.w2ui.changes[col.field] != null + let addStyle = '' + let addClass = '' + let sel = this.last.selection let isRowSelected = false - let infoBubble = '' + let infoBubble = '' if (sel.indexes.indexOf(ind) != -1) isRowSelected = true if (col_span == null) { if (record && record.w2ui && record.w2ui.colspan && record.w2ui.colspan[col.field]) { @@ -7369,7 +7369,7 @@ class w2grid extends w2event { } // expand icon if (col_ind === 0 && record && record.w2ui && Array.isArray(record.w2ui.children)) { - let level = 0 + let level = 0 let subrec = this.get(record.w2ui.parent_recid, true) while (true) { if (subrec != null) { @@ -7426,7 +7426,7 @@ class w2grid extends w2event { if (typeof col.render == 'function') { let html = col.render.call(this, record, ind, col_ind, data) if (html != null && typeof html == 'object') { - data = $.trim(html.html || '') + data = $.trim(html.html || '') addClass = html.class || '' addStyle = html.style || '' } else { @@ -7444,7 +7444,7 @@ class w2grid extends w2event { } // formatters if (typeof col.render == 'string') { - let t = col.render.toLowerCase().indexOf(':') + let t = col.render.toLowerCase().indexOf(':') let tmp = [] if (t == -1) { tmp[0] = col.render.toLowerCase() @@ -7465,12 +7465,12 @@ class w2grid extends w2event { // if editable checkbox if (edit && ['checkbox', 'check'].indexOf(edit.type) != -1) { let changeInd = summary ? -(ind + 1) : ind - style += 'text-align: center;' - data = '' - infoBubble = '' + infoBubble = '' } data = '
' + infoBubble + String(data) + '
' } @@ -7495,7 +7495,7 @@ class w2grid extends w2event { // clipboardCopy let clipboardTxt, clipboardIcon if(col.clipboardCopy){ - clipboardTxt = (typeof col.clipboardCopy == 'string' ? col.clipboardCopy : w2utils.lang('Copy to clipboard')) + clipboardTxt = (typeof col.clipboardCopy == 'string' ? col.clipboardCopy : w2utils.lang('Copy to clipboard')) clipboardIcon = '' @@ -7545,8 +7545,8 @@ class w2grid extends w2event { showBubble(ind, col_ind) { let html = '' let info = this.columns[col_ind].info - let rec = this.records[ind] - let el = $(this.box).find('#grid_'+ this.name +'_data_'+ ind +'_'+ col_ind + ' .w2ui-info') + let rec = this.records[ind] + let el = $(this.box).find('#grid_'+ this.name +'_data_'+ ind +'_'+ col_ind + ' .w2ui-info') if (this.last.bubbleEl) $(this.last.bubbleEl).w2tag() this.last.bubbleEl = el // if no fields defined - show all @@ -7647,17 +7647,17 @@ class w2grid extends w2event { } getCellValue(ind, col_ind, summary) { - let col = this.columns[col_ind] + let col = this.columns[col_ind] let record = (summary !== true ? this.records[ind] : this.summary[ind]) - let data = this.parseField(record, col.field) + let data = this.parseField(record, col.field) if (record && record.w2ui && record.w2ui.changes && record.w2ui.changes[col.field] != null) { data = record.w2ui.changes[col.field] } if ($.isPlainObject(data) /*&& col.editable*/) { //It can be an object btw if (col.options && col.options.items) { - val=col.options.items.find((item) => { return item.id == data.id }) - if (val) data=val.text - else data=data.id + val = col.options.items.find((item) => { return item.id == data.id }) + if (val) data = val.text + else data = data.id } else { if (data.text != null) data = data.text if (data.id != null) data = data.id @@ -7681,7 +7681,7 @@ class w2grid extends w2event { } else { // show number of selected let msgLeft = '' - let sel = this.getSelection() + let sel = this.getSelection() if (sel.length > 0) { if (this.show.statusSelection && sel.length > 1) { msgLeft = String(sel.length).replace(/(\d)(?=(\d\d\d)+(?!\d))/g, '$1,') + ' ' + w2utils.lang('selected') @@ -7736,7 +7736,7 @@ class w2grid extends w2event { } let prop_val for (let i = 0; i < this.columns.length; i++) { - let col = this.columns[i] + let col = this.columns[i] let col_save_obj = {} // iterate properties to save Object.keys(this.stateColProps).forEach((prop, idx) => { @@ -7765,7 +7765,7 @@ class w2grid extends w2event { if (!savedState) savedState = {} if (!savedState.states) savedState.states = {} savedState.states[(this.stateId || this.name)] = state - localStorage.w2ui = JSON.stringify(savedState) + localStorage.w2ui = JSON.stringify(savedState) } catch (e) { delete localStorage.w2ui return null @@ -7798,10 +7798,10 @@ class w2grid extends w2event { if ($.isPlainObject(newState)) { $.extend(this.show, newState.show) $.extend(this.last, newState.last) - let sTop = this.last.scrollTop + let sTop = this.last.scrollTop let sLeft = this.last.scrollLeft for (let c = 0; c < newState.columns.length; c++) { - let tmp = newState.columns[c] + let tmp = newState.columns[c] let col_index = this.getColumn(tmp.field, true) if (col_index !== null) { $.extend(this.columns[col_index], tmp) @@ -7821,7 +7821,7 @@ class w2grid extends w2event { if (this.sortData.length > 0) this.localSort() if (this.searchData.length > 0) this.localSearch() } - this.last.scrollTop = sTop + this.last.scrollTop = sTop this.last.scrollLeft = sLeft this.refresh() }, 1) @@ -7852,7 +7852,7 @@ class w2grid extends w2event { if (this.nestedFields) { let val = '' try { // need this to make sure no error in fields - val = obj + val = obj let tmp = String(field).split('.') for (let i = 0; i < tmp.length; i++) { val = val[tmp[i]] @@ -7896,13 +7896,13 @@ class w2grid extends w2event { if (['time'].indexOf(column.render) != -1) { if (w2utils.isTime(rec[column.field])) { // if string let tmp = w2utils.isTime(rec[column.field], true) - let dt = new Date() + let dt = new Date() dt.setHours(tmp.hours, tmp.minutes, (tmp.seconds ? tmp.seconds : 0), 0) // sets hours, min, sec, mills if (!rec[column.field + '_']) rec[column.field + '_'] = dt } else { // if date object let tmp = rec[column.field] if (w2utils.isInt(tmp)) tmp = parseInt(tmp) - tmp = (tmp != null ? new Date(tmp) : new Date()) + tmp = (tmp != null ? new Date(tmp) : new Date()) let dt = new Date() dt.setHours(tmp.getHours(), tmp.getMinutes(), tmp.getSeconds(), 0) // sets hours, min, sec, mills if (!rec[column.field + '_']) rec[column.field + '_'] = dt @@ -7926,7 +7926,7 @@ class w2grid extends w2event { let tmp = this.records[index].w2ui // let ccol = this.columns[col_ind] // if (tmp && tmp.colspan[ccol.field]) check += parseInt(tmp.colspan[ccol.field]) -1; // colspan of a column - let col = this.columns[check] + let col = this.columns[check] let span = (tmp && tmp.colspan && !isNaN(tmp.colspan[col.field]) ? parseInt(tmp.colspan[col.field]) : 1) if (col == null) return null if (col && col.hidden || span === 0) return this.nextCell(index, check, editable) @@ -7942,8 +7942,8 @@ class w2grid extends w2event { prevCell(index, col_ind, editable) { let check = col_ind - 1 if (check < 0) return null - let tmp = this.records[index].w2ui - let col = this.columns[check] + let tmp = this.records[index].w2ui + let col = this.columns[check] let span = (tmp && tmp.colspan && !isNaN(tmp.colspan[col.field]) ? parseInt(tmp.colspan[col.field]) : 1) if (col == null) return null if (col && col.hidden || span === 0) return this.prevCell(index, check, editable) @@ -7958,7 +7958,7 @@ class w2grid extends w2event { nextRow(ind, col_ind) { let sids = this.last.searchIds - let ret = null + let ret = null if ((ind + 1 < this.records.length && sids.length === 0) // if there are more records || (sids.length > 0 && ind < sids[sids.length-1])) { ind++ @@ -7967,8 +7967,8 @@ class w2grid extends w2event { ind++ } // colspan - let tmp = this.records[ind].w2ui - let col = this.columns[col_ind] + let tmp = this.records[ind].w2ui + let col = this.columns[col_ind] let span = (tmp && tmp.colspan && col != null && !isNaN(tmp.colspan[col.field]) ? parseInt(tmp.colspan[col.field]) : 1) if (span === 0) { ret = this.nextRow(ind, col_ind) @@ -7981,7 +7981,7 @@ class w2grid extends w2event { prevRow(ind, col_ind) { let sids = this.last.searchIds - let ret = null + let ret = null if ((ind > 0 && sids.length === 0) // if there are more records || (sids.length > 0 && ind > sids[0])) { ind-- @@ -7990,8 +7990,8 @@ class w2grid extends w2event { ind-- } // colspan - let tmp = this.records[ind].w2ui - let col = this.columns[col_ind] + let tmp = this.records[ind].w2ui + let col = this.columns[col_ind] let span = (tmp && tmp.colspan && col != null && !isNaN(tmp.colspan[col.field]) ? parseInt(tmp.colspan[col.field]) : 1) if (span === 0) { ret = this.prevRow(ind, col_ind) @@ -8008,10 +8008,10 @@ class w2grid extends w2event { } selectionRestore(noRefresh) { - let time = (new Date()).getTime() + let time = (new Date()).getTime() this.last.selection = { indexes: [], columns: {} } - let sel = this.last.selection - let lst = this.last._selection + let sel = this.last.selection + let lst = this.last._selection if (lst) for (let i = 0; i < lst.length; i++) { if ($.isPlainObject(lst[i])) { // selectType: cell diff --git a/src/w2layout.js b/src/w2layout.js index bdc8d6e72..50ffee6bc 100644 --- a/src/w2layout.js +++ b/src/w2layout.js @@ -78,7 +78,7 @@ class w2layout extends w2event { let pan = object.get(panel) if (pan != null && tabs == null) tabs = pan.tabs if (pan == null || tabs == null) return false - // instanciate tabs + // instantiate tabs if (Array.isArray(tabs)) tabs = { tabs: tabs } $().w2destroy(object.name + '_' + panel + '_tabs') // destroy if existed pan.tabs = new w2tabs($.extend({}, tabs, { owner: object, name: object.name + '_' + panel + '_tabs' })) @@ -90,7 +90,7 @@ class w2layout extends w2event { let pan = object.get(panel) if (pan != null && toolbar == null) toolbar = pan.toolbar if (pan == null || toolbar == null) return false - // instanciate toolbar + // instantiate toolbar if (Array.isArray(toolbar)) toolbar = { items: toolbar } $().w2destroy(object.name + '_' + panel + '_toolbar') // destroy if existed pan.toolbar = new w2toolbar($.extend({}, toolbar, { owner: object, name: object.name + '_' + panel + '_toolbar' })) @@ -464,7 +464,7 @@ class w2layout extends w2event { obj.refresh() // if refresh is not called here, the layout will not be available right after initialization // process event obj.trigger($.extend(edata, { phase: 'after' })) - // reinit events + // re-init events setTimeout(() => { // needed this timeout to allow browser to render first if there are tabs or toolbar initEvents() obj.resize() diff --git a/src/w2popup.js b/src/w2popup.js index 790a52d0b..5e8d0b4bf 100644 --- a/src/w2popup.js +++ b/src/w2popup.js @@ -17,7 +17,7 @@ import { w2utils } from './w2utils.js' class w2dialog extends w2event { constructor(options) { super() - this.defaults = { + this.defaults = { title: '', body: '', buttons: '', @@ -36,22 +36,22 @@ class w2dialog extends w2event { transition: null, multiple: false // if popup already open, opens as a message } - this.status = 'closed' // string that describes current status - this.onOpen = null - this.onClose = null - this.onMax = null - this.onMin = null - this.onToggle = null - this.onKeydown = null - this.onAction = null - this.onMove = null - this.onMsgOpen = null + this.status = 'closed' // string that describes current status + this.onOpen = null + this.onClose = null + this.onMax = null + this.onMin = null + this.onToggle = null + this.onKeydown = null + this.onAction = null + this.onMove = null + this.onMsgOpen = null this.onMsgClose = null } open(options) { return new Promise((resolve, reject) => { - let obj = this + let obj = this let orig_options = $.extend(true, {}, options) if (w2popup.status == 'closing') { setTimeout(() => { obj.open.call(obj, options) }, 100) @@ -59,21 +59,21 @@ class w2dialog extends w2event { } // get old options and merge them let old_options = $('#w2ui-popup').data('options') - options = $.extend({}, this.defaults, old_options, { title: '', body : '', buttons: '' }, options, { maximized: false }) + options = $.extend({}, this.defaults, old_options, { title: '', body : '', buttons: '' }, options, { maximized: false }) // need timer because popup might not be open setTimeout(() => { $('#w2ui-popup').data('options', options) }, 100) // if new - reset event handlers if ($('#w2ui-popup').length === 0) { // w2popup.handlers = []; // if commented, allows to add w2popup.on() for all - w2popup.onOpen = null - w2popup.onClose = null - w2popup.onMax = null - w2popup.onMin = null - w2popup.onToggle = null - w2popup.onKeydown = null - w2popup.onAction = null - w2popup.onMove = null - w2popup.onMsgOpen = null + w2popup.onOpen = null + w2popup.onClose = null + w2popup.onMax = null + w2popup.onMin = null + w2popup.onToggle = null + w2popup.onKeydown = null + w2popup.onAction = null + w2popup.onMove = null + w2popup.onMsgOpen = null w2popup.onMsgClose = null } if (options.onOpen) w2popup.onOpen = options.onOpen @@ -86,7 +86,7 @@ class w2dialog extends w2event { if (options.onMove) w2popup.onMove = options.onMove if (options.onMsgOpen) w2popup.onMsgOpen = options.onMsgOpen if (options.onMsgClose) w2popup.onMsgClose = options.onMsgClose - options.width = parseInt(options.width) + options.width = parseInt(options.width) options.height = parseInt(options.height) let maxW, maxH, edata, msg, tmp @@ -100,7 +100,7 @@ class w2dialog extends w2event { } if (maxW - 10 < options.width) options.width = maxW - 10 if (maxH - 10 < options.height) options.height = maxH - 10 - let top = (maxH - options.height) / 2 * 0.6 + let top = (maxH - options.height) / 2 * 0.6 let left = (maxW - options.width) / 2 // convert action arrays into buttons @@ -207,7 +207,7 @@ class w2dialog extends w2event { if (!old_options.maximized && (old_options.width != options.width || old_options.height != options.height)) { w2popup.resize(options.width, options.height) } - options.prevSize = options.width + 'px:' + options.height + 'px' + options.prevSize = options.width + 'px:' + options.height + 'px' options.maximized = old_options.maximized } // show new items @@ -300,12 +300,12 @@ class w2dialog extends w2event { function mvStart(evnt) { if (!evnt) evnt = window.event w2popup.status = 'moving' - tmp.resizing = true - tmp.isLocked = $('#w2ui-popup > .w2ui-lock').length == 1 ? true : false - tmp.x = evnt.screenX - tmp.y = evnt.screenY - tmp.pos_x = $('#w2ui-popup').position().left - tmp.pos_y = $('#w2ui-popup').position().top + tmp.resizing = true + tmp.isLocked = $('#w2ui-popup > .w2ui-lock').length == 1 ? true : false + tmp.x = evnt.screenX + tmp.y = evnt.screenY + tmp.pos_x = $('#w2ui-popup').position().left + tmp.pos_y = $('#w2ui-popup').position().top if (!tmp.isLocked) w2popup.lock({ opacity: 0 }) $(document).on('mousemove', tmp.mvMove) $(document).on('mouseup', tmp.mvStop) @@ -334,8 +334,8 @@ class w2dialog extends w2event { if (tmp.resizing != true) return if (!evnt) evnt = window.event w2popup.status = 'open' - tmp.div_x = (evnt.screenX - tmp.x) - tmp.div_y = (evnt.screenY - tmp.y) + tmp.div_x = (evnt.screenX - tmp.x) + tmp.div_y = (evnt.screenY - tmp.y) $('#w2ui-popup').css({ 'left': (tmp.pos_x + tmp.div_x) + 'px', 'top' : (tmp.pos_y + tmp.div_y) + 'px' @@ -362,9 +362,9 @@ class w2dialog extends w2event { return } w2popup.status = 'loading' - let tmp = String(options.url).split('#') - let url = tmp[0] - let selector = tmp[1] + let tmp = String(options.url).split('#') + let url = tmp[0] + let selector = tmp[1] if (options == null) options = {} // load url let html = $('#w2ui-popup').data(url) @@ -415,11 +415,11 @@ class w2dialog extends w2event { } action(action, msgId) { - let obj = this + let obj = this let options = $('#w2ui-popup').data('options') if (msgId != null) { options = $('#w2ui-message' + msgId).data('options') - obj = { + obj = { parent: this, options: options, close() { @@ -427,7 +427,7 @@ class w2dialog extends w2event { } } } - let act = options.actions[action] + let act = options.actions[action] let click = act if ($.isPlainObject(act) && act.onClick) click = act.onClick // event before @@ -490,12 +490,12 @@ class w2dialog extends w2event { } toggle() { - let obj = this + let obj = this let options = $('#w2ui-popup').data('options') // trigger event let edata = this.trigger({ phase: 'before', type: 'toggle', target: 'popup', options: options }) if (edata.isCancelled === true) return - // defatul action + // default action if (options.maximized === true) w2popup.min(); else w2popup.max() // event after setTimeout(() => { @@ -504,18 +504,18 @@ class w2dialog extends w2event { } max() { - let obj = this + let obj = this let options = $('#w2ui-popup').data('options') if (options.maximized === true) return // trigger event let edata = this.trigger({ phase: 'before', type: 'max', target: 'popup', options: options }) if (edata.isCancelled === true) return // default behavior - w2popup.status = 'resizing' + w2popup.status = 'resizing' options.prevSize = $('#w2ui-popup').css('width') + ':' + $('#w2ui-popup').css('height') // do resize w2popup.resize(10000, 10000, () => { - w2popup.status = 'open' + w2popup.status = 'open' options.maximized = true obj.trigger($.extend(edata, { phase: 'after'})) // resize gird, form, layout inside popup @@ -527,7 +527,7 @@ class w2dialog extends w2event { } min() { - let obj = this + let obj = this let options = $('#w2ui-popup').data('options') if (options.maximized !== true) return let size = options.prevSize.split(':') @@ -538,9 +538,9 @@ class w2dialog extends w2event { w2popup.status = 'resizing' // do resize w2popup.resize(parseInt(size[0]), parseInt(size[1]), () => { - w2popup.status = 'open' + w2popup.status = 'open' options.maximized = false - options.prevSize = null + options.prevSize = null obj.trigger($.extend(edata, { phase: 'after'})) // resize gird, form, layout inside popup $('#w2ui-popup .w2ui-grid, #w2ui-popup .w2ui-form, #w2ui-popup .w2ui-layout').each(() => { @@ -576,14 +576,14 @@ class w2dialog extends w2event { options = { html: options, width: 200, height: 100 } } if (!options) options = { width: 200, height: 100 } - let pWidth = parseInt($('#w2ui-popup').width()) - let pHeight = parseInt($('#w2ui-popup').height()) - options.originalWidth = options.width + let pWidth = parseInt($('#w2ui-popup').width()) + let pHeight = parseInt($('#w2ui-popup').height()) + options.originalWidth = options.width options.originalHeight = options.height if (parseInt(options.width) < 10) options.width = 10 if (parseInt(options.height) < 10) options.height = 10 if (options.hideOnClick == null) options.hideOnClick = false - let poptions = $('#w2ui-popup').data('options') || {} + let poptions = $('#w2ui-popup').data('options') || {} let titleHeight = parseInt($('#w2ui-popup > .w2ui-popup-title').css('height')) if (options.width == null || options.width > poptions.width - 10) { options.width = poptions.width - 10 @@ -595,7 +595,7 @@ class w2dialog extends w2event { if (options.originalHeight < 0) options.height = pHeight + options.originalHeight - titleHeight if (options.originalWidth < 0) options.width = pWidth + options.originalWidth * 2 // x 2 because there is left and right margin - let head = $('#w2ui-popup .w2ui-popup-title') + let head = $('#w2ui-popup .w2ui-popup-title') let msgCount = $('#w2ui-popup .w2ui-message').length // convert action arrays into buttons @@ -632,7 +632,7 @@ class w2dialog extends w2event { 'transform': 'translateY(-' + options.height + 'px)' })) let $focus = $('#w2ui-popup .w2ui-message') - $focus = $($focus[$focus.length - 2]) + $focus = $($focus[$focus.length - 2]) .css('z-index', 1500) .data('msg-focus') if ($focus && $focus.length > 0) $focus.focus(); else obj.focus() @@ -811,18 +811,18 @@ class w2dialog extends w2event { // see if there are messages and resize them $('#w2ui-popup .w2ui-message').each(() => { let moptions = $(this).data('options') - let $popup = $('#w2ui-popup') + let $popup = $('#w2ui-popup') if (parseInt(moptions.width) < 10) moptions.width = 10 if (parseInt(moptions.height) < 10) moptions.height = 10 let titleHeight = parseInt($popup.find('> .w2ui-popup-title').css('height')) - let pWidth = parseInt($popup.width()) - let pHeight = parseInt($popup.height()) - // recalc width + let pWidth = parseInt($popup.width()) + let pHeight = parseInt($popup.height()) + // re-calc width moptions.width = moptions.originalWidth if (moptions.width > pWidth - 10) { moptions.width = pWidth - 10 } - // recalc height + // re-calc height moptions.height = moptions.originalHeight if (moptions.height > pHeight - titleHeight - 5) { moptions.height = pHeight - titleHeight - 5 @@ -838,10 +838,10 @@ class w2dialog extends w2event { } resize(width, height, callBack) { - let obj = this + let obj = this let options = $('#w2ui-popup').data('options') || {} if (options.speed == null) options.speed = 0 - width = parseInt(width) + width = parseInt(width) height = parseInt(height) // calculate new position let maxW, maxH @@ -855,7 +855,7 @@ class w2dialog extends w2event { } if (maxW - 10 < width) width = maxW - 10 if (maxH - 10 < height) height = maxH - 10 - let top = (maxH - height) / 2 * 0.6 + let top = (maxH - height) / 2 * 0.6 let left = (maxW - width) / 2 // resize there $('#w2ui-popup') @@ -871,7 +871,7 @@ class w2dialog extends w2event { let tmp_int = setInterval(() => { obj.resizeMessages() }, 10) // then messages resize nicely setTimeout(() => { clearInterval(tmp_int) - options.width = width + options.width = width options.height = height obj.resizeMessages() if (typeof callBack == 'function') callBack() @@ -887,14 +887,14 @@ class w2dialog extends w2event { let options = $('#w2ui-popup').data('options') if (options == null) return let template = w2popup._template - let title = options.title - let body = options.body - let buttons = options.buttons + let title = options.title + let body = options.body + let buttons = options.buttons if (w2popup._prev) { template = w2popup._prev.template - title = w2popup._prev.title - body = w2popup._prev.body - buttons = w2popup._prev.buttons + title = w2popup._prev.title + body = w2popup._prev.body + buttons = w2popup._prev.buttons delete w2popup._prev } else { delete w2popup._template @@ -986,8 +986,8 @@ function w2alert(msg, title, callBack) { } function w2confirm(msg, title, callBack) { - let $ = jQuery - let options = {} + let $ = jQuery + let options = {} let defaults = { msg: '', title: w2utils.lang('Confirmation'), @@ -1138,8 +1138,8 @@ function w2confirm(msg, title, callBack) { } function w2prompt(label, title, callBack) { - let $ = jQuery - let options = {} + let $ = jQuery + let options = {} let defaults = { title: w2utils.lang('Notification'), width: ($('#w2ui-popup').length > 0 ? 400 : 450), @@ -1164,7 +1164,7 @@ function w2prompt(label, title, callBack) { onOpen: null, onClose: null } - w2popup.tmp = w2popup.tmp || {} + w2popup.tmp = w2popup.tmp || {} if (arguments.length == 1 && typeof label == 'object') { $.extend(options, defaults, label) @@ -1224,12 +1224,12 @@ function w2prompt(label, title, callBack) { } }) $('#w2ui-popup .w2ui-message .w2ui-btn#Ok').off('.w2prompt').on('click.w2prompt', function(event) { - w2popup.tmp.btn = 'ok' + w2popup.tmp.btn = 'ok' w2popup.tmp.value = $('#w2prompt').val() w2popup.message() }) $('#w2ui-popup .w2ui-message .w2ui-btn#Cancel').off('.w2prompt').on('click.w2prompt', function(event) { - w2popup.tmp.btn = 'cancel' + w2popup.tmp.btn = 'cancel' w2popup.tmp.value = null w2popup.message() }) @@ -1282,12 +1282,12 @@ function w2prompt(label, title, callBack) { $('#w2prompt').val(options.value) $('#w2prompt').w2field('text') $('#w2ui-popup .w2ui-popup-btn#Ok').on('click', function(event) { - w2popup.tmp.btn = 'ok' + w2popup.tmp.btn = 'ok' w2popup.tmp.value = $('#w2prompt').val() w2popup.close() }) $('#w2ui-popup .w2ui-popup-btn#Cancel').on('click', function(event) { - w2popup.tmp.btn = 'cancel' + w2popup.tmp.btn = 'cancel' w2popup.tmp.value = null w2popup.close() }) @@ -1311,7 +1311,7 @@ function w2prompt(label, title, callBack) { $('#w2ui-popup .w2ui-popup-btn#Ok').focus().addClass('clicked') // no need fo click as enter will do click break case 27: // esc - w2popup.tmp.btn = 'cancel' + w2popup.tmp.btn = 'cancel' w2popup.tmp.value = null break } diff --git a/src/w2sidebar.js b/src/w2sidebar.js index c06b73918..58797849c 100644 --- a/src/w2sidebar.js +++ b/src/w2sidebar.js @@ -23,40 +23,40 @@ import { w2utils } from './w2utils.js' class w2sidebar extends w2event { constructor(options) { super(options.name) - this.name = null - this.box = null - this.sidebar = null - this.parent = null - this.nodes = [] // Sidebar child nodes - this.menu = [] - this.routeData = {} // data for dynamic routes - this.selected = null // current selected node (readonly) - this.img = null - this.icon = null - this.style = '' - this.topHTML = '' - this.bottomHTML = '' - this.flatButton = false - this.keyboard = true - this.flat = false - this.hasFocus = false + this.name = null + this.box = null + this.sidebar = null + this.parent = null + this.nodes = [] // Sidebar child nodes + this.menu = [] + this.routeData = {} // data for dynamic routes + this.selected = null // current selected node (readonly) + this.img = null + this.icon = null + this.style = '' + this.topHTML = '' + this.bottomHTML = '' + this.flatButton = false + this.keyboard = true + this.flat = false + this.hasFocus = false this.levelPadding = 12 - this.skipRefresh = false + this.skipRefresh = false this.handle = { size: 0, style: '', content: '' }, this.onClick = null // Fire when user click on Node Text - this.onDblClick = null // Fire when user dbl clicks + this.onDblClick = null // Fire when user dbl clicks this.onContextMenu = null - this.onMenuClick = null // when context menu item selected - this.onExpand = null // Fire when node Expands - this.onCollapse = null // Fire when node Colapses - this.onKeydown = null - this.onRender = null - this.onRefresh = null - this.onResize = null - this.onDestroy = null - this.onFocus = null - this.onBlur = null - this.onFlat = null + this.onMenuClick = null // when context menu item selected + this.onExpand = null // Fire when node expands + this.onCollapse = null // Fire when node collapses + this.onKeydown = null + this.onRender = null + this.onRefresh = null + this.onResize = null + this.onDestroy = null + this.onFocus = null + this.onBlur = null + this.onFlat = null this.node_template = { id: null, text: '', @@ -84,7 +84,7 @@ class w2sidebar extends w2event { parent: null, // node object sidebar: null } - let nodes = options.nodes + let nodes = options.nodes delete options.nodes // mix in options $.extend(true, this, options) @@ -95,7 +95,7 @@ class w2sidebar extends w2event { add(parent, nodes) { if (arguments.length == 1) { // need to be in reverse order - nodes = arguments[0] + nodes = arguments[0] parent = this } if (typeof parent == 'string') parent = this.get(parent) @@ -107,7 +107,7 @@ class w2sidebar extends w2event { let txt, ind, tmp, node, nd if (arguments.length == 2 && typeof parent == 'string') { // need to be in reverse order - nodes = arguments[1] + nodes = arguments[1] before = arguments[0] if (before != null) { ind = this.get(before) @@ -144,11 +144,11 @@ class w2sidebar extends w2event { console.log('ERROR: Cannot insert node with id='+ node.id +' (text: '+ node.text + ') because another node with the same id already exists.') continue } - tmp = Object.assign({}, this.node_template, node) + tmp = Object.assign({}, this.node_template, node) tmp.sidebar = this - tmp.parent = parent - nd = tmp.nodes || [] - tmp.nodes = [] // very important to re-init empty nodes array + tmp.parent = parent + nd = tmp.nodes || [] + tmp.nodes = [] // very important to re-init empty nodes array if (before == null) { // append to the end parent.nodes.push(tmp) } else { @@ -191,8 +191,8 @@ class w2sidebar extends w2event { set(parent, id, node) { if (arguments.length == 2) { // need to be in reverse order - node = id - id = parent + node = id + id = parent parent = this } // searches all nested nodes @@ -232,8 +232,8 @@ class w2sidebar extends w2event { if (arguments.length == 1 || (arguments.length == 2 && id === true) ) { // need to be in reverse order returnIndex = id - id = parent - parent = this + id = parent + parent = this } // searches all nested nodes if (typeof parent == 'string') parent = this.get(parent) @@ -273,7 +273,7 @@ class w2sidebar extends w2event { } sort(options, nodes) { - // defabult options + // default options if (!options || typeof options != 'object') options = {} if (options.foldersFirst == null) options.foldersFirst = true if (options.caseSensitive == null) options.caseSensitive = false @@ -324,7 +324,7 @@ class w2sidebar extends w2event { search(str) { let count = 0 - let str2 = str.toLowerCase() + let str2 = str.toLowerCase() this.each((node) => { if (node.text.toLowerCase().indexOf(str2) === -1) { node.hidden = true @@ -416,7 +416,7 @@ class w2sidebar extends w2event { this.scrollIntoView(id, true) } new_node.selected = true - this.selected = id + this.selected = id return true } @@ -451,7 +451,7 @@ class w2sidebar extends w2event { collapse(id) { let obj = this - let nd = this.get(id) + let nd = this.get(id) if (nd == null) return false // event before let edata = this.trigger({ phase: 'before', type: 'collapse', target: id, object: nd }) @@ -480,7 +480,7 @@ class w2sidebar extends w2event { expand(id) { let obj = this - let nd = this.get(id) + let nd = this.get(id) // event before let edata = this.trigger({ phase: 'before', type: 'expand', target: id, object: nd }) if (edata.isCancelled === true) return @@ -520,12 +520,12 @@ class w2sidebar extends w2event { click(id, event) { let obj = this - let nd = this.get(id) + let nd = this.get(id) if (nd == null) return if (nd.disabled || nd.group) return // should click event if already selected - // unselect all previsously + // unselect all previously $(obj.box).find('.w2ui-node.w2ui-selected').each((index, el) => { - let oldID = $(el).attr('id').replace('node_', '') + let oldID = $(el).attr('id').replace('node_', '') let oldNode = obj.get(oldID) if (oldNode != null) oldNode.selected = false $(el).removeClass('w2ui-selected').find('.w2ui-icon').removeClass('w2ui-icon-selected') @@ -547,11 +547,11 @@ class w2sidebar extends w2event { // default action if (oldNode != null) oldNode.selected = false obj.get(id).selected = true - obj.selected = id + obj.selected = id // route processing if (typeof nd.route == 'string') { let route = nd.route !== '' ? String('/'+ nd.route).replace(/\/{2,}/g, '/') : '' - let info = w2utils.parseRoute(route) + let info = w2utils.parseRoute(route) if (info.keys.length > 0) { for (let k = 0; k < info.keys.length; k++) { if (obj.routeData[info.keys[k].name] == null) continue @@ -594,7 +594,7 @@ class w2sidebar extends w2event { keydown(event) { let obj = this - let nd = obj.get(obj.selected) + let nd = obj.get(obj.selected) if (obj.keyboard !== true) return if (!nd) nd = obj.nodes[0] // trigger event @@ -654,8 +654,8 @@ class w2sidebar extends w2event { function next(node, noSubs) { if (node == null) return null - let parent = node.parent - let ind = obj.get(node.id, true) + let parent = node.parent + let ind = obj.get(node.id, true) let nextNode = null // jump inside if (node.expanded && node.nodes.length > 0 && noSubs !== true) { @@ -674,8 +674,8 @@ class w2sidebar extends w2event { function prev(node) { if (node == null) return null - let parent = node.parent - let ind = obj.get(node.id, true) + let parent = node.parent + let ind = obj.get(node.id, true) let prevNode = (ind > 0) ? lastChild(parent.nodes[ind - 1]) : parent if (prevNode != null && (prevNode.hidden || prevNode.disabled || prevNode.group)) prevNode = prev(prevNode) return prevNode @@ -694,8 +694,8 @@ class w2sidebar extends w2event { if (id == null) id = this.selected let nd = this.get(id) if (nd == null) return - let body = $(this.box).find('.w2ui-sidebar-body') - let item = $(this.box).find('#node_'+ w2utils.escapeId(id)) + let body = $(this.box).find('.w2ui-sidebar-body') + let item = $(this.box).find('#node_'+ w2utils.escapeId(id)) let offset = item.offset().top - body.offset().top if (offset + item.height() > body.height() || offset <= 0) { body.animate({ 'scrollTop': body.scrollTop() + offset - body.height() / 2 + item.height() }, instant ? 0 : 250, 'linear') @@ -715,7 +715,7 @@ class w2sidebar extends w2event { contextMenu(id, event) { let obj = this - let nd = obj.get(id) + let nd = obj.get(id) if (id != obj.selected) obj.click(id) // event before let edata = obj.trigger({ phase: 'before', type: 'contextMenu', target: id, originalEvent: event, object: nd, allowOnDisabled: false }) @@ -764,7 +764,7 @@ class w2sidebar extends w2event { render(box) { let time = (new Date()).getTime() - let obj = this + let obj = this // event before let edata = this.trigger({ phase: 'before', type: 'render', target: this.name, box: box }) if (edata.isCancelled === true) return @@ -866,13 +866,13 @@ class w2sidebar extends w2event { delete options.text } if (options.class) { - nd.class = options.class - level = $el.data('level') + nd.class = options.class + level = $el.data('level') $el[0].className = 'w2ui-node-group w2ui-level-'+ level +(nd.class ? ' ' + nd.class : '') delete options.class } if (options.style) { - nd.style = options.style + nd.style = options.style $el.next()[0].style = nd.style +';'+ (!nd.hidden && nd.expanded ? '' : 'display: none;') delete options.style } @@ -880,7 +880,7 @@ class w2sidebar extends w2event { if (options.icon) { let $img = $el.find('.w2ui-node-image > span') if ($img.length > 0) { - nd.icon = options.icon + nd.icon = options.icon $img[0].className = (typeof nd.icon == 'function' ? nd.icon.call(this, nd) : nd.icon) delete options.icon } @@ -891,8 +891,8 @@ class w2sidebar extends w2event { if ($el.find('.w2ui-node-count').length > 0) delete options.count } if (options.class && $el.length > 0) { - nd.class = options.class - level = $el.data('level') + nd.class = options.class + level = $el.data('level') $el[0].className = 'w2ui-node w2ui-level-'+ level + (nd.selected ? ' w2ui-selected' : '') + (nd.disabled ? ' w2ui-disabled' : '') + (nd.class ? ' ' + nd.class : '') delete options.class } @@ -902,8 +902,8 @@ class w2sidebar extends w2event { delete options.text } if (options.style && $el.length > 0) { - let $txt = $el.find('.w2ui-node-text') - nd.style = options.style + let $txt = $el.find('.w2ui-node-text') + nd.style = options.style $txt[0].style = nd.style delete options.style } @@ -941,7 +941,7 @@ class w2sidebar extends w2event { }) // if no parent - reset nodes if (this.nodes.length > 0 && this.nodes[0].parent == null) { - let tmp = this.nodes + let tmp = this.nodes this.nodes = [] this.add(this, tmp) } @@ -950,7 +950,7 @@ class w2sidebar extends w2event { let nm if (id == null) { node = this - nm = '.w2ui-sidebar-body' + nm = '.w2ui-sidebar-body' } else { node = this.get(id) if (node == null) return @@ -958,7 +958,7 @@ class w2sidebar extends w2event { } let nodeHTML if (node !== this) { - let tmp = '#node_'+ w2utils.escapeId(node.id) + let tmp = '#node_'+ w2utils.escapeId(node.id) nodeHTML = getNodeHTML(node) $(this.box).find(tmp).before('') $(this.box).find(tmp).remove() @@ -974,7 +974,7 @@ class w2sidebar extends w2event { // refresh sub nodes $(this.box).find(nm).html('') for (let i = 0; i < node.nodes.length; i++) { - nd = node.nodes[i] + nd = node.nodes[i] nodeHTML = getNodeHTML(nd) $(this.box).find(nm).append(nodeHTML) if (nd.nodes.length !== 0) { @@ -995,14 +995,14 @@ class w2sidebar extends w2event { function getNodeHTML(nd) { let html = '' - let img = nd.img + let img = nd.img let icon = nd.icon if (icon == null && img == null) { if (icon == null) icon = obj.icon if (img == null) img = obj.img } // -- find out level - let tmp = nd.parent + let tmp = nd.parent let level = 0 while (tmp && tmp.parent != null) { // if (tmp.group) level--; @@ -1037,7 +1037,7 @@ class w2sidebar extends w2event { if (icon) { tmp = '
' } - let text = nd.text + let text = nd.text let expand = '' let counts = (nd.count != null ? '
'+ nd.count +'
' : '') if (nd.collapsible === true) { diff --git a/src/w2tabs.js b/src/w2tabs.js index e0d6a9300..bb669a87d 100644 --- a/src/w2tabs.js +++ b/src/w2tabs.js @@ -16,23 +16,23 @@ import { w2utils } from './w2utils.js' class w2tabs extends w2event { constructor(options) { super(options.name) - this.box = null // DOM Element that holds the element - this.name = null // unique name for w2ui - this.active = null - this.reorder = false - this.flow = 'down' // can be down or up - this.tooltip = 'top|left' // can be top, bottom, left, right - this.tabs = [] - this.routeData = {} // data for dynamic routes - this.tmp = {} // placeholder for internal variables - this.right = '' - this.style = '' - this.onClick = null - this.onClose = null - this.onRender = null - this.onRefresh = null - this.onResize = null - this.onDestroy = null + this.box = null // DOM Element that holds the element + this.name = null // unique name for w2ui + this.active = null + this.reorder = false + this.flow = 'down' // can be down or up + this.tooltip = 'top|left' // can be top, bottom, left, right + this.tabs = [] + this.routeData = {} // data for dynamic routes + this.tmp = {} // placeholder for internal variables + this.right = '' + this.style = '' + this.onClick = null + this.onClose = null + this.onRender = null + this.onRefresh = null + this.onResize = null + this.onDestroy = null this.tab_template = { id: null, text: null, @@ -46,7 +46,7 @@ class w2tabs extends w2event { onRefresh: null, onClose: null } - let tabs = options.tabs + let tabs = options.tabs delete options.tabs // mix in options $.extend(true, this, options) @@ -181,16 +181,16 @@ class w2tabs extends w2event { dragMove(event) { if (!this.tmp.reordering) return - let obj = this + let obj = this let info = this.tmp.moving - let tab = this.tabs[info.index] + let tab = this.tabs[info.index] let next = _find(info.index, 1) let prev = _find(info.index, -1) - let $el = $('#tabs_'+ this.name + '_tab_'+ w2utils.escapeId(tab.id)) + let $el = $('#tabs_'+ this.name + '_tab_'+ w2utils.escapeId(tab.id)) if (info.divX > 0 && next) { let $nextEl = $('#tabs_'+ this.name + '_tab_'+ w2utils.escapeId(next.id)) - let width1 = parseInt($el.css('width')) - let width2 = parseInt($nextEl.css('width')) + let width1 = parseInt($el.css('width')) + let width2 = parseInt($nextEl.css('width')) if (width1 < width2) { width1 = Math.floor(width1 / 3) width2 = width2 - width1 @@ -214,8 +214,8 @@ class w2tabs extends w2event { } if (info.divX < 0 && prev) { let $prevEl = $('#tabs_'+ this.name + '_tab_'+ w2utils.escapeId(prev.id)) - let width1 = parseInt($el.css('width')) - let width2 = parseInt($prevEl.css('width')) + let width1 = parseInt($el.css('width')) + let width2 = parseInt($prevEl.css('width')) if (width1 < width2) { width1 = Math.floor(width1 / 3) width2 = width2 - width1 @@ -238,7 +238,7 @@ class w2tabs extends w2event { } } function _find(ind, inc) { - ind += inc + ind += inc let tab = obj.tabs[ind] if (tab && tab.hidden) { tab = _find(ind, inc) @@ -249,7 +249,7 @@ class w2tabs extends w2event { tooltipShow(id, event, forceRefresh) { let item = this.get(id) - let $el = $(this.box).find('#tabs_'+ this.name + '_tab_'+ w2utils.escapeId(id)) + let $el = $(this.box).find('#tabs_'+ this.name + '_tab_'+ w2utils.escapeId(id)) if (this.tooltip == null || item.disabled || this.tmp.reordering) { return } @@ -271,7 +271,7 @@ class w2tabs extends w2event { tooltipHide(id) { let item = this.get(id) - let $el = $(this.box).find('#tabs_'+ this.name + '_tab_'+ w2utils.escapeId(id)) + let $el = $(this.box).find('#tabs_'+ this.name + '_tab_'+ w2utils.escapeId(id)) if (this.tooltip == null || item.disabled || this.tmp.reordering) { return } @@ -286,7 +286,7 @@ class w2tabs extends w2event { getTabHTML(id) { let index = this.get(id, true) - let tab = this.tabs[index] + let tab = this.tabs[index] if (tab == null) return false if (tab.text == null && tab.caption != null) tab.text = tab.caption if (tab.tooltip == null && tab.hint != null) tab.tooltip = tab.hint // for backward compatibility @@ -338,7 +338,7 @@ class w2tabs extends w2event { } } else { // create or refresh only one item - let $tab = $(this.box).find('#tabs_'+ this.name +'_tab_'+ w2utils.escapeId(id)) + let $tab = $(this.box).find('#tabs_'+ this.name +'_tab_'+ w2utils.escapeId(id)) let tabHTML = this.getTabHTML(id) if ($tab.length === 0) { $(this.box).find('#tabs_'+ this.name +'_right').before(tabHTML) @@ -395,10 +395,10 @@ class w2tabs extends w2event { initReorder(id, event) { if (!this.reorder) return - let obj = this - let $tab = $('#tabs_' + this.name + '_tab_' + w2utils.escapeId(id)) + let obj = this + let $tab = $('#tabs_' + this.name + '_tab_' + w2utils.escapeId(id)) let tabIndex = this.get(id, true) - let $ghost = $tab.clone() + let $ghost = $tab.clone() let edata $ghost.attr('id', '#tabs_' + this.name + '_tab_ghost') this.tmp.moving = { @@ -457,13 +457,13 @@ class w2tabs extends w2event { } scroll(direction) { - let box = $(this.box) - let obj = this - let scrollBox = box.find('.w2ui-scroll-wrapper') + let box = $(this.box) + let obj = this + let scrollBox = box.find('.w2ui-scroll-wrapper') let scrollLeft = scrollBox.scrollLeft() - let $right = $(this.box).find('.w2ui-tabs-right') - let width1 = scrollBox.outerWidth() - let width2 = scrollLeft + parseInt($right.offset().left) + parseInt($right.width()) + let $right = $(this.box).find('.w2ui-tabs-right') + let width1 = scrollBox.outerWidth() + let width2 = scrollLeft + parseInt($right.offset().left) + parseInt($right.width()) let scroll switch (direction) { @@ -491,9 +491,9 @@ class w2tabs extends w2event { // show hide overflow buttons let box = $(this.box) box.find('.w2ui-scroll-left, .w2ui-scroll-right').hide() - let scrollBox = box.find('.w2ui-scroll-wrapper') - let $right = $(this.box).find('.w2ui-tabs-right') - let boxWidth = scrollBox.outerWidth() + let scrollBox = box.find('.w2ui-scroll-wrapper') + let $right = $(this.box).find('.w2ui-tabs-right') + let boxWidth = scrollBox.outerWidth() let itemsWidth = ($right.length > 0 ? $right[0].offsetLeft + $right[0].clientWidth : 0) if (itemsWidth > boxWidth) { // we have overflowed content @@ -543,7 +543,7 @@ class w2tabs extends w2event { // route processing if (typeof tab.route == 'string') { let route = tab.route !== '' ? String('/'+ tab.route).replace(/\/{2,}/g, '/') : '' - let info = w2utils.parseRoute(route) + let info = w2utils.parseRoute(route) if (info.keys.length > 0) { for (let k = 0; k < info.keys.length; k++) { if (this.routeData[info.keys[k].name] == null) continue @@ -572,7 +572,7 @@ class w2tabs extends w2event { animateClose(id) { return new Promise((resolve, reject) => { - let $tab = $(this.box).find('#tabs_'+ this.name +'_tab_'+ w2utils.escapeId(id)) + let $tab = $(this.box).find('#tabs_'+ this.name +'_tab_'+ w2utils.escapeId(id)) let width = parseInt($tab.css('width') || 0) let $anim = $(`
`) $tab.replaceWith($anim) @@ -587,9 +587,8 @@ class w2tabs extends w2event { animateInsert(id, tab) { return new Promise((resolve, reject) => { - let middle = this.get(id, true) let $before = $(this.box).find('#tabs_'+ this.name +'_tab_'+ w2utils.escapeId(id)) - let $tab = $(this.getTabHTML(tab.id)) + let $tab = $(this.getTabHTML(tab.id)) if ($before.length == 0) { $before = $(this.box).find('#tabs_tabs_right') $before.before($tab) @@ -598,9 +597,9 @@ class w2tabs extends w2event { // insert at the end and find width $tab.css({ opacity: 0 }) $(this.box).find('#tabs_tabs_right').before($tab) - let $tmp = $('#'+$tab.attr('id')) + let $tmp = $('#'+$tab.attr('id')) let width = parseInt($tmp.css('width') || 0) - let $anim = $(`
`) + let $anim = $('
') $before.before($anim) $tab.hide() $tab.insertBefore($anim) diff --git a/src/w2toolbar.js b/src/w2toolbar.js index a4914d199..b27e73278 100644 --- a/src/w2toolbar.js +++ b/src/w2toolbar.js @@ -17,17 +17,17 @@ import { w2utils } from './w2utils.js' class w2toolbar extends w2event { constructor(options) { super(options.name) - this.box = null // DOM Element that holds the element - this.name = null // unique name for w2ui - this.routeData = {} // data for dynamic routes - this.items = [] - this.right = '' // HTML text on the right of toolbar - this.tooltip = 'top|left'// can be top, bottom, left, right - this.onClick = null - this.onRender = null - this.onRefresh = null - this.onResize = null - this.onDestroy = null + this.box = null // DOM Element that holds the element + this.name = null // unique name for w2ui + this.routeData = {} // data for dynamic routes + this.items = [] + this.right = '' // HTML text on the right of toolbar + this.tooltip = 'top|left'// can be top, bottom, left, right + this.onClick = null + this.onRender = null + this.onRefresh = null + this.onResize = null + this.onDestroy = null this.item_template = { id: null, // command to be sent to all event handlers type: 'button', // button, check, radio, drop, menu, menu-radio, menu-check, break, html, spacer @@ -56,7 +56,7 @@ class w2toolbar extends w2event { onClick: null, onRefresh: null } - let items = options.items + let items = options.items delete options.items // mix in options $.extend(true, this, options) @@ -258,8 +258,8 @@ class w2toolbar extends w2event { click(id, event) { let obj = this // click on menu items - let tmp = String(id).split(':') - let it = this.get(tmp[0]) + let tmp = String(id).split(':') + let it = this.get(tmp[0]) let items = (it && it.items ? w2utils.normMenu.call(this, it.items, it) : []) if (tmp.length > 1) { @@ -276,7 +276,7 @@ class w2toolbar extends w2event { if (edata.isCancelled === true) return let btn = '#tb_'+ this.name +'_item_'+ w2utils.escapeId(it.id) +' table.w2ui-button' - $(btn).removeClass('down') // need to requery at the moment -- as well as elsewhere in this function + $(btn).removeClass('down') // need to re-query at the moment -- as well as elsewhere in this function if (it.type == 'radio') { for (let i = 0; i < this.items.length; i++) { @@ -384,7 +384,7 @@ class w2toolbar extends w2event { // route processing if (it.route) { let route = String('/'+ it.route).replace(/\/{2,}/g, '/') - let info = w2utils.parseRoute(route) + let info = w2utils.parseRoute(route) if (info.keys.length > 0) { for (let k = 0; k < info.keys.length; k++) { route = route.replace((new RegExp(':'+ info.keys[k].name, 'g')), this.routeData[info.keys[k].name]) @@ -402,9 +402,9 @@ class w2toolbar extends w2event { } scroll(direction) { - let box = $(this.box) - let obj = this - let scrollBox = box.find('.w2ui-scroll-wrapper') + let box = $(this.box) + let obj = this + let scrollBox = box.find('.w2ui-scroll-wrapper') let scrollLeft = scrollBox.scrollLeft() let width1, width2, scroll @@ -511,7 +511,7 @@ class w2toolbar extends w2event { edata2 = this.trigger({ phase: 'before', type: 'refresh', target: id, item: it, object: it }) if (edata2.isCancelled === true) return } - let el = $(this.box).find('#tb_'+ this.name +'_item_'+ w2utils.escapeId(it.id)) + let el = $(this.box).find('#tb_'+ this.name +'_item_'+ w2utils.escapeId(it.id)) let html = this.getItemHTML(it) // hide tooltip this.tooltipHide(id, {}) @@ -614,7 +614,7 @@ class w2toolbar extends w2event { return tmp.find(it => it.id == id ? true : false) } } - let img = ' ' + let img = ' ' let text = (typeof item.text == 'function' ? item.text.call(this, item) : item.text) if (item.img) img = '
' if (item.icon) { @@ -688,10 +688,10 @@ class w2toolbar extends w2event { tooltipShow(id, event, forceRefresh) { if (this.tooltip == null) return - let $el = $(this.box).find('#tb_'+ this.name + '_item_'+ w2utils.escapeId(id)) + let $el = $(this.box).find('#tb_'+ this.name + '_item_'+ w2utils.escapeId(id)) let item = this.get(id) - let pos = this.tooltip - let txt = item.tooltip + let pos = this.tooltip + let txt = item.tooltip if (typeof txt == 'function') txt = txt.call(this, item) clearTimeout(this._tooltipTimer) this._tooltipTimer = setTimeout(() => { @@ -730,8 +730,8 @@ class w2toolbar extends w2event { if (edata.isCancelled === true) return // route processing - let it = event.subItem - let item = this.get(event.item.id) + let it = event.subItem + let item = this.get(event.item.id) let items = item.items if (typeof items == 'function') items = item.items() if (item.type == 'menu-radio') { @@ -785,7 +785,7 @@ class w2toolbar extends w2event { } if (typeof it.route == 'string') { let route = it.route !== '' ? String('/'+ it.route).replace(/\/{2,}/g, '/') : '' - let info = w2utils.parseRoute(route) + let info = w2utils.parseRoute(route) if (info.keys.length > 0) { for (let k = 0; k < info.keys.length; k++) { if (obj.routeData[info.keys[k].name] == null) continue diff --git a/src/w2utils.js b/src/w2utils.js index 6be7319c1..6434f19a3 100644 --- a/src/w2utils.js +++ b/src/w2utils.js @@ -15,7 +15,7 @@ * ************************************************/ -let w2ui = {} +let w2ui = {} let w2utils = (($) => { let tmp = {} // for some temp variables return { @@ -162,27 +162,27 @@ let w2utils = (($) => { if (format == null) format = w2utils.settings.dateFormat if (typeof val.getFullYear === 'function') { // date object - year = val.getFullYear() + year = val.getFullYear() month = val.getMonth() + 1 - day = val.getDate() + day = val.getDate() } else if (parseInt(val) == val && parseInt(val) > 0) { - val = new Date(parseInt(val)) - year = val.getFullYear() + val = new Date(parseInt(val)) + year = val.getFullYear() month = val.getMonth() + 1 - day = val.getDate() + day = val.getDate() } else { val = String(val) // convert month formats if (new RegExp('mon', 'ig').test(format)) { format = format.replace(/month/ig, 'm').replace(/mon/ig, 'm').replace(/dd/ig, 'd').replace(/[, ]/ig, '/').replace(/\/\//g, '/').toLowerCase() - val = val.replace(/[, ]/ig, '/').replace(/\/\//g, '/').toLowerCase() + val = val.replace(/[, ]/ig, '/').replace(/\/\//g, '/').toLowerCase() for (let m = 0, len = w2utils.settings.fullmonths.length; m < len; m++) { let t = w2utils.settings.fullmonths[m] - val = val.replace(new RegExp(t, 'ig'), (parseInt(m) + 1)).replace(new RegExp(t.substr(0, 3), 'ig'), (parseInt(m) + 1)) + val = val.replace(new RegExp(t, 'ig'), (parseInt(m) + 1)).replace(new RegExp(t.substr(0, 3), 'ig'), (parseInt(m) + 1)) } } // format date - let tmp = val.replace(/-/g, '/').replace(/\./g, '/').toLowerCase().split('/') + let tmp = val.replace(/-/g, '/').replace(/\./g, '/').toLowerCase().split('/') let tmp2 = format.replace(/-/g, '/').replace(/\./g, '/').toLowerCase() if (tmp2 === 'mm/dd/yyyy') { month = tmp[0]; day = tmp[1]; year = tmp[2] } if (tmp2 === 'm/d/yyyy') { month = tmp[0]; day = tmp[1]; year = tmp[2] } @@ -204,10 +204,10 @@ let w2utils = (($) => { if (!isInt(year)) return false if (!isInt(month)) return false if (!isInt(day)) return false - year = +year + year = +year month = +month - day = +day - dt = new Date(year, month - 1, day) + day = +day + dt = new Date(year, month - 1, day) dt.setFullYear(year) // do checks if (month == null) return false @@ -221,17 +221,17 @@ let w2utils = (($) => { if (val == null) return false let max, am, pm // -- process american format - val = String(val) - val = val.toUpperCase() - am = val.indexOf('AM') >= 0 - pm = val.indexOf('PM') >= 0 + val = String(val) + val = val.toUpperCase() + am = val.indexOf('AM') >= 0 + pm = val.indexOf('PM') >= 0 let ampm = (pm || am) if (ampm) max = 12; else max = 24 val = val.replace('AM', '').replace('PM', '') val = $.trim(val) // --- let tmp = val.split(':') - let h = parseInt(tmp[0] || 0), m = parseInt(tmp[1] || 0), s = parseInt(tmp[2] || 0) + let h = parseInt(tmp[0] || 0), m = parseInt(tmp[1] || 0), s = parseInt(tmp[2] || 0) // accept edge case: 3PM is a good timestamp, but 3 (without AM or PM) is NOT: if ((!ampm || tmp.length !== 1) && tmp.length !== 2 && tmp.length !== 3) { return false } if (tmp[0] === '' || h < 0 || h > max || !this.isInt(tmp[0]) || tmp[0].length > 2) { return false } @@ -273,8 +273,8 @@ let w2utils = (($) => { } else { if (format == null) format = w2utils.settings.datetimeFormat let formats = format.split('|') - let values = [val.substr(0, tmp), val.substr(tmp).trim()] - formats[0] = formats[0].trim() + let values = [val.substr(0, tmp), val.substr(tmp).trim()] + formats[0] = formats[0].trim() if (formats[1]) formats[1] = formats[1].trim() // check let tmp1 = w2utils.isDate(values[0], formats[0], true) @@ -303,36 +303,36 @@ let w2utils = (($) => { } if (String(d1) === 'Invalid Date') return '' - let d2 = new Date() - let sec = (d2.getTime() - d1.getTime()) / 1000 + let d2 = new Date() + let sec = (d2.getTime() - d1.getTime()) / 1000 let amount = '' - let type = '' + let type = '' if (sec < 0) { amount = 0 - type = 'sec' + type = 'sec' } else if (sec < 60) { amount = Math.floor(sec) - type = 'sec' + type = 'sec' if (sec < 0) { amount = 0; type = 'sec' } } else if (sec < 60*60) { amount = Math.floor(sec/60) - type = 'min' + type = 'min' } else if (sec < 24*60*60) { amount = Math.floor(sec/60/60) - type = 'hour' + type = 'hour' } else if (sec < 30*24*60*60) { amount = Math.floor(sec/24/60/60) - type = 'day' + type = 'day' } else if (sec < 365*24*60*60) { amount = Math.floor(sec/30/24/60/60*10)/10 - type = 'month' + type = 'month' } else if (sec < 365*4*24*60*60) { amount = Math.floor(sec/365/24/60/60*10)/10 - type = 'year' + type = 'year' } else if (sec >= 365*4*24*60*60) { // factor in leap year shift (only older then 4 years) amount = Math.floor(sec/365.25/24/60/60*10)/10 - type = 'year' + type = 'year' } return amount + ' ' + type + (amount > 1 ? 's' : '') } @@ -364,17 +364,17 @@ let w2utils = (($) => { if (String(d1) === 'Invalid Date') return '' let months = w2utils.settings.shortmonths - let d2 = new Date() // today - let d3 = new Date() + let d2 = new Date() // today + let d3 = new Date() d3.setTime(d3.getTime() - 86400000) // yesterday let dd1 = months[d1.getMonth()] + ' ' + d1.getDate() + ', ' + d1.getFullYear() let dd2 = months[d2.getMonth()] + ' ' + d2.getDate() + ', ' + d2.getFullYear() let dd3 = months[d3.getMonth()] + ' ' + d3.getDate() + ', ' + d3.getFullYear() - let time = (d1.getHours() - (d1.getHours() > 12 ? 12 :0)) + ':' + (d1.getMinutes() < 10 ? '0' : '') + d1.getMinutes() + ' ' + (d1.getHours() >= 12 ? 'pm' : 'am') - let time2= (d1.getHours() - (d1.getHours() > 12 ? 12 :0)) + ':' + (d1.getMinutes() < 10 ? '0' : '') + d1.getMinutes() + ':' + (d1.getSeconds() < 10 ? '0' : '') + d1.getSeconds() + ' ' + (d1.getHours() >= 12 ? 'pm' : 'am') - let dsp = dd1 + let time = (d1.getHours() - (d1.getHours() > 12 ? 12 :0)) + ':' + (d1.getMinutes() < 10 ? '0' : '') + d1.getMinutes() + ' ' + (d1.getHours() >= 12 ? 'pm' : 'am') + let time2 = (d1.getHours() - (d1.getHours() > 12 ? 12 :0)) + ':' + (d1.getMinutes() < 10 ? '0' : '') + d1.getMinutes() + ':' + (d1.getSeconds() < 10 ? '0' : '') + d1.getSeconds() + ' ' + (d1.getHours() >= 12 ? 'pm' : 'am') + let dsp = dd1 if (dd1 === dd2) dsp = time if (dd1 === dd3) dsp = w2utils.lang('Yesterday') @@ -386,7 +386,7 @@ let w2utils = (($) => { sizeStr = parseFloat(sizeStr) if (sizeStr === 0) return 0 let sizes = ['Bt', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB'] - let i = parseInt( Math.floor( Math.log(sizeStr) / Math.log(1024) ) ) + let i = parseInt( Math.floor( Math.log(sizeStr) / Math.log(1024) ) ) return (Math.floor(sizeStr / Math.pow(1024, i) * 10) / 10).toFixed(i === 0 ? 0 : 1) + ' ' + (sizes[i] || '??') } @@ -412,9 +412,9 @@ let w2utils = (($) => { if (w2utils.isInt(dateStr)) dt = new Date(Number(dateStr)) // for unix timestamps if (String(dt) === 'Invalid Date') return '' - let year = dt.getFullYear() + let year = dt.getFullYear() let month = dt.getMonth() - let date = dt.getDate() + let date = dt.getDate() return format.toLowerCase() .replace('month', w2utils.settings.fullmonths[month]) .replace('mon', w2utils.settings.shortmonths[month]) @@ -439,7 +439,7 @@ let w2utils = (($) => { if (w2utils.isInt(dateStr)) dt = new Date(Number(dateStr)) // for unix timestamps if (w2utils.isTime(dateStr)) { let tmp = w2utils.isTime(dateStr, true) - dt = new Date() + dt = new Date() dt.setHours(tmp.hours) dt.setMinutes(tmp.minutes) } @@ -447,9 +447,9 @@ let w2utils = (($) => { let type = 'am' let hour = dt.getHours() - let h24 = dt.getHours() - let min = dt.getMinutes() - let sec = dt.getSeconds() + let h24 = dt.getHours() + let min = dt.getMinutes() + let sec = dt.getSeconds() if (min < 10) min = '0' + min if (sec < 10) sec = '0' + sec if (format.indexOf('am') !== -1 || format.indexOf('pm') !== -1) { @@ -478,7 +478,7 @@ let w2utils = (($) => { if (typeof format !== 'string') { fmt = [this.settings.dateFormat, this.settings.timeFormat] } else { - fmt = format.split('|') + fmt = format.split('|') fmt[0] = fmt[0].trim() fmt[1] = (fmt.length > 1 ? fmt[1].trim() : this.settings.timeFormat) } @@ -562,9 +562,9 @@ let w2utils = (($) => { function base64encode (input) { let output = '' let chr1, chr2, chr3, enc1, enc2, enc3, enc4 - let i = 0 + let i = 0 let keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=' - input = utf8_encode(input) + input = utf8_encode(input) while (i < input.length) { chr1 = input.charCodeAt(i++) @@ -583,7 +583,7 @@ let w2utils = (($) => { } function utf8_encode (string) { - string = String(string).replace(/\r\n/g,'\n') + string = String(string).replace(/\r\n/g,'\n') let utftext = '' for (let n = 0; n < string.length; n++) { @@ -611,18 +611,18 @@ let w2utils = (($) => { let output = '' let chr1, chr2, chr3 let enc1, enc2, enc3, enc4 - let i = 0 + let i = 0 let keyStr = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=' - input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '') + input = input.replace(/[^A-Za-z0-9\+\/\=]/g, '') while (i < input.length) { - enc1 = keyStr.indexOf(input.charAt(i++)) - enc2 = keyStr.indexOf(input.charAt(i++)) - enc3 = keyStr.indexOf(input.charAt(i++)) - enc4 = keyStr.indexOf(input.charAt(i++)) - chr1 = (enc1 << 2) | (enc2 >> 4) - chr2 = ((enc2 & 15) << 4) | (enc3 >> 2) - chr3 = ((enc3 & 3) << 6) | enc4 + enc1 = keyStr.indexOf(input.charAt(i++)) + enc2 = keyStr.indexOf(input.charAt(i++)) + enc3 = keyStr.indexOf(input.charAt(i++)) + enc4 = keyStr.indexOf(input.charAt(i++)) + chr1 = (enc1 << 2) | (enc2 >> 4) + chr2 = ((enc2 & 15) << 4) | (enc3 >> 2) + chr3 = ((enc3 & 3) << 6) | enc4 output = output + String.fromCharCode(chr1) if (enc3 !== 64) { output = output + String.fromCharCode(chr2) @@ -635,8 +635,8 @@ let w2utils = (($) => { function utf8_decode (utftext) { let string = '' - let i = 0 - let c = 0, c2, c3 + let i = 0 + let c = 0, c2, c3 while ( i < utftext.length ) { c = utftext.charCodeAt(i) @@ -645,15 +645,15 @@ let w2utils = (($) => { i++ } else if((c > 191) && (c < 224)) { - c2 = utftext.charCodeAt(i+1) + c2 = utftext.charCodeAt(i+1) string += String.fromCharCode(((c & 31) << 6) | (c2 & 63)) - i += 2 + i += 2 } else { - c2 = utftext.charCodeAt(i+1) - c3 = utftext.charCodeAt(i+2) + c2 = utftext.charCodeAt(i+1) + c3 = utftext.charCodeAt(i+2) string += String.fromCharCode(((c & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63)) - i += 3 + i += 3 } } @@ -692,11 +692,11 @@ let w2utils = (($) => { hexcase = 0 } let hex_tab = hexcase ? '0123456789ABCDEF' : '0123456789abcdef' - let output = '' + let output = '' let x for (let i = 0; i < input.length; i++) { - x = input.charCodeAt(i) + x = input.charCodeAt(i) output += hex_tab.charAt((x >>> 4) & 0x0F) + hex_tab.charAt(x & 0x0F) } @@ -710,7 +710,7 @@ let w2utils = (($) => { function __pj_crypt_str2rstr_utf8(input) { let output = '' - let i = -1 + let i = -1 let x, y while (++i < input.length) @@ -774,7 +774,7 @@ let w2utils = (($) => { function __pj_crypt_binl_md5(x, len) { /* append padding */ - x[len >> 5] |= 0x80 << ((len) % 32) + x[len >> 5] |= 0x80 << ((len) % 32) x[(((len + 64) >>> 9) << 4) + 14] = len let a = 1732584193 @@ -913,9 +913,9 @@ let w2utils = (($) => { } function transition (div_old, div_new, type, callBack) { - let width = $(div_old).width() + let width = $(div_old).width() let height = $(div_old).height() - let time = 0.5 + let time = 0.5 if (!div_old || !div_new) { console.log('ERROR: Cannot do transition when one of the divs is null') @@ -923,8 +923,8 @@ let w2utils = (($) => { } div_old.parentNode.style.cssText += 'perspective: 900px; overflow: hidden;' - div_old.style.cssText += '; position: absolute; z-index: 1019; backface-visibility: hidden' - div_new.style.cssText += '; position: absolute; z-index: 1020; backface-visibility: hidden' + div_old.style.cssText += '; position: absolute; z-index: 1019; backface-visibility: hidden' + div_new.style.cssText += '; position: absolute; z-index: 1020; backface-visibility: hidden' switch (type) { case 'slide-left': @@ -1086,7 +1086,7 @@ let w2utils = (($) => { if (typeof msg === 'object') { options = msg } else { - options.msg = msg + options.msg = msg options.spinner = spinner } if (!options.msg && options.msg !== 0) options.msg = '' @@ -1096,7 +1096,7 @@ let w2utils = (($) => { '
' ) let $lock = $(box).find('.w2ui-lock') - let mess = $(box).find('.w2ui-lock-msg') + let mess = $(box).find('.w2ui-lock-msg') if (!options.msg) mess.css({ 'background-color': 'transparent', 'border': '0px' }) if (options.spinner === true) options.msg = '' + options.msg if (options.opacity != null) $lock.css('opacity', options.opacity) @@ -1137,12 +1137,12 @@ let w2utils = (($) => { if (options.on == null) $.extend(options, w2utils.event) if (options.width == null) options.width = 200 if (options.height == null) options.height = 100 - let pWidth = parseInt($(where.box).width()) - let pHeight = parseInt($(where.box).height()) + let pWidth = parseInt($(where.box).width()) + let pHeight = parseInt($(where.box).height()) let titleHeight = parseInt($(where.box).find(where.title).css('height') || 0) if (options.width > pWidth) options.width = pWidth - 10 if (options.height > pHeight - titleHeight) options.height = pHeight - 10 - titleHeight - options.originalWidth = options.width + options.originalWidth = options.width options.originalHeight = options.height if (parseInt(options.width) < 0) options.width = pWidth + options.width if (parseInt(options.width) < 10) options.width = 10 @@ -1172,7 +1172,7 @@ let w2utils = (($) => { if ($.trim(options.html) === '' && $.trim(options.body) === '' && $.trim(options.buttons) === '') { if (msgCount === 0) return // no messages at all let $msg = $(where.box).find('#w2ui-message'+ (msgCount-1)) - options = $msg.data('options') || {} + options = $msg.data('options') || {} // before event if (options.trigger) { edata = options.trigger({ phase: 'before', type: 'close', target: 'self' }) @@ -1284,7 +1284,7 @@ let w2utils = (($) => { } function getSize (el, type) { - let $el = $(el) + let $el = $(el) let bwidth = { left : parseInt($el.css('border-left-width')) || 0, right : parseInt($el.css('border-right-width')) || 0, @@ -1420,9 +1420,9 @@ let w2utils = (($) => { } function cssPrefix(field, value, returnString) { - let css = {} + let css = {} let newCSS = {} - let ret = '' + let ret = '' if (!$.isPlainObject(field)) { css[field] = value } else { @@ -1430,11 +1430,11 @@ let w2utils = (($) => { if (value === true) returnString = true } for (let c in css) { - newCSS[c] = css[c] + newCSS[c] = css[c] newCSS['-webkit-'+c] = css[c] - newCSS['-moz-'+c] = css[c].replace('-webkit-', '-moz-') - newCSS['-ms-'+c] = css[c].replace('-webkit-', '-ms-') - newCSS['-o-'+c] = css[c].replace('-webkit-', '-o-') + newCSS['-moz-'+c] = css[c].replace('-webkit-', '-moz-') + newCSS['-ms-'+c] = css[c].replace('-webkit-', '-ms-') + newCSS['-o-'+c] = css[c].replace('-webkit-', '-o-') } if (returnString === true) { for (let c in newCSS) { @@ -1449,8 +1449,8 @@ let w2utils = (($) => { function getCursorPosition(input) { if (input == null) return null let caretOffset = 0 - let doc = input.ownerDocument || input.document - let win = doc.defaultView || doc.parentWindow + let doc = input.ownerDocument || input.document + let win = doc.defaultView || doc.parentWindow let sel if (input.tagName && input.tagName.toUpperCase() === 'INPUT' && input.selectionStart) { // standards browser @@ -1459,14 +1459,14 @@ let w2utils = (($) => { if (win.getSelection) { sel = win.getSelection() if (sel.rangeCount > 0) { - let range = sel.getRangeAt(0) + let range = sel.getRangeAt(0) let preCaretRange = range.cloneRange() preCaretRange.selectNodeContents(input) preCaretRange.setEnd(range.endContainer, range.endOffset) caretOffset = preCaretRange.toString().length } } else if ( (sel = doc.selection) && sel.type !== 'Control') { - let textRange = sel.createRange() + let textRange = sel.createRange() let preCaretTextRange = doc.body.createTextRange() preCaretTextRange.moveToElementText(input) preCaretTextRange.setEndPoint('EndToEnd', textRange) @@ -1477,7 +1477,7 @@ let w2utils = (($) => { } function setCursorPosition(input, pos, posEnd) { - let range = document.createRange() + let range = document.createRange() let el, sel = window.getSelection() if (input == null) return for (let i = 0; i < input.childNodes.length; i++) { @@ -1550,7 +1550,7 @@ let w2utils = (($) => { } } else if (str.length > 4 && str.substr(0, 4) === 'RGB(') { let tmp = str.replace('RGB', '').replace(/\(/g, '').replace(/\)/g, '').split(',') - color = { + color = { r: parseInt(tmp[0], 10), g: parseInt(tmp[1], 10), b: parseInt(tmp[2], 10), @@ -1558,7 +1558,7 @@ let w2utils = (($) => { } } else if (str.length > 5 && str.substr(0, 5) === 'RGBA(') { let tmp = str.replace('RGBA', '').replace(/\(/g, '').replace(/\)/g, '').split(',') - color = { + color = { r: parseInt(tmp[0], 10), g: parseInt(tmp[1], 10), b: parseInt(tmp[2], 10), @@ -1627,7 +1627,7 @@ let w2utils = (($) => { function tooltip(msg, options) { let actions, showOn = 'mouseenter', hideOn = 'mouseleave' - options = options || {} + options = options || {} if (options.showOn) { showOn = options.showOn delete options.showOn @@ -1680,7 +1680,7 @@ let w2utils = (($) => { if (codeA < 76 && codeB < 76 && codeA > 66 && codeB > 66) { codeA = getCode(a, posA, posA) codeB = getCode(b, posB, posA = i) - posB = i + posB = i } if (codeA != codeB) return (codeA < codeB) ? -1 : 1 @@ -1713,7 +1713,7 @@ let w2utils = (($) => { /*********************************************************** * Formatters object -* --- Primariy used in grid +* --- Primarily used in grid * *********************************************************/ @@ -1814,7 +1814,7 @@ w2utils.formatters = { 'password'(value, params) { let ret = '' - for (let i=0; i < value.length; i++) { + for (let i = 0; i < value.length; i++) { ret += '*' } return ret @@ -1823,8 +1823,8 @@ w2utils.formatters = { if (self) { self.w2utils = w2utils - self.w2ui = self.w2ui || {} - w2ui = self.w2ui + self.w2ui = self.w2ui || {} + w2ui = self.w2ui } export { w2ui, w2utils } \ No newline at end of file From 1f579822388ac47b2db2f09fd020858452af317d Mon Sep 17 00:00:00 2001 From: Mike Date: Tue, 25 May 2021 14:57:13 +0200 Subject: [PATCH 2/2] fixed undefined variables IMPORTANT: this branch builds upon PR #2019 added eslint rule ``'no-undef': 'error',`` Hunted down most undefined variables. improved docs on w2utils.parseColor --- .eslintrc.js | 5 +++++ docs/details/w2utils.parseColor.html | 7 ++++++- src/w2compat.js | 2 +- src/w2form.js | 1 - src/w2grid.js | 13 ++++++++----- src/w2toolbar.js | 3 ++- 6 files changed, 22 insertions(+), 9 deletions(-) diff --git a/.eslintrc.js b/.eslintrc.js index 4345e085e..f6ff8208d 100644 --- a/.eslintrc.js +++ b/.eslintrc.js @@ -14,6 +14,10 @@ module.exports = { 'globals': { '$': 'readonly', 'app': 'readonly', + 'define': 'readonly', + 'exports': 'readonly', + 'jQuery': 'readonly', + 'module': 'readonly', 'w2ui': 'readonly', 'w2obj': 'readonly', 'w2utils': 'readonly', @@ -50,6 +54,7 @@ module.exports = { 'func-name-matching': 'warn', // "func-names": ["warn", "always"], 'no-inner-declarations': 'off', + 'no-undef': 'error', 'no-unreachable': 'off', // PLUGIN rules 'align-assignments/align-assignments' : [ 2, { requiresOnly : false } ], diff --git a/docs/details/w2utils.parseColor.html b/docs/details/w2utils.parseColor.html index 9a6cbe582..5077cc7f4 100644 --- a/docs/details/w2utils.parseColor.html +++ b/docs/details/w2utils.parseColor.html @@ -16,7 +16,12 @@ Returns object.

Description

-The color argument is a web color, for example: +The color argument is a web color. + +Valid notations include 3, 6 or 8 hex digits with an optional leading hash symbol, +as well as rgb() or rgba() notations. + +Example: