[ReactNative] Use oss TimerMixin

facebook · Mar 24, 2015 · 57ee9e7 · 57ee9e7
1 parent fe0527a
commit 57ee9e7
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 119 deletions.
diff --git a/Examples/Movies/SearchScreen.js b/Examples/Movies/SearchScreen.js
@@ -18,9 +18,9 @@ var {
   StyleSheet,
   Text,
   TextInput,
-  TimerMixin,
   View,
 } = React;
+var TimerMixin = require('react-timer-mixin');
 
 var MovieCell = require('./MovieCell');
 var MovieScreen = require('./MovieScreen');

diff --git a/Examples/UIExplorer/ActivityIndicatorExample.js b/Examples/UIExplorer/ActivityIndicatorExample.js
@@ -14,9 +14,9 @@ var React = require('react-native');
 var {
   ActivityIndicatorIOS,
   StyleSheet,
-  TimerMixin,
   View,
 } = React;
+var TimerMixin = require('react-timer-mixin');
 
 var ToggleAnimatingActivityIndicator = React.createClass({
   mixins: [TimerMixin],

diff --git a/Examples/UIExplorer/TimerExample.js b/Examples/UIExplorer/TimerExample.js
@@ -15,10 +15,10 @@ var {
   AlertIOS,
   StyleSheet,
   Text,
-  TimerMixin,
   TouchableHighlight,
   View,
 } = React;
+var TimerMixin = require('react-timer-mixin');
 
 var Button = React.createClass({
   render: function() {

diff --git a/IntegrationTests/TimersTest.js b/IntegrationTests/TimersTest.js
@@ -13,9 +13,9 @@ var React = require('react-native');
 var {
   StyleSheet,
   Text,
-  TimerMixin,
   View,
 } = React;
+var TimerMixin = require('react-timer-mixin');
 
 var TimersTest = React.createClass({
   mixins: [TimerMixin],

diff --git a/Libraries/Components/TextInput/TextInput.ios.js b/Libraries/Components/TextInput/TextInput.ios.js
@@ -21,7 +21,7 @@ var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
 var StyleSheet = require('StyleSheet');
 var Text = require('Text');
 var TextInputState = require('TextInputState');
-var TimerMixin = require('TimerMixin');
+var TimerMixin = require('react-timer-mixin');
 var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 
 var createReactIOSNativeComponentClass = require('createReactIOSNativeComponentClass');

diff --git a/Libraries/Components/Touchable/TouchableHighlight.js b/Libraries/Components/Touchable/TouchableHighlight.js
@@ -14,7 +14,7 @@ var NativeMethodsMixin = require('NativeMethodsMixin');
 var React = require('React');
 var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
 var StyleSheet = require('StyleSheet');
-var TimerMixin = require('TimerMixin');
+var TimerMixin = require('react-timer-mixin');
 var Touchable = require('Touchable');
 var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
 var View = require('View');

diff --git a/Libraries/CustomComponents/ListView/ListView.js b/Libraries/CustomComponents/ListView/ListView.js
@@ -16,7 +16,7 @@ var RCTUIManager = require('NativeModules').UIManager;
 var ScrollView = require('ScrollView');
 var ScrollResponder = require('ScrollResponder');
 var StaticRenderer = require('StaticRenderer');
-var TimerMixin = require('TimerMixin');
+var TimerMixin = require('react-timer-mixin');
 
 var logError = require('logError');
 var merge = require('merge');

diff --git a/Libraries/Utilities/TimerMixin.js b/Libraries/Utilities/TimerMixin.js
diff --git a/Libraries/react-native/react-native.js b/Libraries/react-native/react-native.js
@@ -54,7 +54,6 @@ var ReactNative = Object.assign(Object.create(require('React')), {
   PanResponder: require('PanResponder'),
   StatusBarIOS: require('StatusBarIOS'),
   StyleSheet: require('StyleSheet'),
-  TimerMixin: require('TimerMixin'),
   VibrationIOS: require('VibrationIOS'),
 
   // Plugins

diff --git a/package.json b/package.json
@@ -30,9 +30,10 @@
   "dependencies": {
     "connect": "2.8.3",
     "jstransform": "10.0.1",
+    "react-timer-mixin": "^0.13.1",
+    "react-tools": "0.13.0-rc2",
     "source-map": "0.1.31",
-    "stacktrace-parser": "0.1.1",
-    "react-tools": "0.13.0-rc2"
+    "stacktrace-parser": "0.1.1"
   },
   "devDependencies": {
     "ws": "0.4.31",