Attach platform to asset url

frantic · facebook-github-bot-8 · commit ce47e56b7b56 · 2015-09-09T11:25:26.000-07:00
Summary: Depends on D2420548 Reviewed By: @martinbigio Differential Revision: D2421696
diff --git a/Libraries/Image/__tests__/resolveAssetSource-test.js b/Libraries/Image/__tests__/resolveAssetSource-test.js
@@ -25,6 +25,7 @@ function expectResolvesAsset(input, expectedSource) {
 describe('resolveAssetSource', () => {
   beforeEach(() => {
     jest.resetModuleRegistry();
+    __DEV__ = true;
     AssetRegistry = require('AssetRegistry');
     Platform = require('Platform');
     SourceCode = require('NativeModules').SourceCode;
@@ -64,6 +65,7 @@ describe('resolveAssetSource', () => {
   describe('bundle was loaded from network (DEV)', () => {
     beforeEach(() => {
       SourceCode.scriptURL = 'http://10.0.0.1:8081/main.bundle';
+      Platform.OS = 'ios';
     });
 
     it('uses network image', () => {
@@ -81,7 +83,7 @@ describe('resolveAssetSource', () => {
         isStatic: false,
         width: 100,
         height: 200,
-        uri: 'http://10.0.0.1:8081/assets/module/a/logo.png?hash=5b6f00f',
+        uri: 'http://10.0.0.1:8081/assets/module/a/logo.png?platform=ios&hash=5b6f00f',
       });
     });
 
@@ -100,29 +102,19 @@ describe('resolveAssetSource', () => {
         isStatic: false,
         width: 100,
         height: 200,
-        uri: 'http://10.0.0.1:8081/assets/module/a/logo@2x.png?hash=5b6f00f',
+        uri: 'http://10.0.0.1:8081/assets/module/a/logo@2x.png?platform=ios&hash=5b6f00f',
       });
     });
 
   });
 
   describe('bundle was loaded from file (PROD) on iOS', () => {
-    var originalDevMode;
-    var originalPlatform;
-
     beforeEach(() => {
       SourceCode.scriptURL = 'file:///Path/To/Simulator/main.bundle';
-      originalDevMode = __DEV__;
-      originalPlatform = Platform.OS;
       __DEV__ = false;
       Platform.OS = 'ios';
     });
 
-    afterEach(() => {
-      __DEV__ = originalDevMode;
-      Platform.OS = originalPlatform;
-    });
-
     it('uses pre-packed image', () => {
       expectResolvesAsset({
         __packager_asset: true,
@@ -144,22 +136,12 @@ describe('resolveAssetSource', () => {
   });
 
   describe('bundle was loaded from file (PROD) on Android', () => {
-    var originalDevMode;
-    var originalPlatform;
-
     beforeEach(() => {
       SourceCode.scriptURL = 'file:///Path/To/Simulator/main.bundle';
-      originalDevMode = __DEV__;
-      originalPlatform = Platform.OS;
       __DEV__ = false;
       Platform.OS = 'android';
     });
 
-    afterEach(() => {
-      __DEV__ = originalDevMode;
-      Platform.OS = originalPlatform;
-    });
-
     it('uses pre-packed image', () => {
       expectResolvesAsset({
         __packager_asset: true,
diff --git a/Libraries/Image/resolveAssetSource.js b/Libraries/Image/resolveAssetSource.js
@@ -63,7 +63,8 @@ function getPathInArchive(asset) {
  * from the devserver
  */
 function getPathOnDevserver(devServerUrl, asset) {
-  return devServerUrl + getScaledAssetPath(asset) + '?hash=' + asset.hash;
+  return devServerUrl + getScaledAssetPath(asset) + '?platform=' + Platform.OS +
+    '&hash=' + asset.hash;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,8 @@ function getPathInArchive(asset) {`
`63`	`63`	`* from the devserver`
`64`	`64`	`*/`
`65`	`65`	`function getPathOnDevserver(devServerUrl, asset) {`
`66`		`- return devServerUrl + getScaledAssetPath(asset) + '?hash=' + asset.hash;`
	`66`	`+ return devServerUrl + getScaledAssetPath(asset) + '?platform=' + Platform.OS +`
	`67`	`+ '&hash=' + asset.hash;`
`67`	`68`	`}`
`68`	`69`
`69`	`70`	`/**`