Passing some UI Defaults to loleaflet frame #1211
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -80,6 +80,46 @@ const hideLoadingIndicator = () => { | |||||
| document.getElementById('proxyLoadingMessage').textContent = '' | ||||||
| } | ||||||
|
|
||||||
| const generateCSSVarTokens = () => { | ||||||
| /* NC versus COOL */ | ||||||
| var cssVarMap = { | ||||||
| '--color-main-text': '--co-color-main-text', | ||||||
| '--color-main-background': '--co-body-bg', | ||||||
| '--color-primary-text': '--co-primary-text', | ||||||
| '--color-primary-element': '--co-primary-element:--co-text-accent', | ||||||
| '--color-primary-element-light': '--co-primary-element-light', | ||||||
| '--color-error': '--co-color-error', | ||||||
| '--color-warning': '--co-color-warning', | ||||||
| '--color-success': '--co-color-success', | ||||||
| '--border-radius': '--co-border-radius', | ||||||
| '--border-radius-large': '--co-border-radius-large', | ||||||
| '--color-background-hover': '--co-background-hover', | ||||||
| '--color-background-dark': '--co-background-dark', | ||||||
| '--color-text-light': '--co-text-light', | ||||||
| '--color-text-lighter': '--co-text-lighter', | ||||||
| '--color-loading-light': '--co-loading-light', | ||||||
| '--color-loading-dark': '--co-loading-dark', | ||||||
| '--color-box-shadow': '--co-box-shadow', | ||||||
| '--color-border': '--co-border', | ||||||
| '--color-border-dark': '--co-border-dark', | ||||||
| '--border-radius-pill': '--co-border-radius-pill' | ||||||
| } | ||||||
| var str = '' | ||||||
| for (var cssVarKey in cssVarMap) { | ||||||
| var cStyle = window.parent.getComputedStyle(document.documentElement).getPropertyValue(cssVarKey) | ||||||
| if (!cStyle) { | ||||||
| // try suffix -dark instead | ||||||
| cStyle = window.parent.getComputedStyle(document.documentElement).getPropertyValue(cssVarKey + '-dark') | ||||||
|
There was a problem hiding this comment.
Suggested change
There was a problem hiding this comment. Thank you for the reply. Initially it was like this but later we discovered that it does not work on Firefox without parent. The CSS variables become empty string. The only solution I found was using window.parent. There was a problem hiding this comment. Indeed seems to be a firefox bug: https://bugzilla.mozilla.org/show_bug.cgi?id=1471231 Then let's get this in as it is and maybe see if we can work around that by not using |
||||||
| } | ||||||
| if (!cStyle) continue // skip if it is not set | ||||||
| var varNames = cssVarMap[cssVarKey].split(':') | ||||||
| for (var i = 0; i < varNames.length; ++i) { | ||||||
| str += varNames[i] + '=' + cStyle + ';' | ||||||
| } | ||||||
| } | ||||||
| return str | ||||||
| } | ||||||
|
|
||||||
| showLoadingIndicator() | ||||||
|
|
||||||
| $.widget('oc.guestNamePicker', { | ||||||
|
|
@@ -176,7 +216,9 @@ const documentsMain = { | |||||
|
|
||||||
| // form to post the access token for WOPISrc | ||||||
| const form = '<form id="loleafletform_viewer" name="loleafletform_viewer" target="loleafletframe_viewer" action="' + urlsrc + '" method="post">' | ||||||
| + '<input name="access_token" value="' + accessToken + '" type="hidden"/>' | ||||||
| + '<input name="ui_defaults" value="TextRuler=false;TextStatusbar=true;TextSidebar=false;PresentationSidebar=false;PresentationStatusbar=true;SpreadsheetSidebar=false" type="hidden"/>' | ||||||
| + '<input name="css_variables" value="' + generateCSSVarTokens() + '" type="hidden"/></form>' | ||||||
|
|
||||||
| // iframe that contains the Collabora Online Viewer | ||||||
| const frame = '<iframe id="loleafletframe_viewer" name="loleafletframe_viewer" nonce="' + btoa(getRequestToken()) + '" style="width:100%;height:100%;position:absolute;"/>' | ||||||
|
|
@@ -225,7 +267,9 @@ const documentsMain = { | |||||
|
|
||||||
| // form to post the access token for WOPISrc | ||||||
| var form = '<form id="loleafletform" name="loleafletform" target="loleafletframe" action="' + urlsrc + '" method="post">' | ||||||
| + '<input name="access_token" value="' + accessToken + '" type="hidden"/>' | ||||||
| + '<input name="ui_defaults" value="TextRuler=true;TextStatusbar=false;TextSidebar=false;PresentationSidebar=false;PresentationStatusbar=false;SpreadsheetSidebar=false" type="hidden"/>' | ||||||
| + '<input name="css_variables" value="' + generateCSSVarTokens() + '" type="hidden"/></form>' | ||||||
|
|
||||||
| // iframe that contains the Collabora Online | ||||||
| var frame = '<iframe id="loleafletframe" name="loleafletframe" nonce="' + btoa(getRequestToken()) + '" scrolling="no" allowfullscreen style="width:100%;height:100%;position:absolute;" />' | ||||||
|
|
||||||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The CSS variables are also properly loaded inside of the document frame.