Skip to content

Commit

Permalink
Merge branch '230727_npm' of https://github.com/tidev/titanium-sdk in…
Browse files Browse the repository at this point in the history
…to 230727_npm
  • Loading branch information
m1ga committed May 13, 2024
2 parents b2d02e7 + a6cd021 commit 7dbc890
Show file tree
Hide file tree
Showing 10 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions iphone/Classes/TiUINavBarButton.m
Original file line number Diff line number Diff line change
Expand Up @@ -137,8 +137,8 @@ - (id)initWithProxy:(TiUIButtonProxy *)proxy_

self.width = [TiUtils floatValue:[proxy_ valueForKey:@"width"] def:0.0];
// A width of 0 is treated as Auto by the iPhone OS, so this is safe.
// we need to listen manually to proxy change events if we want to be
// able to change them dynamically
// we need to listen manually to proxy change events if we want to be
// able to change them dynamically
proxy.modelDelegate = self;

// we need to manually check for this property on init
Expand Down
8 changes: 4 additions & 4 deletions iphone/Classes/TiUIScrollableView.m
Original file line number Diff line number Diff line change
Expand Up @@ -450,10 +450,10 @@ - (void)refreshScrollView:(CGRect)visibleBounds readd:(BOOL)readd

NSUInteger viewsCount = [[self proxy] viewCount];
/*
Reset readd here since refreshScrollView is called from
frameSizeChanged with readd false and the views might
not yet have been added on first launch
*/
Reset readd here since refreshScrollView is called from
frameSizeChanged with readd false and the views might
not yet have been added on first launch
*/
readd = ([[sv subviews] count] == 0);

for (int c = 0; c < viewsCount; c++) {
Expand Down
2 changes: 1 addition & 1 deletion iphone/Classes/TiUITableView.m
Original file line number Diff line number Diff line change
Expand Up @@ -2858,7 +2858,7 @@ - (void)scrollViewDidEndDragging:(UIScrollView *)scrollView willDecelerate:(BOOL
}

// This section of code now moved to [TiUITextWidgetView updateKeyboardStatus]
// Update keyboard status to insure that any fields actively being edited remain in view
// Update keyboard status to insure that any fields actively being edited remain in view
// if ([[[TiApp app] controller] keyboardVisible]) {
// [[[TiApp app] controller] performSelector:@selector(handleNewKeyboardStatus) withObject:nil afterDelay:0.0];
// }
Expand Down
8 changes: 4 additions & 4 deletions iphone/Classes/TiUITableViewProxy.m
Original file line number Diff line number Diff line change
Expand Up @@ -504,10 +504,10 @@ - (void)deleteRow:(id)args
[table dispatchAction:action];
} else {
// No table, we have to do the data update ourselves.
// If we don't handle it, the row gets dropped on the ground,
// but if we create the tableview, there's this horrible issue where
// the uitableview isn't fully formed, it gets this message to do an action,
// and ends up throwing an exception because we're out of bounds.
// If we don't handle it, the row gets dropped on the ground,
// but if we create the tableview, there's this horrible issue where
// the uitableview isn't fully formed, it gets this message to do an action,
// and ends up throwing an exception because we're out of bounds.
[section remove:row];
}
}
Expand Down
4 changes: 2 additions & 2 deletions iphone/Classes/TiUIiOSProxy.h
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,8 @@
@property (nonatomic, readonly) NSNumber *LARGE_TITLE_DISPLAY_MODE_NEVER;

/**
Checks the force touch capibility of the current device.
*/
* Checks the force touch capibility of the current device.
*/
- (NSNumber *)forceTouchSupported;

#ifdef USE_TI_UIIOSCOVERFLOWVIEW
Expand Down
4 changes: 2 additions & 2 deletions iphone/Classes/TiUIiOSStepper.m
Original file line number Diff line number Diff line change
Expand Up @@ -246,8 +246,8 @@ - (void)controlAction:(id)sender forEvent:(UIEvent *)event
- (UIImage *)imageWithImage:(UIImage *)image fullScale:(bool)full
{
// UIGraphicsBeginImageContext(newSize);
// In next line, pass 0.0 to use the current device's pixel scaling factor (and thus account for Retina resolution).
// Pass 1.0 to force exact pixel size.
// In next line, pass 0.0 to use the current device's pixel scaling factor (and thus account for Retina resolution).
// Pass 1.0 to force exact pixel size.
[self stepper];
CGRect bounds = [stepper bounds];

Expand Down
6 changes: 3 additions & 3 deletions iphone/TitaniumKit/TitaniumKit/Sources/API/TiProxy.m
Original file line number Diff line number Diff line change
Expand Up @@ -828,7 +828,7 @@ - (void)fireEvent:(id)args
}
if ([self doesntOverrideFireEventWithSource]) {
// TODO: Once the deprecated methods are removed, we can use the following line without checking to see if we'd shortcut.
// For now, we're shortcutting to suppress false warnings.
// For now, we're shortcutting to suppress false warnings.
[self fireEvent:type withObject:params propagate:bubble reportSuccess:NO errorCode:0 message:nil];
return;
}
Expand All @@ -840,7 +840,7 @@ - (void)fireEvent:(NSString *)type withObject:(id)obj
{
if ([self doesntOverrideFireEventWithSource]) {
// TODO: Once the deprecated methods are removed, we can use the following line without checking to see if we'd shortcut.
// For now, we're shortcutting to suppress false warnings.
// For now, we're shortcutting to suppress false warnings.
[self fireEvent:type withObject:obj propagate:YES reportSuccess:NO errorCode:0 message:nil];
return;
}
Expand All @@ -858,7 +858,7 @@ - (void)fireEvent:(NSString *)type withObject:(id)obj propagate:(BOOL)yn
{
if ([self doesntOverrideFireEventWithSource]) {
// TODO: Once the deprecated methods are removed, we can use the following line without checking to see if we'd shortcut.
// For now, we're shortcutting to suppress false warnings.
// For now, we're shortcutting to suppress false warnings.
[self fireEvent:type withObject:obj propagate:yn reportSuccess:NO errorCode:0 message:nil];
return;
}
Expand Down
10 changes: 5 additions & 5 deletions iphone/TitaniumKit/TitaniumKit/Sources/API/TiStylesheet.m
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,11 @@ - (id)stylesheet:(NSString *)objectId density:(NSString *)density basename:(NSSt
#endif

/*
CSS selector priority order (lowest to highest) is
- Tag selectors
- Classes
- ID selectors
*/
CSS selector priority order (lowest to highest) is
- Tag selectors
- Classes
- ID selectors
*/

NSMutableDictionary *result = [NSMutableDictionary dictionary];
if (tags != nil) {
Expand Down
8 changes: 4 additions & 4 deletions iphone/TitaniumKit/TitaniumKit/Sources/API/TiViewProxy.m
Original file line number Diff line number Diff line change
Expand Up @@ -1633,10 +1633,10 @@ - (void)didReceiveMemoryWarning:(NSNotification *)notification
// 1.4 where we can figure out why the drawing is screwed up since
// the views aren't reattaching.
/*
if (view!=nil && [view retainCount]==1)
{
[self detachView];
}*/
if (view!=nil && [view retainCount]==1)
{
[self detachView];
}*/
[super didReceiveMemoryWarning:notification];
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#import "TiViewProxy.h"
#import "TiWindowProxy.h"

// TODO: we probably should split this ViewProxy into a a separate TiUIView like normal
// TODO: we probably should split this ViewProxy into a separate TiUIView like normal

@interface TiUIWindowProxy : TiWindowProxy {
@private
Expand Down

0 comments on commit 7dbc890

Please sign in to comment.