status-im/react-native
2
0
Fork 0
mirror of https://github.com/status-im/react-native.git synced 2025-02-26 16:10:58 +00:00
Code Issues Projects Releases Wiki Activity

Rely only on scriptURL when loading images

Browse Source 
Reviewed By: @foghina

Differential Revision: D2527119

fb-gh-sync-id: e2a9618f729a2ec03b1959fa13fae46620cc379e
This commit is contained in:
Alex Kotliarskyi 2015-10-12 11:34:27 -07:00 committed by facebook-github-bot-9
parent 5e33dbcfcc
commit 62d0586e59
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Libraries/Image/__tests__/resolveAssetSource-test.js
View File

@ -25,7 +25,6 @@ function expectResolvesAsset(input, expectedSource) {
describe('resolveAssetSource', () => { describe('resolveAssetSource', () => {
beforeEach(() => { beforeEach(() => {
jest.resetModuleRegistry(); jest.resetModuleRegistry();
__DEV__ = true;
}); });
it('returns same source for simple static and network images', () => { it('returns same source for simple static and network images', () => {
@ -109,11 +108,10 @@ describe('resolveAssetSource', () => {
}); });
describe('bundle was loaded from file (PROD) on iOS', () => { describe('bundle was loaded from file on iOS', () => {
beforeEach(() => { beforeEach(() => {
NativeModules.SourceCode.scriptURL = NativeModules.SourceCode.scriptURL =
'file:///Path/To/Simulator/main.bundle'; 'file:///Path/To/Simulator/main.bundle';
__DEV__ = false;
Platform.OS = 'ios'; Platform.OS = 'ios';
}); });
@ -138,11 +136,10 @@ describe('resolveAssetSource', () => {
}); });
}); });
describe('bundle was loaded from file (PROD) on Android', () => { describe('bundle was loaded from file on Android', () => {
beforeEach(() => { beforeEach(() => {
NativeModules.SourceCode.scriptURL = NativeModules.SourceCode.scriptURL =
'file:///Path/To/Simulator/main.bundle'; 'file:///Path/To/Simulator/main.bundle';
__DEV__ = false;
Platform.OS = 'android'; Platform.OS = 'android';
}); });

4
Libraries/Image/resolveAssetSource.js
View File

@ -20,10 +20,6 @@ var SourceCode = require('NativeModules').SourceCode;
var _serverURL; var _serverURL;
function getDevServerURL() { function getDevServerURL() {
if (!__DEV__) {
// In prod we want assets to be loaded from the archive
return null;
}
if (_serverURL === undefined) { if (_serverURL === undefined) {
var scriptURL = SourceCode.scriptURL; var scriptURL = SourceCode.scriptURL;
var match = scriptURL && scriptURL.match(/^https?:\/\/.*?\//); var match = scriptURL && scriptURL.match(/^https?:\/\/.*?\//);