Skip to content

Commit f92f6d0

Browse files
committed
fix regression issue #705
1 parent 227f563 commit f92f6d0

File tree

3 files changed

+12
-3
lines changed

3 files changed

+12
-3
lines changed

assets/src/dashboard/parts/connected/settings/Menu.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,12 +55,16 @@ const menuItems = [
5555
const SubMenu = ({
5656
children,
5757
tab,
58+
settings,
5859
setTab
5960
}) => {
6061
return (
6162
<ul className="flex flex-col gap-1 m-0 mt-1">
6263
{children.map( item => {
6364
const { value, label } = item;
65+
if ( 'lazyload' === item.value && 'disabled' === settings.lazyload ) {
66+
return;
67+
}
6468
const classes = classnames(
6569
{
6670
'bg-light-blue hover:text-purple-gray': tab === value,
@@ -82,13 +86,16 @@ const SubMenu = ({
8286

8387
const Menu = ({
8488
tab,
89+
settings,
8590
setTab
8691
}) => {
8792
return (
8893
<div className="basis-1/5">
8994
<ul className="grid m-0 gap-1">
9095
{menuItems.map( item => {
9196
const isActive = tab === item.value || ( item.children && item.children.some( child => child.value === tab ) );
97+
98+
9299
const buttonClasses = classnames({ '!text-info': isActive }, 'w-full bg-transparent border-0 flex items-center appearance-none not-italic font-semibold text-base text-purple-gray cursor-pointer hover:text-info py-2' );
93100
return (
94101
<li key={item.value} className='m-0'>
@@ -110,6 +117,7 @@ const Menu = ({
110117
<SubMenu
111118
children={item.children}
112119
tab={tab}
120+
settings={settings}
113121
setTab={setTab}
114122
/>
115123
)}

assets/src/dashboard/parts/connected/settings/Resize.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ const Resize = ({
108108

109109
<hr className="my-8 border-grayish-blue"/>
110110

111-
<ToggleControl
111+
{ 'disabled' !== settings.lazyload && ( <> <ToggleControl
112112
label={ optimoleDashboardApp.strings.options_strings.enable_retina_title }
113113
help={ () => <p dangerouslySetInnerHTML={ { __html: optimoleDashboardApp.strings.options_strings.enable_retina_desc } } /> }
114114
checked={ isRetinaEnabled }
@@ -119,9 +119,9 @@ const Resize = ({
119119
}
120120
) }
121121
onChange={ value => updateOption( 'retina_images', value ) }
122-
/>
122+
/> <hr className="my-8 border-grayish-blue"/> </> )
123+
}
123124

124-
<hr className="my-8 border-grayish-blue"/>
125125

126126
<ToggleControl
127127
label={ optimoleDashboardApp.strings.options_strings.enable_limit_dimensions_title }

assets/src/dashboard/parts/connected/settings/index.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,7 @@ const Settings = ({
8585
<Menu
8686
tab={ tab }
8787
setTab={ setTab }
88+
settings={ settings }
8889
/>
8990

9091
<div className="basis-4/5">

0 commit comments

Comments
 (0)