From d762d64b4956e3fc75a02669e24e002cc9f661d2 Mon Sep 17 00:00:00 2001
From: Nicolas Gallagher <nicolasgallagher@gmail.com>
Date: Tue, 19 Sep 2017 15:20:26 -0700
Subject: [PATCH] Revert SSR Image change

Reverts 3c660e2ad7df4815ef1735acc262ae52e2cae8cf

See #543
---
 src/components/Image/__tests__/index-test.js | 13 +------------
 src/components/Image/index.js                |  3 +--
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/components/Image/__tests__/index-test.js b/src/components/Image/__tests__/index-test.js
index ffa1118b..05d3f8d2 100644
--- a/src/components/Image/__tests__/index-test.js
+++ b/src/components/Image/__tests__/index-test.js
@@ -1,12 +1,10 @@
 /* eslint-env jasmine, jest */
 
-import ExecutionEnvironment from 'fbjs/lib/ExecutionEnvironment';
 import Image from '../';
 import ImageUriCache from '../ImageUriCache';
 import React from 'react';
-import { mount, render, shallow } from 'enzyme';
+import { mount, shallow } from 'enzyme';
 
-const originalCanUseDOM = ExecutionEnvironment.canUseDOM;
 const originalImage = window.Image;
 
 describe('components/Image', () => {
@@ -137,15 +135,6 @@ describe('components/Image', () => {
           .attr('src')
       ).toBe(uriTwo);
     });
-
-    test('is set immediately when rendered on the server', () => {
-      ExecutionEnvironment.canUseDOM = false;
-      const uri = 'https://google.com/favicon.ico';
-      const component = render(<Image source={{ uri }} />);
-      expect(component.find('img').attr('src')).toBe(uri);
-      expect(ImageUriCache.has(uri)).toBe(true);
-      ExecutionEnvironment.canUseDOM = originalCanUseDOM;
-    });
   });
 
   describe('prop "style"', () => {
diff --git a/src/components/Image/index.js b/src/components/Image/index.js
index 6a0f966a..e295a15b 100644
--- a/src/components/Image/index.js
+++ b/src/components/Image/index.js
@@ -11,7 +11,6 @@
  */
 
 import applyNativeMethods from '../../modules/applyNativeMethods';
-import { canUseDOM } from 'fbjs/lib/ExecutionEnvironment';
 import createElement from '../../modules/createElement';
 import { getAssetByID } from '../../modules/AssetRegistry';
 import ImageLoader from '../../modules/ImageLoader';
@@ -131,7 +130,7 @@ class Image extends Component {
     super(props, context);
     // If an image has been loaded before, render it immediately
     const uri = resolveAssetSource(props.source);
-    const shouldDisplaySource = ImageUriCache.has(uri) || !canUseDOM;
+    const shouldDisplaySource = ImageUriCache.has(uri);
     this.state = { shouldDisplaySource };
     this._imageState = getImageState(uri, shouldDisplaySource);
     shouldDisplaySource && ImageUriCache.add(uri);