EVOgeek/Vmeda.Online
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2743 from dpalou/MOBILE-3320

Browse Source 
MOBILE-3320 core: Fix localhost images in browser
This commit is contained in:
Noel De Martin 2021-05-04 17:21:23 +02:00 committed by GitHub
commit a8fd822c36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/directives/tests/format-text.test.ts
View File

@ -29,6 +29,7 @@ import { Platform } from '@singletons';
import { mock, mockSingleton, RenderConfig, renderWrapperComponent } from '@/testing/utils'; import { mock, mockSingleton, RenderConfig, renderWrapperComponent } from '@/testing/utils';
import { CoreFilter } from '@features/filter/services/filter'; import { CoreFilter } from '@features/filter/services/filter';
import { CoreApp } from '@services/app';
describe('CoreFormatTextDirective', () => { describe('CoreFormatTextDirective', () => {
@ -87,6 +88,7 @@ describe('CoreFormatTextDirective', () => {
getCurrentSite: () => Promise.resolve(site), getCurrentSite: () => Promise.resolve(site),
}); });
mockSingleton(CoreFilter, { formatText: (text) => Promise.resolve(text) }); mockSingleton(CoreFilter, { formatText: (text) => Promise.resolve(text) });
mockSingleton(CoreApp, { isMobile: () => false });
// Act // Act
const fixture = await renderWrapperComponent( const fixture = await renderWrapperComponent(

3
src/core/services/utils/url.ts
View File

@ -19,6 +19,7 @@ import { CoreTextUtils } from '@services/utils/text';
import { CoreConstants } from '@/core/constants'; import { CoreConstants } from '@/core/constants';
import { makeSingleton } from '@singletons'; import { makeSingleton } from '@singletons';
import { CoreUrl } from '@singletons/url'; import { CoreUrl } from '@singletons/url';
import { CoreApp } from '@services/app';
/* /*
* "Utils" service with helper functions for URLs. * "Utils" service with helper functions for URLs.
@ -443,7 +444,7 @@ export class CoreUrlUtilsProvider {
scheme == 'file' || scheme == 'file' ||
scheme == 'filesystem' || scheme == 'filesystem' ||
scheme == CoreConstants.CONFIG.ioswebviewscheme || scheme == CoreConstants.CONFIG.ioswebviewscheme ||
(scheme === 'http' && domain === 'localhost'); (CoreApp.isMobile() && scheme === 'http' && domain === 'localhost'); // @todo: Get served domain from ENV.
} }
/** /**