ce8cde35cd
[ReactNative][docs] LinkingIOS
2015-03-29 11:22:40 -08:00
a587525c2d
Fixing TouchableOpacity and TouchableHighlight documentation
...
Summary:
Found a typo in the TouchableOpacity and TouchableHighlight documentation
Closes https://github.com/facebook/react-native/pull/292
Github Author: Ryan Warren <ryan@war.re>
Test Plan: Imported from GitHub, without a `Test Plan:` line.
2015-03-28 15:18:31 -08:00
199613de6a
[react-native] Add React.addons.createFragment
2015-03-28 15:10:34 -08:00
dde70d3d73
[ReactNative] Fix LinkingIOS event listening
2015-03-27 13:56:01 -08:00
bf4bd4b08e
[ReactNative] JS files for D1947217
2015-03-27 13:48:41 -08:00
c430782e81
[ReactNative] Fix a minor bug in AnimationUtils
2015-03-27 12:15:17 -08:00
89fce9aead
Make bounds and scale of gif network images respond to device and styles
...
Summary:
@vjeux and I were discussing this in irc an discovered that network gif images did not respond how they should to width, height or flex properties. Along the way I also noticed that the scale was not changing depending on the device. This PR fixes that, so now you can do `flex: 1` on a gif image to have it stretch to the whole screen. [Minimum reproducible example here](https://gist.github.com/brentvatne/f745377b0789162a28df ) - try this without and then with the changes of this PR to see.
Closes https://github.com/facebook/react-native/pull/353
Github Author: Brent Vatne <brent.vatne@madriska.com>
Test Plan: Imported from GitHub, without a `Test Plan:` line.
2015-03-27 12:01:00 -08:00
02ac401278
[react_native] Sync D1939291
2015-03-27 11:26:39 -08:00
3e6c2e80ba
Remove duplication in ScrollResponder.js | Edward Kim
...
Summary:
I think this line is a legacy code from `NativeModulesDeprecated`.
Closes https://github.com/facebook/react-native/pull/340
Github Author: Edward Kim <onward.edkim@gmail.com>
Test Plan: Imported from GitHub, without a `Test Plan:` line.
2015-03-27 09:30:18 -08:00
698988017c
Added support for text padding
2015-03-27 09:21:27 -08:00
7bcb467526
Cancel contents animation before setting new contents in RCTNetworkImageView
...
Summary:
This is a fix for #322
When setting a new image via the imageURL property, the new image
doesn't always replace the previous one when it is finished downloading
because the image view has a previously instated layer animation
on its contents. This cancels any animation prior to setting the new
contents to fix the issue.
Closes https://github.com/facebook/react-native/pull/337
Github Author: Julius Parishy <julius>
Test Plan: Imported from GitHub, without a `Test Plan:` line.
2015-03-27 06:21:04 -08:00
932e600205
[ReactNative][Docs] Remove references to ReactNavigator from docs
2015-03-26 13:53:26 -08:00
011e342bbc
Revert .buckversion bumps.
2015-03-26 11:02:54 -08:00
7a97043a3e
[React Kit] Remove embarrassing TODOs
2015-03-26 10:33:05 -08:00
bdd170568c
[ReactNative][MAdMan] Clean up after D1942269
2015-03-26 10:18:39 -08:00
030b264eb4
flowify a few more Libraries
2015-03-26 10:13:38 -08:00
7e02a1e111
[ReactNative] PushNotificationIOS documentation
2015-03-26 10:01:12 -08:00
921da23e22
[ReactNative][CustomComponents] Update old headers
2015-03-26 09:12:48 -08:00
293b9b9a7f
[React Native] Fix incorrect if-statement in RCTGeolocation
2015-03-26 05:18:49 -08:00
20291a02df
[ReactNative] s/ReactKit/React/g
2015-03-26 02:42:24 -08:00
f9c1a9357a
[ReactNative] Navigator docs
2015-03-26 00:34:15 -08:00
5b8aad5fdc
[ReactNative] License headers and renaming
2015-03-26 00:34:14 -08:00
bbb78df076
[React Native] Add CocoaPods spec
2015-03-25 21:53:26 -08:00
19e328fb08
Added explicit types for all view properties
2015-03-25 21:20:24 -08:00
558b8c65e0
[ReactNative] s/ReactNavigator/Navigator/
2015-03-25 20:20:57 -08:00
20501b3042
[ReactNative] Add copyright header for code copied from the jQuery UI project
2015-03-25 19:57:40 -08:00
f6fc7f37b6
[ReactNative] PanResponder documentation
2015-03-25 19:25:10 -08:00
8679c0bc96
[ReactNative] Add deep linking api
2015-03-25 19:01:08 -08:00
7ffa7942aa
flowify Libraries/ReactIOS
2015-03-25 17:09:51 -08:00
f124c32143
[WIP] Added support for italics and additional font weights
2015-03-25 16:09:08 -08:00
d131e1e09e
[ReactNative] Improve View documentation
2015-03-25 15:55:08 -08:00
cd81fee57c
[ReactNative] Flow and doc formatting for NetInfo
2015-03-25 14:41:00 -08:00
96c63c9ac3
[ReactNative] Document AppStateIOS
2015-03-25 14:24:41 -08:00
ea570844f9
[MAdMan][Android] Make things look more Androidy
2015-03-25 13:05:18 -08:00
95deed578c
flowified Libraries from Avik
2015-03-25 12:44:28 -08:00
18b6d5c20d
flowify some Libraries
2015-03-25 11:09:54 -08:00
0315719507
Flowify ReactIOSEventEmitter
2015-03-25 10:10:47 -08:00
972bbd7adf
[react_native] JS files from D1941151: Allow fontWeight to be 100,200,...,900
2015-03-25 09:21:30 -08:00
15f6783f34
[ReactNative] Add snapshot tests for examples
2015-03-24 21:48:49 -08:00
7311260e58
[ReactNative] Rename JSNavigationStack to ReactNavigator, rename scene config
2015-03-24 19:27:59 -08:00
9eec8aa9d5
Flowify a bunch of Libraries
2015-03-24 18:22:05 -08:00
d71bfa104d
[ReactNative] JSNavigationStack - Use key to blow away old scenes
2015-03-24 17:58:43 -08:00
94db4facf5
Unfork UIManager
2015-03-24 17:24:51 -08:00
a343c4345e
Flowify Libraries/StyleSheet and Libraries/Text
2015-03-24 16:22:59 -08:00
eb16bb4dfd
[ReactNative] Fix OSS Dependency Issues
2015-03-24 16:15:23 -08:00
9b03bec662
[ReactNative] rename navigationOperations to navigator
2015-03-24 15:28:36 -08:00
40d71e6c5b
JS files from D1936817: Add to XMLHttpRequest android and share code with ios
2015-03-24 14:25:20 -08:00
e4bf45beee
flowify some Libraries
2015-03-24 13:27:00 -08:00
23094dbfc3
[ReactNative] JSNavigationStack rename routeMapper to renderSceneForRoute
2015-03-24 11:48:42 -08:00
9a12b9c728
Flowify renderApplication
2015-03-24 11:16:19 -08:00
57ee9e7dc0
[ReactNative] Use oss TimerMixin
2015-03-24 10:46:05 -08:00
fe0527a7c4
[ReactNative] Remove auto permission request from setAppIconBadgeNumber
2015-03-24 10:33:46 -08:00
3f137da232
[ReactNative] OSS snapshot tests
2015-03-24 10:16:15 -08:00
c9a40a989b
[ReactNative] OSS JSNavigationStack w/ Examples
2015-03-24 09:39:40 -08:00
20a0bea197
Fix build - remove relative import path
2015-03-24 06:07:47 -08:00
8ae0eacf17
[ReactNative] Open Source PushNotifications and move Badge Number methods and permission into it
2015-03-24 04:31:34 -08:00
b4a39a2a9e
Flowify TextStylePropTypes and fix a bug with unsupported props
2015-03-23 17:44:41 -08:00
cf126f1172
Flowify Library/Utilities/
2015-03-23 16:47:26 -08:00
1aeb02ada3
[ReactNative] Expanded license on obj-c files
2015-03-23 13:18:29 -08:00
e1ef0328d9
[ReactNative] Expanded license on js files
2015-03-23 13:17:54 -08:00
0cdf56cc4f
[ReactNative] Fix React Devtools integration
2015-03-23 12:58:55 -08:00
62766e6077
[Text] Account for font leading so descenders are not clipped
...
Summary:
Prior to this diff, descenders (the hanging tail on letters like g and j) were clipped on the last line because the text measurer did not account for the font leading. With `NSStringDrawingUsesFontLeading` it honors the fonts line spacing.
To test: open the Text demo of the UIExplorer and see that the bottom of the letter g is no longer clipped off.
## Before
## After
Closes https://github.com/facebook/react-native/pull/96
Github Author: James Ide <ide@jameside.com>
Test Plan: Imported from GitHub, without a `Test Plan:` line.
2015-03-23 11:40:24 -08:00
d6bb48d972
more UIExplorer flow
2015-03-23 11:21:08 -08:00
e4990939e4
[ReactNative] Add NativeModules and DeviceEventEmitter to react-native exports
2015-03-23 09:23:51 -08:00
48cc440bd3
[React Native] Fix iOS 7 crashes b/c missing Photos.fmwk
2015-03-23 08:06:58 -08:00
45a7b5cdcb
UIExplorer flowification
2015-03-23 00:24:47 -08:00
05409868b6
Add clearImmediate module
2015-03-22 23:28:04 -08:00
0a88663b1e
Work around flow bug with exports
2015-03-22 22:12:18 -08:00
87f42ab450
[ReactNative] Remove react-native/package.json
2015-03-22 20:17:01 -08:00
81d024924c
[react-native] Use SpreadProperty to make react-docgen happy
2015-03-20 17:04:12 -08:00
f1746ac83e
[react-packager] change all but one `ix` to `require`
2015-03-20 15:26:58 -08:00
c445cbdb1e
[ReactNative] Touchable invoke press on longPress when longPress handler missing
2015-03-20 11:47:01 -08:00
21a1cd52b5
[ReactNative] Commit missing RCTWebSocketDebugger.xcodeproj
2015-03-20 11:16:41 -08:00
ac804244a6
[ReactNative] Add Custom Components folder
2015-03-20 09:19:28 -08:00
8dea55618d
[ReactNative] Bring Chrome debugger to OSS. Part 2
2015-03-19 11:48:51 -08:00
0de49ab0d5
[ReactNative][RFC] Bring Chrome debugger to OSS. Part 1
2015-03-19 09:32:52 -08:00
1289536fe1
[ReactNative] Return the appropriate status code from XHR
2015-03-19 09:27:06 -08:00
d6a031b431
[ReactNative] Make JS stack traces in Xcode prettier
2015-03-19 09:25:46 -08:00
2cace1a5b3
[ReactNative] Remove invariant from require('react-native')
2015-03-18 18:58:12 -08:00
48f7399cfc
[ReactNative] Remove ListViewDataSource from require('react-native')
2015-03-18 18:53:16 -08:00
f2d688debb
purge rni
2015-03-18 17:17:08 -08:00
4b42f8c9e9
[ReactNative] s/render*View/render/ in <WebView>
2015-03-18 16:02:19 -08:00
196bc85629
[ReactNative] Remove ExpandingText
2015-03-18 13:08:23 -08:00
f002fda275
[TouchableHighlight] Preserve underlay style when restoring inactive props
...
Summary:
If you give a TouchableHighlight component some styling (e.g. a background color) with the `underlayStyle` prop, the style is wiped away after touching the component. This diff restores the `underlayStyle`.
Closes https://github.com/facebook/react-native/pull/129
Github Author: James Ide <ide@jameside.com>
Test Plan:
Create a TouchableHighlight that receives `underlayStyle={{style:
'blue'}}`. It initially has a blue background. Touch it and let go. See the blue background now comes back as expected.
2015-03-18 11:56:24 -08:00
c43d1458c7
clean flow errors in react-native-github
2015-03-18 11:44:13 -08:00
0f5a3c16e4
[ReactNative] Sort React Native exports into two groups, Components and ...
...
Summary:
...APIs
This maps the way the docs are structured, this is easier to figure out when the docs are stale
Closes https://github.com/facebook/react-native/pull/161
Github Author: Christopher Chedeau <vjeux@fb.com>
Test Plan: Imported from GitHub, without a `Test Plan:` line.
2015-03-18 09:49:58 -08:00
8cb6dc2ff6
[ReactNative] Rename Slider to SliderIOS
2015-03-18 08:36:12 -08:00
efd56688ba
[RFC][ReactNative] increase timer resolution
2015-03-17 22:09:03 -08:00
9086365faf
[ReactNative] Strip prefixes from NativeModules keys
2015-03-17 21:54:27 -08:00
2991f583e0
[ReactNative] Small docs cleanup in ActivityIndicatorIOS and DatePickerIOS
...
Summary:
Summary:
Makes sure that it looks good in the website
Closes https://github.com/facebook/react-native/pull/160
Github Author: Christopher Chedeau <vjeux@fb.com>
Test Plan:
Run the website
CC:
Task ID: #
2015-03-17 21:13:07 -08:00
278932e61e
[ReactNative] Improvements on perf measurement output
2015-03-17 20:24:28 -08:00
f377849c73
[ReactNative] Clean up Touchable PropTypes
...
Summary:
Summary:
Instead of having a separate TouchablePropTypes, put those in TouchableWithoutFeedback and have the other ones use ...TouchableWithoutFeedback.propTypes. This makes it work with the docs parsing.
Closes https://github.com/facebook/react-native/pull/159
Github Author: Christopher Chedeau <vjeux@fb.com>
Test Plan:
Run the website, make sure all the touchable components have the right prop types
CC:
Task ID: #
2015-03-17 16:46:14 -08:00
2aafcd0e58
[ReactNative] Remove pushNotification prop from renderApplication
2015-03-17 11:48:06 -08:00
d5d9d9b9c1
[react_native] Stub VibrationIOS on Android
2015-03-17 11:30:30 -08:00
345f161399
[ReactNative] Simplify and test interpolators
2015-03-17 11:06:03 -08:00
f8f3f67bed
[ReactNative] Increase timeout for obj-c tests
2015-03-17 08:33:42 -08:00
18d1805695
[ReactNative] Updated RKText to new UIManager system
2015-03-17 06:37:24 -08:00
d8ee4e87a1
[ReactKit] Remove NativeModulesDeprecated
2015-03-17 02:48:58 -08:00
54c6a7ddff
[ReactNative] Allow single callbacks in NativeModules
2015-03-17 02:48:57 -08:00
b396de3cc8
[ReactNative] s/RK/RCT in OSS
2015-03-17 02:48:57 -08:00
733596b67a
[ReactNative] Cleanup StyleSheet API
2015-03-16 20:46:04 -08:00
f8ab8415d5
[RCTVibration] Basic Vibration API
...
Summary:
* Exposed as `VibrationIOS.vibrate();`
* Included a UI Explorer example.
* Vibration patterns are currently unsupported as there is no API to produce a vibration of less than 1 second on iOS.
Closes https://github.com/facebook/react-native/pull/154
Github Author: Joe Stanton <joe.stanton@red-badger.com>
Test Plan: Imported from GitHub, without a `Test Plan:` line.
2015-03-16 20:41:33 -08:00
6fc5a78956
[ReactNative] unbreak Android
2015-03-16 17:51:09 -08:00
310aef9dcc
[ReactNative] NetworkInformation.reachability API w/ example
2015-03-16 13:44:40 -08:00
5f538b2284
[ReactNative] Put launchOptions in RCTPushNotificationManager
2015-03-16 12:11:50 -08:00
06125009dd
[ReactNative] Improve PixelRatio documentation
2015-03-16 09:08:57 -08:00
8799f0c487
Ported ART to new UIManager
2015-03-15 16:01:58 -08:00
2ad43094ea
[ReactNative] OSS Interaction Manager
2015-03-14 11:17:15 -08:00
66bb821a31
Unforked RKWebView
2015-03-14 00:22:43 -08:00
3cc81c6561
[ReactNative] Add integration test stuff
2015-03-13 18:03:34 -08:00
85bcbd4bf3
[ReactNative] AlertIOS.alert and examples
2015-03-13 17:34:13 -08:00
cc74944bef
[React Native] Update 2048
2015-03-13 15:19:05 -08:00
b51f51e47d
deepDiffer should support explicitly undefined values
2015-03-13 15:17:07 -08:00
28e38afb68
[ReactNative] Oss ActionSheet
2015-03-13 10:51:06 -08:00
2b38a70e9c
[ReactNative] Fix ScrollView.scrollTo()
2015-03-13 10:28:59 -08:00
b2bf4b88bf
[catalyst|madman] fix location observer
2015-03-13 10:02:34 -08:00
7577f0e0b3
[ReactNative] Remove keyboardDismissMode from static
2015-03-13 10:00:18 -08:00
6299803081
[ReactNative] Support loading sourcemaps from sourceMappingURL
2015-03-12 17:21:43 -08:00
582d8f062a
[React Native] add support for reading tracking bit
2015-03-12 15:25:44 -08:00
24da269404
Fixed sticky section headers in ListView
2015-03-12 02:41:48 -08:00
5c853c4433
[ReactNative] AppState cleanup, remove Subscribable, add in OSS examples
2015-03-11 20:35:57 -08:00
df9874de6f
[ReactNative] Move PushNotificationIOS to oss
2015-03-11 16:58:14 -08:00
50f77016bb
[catlyst|madman] fix prop type warning
2015-03-11 14:45:41 -08:00
65ba4c68c0
[ReactNative] Remove Subscribable from TextInput
2015-03-11 14:42:47 -08:00
2424711a03
Unforked ExceptionsManager, AlertManager and AppState
2015-03-11 13:46:35 -08:00
30d3117f96
[ReactNative|MAdMan] Notification Subscribable
2015-03-11 13:44:30 -08:00
221ddd3cfe
[ReactNative] OSS AsyncStorage with example
2015-03-11 11:54:09 -08:00
74e84ba494
Unforked RKNavigator, RKScrollView and RKView
2015-03-10 19:25:46 -08:00
0c4b338bca
[Relay] Update Relay + ES6 class containers
2015-03-10 17:39:47 -08:00
62eff7197b
[React Native] Add RCTAdSupport.xcodeproj
2015-03-10 15:16:09 -08:00
1793712c77
[ReactNative][Android] Fix after a new React version was downstreamed
2015-03-10 14:44:05 -08:00
fb475dd0c4
[React Native] Add preliminary animation API
2015-03-10 14:19:38 -08:00
a8aedb3e78
[React Native][Device ID][wip] implement most basic js access
2015-03-10 11:56:47 -08:00
184ae2314d
[ReactNative] OSS Picker
2015-03-10 09:29:53 -08:00
403fbd66c3
[ReactNative][tmp] Rename GeoLocation2 files back to Geolocation
2015-03-10 09:01:11 -08:00
7462caa304
[ReactNative][tmp] Rename GeoLocation files to fix letter case
2015-03-10 09:01:10 -08:00
fa87d83af5
[ReactNative] Oss GeoMap
2015-03-09 17:55:40 -08:00
78ec0df464
[ReactNative] OSS CameraRoll
2015-03-09 16:48:02 -08:00
b31fd38bb6
[React Native][RFC] Print __DEV__ value on app start
2015-03-09 15:54:12 -08:00
2640002d0e
[ReactNative] Oss RCTSlider
2015-03-09 14:43:53 -08:00
c79cb09c14
[ReactNative] Oss RCTSwitch
2015-03-09 13:22:11 -08:00
e4093a6abb
[ReactNative] Remove ImageSourcePropType
2015-03-09 09:49:30 -08:00
45da1f03cb
[ReactNative] s/Image.sourcePropType/Image.propTypes.source/
2015-03-09 09:49:29 -08:00
1e01c26457
[ReactNative] s/Text.stylePropType/Text.propTypes.style/
2015-03-09 09:49:28 -08:00
f61e4184a8
[ReactNative] s/View.stylePropType/View.propTypes.style/
2015-03-09 09:49:27 -08:00
0f2a2e73f0
[ReactNative] Remove nativePropTypes
2015-03-09 09:49:27 -08:00
dc309b9dd4
[ReactNative] Inline ScrollViewPropTypes
2015-03-09 09:49:26 -08:00
7466846c7e
[ReactNative] Unify ScrollView.android and ScrollView.ios
2015-03-09 09:49:25 -08:00
d8e83c882e
[ReactNative] Move around and reformat comments for the documentation
2015-03-09 09:49:24 -08:00
705a8e0144
Improved Geolocation API
2015-03-09 02:50:16 -08:00
c5e6f550ad
[React Native] Move copyProperties and mergeHelpers to github dir
2015-03-08 23:47:06 -08:00
444e3e703f
[ReactNative] OSS DatePicker
2015-03-06 18:28:45 -08:00
b335f88efd
[React Native] Update core modules for React 0.13
2015-03-06 17:12:53 -08:00
9e2bdede15
[react_native] JS files for D1885531
2015-03-06 07:32:17 -08:00
fb2f063ef5
Ported TabBarIOS to OSS and unified implementation
2015-03-05 17:16:19 -08:00
e979f2324a
[ReactNative] Fix ExpandingText prop types
2015-03-05 10:49:16 -08:00
6072521a52
[ReactNative] Replace js long constants with strings
2015-03-04 14:32:54 -08:00
45deae03af
React Native: Remove Unnecessary `document.body` Shim
2015-03-04 13:31:04 -08:00
fd198b71dc
[ReactNative] Use spread operator and .propTypes for ScrollView/ListView
2015-03-04 08:29:57 -08:00
eb3c3a27b1
React Native: Force !ExecutionEnvironment.canUseDOM
2015-03-03 18:27:31 -08:00
46f41c3d4b
[ReactNative] Use strings instead of constants for keyboardDismissMode
2015-03-03 11:26:22 -08:00
3daaf1741c
[ReactNative] Clean up libraries and include paths
2015-03-03 10:46:34 -08:00
1aeeac1314
[f8] Make map zoomable on double-tap
2015-03-02 19:48:46 -08:00
902af4c729
[ReactNative] Move merge & mergeInto from downstream to vendor
2015-03-02 18:10:43 -08:00
a39024928e
[ReactNative] Expose ListView.DataSource instead of a top domain ListViewDataSource
2015-03-02 16:27:12 -08:00
ea6bfbb7d6
[ReactNative] Replace all the call sites of mergeInto by Object.assign
2015-03-01 17:16:18 -08:00
3b11b9d6c3
[WIP] Migrated View Managers over to new architecture
2015-03-01 16:34:14 -08:00
33290fb1e2
[ReactNative] Replace all the call sites of copyProperties by Object.assign
2015-03-01 16:09:11 -08:00
878bc9d491
[ReactNative] Migrate navigator.geolocation to open source
2015-02-28 21:25:27 -08:00
c7b5a1ddfa
[ReactNative] Use local CocoaPod config for ReactNative modules
2015-02-27 08:36:53 -08:00
99f7a0ab9d
[ReactNative] Pull out some OSS modules into separate libs
2015-02-27 08:36:52 -08:00
ddf8933904
[Children] Expose React.Children like web React
...
Summary:
Simply exposes this public API from ReactIOS in the same manner as web React.
Closes https://github.com/facebook/react-native/pull/104
Github Author: James Ide <ide@jameside.com>
Test Plan: Imported from GitHub, without a `Test Plan:` line.
2015-02-26 20:24:46 -08:00
ee8d0d7204
[treehouse] Add support for clear button on UITextFields
2015-02-26 16:14:14 -08:00
337329451d
[Touch] Suite of touchable events on TouchableHighlight/Opacity
...
Summary:
The following props are now supported on TouchableHighlight/Opacity components:
- onPress (was there before)
- onPressIn
- onPressOut
- onLongPress
There is a `TouchableFeedbackPropType` that is shared amongst the Touchable family for consistency.
Added UIExplorer example to demonstrate and test.
Fixes #101 .
Closes https://github.com/facebook/react-native/pull/102
Github Author: James Ide <ide@jameside.com>
Test Plan: Imported from GitHub, without a `Test Plan:` line.
2015-02-26 10:30:31 -08:00
efae175a8e
[react-packager][streamline oss] Move open sourced JS source to react-native-github
2015-02-19 21:25:11 -08:00
Tadeu Zagallo
Ryan Warren
Ben Alpert
Martin Konicek
Brent Vatne
Andrei Coman
Edward Kim
Nick Lockwood
Julius Parishy
Jakub Zika
Alex Akers
Philipp von Weitershausen
Basil Hosmer
Eric Vicenti
Marshall Roch
Christopher Chedeau
Krzysztof Magiera
Spencer Ahrens
Olivia Bishop
Alex Kotliarskyi
James Ide
Felix Kling
Amjad Masad
Jing Chen
Andy Street
Joe Stanton
Andrew Rasmussen
Thomas Aylott
Jiajie Zhu
Owen Coutts
Christoph Pojer
Tim Yung
Sumeet Vaidya
