diff --git a/Libraries/Components/Navigation/NavigatorIOS.ios.js b/Libraries/Components/Navigation/NavigatorIOS.ios.js index 4c8e1b6e7..a0f2199b2 100644 --- a/Libraries/Components/Navigation/NavigatorIOS.ios.js +++ b/Libraries/Components/Navigation/NavigatorIOS.ios.js @@ -14,15 +14,16 @@ var EventEmitter = require('EventEmitter'); var Image = require('Image'); var NavigationContext = require('NavigationContext'); -var React = require('React'); var RCTNavigatorManager = require('NativeModules').NavigatorManager; -var StyleSheet = require('StyleSheet'); +var React = require('React'); var StaticContainer = require('StaticContainer.react'); +var StyleSheet = require('StyleSheet'); var View = require('View'); -var requireNativeComponent = require('requireNativeComponent'); var invariant = require('invariant'); var logError = require('logError'); +var requireNativeComponent = require('requireNativeComponent'); +var resolveAssetSource = require('resolveAssetSource'); var TRANSITIONER_REF = 'transitionerRef'; @@ -603,12 +604,12 @@ var NavigatorIOS = React.createClass({ this.props.itemWrapperStyle, route.wrapperStyle ]} - backButtonIcon={this._imageNameFromSource(route.backButtonIcon)} + backButtonIcon={resolveAssetSource(route.backButtonIcon)} backButtonTitle={route.backButtonTitle} - leftButtonIcon={this._imageNameFromSource(route.leftButtonIcon)} + leftButtonIcon={resolveAssetSource(route.leftButtonIcon)} leftButtonTitle={route.leftButtonTitle} onNavLeftButtonTap={route.onLeftButtonPress} - rightButtonIcon={this._imageNameFromSource(route.rightButtonIcon)} + rightButtonIcon={resolveAssetSource(route.rightButtonIcon)} rightButtonTitle={route.rightButtonTitle} onNavRightButtonTap={route.onRightButtonPress} navigationBarHidden={this.props.navigationBarHidden} @@ -627,10 +628,6 @@ var NavigatorIOS = React.createClass({ ); }, - _imageNameFromSource: function(source: ?Object) { - return source ? source.uri : undefined; - }, - renderNavigationStackItems: function() { var shouldRecurseToNavigator = this.state.makingNavigatorRequest ||