Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[TIMOB-18119] (3_5_X) Update removed version to 3.6.0 #6423

Merged
merged 1 commit into from
Dec 3, 2014
Merged

[TIMOB-18119] (3_5_X) Update removed version to 3.6.0 #6423

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 11 additions & 11 deletions iphone/Classes/MediaModule.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,17 +183,17 @@ -(NSString*)apiName
MAKE_SYSTEM_UINT(AUDIO_FILEFORMAT_AMR,kAudioFileAMRType);

//Constants for audioLineType
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_HEADPHONES,-1,@"Media.AUDIO_HEADPHONES",@"3.4.2",@"3.5.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_HEADSET_INOUT,-2,@"Media.AUDIO_HEADSET_INOUT",@"3.4.2",@"3.5.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_RECEIVER_AND_MIC,-3,@"Media.AUDIO_RECEIVER_AND_MIC",@"3.4.2",@"3.5.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_HEADPHONES_AND_MIC,-4,@"Media.AUDIO_HEADPHONES_AND_MIC",@"3.4.2",@"3.5.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_LINEOUT,-5,@"Media.AUDIO_LINEOUT",@"3.4.2",@"3.5.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_SPEAKER,-6,@"Media.AUDIO_SPEAKER",@"3.4.2",@"3.5.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_MICROPHONE,-7,@"Media.AUDIO_MICROPHONE",@"3.4.2",@"3.5.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_MUTED,-8,@"Media.AUDIO_MUTED",@"3.4.2",@"3.5.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_UNAVAILABLE,-9,@"Media.AUDIO_UNAVAILABLE",@"3.4.2",@"3.5.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_UNKNOWN,-10,@"Media.AUDIO_UNKNOWN",@"3.4.2",@"3.5.0");
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED_REMOVED(audioLineType,-10,@"Media.audioLineType",@"3.4.2",@"3.5.0",@"Media.currentRoute");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_HEADPHONES,-1,@"Media.AUDIO_HEADPHONES",@"3.4.2",@"3.6.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_HEADSET_INOUT,-2,@"Media.AUDIO_HEADSET_INOUT",@"3.4.2",@"3.6.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_RECEIVER_AND_MIC,-3,@"Media.AUDIO_RECEIVER_AND_MIC",@"3.4.2",@"3.6.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_HEADPHONES_AND_MIC,-4,@"Media.AUDIO_HEADPHONES_AND_MIC",@"3.4.2",@"3.6.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_LINEOUT,-5,@"Media.AUDIO_LINEOUT",@"3.4.2",@"3.6.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_SPEAKER,-6,@"Media.AUDIO_SPEAKER",@"3.4.2",@"3.6.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_MICROPHONE,-7,@"Media.AUDIO_MICROPHONE",@"3.4.2",@"3.6.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_MUTED,-8,@"Media.AUDIO_MUTED",@"3.4.2",@"3.6.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_UNAVAILABLE,-9,@"Media.AUDIO_UNAVAILABLE",@"3.4.2",@"3.6.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(AUDIO_UNKNOWN,-10,@"Media.AUDIO_UNKNOWN",@"3.4.2",@"3.6.0");
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED_REMOVED(audioLineType,-10,@"Media.audioLineType",@"3.4.2",@"3.6.0",@"Media.currentRoute");

//Constants for currentRoute
MAKE_SYSTEM_STR(AUDIO_SESSION_PORT_LINEIN,AVAudioSessionPortLineIn)
Expand Down
2 changes: 1 addition & 1 deletion iphone/Classes/TiMediaVideoPlayerProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -526,7 +526,7 @@ -(void)requestThumbnailImagesAtTimes:(id)args

-(TiBlob*)thumbnailImageAtTime:(id)args
{
DEPRECATED_REPLACED_REMOVED(@"Media.VideoPlayer.thumbnailImageAtTime",@"3.4.2",@"3.5.0",@"Media.VideoPlayer.requestThumbnailImagesAtTimes")
DEPRECATED_REPLACED_REMOVED(@"Media.VideoPlayer.thumbnailImageAtTime",@"3.4.2",@"3.6.0",@"Media.VideoPlayer.requestThumbnailImagesAtTimes")
return nil;
}

Expand Down
6 changes: 3 additions & 3 deletions iphone/Classes/TiUIiOSProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,17 +424,17 @@ -(NSNumber*)AUTODETECT_ALL

-(NSString*)COLOR_SCROLLVIEW_BACKGROUND
{
DEPRECATED_REMOVED(@"UI.iOS.COLOR_SCROLLVIEW_BACKGROUND",@"3.4.2",@"3.5.0")
DEPRECATED_REMOVED(@"UI.iOS.COLOR_SCROLLVIEW_BACKGROUND",@"3.4.2",@"3.6.0")
return IOS_COLOR_SCROLLVIEW_TEXTURED_BACKGROUND;
}
-(NSString*)COLOR_VIEW_FLIPSIDE_BACKGROUND
{
DEPRECATED_REMOVED(@"UI.iOS.COLOR_VIEW_FLIPSIDE_BACKGROUND",@"3.4.2",@"3.5.0")
DEPRECATED_REMOVED(@"UI.iOS.COLOR_VIEW_FLIPSIDE_BACKGROUND",@"3.4.2",@"3.6.0")
return IOS_COLOR_VIEW_FLIPSIDE_BACKGROUND;
}
-(NSString*)COLOR_UNDER_PAGE_BACKGROUND
{
DEPRECATED_REMOVED(@"UI.iOS.COLOR_UNDER_PAGE_BACKGROUND",@"3.4.2",@"3.5.0")
DEPRECATED_REMOVED(@"UI.iOS.COLOR_UNDER_PAGE_BACKGROUND",@"3.4.2",@"3.6.0")
return IOS_COLOR_UNDER_PAGE_BACKGROUND;
}

Expand Down
4 changes: 2 additions & 2 deletions iphone/Classes/TiUIiPhoneStatusBarProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ @implementation TiUIiPhoneStatusBarProxy
MAKE_SYSTEM_PROP(DEFAULT,UIStatusBarStyleDefault);
MAKE_SYSTEM_PROP(GRAY,UIStatusBarStyleDefault);
MAKE_SYSTEM_PROP(GREY,UIStatusBarStyleDefault);
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED_REMOVED(OPAQUE_BLACK,UIStatusBarStyleLightContent,@"UI.iPhone.StatusBar.OPAQUE_BLACK",@"3.4.2",@"3.5.0",@"UI.iPhone.StatusBar.LIGHT_CONTENT")
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED_REMOVED(TRANSLUCENT_BLACK,UIStatusBarStyleLightContent,@"UI.iPhone.StatusBar.OPAQUE_BLACK",@"3.4.2",@"3.5.0",@"UI.iPhone.StatusBar.LIGHT_CONTENT")
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED_REMOVED(OPAQUE_BLACK,UIStatusBarStyleLightContent,@"UI.iPhone.StatusBar.OPAQUE_BLACK",@"3.4.2",@"3.6.0",@"UI.iPhone.StatusBar.LIGHT_CONTENT")
MAKE_SYSTEM_PROP_DEPRECATED_REPLACED_REMOVED(TRANSLUCENT_BLACK,UIStatusBarStyleLightContent,@"UI.iPhone.StatusBar.OPAQUE_BLACK",@"3.4.2",@"3.6.0",@"UI.iPhone.StatusBar.LIGHT_CONTENT")
MAKE_SYSTEM_PROP(LIGHT_CONTENT,UIStatusBarStyleLightContent);


Expand Down
2 changes: 1 addition & 1 deletion iphone/Classes/TiUIiPhoneSystemButtonStyleProxy.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ -(NSString*)apiName
MAKE_SYSTEM_PROP(DONE,UIBarButtonItemStyleDone);
MAKE_SYSTEM_PROP(BORDERED,UIBarButtonItemStyleBordered);
MAKE_SYSTEM_PROP(PLAIN,UIBarButtonItemStylePlain);
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(BAR,2,@"UI.iPhone.SystemButtonStyle.BAR",@"3.4.2",@"3.5.0");
MAKE_SYSTEM_PROP_DEPRECATED_REMOVED(BAR,2,@"UI.iPhone.SystemButtonStyle.BAR",@"3.4.2",@"3.6.0");

@end

Expand Down