Skip to content

Commit

Permalink
Merge pull request #820 from OneSignal/fix-not-allowing-push-slidedow…
Browse files Browse the repository at this point in the history
…ns-issue

Allow push slidedown to be shown even if not configured
  • Loading branch information
Rodrigo Gomez Palacio authored May 4, 2021
2 parents e2b64af + 255ed7a commit 211b2c5
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions src/managers/PromptsManager.ts
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
SlidedownPromptOptions} from '../models/Prompts';
import { DismissHelper } from '../helpers/DismissHelper';
import InitHelper from '../helpers/InitHelper';
import { SERVER_CONFIG_DEFAULTS_PROMPT_DELAYS } from '../config/index';
import { CONFIG_DEFAULTS_SLIDEDOWN_OPTIONS, SERVER_CONFIG_DEFAULTS_PROMPT_DELAYS } from '../config/index';
import { EnvironmentInfoHelper } from '../context/browser/helpers/EnvironmentInfoHelper';
import { awaitableTimeout } from '../utils/AwaitableTimeout';
import PromptsHelper from '../helpers/PromptsHelper';
Expand Down Expand Up @@ -162,6 +162,10 @@ export class PromptsManager {
private async internalShowSlidedownPrompt(options: AutoPromptOptions = { force: false }): Promise<void> {
OneSignalUtils.logMethodCall("internalShowSlidedownPrompt");

if (!options.slidedownPromptOptions) {
options.slidedownPromptOptions = CONFIG_DEFAULTS_SLIDEDOWN_OPTIONS;
}

MainHelper.markHttpSlidedownShown();
const sdkStylesLoadResult = await this.context.dynamicResourceLoader.loadSdkStylesheet();
if (sdkStylesLoadResult !== ResourceLoadState.Loaded) {
Expand Down Expand Up @@ -210,9 +214,14 @@ export class PromptsManager {
PromptsHelper.getFirstSlidedownPromptOptionsWithType(prompts, typeToPullFromConfig);

if (!slidedownPromptOptions) {
Log.error(`OneSignal: slidedown of type '${typeToPullFromConfig}' couldn't be shown. Check your configuration`+
` on the OneSignal dashboard or your custom code initialization.`);
return;
if (typeToPullFromConfig !== DelayedPromptType.Push) {
Log.error(`OneSignal: slidedown of type '${typeToPullFromConfig}' couldn't be shown. Check your configuration`+
` on the OneSignal dashboard or your custom code initialization.`);
return;
} else {
Log.warn(`The OneSignal 'push' slidedown will be shown with default text settings.` +
` To customize, see the OneSignal documentation.`);
}
}

await this.internalShowSlidedownPrompt({
Expand Down

0 comments on commit 211b2c5

Please sign in to comment.