diff options
| author | Darshan-upadhyay1110 <darshan.upadhyay@collabora.com> | 2023-05-31 17:14:00 +0530 |
|---|---|---|
| committer | Darshan-upadhyay1110 <darshan.upadhyay@collabora.com> | 2023-05-31 17:18:16 +0530 |
| commit | 4d6a3bda89d7bab5251a2600dac774b6336a8d82 (patch) | |
| tree | 36a86e71645e2865829bbfc8c6dc61aa6f453514 | |
| parent | feat: Add UITheme option for light/dark to ui_defaults (diff) | |
| download | online-enh/6432/initial-theme-ui_defaults.tar.gz online-enh/6432/initial-theme-ui_defaults.zip | |
add base conditon to check for window ui_default for dark mode
enh/6432/initial-theme-ui_defaults
Signed-off-by: Darshan-upadhyay1110 <darshan.upadhyay@collabora.com>
Change-Id: I35f1805ff6468f2b8119e9ba25c9a4a21dd26728
| -rw-r--r-- | browser/src/control/Control.UIManager.js | 2 | ||||
| -rw-r--r-- | browser/src/core/LOUtil.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/browser/src/control/Control.UIManager.js b/browser/src/control/Control.UIManager.js index eacd3bda0a..67e189493a 100644 --- a/browser/src/control/Control.UIManager.js +++ b/browser/src/control/Control.UIManager.js @@ -83,7 +83,7 @@ L.Control.UIManager = L.Control.extend({ }, getDarkModeState: function() { - return this.getSavedStateOrDefault('darkTheme', false); + return this.getSavedStateOrDefault('darkTheme', window.uiDefaults['darkTheme'] ? window.uiDefaults['darkTheme'] : false); }, toggleDarkMode: function() { diff --git a/browser/src/core/LOUtil.js b/browser/src/core/LOUtil.js index 22730e2993..6a27aa523f 100644 --- a/browser/src/core/LOUtil.js +++ b/browser/src/core/LOUtil.js @@ -116,7 +116,7 @@ L.LOUtil = { var defaultImageURL = this.getURL('images/' + imgName); if (window.isLocalStorageAllowed) { var state = localStorage.getItem('UIDefaults_' + docType + '_darkTheme'); - if (state && (/true/).test(state.toLowerCase())) { + if ((state && (/true/).test(state.toLowerCase())) || (state === null && window.uiDefaults['darkTheme'])) { return this.getURL('images/dark/' + imgName); } } |