From 8e1f2c4dbce2deeeb48abd0c3da880d8275574db Mon Sep 17 00:00:00 2001 From: Eric Dunsworth <1907279+EricDunsworth@users.noreply.github.com> Date: Wed, 21 Aug 2024 14:00:02 -0400 Subject: [PATCH] ESLint: Indent switch case clauses MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Port of wet-boew/wet-boew#9793... and depends on it. Doesn't cover "frozen" méli-mélo JS files. --- .eslintrc.json | 2 +- components/wb-actionmng/actionmng.js | 116 +++++------ components/wb-fieldflow/fieldflow.js | 190 +++++++++--------- components/wb-suggest/suggest.js | 62 +++--- .../2021-04-gcaem/js/x-combobox.js" | 130 ++++++------ .../2021-04-gcaem/js/x-core-wb5.js" | 12 +- .../2021-04-gcaem/js/x-wb5-datatable.js" | 32 +-- .../2023-10-clipboard/js/clipboard.js" | 24 +-- package-lock.json | 4 +- package.json | 2 +- sites/gcweb-menu/menu.js | 30 +-- 11 files changed, 302 insertions(+), 302 deletions(-) diff --git a/.eslintrc.json b/.eslintrc.json index 8ca83a8b30..4e92f0841a 100644 --- a/.eslintrc.json +++ b/.eslintrc.json @@ -15,7 +15,7 @@ "JSON": true }, "rules": { - "indent": ["error", "tab", { "outerIIFEBody": 0 }], + "indent": ["error", "tab", { "outerIIFEBody": 0, "SwitchCase": 1 }], "eqeqeq": [2, "allow-null"], "no-eq-null": 2, "no-unused-expressions": [2, { "allowTernary": true }], diff --git a/components/wb-actionmng/actionmng.js b/components/wb-actionmng/actionmng.js index 498961071f..46bffc886a 100644 --- a/components/wb-actionmng/actionmng.js +++ b/components/wb-actionmng/actionmng.js @@ -383,32 +383,32 @@ var $document = wb.doc, switch ( cache_action ) { - case "patch": - var ops = i_cache.patches, - basePntr = i_cache.base || "/"; - if ( !ops ) { - ops = [ patchDefault ]; - i_cache.cumulative = true; - } - if ( !$.isArray( ops ) ) { - ops = [ ops ]; - } - ops = patchFixArray( ops, i_cache.qval, basePntr ); - i_cache.patches = ops; - break; - case "ajax": - if ( i_cache.trigger && dontTriggerWET ) { - i_cache.trigger = false; - } - i_cache.url = replaceMappingKeys( i_cache.url, i_cache.qval ); - break; - case "tblfilter": - i_cache.value = replaceMappingKeys( i_cache.value, i_cache.qval ); - break; - default: + case "patch": + var ops = i_cache.patches, + basePntr = i_cache.base || "/"; + if ( !ops ) { + ops = [ patchDefault ]; + i_cache.cumulative = true; + } + if ( !$.isArray( ops ) ) { + ops = [ ops ]; + } + ops = patchFixArray( ops, i_cache.qval, basePntr ); + i_cache.patches = ops; + break; + case "ajax": + if ( i_cache.trigger && dontTriggerWET ) { + i_cache.trigger = false; + } + i_cache.url = replaceMappingKeys( i_cache.url, i_cache.qval ); + break; + case "tblfilter": + i_cache.value = replaceMappingKeys( i_cache.value, i_cache.qval ); + break; + default: - // Just do the action as defined. - break; + // Just do the action as defined. + break; } @@ -579,39 +579,39 @@ $document.on( actionMngEvent, selector, function( event, data ) { if ( actionEvent === event.namespace ) { switch ( eventType ) { - case "run": - runAct( event, data ); - break; - case "tblfilter": - tblflrAct( event, data ); - break; - case "addClass": - addClassAct( event, data ); - break; - case "removeClass": - remClassAct( event, data ); - break; - case "ajax": - ajaxAct( event, data ); - break; - case "patch": - patchAct( event, data ); - break; - case "selectInput": - selectInputAct( event, data ); - break; - case "mapfilter": - geomapAOIAct( event, data ); - break; - case "tocsv": - tblToCSV( data.source, data.filename ); - break; - case "loadJSON": - loadJSON( data ); - break; - case "withInput": - withInput( event, data ); - break; + case "run": + runAct( event, data ); + break; + case "tblfilter": + tblflrAct( event, data ); + break; + case "addClass": + addClassAct( event, data ); + break; + case "removeClass": + remClassAct( event, data ); + break; + case "ajax": + ajaxAct( event, data ); + break; + case "patch": + patchAct( event, data ); + break; + case "selectInput": + selectInputAct( event, data ); + break; + case "mapfilter": + geomapAOIAct( event, data ); + break; + case "tocsv": + tblToCSV( data.source, data.filename ); + break; + case "loadJSON": + loadJSON( data ); + break; + case "withInput": + withInput( event, data ); + break; } } } ); diff --git a/components/wb-fieldflow/fieldflow.js b/components/wb-fieldflow/fieldflow.js index 92e3dc1300..f20f468686 100644 --- a/components/wb-fieldflow/fieldflow.js +++ b/components/wb-fieldflow/fieldflow.js @@ -1265,115 +1265,115 @@ $document.on( fieldflowActionsEvents, selector, function( event, data ) { var eventType = event.type; switch ( event.namespace ) { - case drawEvent: - switch ( eventType ) { - case componentName: - drwFieldflow( event, data ); - break; - case "tblfilter": - drwTblFilter( event, data ); - break; - } - break; - - case createCtrlEvent: - switch ( eventType ) { - case "select": - ctrlSelect( event, data ); - break; - case "checkbox": - data.typeRadCheck = "checkbox"; - ctrlChkbxRad( event, data ); - break; - case "radio": - data.typeRadCheck = "radio"; - ctrlChkbxRad( event, data ); - break; - } - break; - - case actionEvent: - switch ( eventType ) { - case "append": - actAppend( event, data ); - break; - case "redir": - pushData( $( data.provEvt ), submitJQData, data, true ); - break; - case "ajax": - actAjax( event, data ); - break; - case "tblfilter": - actTblFilter( event, data ); - break; - case "toggle": - if ( data.live ) { - subToggle( event, data ); - } else { - data.preventSubmit = true; - pushData( $( data.provEvt ), submitJQData, data ); + case drawEvent: + switch ( eventType ) { + case componentName: + drwFieldflow( event, data ); + break; + case "tblfilter": + drwTblFilter( event, data ); + break; } break; - case "addClass": - if ( !data.source || !data.class ) { - return; - } - if ( data.live ) { - $( data.source ).addClass( data.class ); - } else { - data.preventSubmit = true; - pushData( $( data.provEvt ), submitJQData, data ); + + case createCtrlEvent: + switch ( eventType ) { + case "select": + ctrlSelect( event, data ); + break; + case "checkbox": + data.typeRadCheck = "checkbox"; + ctrlChkbxRad( event, data ); + break; + case "radio": + data.typeRadCheck = "radio"; + ctrlChkbxRad( event, data ); + break; } break; - case "removeClass": - if ( !data.source || !data.class ) { - return; - } - if ( data.live ) { - $( data.source ).removeClass( data.class ); - } else { - data.preventSubmit = true; - pushData( $( data.provEvt ), submitJQData, data ); + + case actionEvent: + switch ( eventType ) { + case "append": + actAppend( event, data ); + break; + case "redir": + pushData( $( data.provEvt ), submitJQData, data, true ); + break; + case "ajax": + actAjax( event, data ); + break; + case "tblfilter": + actTblFilter( event, data ); + break; + case "toggle": + if ( data.live ) { + subToggle( event, data ); + } else { + data.preventSubmit = true; + pushData( $( data.provEvt ), submitJQData, data ); + } + break; + case "addClass": + if ( !data.source || !data.class ) { + return; + } + if ( data.live ) { + $( data.source ).addClass( data.class ); + } else { + data.preventSubmit = true; + pushData( $( data.provEvt ), submitJQData, data ); + } + break; + case "removeClass": + if ( !data.source || !data.class ) { + return; + } + if ( data.live ) { + $( data.source ).removeClass( data.class ); + } else { + data.preventSubmit = true; + pushData( $( data.provEvt ), submitJQData, data ); + } + break; + case "query": + actQuery( event, data ); + break; } break; - case "query": - actQuery( event, data ); - break; - } - break; - case submitEvent: - switch ( eventType ) { - case "redir": - subRedir( event, data ); - break; - case "ajax": - subAjax( event, data ); - break; - case "toggle": - subToggle( event, data ); - break; - case "addClass": - $( data.source ).addClass( data.class ); - break; - case "removeClass": - $( data.source ).removeClass( data.class ); - break; - case "query": - actQuery( event, data ); + case submitEvent: + switch ( eventType ) { + case "redir": + subRedir( event, data ); + break; + case "ajax": + subAjax( event, data ); + break; + case "toggle": + subToggle( event, data ); + break; + case "addClass": + $( data.source ).addClass( data.class ); + break; + case "removeClass": + $( data.source ).removeClass( data.class ); + break; + case "query": + actQuery( event, data ); + break; + } break; - } - break; } } ); // Bind the init event of the plugin $document.on( "timerpoke.wb " + initEvent, selector, function( event ) { switch ( event.type ) { - case "timerpoke": - case "wb-init": - init( event ); - break; + case "timerpoke": + case "wb-init": + init( event ); + break; } /* diff --git a/components/wb-suggest/suggest.js b/components/wb-suggest/suggest.js index 6914ce64da..37e65cc02a 100644 --- a/components/wb-suggest/suggest.js +++ b/components/wb-suggest/suggest.js @@ -81,17 +81,17 @@ var $document = wb.doc, if ( filter ) { switch ( filterType ) { - case "startWith": - filter = "^" + filter; - break; - case "word": - filter = "^" + filter + "|\\s" + filter; - break; - case "any": - default: - - // Keep the filter as is for the regular expression check - break; + case "startWith": + filter = "^" + filter; + break; + case "word": + filter = "^" + filter + "|\\s" + filter; + break; + case "any": + default: + + // Keep the filter as is for the regular expression check + break; } filterRegExp = new RegExp( filter, "i" ); @@ -210,20 +210,20 @@ var $document = wb.doc, } switch ( event.type ) { - case "change": - wait = setTimeout( addDataListOptions.bind( datalistElm, query ), waitInterval ); - break; - case "keyup": - if ( !( event.ctrlKey || event.altKey || event.metaKey ) ) { - - // Backspace, Spacebar, a - z keys, 0 - 9 keys punctuation, and symbols - if ( which === 8 || which === 32 || ( which > 47 && which < 91 ) || - ( which > 95 && which < 112 ) || ( which > 159 && which < 177 ) || - ( which > 187 && which < 223 ) ) { - - wait = setTimeout( addDataListOptions.bind( datalistElm, query ), waitInterval ); + case "change": + wait = setTimeout( addDataListOptions.bind( datalistElm, query ), waitInterval ); + break; + case "keyup": + if ( !( event.ctrlKey || event.altKey || event.metaKey ) ) { + + // Backspace, Spacebar, a - z keys, 0 - 9 keys punctuation, and symbols + if ( which === 8 || which === 32 || ( which > 47 && which < 91 ) || + ( which > 95 && which < 112 ) || ( which > 159 && which < 177 ) || + ( which > 187 && which < 223 ) ) { + + wait = setTimeout( addDataListOptions.bind( datalistElm, query ), waitInterval ); + } } - } } }, @@ -259,13 +259,13 @@ $document.on( "timerpoke.wb " + initEvent + " " + jsonFetched, selector, functio if ( event.currentTarget === eventTarget ) { switch ( event.type ) { - case "timerpoke": - case "wb-init": - init( event ); - break; - case "json-fetched": - initSuggestion.call( eventTarget, event.fetch.response ); - break; + case "timerpoke": + case "wb-init": + init( event ); + break; + case "json-fetched": + initSuggestion.call( eventTarget, event.fetch.response ); + break; } } return true; diff --git "a/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-combobox.js" "b/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-combobox.js" index a195fb0229..61ea3f4c62 100644 --- "a/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-combobox.js" +++ "b/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-combobox.js" @@ -1339,34 +1339,34 @@ $document.on( "keyup", "[role=combobox] input", function( evt ) { isInError = evt.target.classList.contains( "error" ); switch ( key ) { - case KeyCode.UP: - case KeyCode.DOWN: - case KeyCode.ESC: - case KeyCode.RETURN: - case KeyCode.HOME: - case KeyCode.END: - evt.preventDefault(); - if ( isInError ) { - setTimeout( function() { - onChange( evt.target ); - }, 100 ); - } - return; + case KeyCode.UP: + case KeyCode.DOWN: + case KeyCode.ESC: + case KeyCode.RETURN: + case KeyCode.HOME: + case KeyCode.END: + evt.preventDefault(); + if ( isInError ) { + setTimeout( function() { + onChange( evt.target ); + }, 100 ); + } + return; - case KeyCode.TAB: - if ( isInError ) { - setTimeout( function() { - onChange( evt.target ); - }, 100 ); - } - return; - default: - setTimeout( function() { - updateResults( evt.target, false ); + case KeyCode.TAB: if ( isInError ) { - onChange( evt.target ); + setTimeout( function() { + onChange( evt.target ); + }, 100 ); } - }, 100 ); + return; + default: + setTimeout( function() { + updateResults( evt.target, false ); + if ( isInError ) { + onChange( evt.target ); + } + }, 100 ); } } ); @@ -1415,59 +1415,59 @@ $document.on( "keydown", "[role=combobox] input", function( evt ) { switch ( key ) { - case KeyCode.UP: + case KeyCode.UP: - // Move focus to and select the previous option. If focus is on the first option do nothing - if ( activeIndex === -1 ) { - activeIndex = resultsCount - 1; - } else if ( activeIndex !== 0 ) { - activeIndex--; - } else { - activeIndex = resultsCount - 1; - } + // Move focus to and select the previous option. If focus is on the first option do nothing + if ( activeIndex === -1 ) { + activeIndex = resultsCount - 1; + } else if ( activeIndex !== 0 ) { + activeIndex--; + } else { + activeIndex = resultsCount - 1; + } - break; - case KeyCode.DOWN: + break; + case KeyCode.DOWN: - // Move focus to and select next option. If focus is on the first option do nothing - if ( activeIndex === -1 ) { - activeIndex = 0; - } else if ( activeIndex < resultsCount ) { - activeIndex++; - } + // Move focus to and select next option. If focus is on the first option do nothing + if ( activeIndex === -1 ) { + activeIndex = 0; + } else if ( activeIndex < resultsCount ) { + activeIndex++; + } - break; + break; - case KeyCode.HOME: + case KeyCode.HOME: - // Move focus to and selects the first option - activeIndex = 0; - break; + // Move focus to and selects the first option + activeIndex = 0; + break; - case KeyCode.END: + case KeyCode.END: - // Move focus to and selects the last option - activeIndex = resultsCount - 1; + // Move focus to and selects the last option + activeIndex = resultsCount - 1; - break; + break; - case KeyCode.RETURN: + case KeyCode.RETURN: - $( options[ activeIndex ] ).trigger( "wb.select" ); + $( options[ activeIndex ] ).trigger( "wb.select" ); - hideListbox(); - evt.preventDefault(); // Need to prevent default here because when the combobox is within a form, the form are submited - return; - case KeyCode.TAB: + hideListbox(); + evt.preventDefault(); // Need to prevent default here because when the combobox is within a form, the form are submited + return; + case KeyCode.TAB: - // Should only select if the last active item selected was made through keyboard - if ( isLastActiveKeyboardSelect ) { - $( options[ activeIndex ] ).trigger( "wb.select" ); - } - hideListbox(); - return; - default: - return; + // Should only select if the last active item selected was made through keyboard + if ( isLastActiveKeyboardSelect ) { + $( options[ activeIndex ] ).trigger( "wb.select" ); + } + hideListbox(); + return; + default: + return; } evt.preventDefault(); diff --git "a/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-core-wb5.js" "b/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-core-wb5.js" index b9131a5233..068b5bbe6c 100644 --- "a/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-core-wb5.js" +++ "b/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-core-wb5.js" @@ -261,10 +261,10 @@ $( document ).on( "keypress click", "[data-wb5-ajax]", function( evt ) { $nodes.attr( "aria-live", "polite" ); switch ( action.command ) { - case "replace": - $.get( action.options, function( data ) { - $nodes.html( data ); - } ); + case "replace": + $.get( action.options, function( data ) { + $nodes.html( data ); + } ); } } ); @@ -294,8 +294,8 @@ $( document ).on( "keypress click", "[data-wb5-load]", function( evt ) { } ); switch ( action.command ) { - case "replace": - $nodes.load( action.options ); + case "replace": + $nodes.load( action.options ); } } ); diff --git "a/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-wb5-datatable.js" "b/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-wb5-datatable.js" index c19ae1dd77..52e1f7bd2e 100644 --- "a/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-wb5-datatable.js" +++ "b/m\303\251li-m\303\251lo/2021-04-gcaem/js/x-wb5-datatable.js" @@ -99,24 +99,24 @@ $( document ).on( "draw.dt", "[data-wbtbl-draw]", function( evnt ) { //total = evnt.displayed; switch ( action.command ) { - case "display": - return setValue( $elm, $table.page.info()[ action.options ] ); - case "count": - var rows = isFiltered ? $table.rows( { search: "applied" } ) : $table.rows( { page: "all" } ); - rows.iterator( "row", function( context, index ) { - if ( $( this.row( index ).node() ).text().indexOf( action.options ) > -1 ) { - count++; - } - } ); - if ( $elm.is( "progress" ) ) { - $elm.attr( { max: all, value: count } ); + case "display": + return setValue( $elm, $table.page.info()[ action.options ] ); + case "count": + var rows = isFiltered ? $table.rows( { search: "applied" } ) : $table.rows( { page: "all" } ); + rows.iterator( "row", function( context, index ) { + if ( $( this.row( index ).node() ).text().indexOf( action.options ) > -1 ) { + count++; + } + } ); + if ( $elm.is( "progress" ) ) { + $elm.attr( { max: all, value: count } ); - if ( $node.hasClass( "wbtbl-silent" ) ) { - return true; + if ( $node.hasClass( "wbtbl-silent" ) ) { + return true; + } + $elm.trigger( "updated.wb5" ); } - $elm.trigger( "updated.wb5" ); - } - return $elm.text( count ); + return $elm.text( count ); } } ); diff --git "a/m\303\251li-m\303\251lo/2023-10-clipboard/js/clipboard.js" "b/m\303\251li-m\303\251lo/2023-10-clipboard/js/clipboard.js" index fc2906edba..b4abb0fb4e 100644 --- "a/m\303\251li-m\303\251lo/2023-10-clipboard/js/clipboard.js" +++ "b/m\303\251li-m\303\251lo/2023-10-clipboard/js/clipboard.js" @@ -358,18 +358,18 @@ if ( "noButton" in data === false ) { buttonId = wb.getId(); switch ( data.btnAlign ) { - case "left": - btnAlign = "text-left "; - break; - case "right": - btnAlign = "text-right "; - break; - case "center": - btnAlign = "text-center "; - break; - case "none": - default: - btnAlign = ""; + case "left": + btnAlign = "text-left "; + break; + case "right": + btnAlign = "text-right "; + break; + case "center": + btnAlign = "text-center "; + break; + case "none": + default: + btnAlign = ""; } if ( getDisplayType( elm ) === true ) { containTag = "span"; diff --git a/package-lock.json b/package-lock.json index 658feb8b6d..65c993fe09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -11590,8 +11590,8 @@ } }, "wet-boew": { - "version": "github:wet-boew/wet-boew#e01bc308c1cc123dbe7948cd8dccc14829ed8e70", - "from": "github:wet-boew/wet-boew#v4.0.81.1", + "version": "github:wet-boew/wet-boew#dbf94ced436934a28e5c17d2cde617b7e39d1b23", + "from": "github:wet-boew/wet-boew#v4.0.81.2", "requires": { "bootstrap-sass": "3.4.1", "code-prettify": "^0.1.0", diff --git a/package.json b/package.json index abc41d83cb..b0a9c6a721 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "license": "MIT", "dependencies": { "bootstrap-sass": "3.4.1", - "wet-boew": "github:wet-boew/wet-boew#v4.0.81.1" + "wet-boew": "github:wet-boew/wet-boew#v4.0.81.2" }, "browserslist": [ "last 2 versions", diff --git a/sites/gcweb-menu/menu.js b/sites/gcweb-menu/menu.js index 8cdf9c1788..9c818d9fe4 100644 --- a/sites/gcweb-menu/menu.js +++ b/sites/gcweb-menu/menu.js @@ -249,21 +249,21 @@ function setMnu3LevelOrientationExpandState( isVertical, isExpanded ) { $document.on( wb.resizeEvents, function( event ) { switch ( event.type ) { - case "xxsmallview": - case "xsmallview": - case "smallview": - isMobileMode = true; - setMnu3LevelOrientationExpandState( false, false ); - break; - case "mediumview": - isMobileMode = false; - setMnu3LevelOrientationExpandState( false, true ); - break; - case "largeview": - case "xlargeview": - default: - isMobileMode = false; - setMnu3LevelOrientationExpandState( true, true ); + case "xxsmallview": + case "xsmallview": + case "smallview": + isMobileMode = true; + setMnu3LevelOrientationExpandState( false, false ); + break; + case "mediumview": + isMobileMode = false; + setMnu3LevelOrientationExpandState( false, true ); + break; + case "largeview": + case "xlargeview": + default: + isMobileMode = false; + setMnu3LevelOrientationExpandState( true, true ); } } );