Skip to content

Commit 57ee9e7

Browse files
committed
[ReactNative] Use oss TimerMixin
1 parent fe0527a commit 57ee9e7

10 files changed

Lines changed: 10 additions & 119 deletions

File tree

Examples/Movies/SearchScreen.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ var {
1818
StyleSheet,
1919
Text,
2020
TextInput,
21-
TimerMixin,
2221
View,
2322
} = React;
23+
var TimerMixin = require('react-timer-mixin');
2424

2525
var MovieCell = require('./MovieCell');
2626
var MovieScreen = require('./MovieScreen');

Examples/UIExplorer/ActivityIndicatorExample.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ var React = require('react-native');
1414
var {
1515
ActivityIndicatorIOS,
1616
StyleSheet,
17-
TimerMixin,
1817
View,
1918
} = React;
19+
var TimerMixin = require('react-timer-mixin');
2020

2121
var ToggleAnimatingActivityIndicator = React.createClass({
2222
mixins: [TimerMixin],

Examples/UIExplorer/TimerExample.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ var {
1515
AlertIOS,
1616
StyleSheet,
1717
Text,
18-
TimerMixin,
1918
TouchableHighlight,
2019
View,
2120
} = React;
21+
var TimerMixin = require('react-timer-mixin');
2222

2323
var Button = React.createClass({
2424
render: function() {

IntegrationTests/TimersTest.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ var React = require('react-native');
1313
var {
1414
StyleSheet,
1515
Text,
16-
TimerMixin,
1716
View,
1817
} = React;
18+
var TimerMixin = require('react-timer-mixin');
1919

2020
var TimersTest = React.createClass({
2121
mixins: [TimerMixin],

Libraries/Components/TextInput/TextInput.ios.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
2121
var StyleSheet = require('StyleSheet');
2222
var Text = require('Text');
2323
var TextInputState = require('TextInputState');
24-
var TimerMixin = require('TimerMixin');
24+
var TimerMixin = require('react-timer-mixin');
2525
var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
2626

2727
var createReactIOSNativeComponentClass = require('createReactIOSNativeComponentClass');

Libraries/Components/Touchable/TouchableHighlight.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ var NativeMethodsMixin = require('NativeMethodsMixin');
1414
var React = require('React');
1515
var ReactIOSViewAttributes = require('ReactIOSViewAttributes');
1616
var StyleSheet = require('StyleSheet');
17-
var TimerMixin = require('TimerMixin');
17+
var TimerMixin = require('react-timer-mixin');
1818
var Touchable = require('Touchable');
1919
var TouchableWithoutFeedback = require('TouchableWithoutFeedback');
2020
var View = require('View');

Libraries/CustomComponents/ListView/ListView.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ var RCTUIManager = require('NativeModules').UIManager;
1616
var ScrollView = require('ScrollView');
1717
var ScrollResponder = require('ScrollResponder');
1818
var StaticRenderer = require('StaticRenderer');
19-
var TimerMixin = require('TimerMixin');
19+
var TimerMixin = require('react-timer-mixin');
2020

2121
var logError = require('logError');
2222
var merge = require('merge');

Libraries/Utilities/TimerMixin.js

Lines changed: 0 additions & 109 deletions
This file was deleted.

Libraries/react-native/react-native.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ var ReactNative = Object.assign(Object.create(require('React')), {
5454
PanResponder: require('PanResponder'),
5555
StatusBarIOS: require('StatusBarIOS'),
5656
StyleSheet: require('StyleSheet'),
57-
TimerMixin: require('TimerMixin'),
5857
VibrationIOS: require('VibrationIOS'),
5958

6059
// Plugins

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,10 @@
3030
"dependencies": {
3131
"connect": "2.8.3",
3232
"jstransform": "10.0.1",
33+
"react-timer-mixin": "^0.13.1",
34+
"react-tools": "0.13.0-rc2",
3335
"source-map": "0.1.31",
34-
"stacktrace-parser": "0.1.1",
35-
"react-tools": "0.13.0-rc2"
36+
"stacktrace-parser": "0.1.1"
3637
},
3738
"devDependencies": {
3839
"ws": "0.4.31",

0 commit comments

Comments
 (0)