|
1 |
| -var update = require('react/addons').addons.update; |
| 1 | +var _ = require('lodash'); |
2 | 2 |
|
3 | 3 | module.exports = {
|
4 | 4 |
|
@@ -64,60 +64,39 @@ module.exports = {
|
64 | 64 | },
|
65 | 65 |
|
66 | 66 | _theatreBodyWrapperStyle: function() {
|
67 |
| - return update({ |
| 67 | + return _.assign({ |
68 | 68 | position: 'absolute',
|
69 | 69 | height: 'calc(100% - 8vw)',
|
70 | 70 | width: 'calc(100% - 8vw)',
|
71 | 71 | margin: '4vw',
|
72 | 72 | zIndex: 2,
|
73 |
| - }, { |
74 |
| - $merge: this.displayFlex(), |
75 |
| - $merge: this.flexFlow('column'), |
76 |
| - }); |
| 73 | + }, this.displayFlex(), this.flexFlow('column')); |
77 | 74 | },
|
78 | 75 |
|
79 | 76 | _theatreHeaderStyle: function() {
|
80 |
| - return update({ |
| 77 | + return _.assign({ |
81 | 78 | marginBottom: '2vh',
|
82 |
| - }, { |
83 |
| - $merge: this.displayFlex(), |
84 |
| - }); |
| 79 | + }, this.displayFlex()); |
85 | 80 | },
|
86 | 81 |
|
87 | 82 | _theatreSelectStyle: function() {
|
88 |
| - return update({ |
89 |
| - background: 'red', |
90 |
| - minHeight: '100px', |
91 |
| - }, { |
92 |
| - $merge: this.alignItems('center'), |
93 |
| - $merge: this.justifyContent('center'), |
94 |
| - $merge: this.flex('1 1 auto'), |
95 |
| - }); |
| 83 | + return _.assign({}, this.alignItems('center'), this.justifyContent('center'), this.flex('1 1 auto')); |
96 | 84 | },
|
97 | 85 |
|
98 | 86 | _theatreCloseStyle: function() {
|
99 |
| - return update({ |
| 87 | + return _.assign({ |
100 | 88 | color: '#ccc',
|
101 | 89 | cursor: 'pointer',
|
102 | 90 | padding: '1vh 2vw',
|
103 | 91 | fontSize: '2em',
|
104 |
| - }, { |
105 |
| - $merge: this.alignItems('center'), |
106 |
| - $merge: this.justifyContent('center'), |
107 |
| - $merge: this.flex('0 0 auto'), |
108 |
| - }); |
| 92 | + }, this.alignItems('center'), this.justifyContent('center'), this.flex('0 0 auto')); |
109 | 93 | },
|
110 | 94 |
|
111 | 95 | _theatreContentStyle: function() {
|
112 |
| - return update({ |
| 96 | + return _.assign({ |
113 | 97 | height: '100%',
|
114 | 98 | overflowY: 'scroll',
|
115 |
| - }, { |
116 |
| - $merge: this.displayFlex(), |
117 |
| - $merge: this.alignItems('center'), |
118 |
| - $merge: this.justifyContent('center'), |
119 |
| - $merge: this.flexFlow('column'), |
120 |
| - }); |
| 99 | + }, this.displayFlex(), this.justifyContent('center'), this.flexFlow('column')); |
121 | 100 | },
|
122 | 101 |
|
123 | 102 | _progressStyle: function(width) {
|
|
0 commit comments