From 39d712b317e48f37ec38a063e733b061b2817458 Mon Sep 17 00:00:00 2001 From: Max Guglielmi Date: Mon, 6 Apr 2015 19:21:49 +1000 Subject: [PATCH] Renamed events --- dist/filtergrid.css | 2 +- src-es6/event.js | 12 ++++-- src-es6/modules/paging.js | 2 +- src-es6/tablefilter.js | 85 +++++++++++++++++++-------------------- src/event.js | 3 ++ src/index.html | 2 +- src/modules/paging.js | 2 +- src/tablefilter.js | 84 +++++++++++++++++++------------------- 8 files changed, 97 insertions(+), 95 deletions(-) diff --git a/dist/filtergrid.css b/dist/filtergrid.css index b2e0025d..844dd937 100644 --- a/dist/filtergrid.css +++ b/dist/filtergrid.css @@ -1,6 +1,6 @@ /*------------------------------------------------------------------------ - TableFilter stylesheet by Max Guglielmi - - (build date: Mon Apr 06 2015 18:41:27) + - (build date: Mon Apr 06 2015 19:21:24) - Edit below for your projects' needs ------------------------------------------------------------------------*/ diff --git a/src-es6/event.js b/src-es6/event.js index 57fd0ae1..9edab530 100644 --- a/src-es6/event.js +++ b/src-es6/event.js @@ -3,7 +3,7 @@ */ var Event = { - add: function(obj, type, func, capture){ + add(obj, type, func, capture){ if(obj.addEventListener){ obj.addEventListener(type, func, capture); } @@ -13,7 +13,7 @@ var Event = { obj['on'+type] = func; } }, - remove: function(obj, type, func, capture){ + remove(obj, type, func, capture){ if(obj.detachEvent){ obj.detachEvent('on'+type,func); } @@ -23,7 +23,7 @@ var Event = { obj['on'+type] = null; } }, - stop: function(evt){ + stop(evt){ if(!evt){ evt = window.event; } @@ -33,7 +33,7 @@ var Event = { evt.cancelBubble = true; } }, - cancel: function(evt){ + cancel(evt){ if(!evt){ evt = window.event; } @@ -42,6 +42,10 @@ var Event = { } else { evt.returnValue = false; } + }, + keyCode(evt){ + return evt.charCode ? evt.charCode : + (evt.keyCode ? evt.keyCode: (evt.which ? evt.which : 0)); } }; diff --git a/src-es6/modules/paging.js b/src-es6/modules/paging.js index ae38da05..47f45d6c 100644 --- a/src-es6/modules/paging.js +++ b/src-es6/modules/paging.js @@ -124,7 +124,7 @@ export class Paging{ o.changePage(0); }, _detectKey(e){ - var key = tf.Evt.getKeyCode(e); + var key = Event.keyCode(e); if(key===13){ if(tf.sorted){ tf.filter(); diff --git a/src-es6/tablefilter.js b/src-es6/tablefilter.js index c5bc0bf0..9adfd8c3 100644 --- a/src-es6/tablefilter.js +++ b/src-es6/tablefilter.js @@ -667,18 +667,15 @@ export default class TableFilter{ loadextensions: 'LoadExtensions', loadthemes: 'LoadThemes' }, - getKeyCode: function(evt){ - return evt.charCode ? evt.charCode : - (evt.keyCode ? evt.keyCode: (evt.which ? evt.which : 0)); - }, + /*==================================================== - Detects key for a given element =====================================================*/ - _DetectKey: function(e) { + detectKey: function(e) { if(!o.enterKey){ return; } var _evt = e || global.event; if(_evt){ - var key = o.Evt.getKeyCode(_evt); + var key = evt.keyCode(_evt); if(key===13){ o._filter(); evt.cancel(_evt); @@ -693,12 +690,12 @@ export default class TableFilter{ /*==================================================== - onkeyup event for text filters =====================================================*/ - _OnKeyUp: function(e) { + onKeyUp: function(e) { if(!o.onKeyUp){ return; } var _evt = e || global.event; - var key = o.Evt.getKeyCode(_evt); + var key = evt.keyCode(_evt); o.isUserTyping = false; function filter() { @@ -723,14 +720,14 @@ export default class TableFilter{ /*==================================================== - onkeydown event for input filters =====================================================*/ - _OnKeyDown: function(e) { + onKeyDown: function(e) { if(!o.onKeyUp) { return; } o.isUserTyping = true; }, /*==================================================== - onblur event for input filters =====================================================*/ - _OnInpBlur: function(e) { + onInpBlur: function(e) { if(o.onKeyUp){ o.isUserTyping = false; global.clearInterval(o.onKeyUpTimer); @@ -747,7 +744,7 @@ export default class TableFilter{ /*==================================================== - onfocus event for input filters =====================================================*/ - _OnInpFocus: function(e) { + onInpFocus: function(e) { var _evt = e || global.event; o.activeFilterId = this.getAttribute('id'); o.activeFlt = dom.id(o.activeFilterId); @@ -767,7 +764,7 @@ export default class TableFilter{ /*==================================================== - onfocus event for select filters =====================================================*/ - _OnSlcFocus: function(e) { + onSlcFocus: function(e) { var _evt = e || global.event; o.activeFilterId = this.getAttribute('id'); o.activeFlt = dom.id(o.activeFilterId); @@ -784,13 +781,13 @@ export default class TableFilter{ /*==================================================== - onchange event for select filters =====================================================*/ - _OnSlcChange: function(e) { + onSlcChange: function(e) { if(!o.activeFlt){ return; } var colIndex = o.activeFlt.getAttribute('colIndex'); //Checks filter is a checklist and caller is not null // if(o.activeFlt && colIndex && // o['col'+colIndex]===o.fltTypeCheckList && - // !o.Evt._OnSlcChange.caller){ return; } + // !o.Evt.onSlcChange.caller){ return; } var _evt = e || global.event; if(o.popUpFilters){ evt.stop(_evt); } if(o.onSlcChange){ o.filter(); } @@ -798,11 +795,11 @@ export default class TableFilter{ /*==================================================== - onblur event for select filters =====================================================*/ - _OnSlcBlur: function(e) {}, + // _OnSlcBlur: function(e) {}, /*==================================================== - onclick event for checklist filters =====================================================*/ - _OnCheckListClick: function() { + onCheckListClick: function() { if(o.fillSlcOnDemand && this.getAttribute('filled') === '0'){ var ct = this.getAttribute('ct'); o.Cpt.checkList._build(ct); @@ -813,35 +810,35 @@ export default class TableFilter{ /*==================================================== - onclick event for checklist filter container =====================================================*/ - _OnCheckListFocus: function(e) { + onCheckListFocus: function(e) { o.activeFilterId = this.firstChild.getAttribute('id'); o.activeFlt = dom.id(o.activeFilterId); }, - _OnCheckListBlur: function(e){}, /*==================================================== - onclick event for validation button (btn property) =====================================================*/ - _OnBtnClick: function() { + onBtnClick: function() { o.filter(); - }, - _OnSlcPagesChangeEvt: null, //used by sort adapter + } + // , + // _OnSlcPagesChangeEvt: null, //used by sort adapter /*==================================================== - onclick event slc parent node (enables filters) IE only =====================================================*/ - _EnableSlc: function() { - this.firstChild.disabled = false; - this.firstChild.focus(); - this.onclick = null; - }, + // _EnableSlc: function() { + // this.firstChild.disabled = false; + // this.firstChild.focus(); + // this.onclick = null; + // }, - _Paging: { //used by sort adapter - nextEvt: null, - prevEvt: null, - lastEvt: null, - firstEvt: null - } + // _Paging: { //used by sort adapter + // nextEvt: null, + // prevEvt: null, + // lastEvt: null, + // firstEvt: null + // } }; } @@ -1025,10 +1022,10 @@ export default class TableFilter{ dropdown._build(i); } - evt.add(slc, 'keypress', this.Evt._DetectKey); - evt.add(slc, 'change', this.Evt._OnSlcChange); - evt.add(slc, 'focus', this.Evt._OnSlcFocus); - evt.add(slc, 'blur', this.Evt._OnSlcBlur); + evt.add(slc, 'keypress', this.Evt.detectKey); + evt.add(slc, 'change', this.Evt.onSlcChange); + evt.add(slc, 'focus', this.Evt.onSlcFocus); + // evt.add(slc, 'blur', this.Evt._OnSlcBlur); //1st option is created here since dropdown.build isn't //invoked @@ -1068,13 +1065,13 @@ export default class TableFilter{ if(this.fillSlcOnDemand){ evt.add( - divCont, 'click', this.Evt._OnCheckListClick); + divCont, 'click', this.Evt.onCheckListClick); divCont.appendChild( dom.text( this.Cpt.checkList.activateCheckListTxt)); } - evt.add(divCont, 'click', this.Evt._OnCheckListFocus); + evt.add(divCont, 'click', this.Evt.onCheckListFocus); } else{ @@ -1091,7 +1088,7 @@ export default class TableFilter{ ); } inp.className = inpclass; - inp.onfocus = this.Evt._OnInpFocus; + inp.onfocus = this.Evt.onInpFocus; //filter is appended in desired element if(externalFltTgtId){ @@ -1103,10 +1100,10 @@ export default class TableFilter{ this.fltIds.push(this.prfxFlt+i+'_'+this.id); - inp.onkeypress = this.Evt._DetectKey; - inp.onkeydown = this.Evt._OnKeyDown; - inp.onkeyup = this.Evt._OnKeyUp; - inp.onblur = this.Evt._OnInpBlur; + inp.onkeypress = this.Evt.detectKey; + inp.onkeydown = this.Evt.onKeyDown; + inp.onkeyup = this.Evt.onKeyUp; + inp.onblur = this.Evt.onInpBlur; if(this.rememberGridValues){ var flts_values = this.Cpt.store.getFilterValues( @@ -1130,7 +1127,7 @@ export default class TableFilter{ fltcell.appendChild(btn); } - btn.onclick = this.Evt._OnBtnClick; + btn.onclick = this.Evt.onBtnClick; }//if }// for i diff --git a/src/event.js b/src/event.js index 770bcdb4..3a24bef9 100644 --- a/src/event.js +++ b/src/event.js @@ -43,6 +43,9 @@ define(["exports"], function (exports) { } else { evt.returnValue = false; } + }, + keyCode: function keyCode(evt) { + return evt.charCode ? evt.charCode : evt.keyCode ? evt.keyCode : evt.which ? evt.which : 0; } }; diff --git a/src/index.html b/src/index.html index f887b8f5..45205c11 100644 --- a/src/index.html +++ b/src/index.html @@ -124,7 +124,7 @@ editable: true, ezEditTable_config:{ default_selection: 'both', - base_path: 'extensions/ezEditTable/' + loadStylesheet: true }, grid_layout: false, // grid_width: '500px', diff --git a/src/modules/paging.js b/src/modules/paging.js index c0807a6b..8d86d5ee 100644 --- a/src/modules/paging.js +++ b/src/modules/paging.js @@ -117,7 +117,7 @@ define(["exports", "../dom", "../types", "../string", "../helpers", "../event"], o.changePage(0); }, _detectKey: function _detectKey(e) { - var key = tf.Evt.getKeyCode(e); + var key = Event.keyCode(e); if (key === 13) { if (tf.sorted) { tf.filter(); diff --git a/src/tablefilter.js b/src/tablefilter.js index dcf1118e..3cdb9de9 100644 --- a/src/tablefilter.js +++ b/src/tablefilter.js @@ -618,19 +618,17 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array loadextensions: "LoadExtensions", loadthemes: "LoadThemes" }, - getKeyCode: function getKeyCode(evt) { - return evt.charCode ? evt.charCode : evt.keyCode ? evt.keyCode : evt.which ? evt.which : 0; - }, + /*==================================================== - Detects key for a given element =====================================================*/ - _DetectKey: function _DetectKey(e) { + detectKey: function detectKey(e) { if (!o.enterKey) { return; } var _evt = e || global.event; if (_evt) { - var key = o.Evt.getKeyCode(_evt); + var key = evt.keyCode(_evt); if (key === 13) { o._filter(); evt.cancel(_evt); @@ -645,12 +643,12 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array /*==================================================== - onkeyup event for text filters =====================================================*/ - _OnKeyUp: function _OnKeyUp(e) { + onKeyUp: function onKeyUp(e) { if (!o.onKeyUp) { return; } var _evt = e || global.event; - var key = o.Evt.getKeyCode(_evt); + var key = evt.keyCode(_evt); o.isUserTyping = false; function filter() { @@ -674,7 +672,7 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array /*==================================================== - onkeydown event for input filters =====================================================*/ - _OnKeyDown: function _OnKeyDown(e) { + onKeyDown: function onKeyDown(e) { if (!o.onKeyUp) { return; } @@ -683,7 +681,7 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array /*==================================================== - onblur event for input filters =====================================================*/ - _OnInpBlur: function _OnInpBlur(e) { + onInpBlur: function onInpBlur(e) { if (o.onKeyUp) { o.isUserTyping = false; global.clearInterval(o.onKeyUpTimer); @@ -700,7 +698,7 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array /*==================================================== - onfocus event for input filters =====================================================*/ - _OnInpFocus: function _OnInpFocus(e) { + onInpFocus: function onInpFocus(e) { var _evt = e || global.event; o.activeFilterId = this.getAttribute("id"); o.activeFlt = dom.id(o.activeFilterId); @@ -720,7 +718,7 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array /*==================================================== - onfocus event for select filters =====================================================*/ - _OnSlcFocus: function _OnSlcFocus(e) { + onSlcFocus: function onSlcFocus(e) { var _evt = e || global.event; o.activeFilterId = this.getAttribute("id"); o.activeFlt = dom.id(o.activeFilterId); @@ -737,7 +735,7 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array /*==================================================== - onchange event for select filters =====================================================*/ - _OnSlcChange: function _OnSlcChange(e) { + onSlcChange: function onSlcChange(e) { if (!o.activeFlt) { return; } @@ -745,7 +743,7 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array //Checks filter is a checklist and caller is not null // if(o.activeFlt && colIndex && // o['col'+colIndex]===o.fltTypeCheckList && - // !o.Evt._OnSlcChange.caller){ return; } + // !o.Evt.onSlcChange.caller){ return; } var _evt = e || global.event; if (o.popUpFilters) { evt.stop(_evt); @@ -757,11 +755,11 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array /*==================================================== - onblur event for select filters =====================================================*/ - _OnSlcBlur: function _OnSlcBlur(e) {}, + // _OnSlcBlur: function(e) {}, /*==================================================== - onclick event for checklist filters =====================================================*/ - _OnCheckListClick: function _OnCheckListClick() { + onCheckListClick: function onCheckListClick() { if (o.fillSlcOnDemand && this.getAttribute("filled") === "0") { var ct = this.getAttribute("ct"); o.Cpt.checkList._build(ct); @@ -772,35 +770,35 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array /*==================================================== - onclick event for checklist filter container =====================================================*/ - _OnCheckListFocus: function _OnCheckListFocus(e) { + onCheckListFocus: function onCheckListFocus(e) { o.activeFilterId = this.firstChild.getAttribute("id"); o.activeFlt = dom.id(o.activeFilterId); }, - _OnCheckListBlur: function _OnCheckListBlur(e) {}, /*==================================================== - onclick event for validation button (btn property) =====================================================*/ - _OnBtnClick: function _OnBtnClick() { + onBtnClick: function onBtnClick() { o.filter(); - }, - _OnSlcPagesChangeEvt: null, //used by sort adapter + } + // , + // _OnSlcPagesChangeEvt: null, //used by sort adapter /*==================================================== - onclick event slc parent node (enables filters) IE only =====================================================*/ - _EnableSlc: function _EnableSlc() { - this.firstChild.disabled = false; - this.firstChild.focus(); - this.onclick = null; - }, + // _EnableSlc: function() { + // this.firstChild.disabled = false; + // this.firstChild.focus(); + // this.onclick = null; + // }, - _Paging: { //used by sort adapter - nextEvt: null, - prevEvt: null, - lastEvt: null, - firstEvt: null - } + // _Paging: { //used by sort adapter + // nextEvt: null, + // prevEvt: null, + // lastEvt: null, + // firstEvt: null + // } }; } @@ -977,10 +975,10 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array dropdown._build(i); } - evt.add(slc, "keypress", this.Evt._DetectKey); - evt.add(slc, "change", this.Evt._OnSlcChange); - evt.add(slc, "focus", this.Evt._OnSlcFocus); - evt.add(slc, "blur", this.Evt._OnSlcBlur); + evt.add(slc, "keypress", this.Evt.detectKey); + evt.add(slc, "change", this.Evt.onSlcChange); + evt.add(slc, "focus", this.Evt.onSlcFocus); + // evt.add(slc, 'blur', this.Evt._OnSlcBlur); //1st option is created here since dropdown.build isn't //invoked @@ -1016,11 +1014,11 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array } if (this.fillSlcOnDemand) { - evt.add(divCont, "click", this.Evt._OnCheckListClick); + evt.add(divCont, "click", this.Evt.onCheckListClick); divCont.appendChild(dom.text(this.Cpt.checkList.activateCheckListTxt)); } - evt.add(divCont, "click", this.Evt._OnCheckListFocus); + evt.add(divCont, "click", this.Evt.onCheckListFocus); } else { //show/hide input var inptype = col === this.fltTypeInp ? "text" : "hidden"; @@ -1029,7 +1027,7 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array inp.setAttribute("placeholder", this.isWatermarkArray ? this.watermark[i] : this.watermark); } inp.className = inpclass; - inp.onfocus = this.Evt._OnInpFocus; + inp.onfocus = this.Evt.onInpFocus; //filter is appended in desired element if (externalFltTgtId) { @@ -1041,10 +1039,10 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array this.fltIds.push(this.prfxFlt + i + "_" + this.id); - inp.onkeypress = this.Evt._DetectKey; - inp.onkeydown = this.Evt._OnKeyDown; - inp.onkeyup = this.Evt._OnKeyUp; - inp.onblur = this.Evt._OnInpBlur; + inp.onkeypress = this.Evt.detectKey; + inp.onkeydown = this.Evt.onKeyDown; + inp.onkeyup = this.Evt.onKeyUp; + inp.onblur = this.Evt.onInpBlur; if (this.rememberGridValues) { var flts_values = this.Cpt.store.getFilterValues(this.fltsValuesCookie); @@ -1065,7 +1063,7 @@ define(["exports", "module", "event", "dom", "string", "cookie", "types", "array fltcell.appendChild(btn); } - btn.onclick = this.Evt._OnBtnClick; + btn.onclick = this.Evt.onBtnClick; } //if } // for i } else {