diff --git a/config.xml b/config.xml index d7439c757..89d2f5b5e 100644 --- a/config.xml +++ b/config.xml @@ -79,18 +79,11 @@ - - - diff --git a/src/components/iframe/core-iframe.html b/src/components/iframe/core-iframe.html index 7bdeac425..9e5f98ae6 100644 --- a/src/components/iframe/core-iframe.html +++ b/src/components/iframe/core-iframe.html @@ -1,5 +1,5 @@
- + diff --git a/src/components/iframe/iframe.ts b/src/components/iframe/iframe.ts index f6517fde6..516012a8f 100644 --- a/src/components/iframe/iframe.ts +++ b/src/components/iframe/iframe.ts @@ -21,6 +21,7 @@ import { CoreLoggerProvider } from '@providers/logger'; import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreUrlUtilsProvider } from '@providers/utils/url'; import { CoreIframeUtilsProvider } from '@providers/utils/iframe'; +import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreSplitViewComponent } from '@components/split-view/split-view'; @Component({ @@ -33,6 +34,7 @@ export class CoreIframeComponent implements OnInit, OnChanges { @Input() src: string; @Input() iframeWidth: string; @Input() iframeHeight: string; + @Input() allowFullscreen: boolean | string; @Output() loaded?: EventEmitter = new EventEmitter(); loading: boolean; safeUrl: SafeResourceUrl; @@ -46,6 +48,7 @@ export class CoreIframeComponent implements OnInit, OnChanges { protected sanitizer: DomSanitizer, protected navCtrl: NavController, protected urlUtils: CoreUrlUtilsProvider, + protected utils: CoreUtilsProvider, @Optional() protected svComponent: CoreSplitViewComponent) { this.logger = logger.getInstance('CoreIframe'); @@ -60,6 +63,7 @@ export class CoreIframeComponent implements OnInit, OnChanges { this.iframeWidth = this.domUtils.formatPixelsSize(this.iframeWidth) || '100%'; this.iframeHeight = this.domUtils.formatPixelsSize(this.iframeHeight) || '100%'; + this.allowFullscreen = this.utils.isTrueOrOne(this.allowFullscreen); // Show loading only with external URLs. this.loading = !this.src || !!this.src.match(/^https?:\/\//i); diff --git a/src/core/h5p/components/h5p-player/core-h5p-player.html b/src/core/h5p/components/h5p-player/core-h5p-player.html index e98b6ab63..22981316f 100644 --- a/src/core/h5p/components/h5p-player/core-h5p-player.html +++ b/src/core/h5p/components/h5p-player/core-h5p-player.html @@ -9,5 +9,5 @@
- + diff --git a/src/core/h5p/components/h5p-player/h5p-player.scss b/src/core/h5p/components/h5p-player/h5p-player.scss index 8a4875ac9..e4ccc242d 100644 --- a/src/core/h5p/components/h5p-player/h5p-player.scss +++ b/src/core/h5p/components/h5p-player/h5p-player.scss @@ -10,7 +10,7 @@ ion-app.app-root core-h5p-player { background: url('../assets/img/icons/h5p.svg') center top 25px / 100px auto no-repeat $core-h5p-placeholder-bg-color; color: $core-h5p-placeholder-text-color; - .icon { + .icon:not([color="success"]) { color: $core-h5p-placeholder-text-color; }