Skip to content

Commit

Permalink
Merge pull request #363 from okta/build-oce-20220808
Browse files Browse the repository at this point in the history
Updates Classic for 2022.08.0 (Prod)
  • Loading branch information
IanHakes-okta committed Aug 9, 2022
2 parents bde1588 + 7c70bd7 commit 7412403
Show file tree
Hide file tree
Showing 1,197 changed files with 7,381 additions and 5,282 deletions.
2 changes: 1 addition & 1 deletion Resources/Scripts/require.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
require.config({
urlArgs: 't=637952326220079829'
urlArgs: 't=637955848179985719'
});
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -29,17 +29,16 @@ document.addEventListener('readyToInitCoveo', function () {
/* Code update below from Nate MacInnes for using search sandbox in review builds */
/* var newTokenObj = { value: JSON.parse(response), timestamp: new Date().getTime() }
localStorage.setItem("CoveoSearchToken", JSON.stringify(newTokenObj));
resolve(newTokenObj.value); */
resolve(newTokenObj.value); */
var parsedResponse = JSON.parse(response);
var token = parsedResponse.token ? parsedResponse.token : parsedResponse;
var newTokenObj = { value: token, timestamp: new Date().getTime() };
localStorage.setItem("CoveoSearchToken", JSON.stringify(newTokenObj));
resolve(newTokenObj.value);
resolve(newTokenObj.value);
});
}
});
tokenPromise.then(function (token) {
console.log('token >>>>> ' + token);
Coveo.SearchEndpoint.configureCloudV2Endpoint(coveo_org_id, token, coveo_rest_uri);
var searchboxRoot = document.getElementById('standaloneSearchbox');
var customSelectObj = new Coveo.CustomSelect(document.getElementById('customSelect'), {
Expand Down
15 changes: 15 additions & 0 deletions en-us/Content/Resources/Scripts/js/ignore-dompurify.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
// We remove defer tag for jquery library to fix coveo script
// and tabs functionality, however that changes how madcap
// loads scripts on the page and built in dom purify script
// can not be loaded normally.
// Suppressing jquery error only for dompurify module, as fixing
// root cause is not possible.

requirejs.onError = function (err) {
if (err.requireType === 'mismatch' &&
err.message.search('dompurify') !== -1) {
// ignoring dom purify module error
return;
}
throw err;
};
482 changes: 0 additions & 482 deletions en-us/Content/Resources/Snippets/task steps/_nav-snippets.htm

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -3620,6 +3620,8 @@ <h1>Foundation Icons contains 283 glyphs:</h1>
</div>
<!-- ***************************** Scripts ************************************* -->
<!-- Foundation -->
<script src="../../Scripts/js/ignore-dompurify.js">
</script>
<script src="../../Scripts/js/app.js">
</script>
<script src="../../Scripts/js/vendor/what-input.js">
Expand Down Expand Up @@ -3670,6 +3672,8 @@ <h1>Foundation Icons contains 283 glyphs:</h1>
</div>
<!-- ********************** Scripts ************************************* -->
<!-- Foundation -->
<script src="../../Scripts/js/ignore-dompurify.js">
</script>
<script src="../../Scripts/js/app.js">
</script>
<script src="../../Scripts/js/vendor/what-input.js">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3200,6 +3200,8 @@
</div>
<!-- ***************************** Scripts ************************************* -->
<!-- Foundation -->
<script src="../../Scripts/js/ignore-dompurify.js">
</script>
<script src="../../Scripts/js/app.js">
</script>
<script src="../../Scripts/js/vendor/what-input.js">
Expand Down
5 changes: 5 additions & 0 deletions en-us/Content/Resources/Stylesheets/okta-main-new-nav.css
Original file line number Diff line number Diff line change
Expand Up @@ -939,6 +939,10 @@ div.toolbar-main ._Skins_okta_toolbar_nav_poc.mc-component .button.next-topic-bu
transform: rotate(90deg);
}

.external-link-icon {
margin: 0 8px 6px 8px;
}

/*** Override: Tabs styles ***/

.tabs
Expand Down Expand Up @@ -1865,6 +1869,7 @@ dt {

dd {
padding-top: 0.5em;
margin-left: 24px;
}

/* Target IE11 and set font-weight to 400 */
Expand Down
2 changes: 2 additions & 0 deletions en-us/Content/Search.htm
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,8 @@ <h1 id="results-heading">Your search for <span class="query"></span> returned <s
</div>
<!-- ********************** Scripts ************************************* -->
<!-- Foundation -->
<script src="Resources/Scripts/js/ignore-dompurify.js">
</script>
<script src="Resources/Scripts/js/app.js">
</script>
<script src="Resources/Scripts/js/vendor/what-input.js">
Expand Down
2 changes: 2 additions & 0 deletions en-us/Content/Topics/API/trusted-origins-iframe.htm
Original file line number Diff line number Diff line change
Expand Up @@ -456,6 +456,8 @@ <h2>Known Issues</h2>
</div>
<!-- ********************** Scripts ************************************* -->
<!-- Foundation -->
<script src="../../Resources/Scripts/js/ignore-dompurify.js">
</script>
<script src="../../Resources/Scripts/js/app.js">
</script>
<script src="../../Resources/Scripts/js/vendor/what-input.js">
Expand Down
2 changes: 2 additions & 0 deletions en-us/Content/Topics/Apps/Access_Request_Workflow.htm
Original file line number Diff line number Diff line change
Expand Up @@ -323,6 +323,8 @@ <h1>Access Request Workflow</h1>
</div>
<!-- ********************** Scripts ************************************* -->
<!-- Foundation -->
<script src="../../Resources/Scripts/js/ignore-dompurify.js">
</script>
<script src="../../Resources/Scripts/js/app.js">
</script>
<script src="../../Resources/Scripts/js/vendor/what-input.js">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -307,7 +307,6 @@
<div role="main" id="mc-main-content">
<h1>Allow end users to add apps with the plugin</h1>
<p>End users can add most standard online apps to their Okta End User Dashboard with a single click. When users enter credentials to log in to an online app (whether in the OIN or not), Okta displays a banner offering to save the app's password. Clicking <span class="uicontrol">Save Password</span> <span style="">automatically </span>adds the app to their Okta End-User Dashboard.</p>
<p>&#160;</p>
<table style="margin-left: 0;margin-right: auto;mc-table-style: url('../../Resources/TableStyles/standard.css');" class="TableStyle-standard" cellspacing="0">
<col style="width: 50%;" class="TableStyle-standard-Column-Column1" />
<col style="width: 50%;" class="TableStyle-standard-Column-Column1" />
Expand All @@ -332,7 +331,6 @@ <h1>Allow end users to add apps with the plugin</h1>
</tr>
</tbody>
</table>
<p>&#160;</p>
<h2>Start this task</h2>
<p><a id="Enable" name="Enable"></a>As an admin, you can allow end users to add apps to their dashboard by enabling this feature in <a href="apps-selfservice-main.htm" class="MCXref xref">Self Service for app integrations</a> settings as follows:</p>
<ol>
Expand Down Expand Up @@ -382,6 +380,8 @@ <h2>Related topics </h2>
</div>
<!-- ********************** Scripts ************************************* -->
<!-- Foundation -->
<script src="../../Resources/Scripts/js/ignore-dompurify.js">
</script>
<script src="../../Resources/Scripts/js/app.js">
</script>
<script src="../../Resources/Scripts/js/vendor/what-input.js">
Expand Down
2 changes: 2 additions & 0 deletions en-us/Content/Topics/Apps/Apps_App_Integration_Wizard.htm
Original file line number Diff line number Diff line change
Expand Up @@ -344,6 +344,8 @@ <h2>Topics</h2>
</div>
<!-- ********************** Scripts ************************************* -->
<!-- Foundation -->
<script src="../../Resources/Scripts/js/ignore-dompurify.js">
</script>
<script src="../../Resources/Scripts/js/app.js">
</script>
<script src="../../Resources/Scripts/js/vendor/what-input.js">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,8 @@ <h2>Next steps</h2>
</div>
<!-- ********************** Scripts ************************************* -->
<!-- Foundation -->
<script src="../../Resources/Scripts/js/ignore-dompurify.js">
</script>
<script src="../../Resources/Scripts/js/app.js">
</script>
<script src="../../Resources/Scripts/js/vendor/what-input.js">
Expand Down
Loading

0 comments on commit 7412403

Please sign in to comment.