From 3e23760c73e1c7c01c70a02fb0ad9d81e5244ed6 Mon Sep 17 00:00:00 2001 From: kirsty-hames Date: Tue, 23 Jan 2024 09:45:13 +0000 Subject: [PATCH 1/2] separate .is-locked and .is-disabled btn state classes --- js/PageLevelProgressView.js | 2 +- templates/pageLevelProgressItem.jsx | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/js/PageLevelProgressView.js b/js/PageLevelProgressView.js index 235478c..05bf529 100644 --- a/js/PageLevelProgressView.js +++ b/js/PageLevelProgressView.js @@ -30,7 +30,7 @@ export default class PageLevelProgressView extends Backbone.View { if (event && event.preventDefault) event.preventDefault(); const $target = $(event.currentTarget); - if ($target.is('.is-disabled')) return; + if ($target.is('.is-locked') || $target.is('.is-disabled')) return; const id = $target.attr('data-pagelevelprogress-id'); const model = data.findById(id); diff --git a/templates/pageLevelProgressItem.jsx b/templates/pageLevelProgressItem.jsx index 7a9b9d3..02ecc4b 100644 --- a/templates/pageLevelProgressItem.jsx +++ b/templates/pageLevelProgressItem.jsx @@ -43,7 +43,8 @@ export default function PageLevelProgressItem(props) { className={classes([ 'pagelevelprogress__item-btn drawer__item-btn', 'js-indicator js-pagelevelprogress-item-click', - (_isLocked || !_isVisible) && 'is-disabled' + (_isLocked) && 'is-locked', + (!_isVisible) && 'is-disabled' ])} ref={indicatorSeat} data-pagelevelprogress-id={_id} From 6dbfcad448e83c8b59c2d928b4fecd801a2625c3 Mon Sep 17 00:00:00 2001 From: kirsty-hames Date: Wed, 24 Jan 2024 12:03:45 +0000 Subject: [PATCH 2/2] add locking state to disabled buttons rather than separating --- js/PageLevelProgressView.js | 2 +- templates/pageLevelProgressItem.jsx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/js/PageLevelProgressView.js b/js/PageLevelProgressView.js index 05bf529..235478c 100644 --- a/js/PageLevelProgressView.js +++ b/js/PageLevelProgressView.js @@ -30,7 +30,7 @@ export default class PageLevelProgressView extends Backbone.View { if (event && event.preventDefault) event.preventDefault(); const $target = $(event.currentTarget); - if ($target.is('.is-locked') || $target.is('.is-disabled')) return; + if ($target.is('.is-disabled')) return; const id = $target.attr('data-pagelevelprogress-id'); const model = data.findById(id); diff --git a/templates/pageLevelProgressItem.jsx b/templates/pageLevelProgressItem.jsx index 02ecc4b..553110e 100644 --- a/templates/pageLevelProgressItem.jsx +++ b/templates/pageLevelProgressItem.jsx @@ -44,7 +44,7 @@ export default function PageLevelProgressItem(props) { 'pagelevelprogress__item-btn drawer__item-btn', 'js-indicator js-pagelevelprogress-item-click', (_isLocked) && 'is-locked', - (!_isVisible) && 'is-disabled' + (_isLocked || !_isVisible) && 'is-disabled' ])} ref={indicatorSeat} data-pagelevelprogress-id={_id}