Skip to content

Infinite loop fix #722

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

Open
StDogbert wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Infinite loop fix #722

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e77d91b
Starting from iOS 7.1 SUDDENLY even if u set UIToolBar appearance tin…
StDogbert Mar 28, 2014
4453f7f
Merge branch 'master' of https://github.com/escoz/QuickDialog
StDogbert Aug 4, 2015
c6f6653
Merge remote-tracking branch 'upstream/master'
StDogbert Sep 8, 2015
0204d7e
infinite loop fix
StDogbert Sep 8, 2015
25e5a5e
Set root only after data source and delegate are set
Aug 26, 2015
6d98592
Updated pod
escoz Aug 25, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion QuickDialog.podspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = 'QuickDialog'
s.version = '1.0.2'
s.version = '1.1.0'
s.platform = :ios, '5.0'
s.license = 'Apache License, Version 2.0'
s.summary = 'Quick and easy dialog screens for iOS.'
Expand All @@ -25,5 +25,25 @@ Pod::Spec.new do |s|
sp.source_files = 'extras', '*.{h,m}'
end

s.subspec "QPicker" do |sp|
sp.dependency 'QuickDialog/Core'
sp.source_files = 'extras/QPicker*.{h,m}'
end
s.subspec "QMail" do |sp|
sp.dependency 'QuickDialog/Core'
sp.source_files = 'extras/QMail*.{h,m}'
end
s.subspec "QMap" do |sp|
sp.dependency 'QuickDialog/Core'
sp.source_files = 'extras/QMap*.{h,m}'
end
s.subspec "QWeb" do |sp|
sp.dependency 'QuickDialog/Core'
sp.source_files = 'extras/QWeb*.{h,m}'
end
s.subspec "QColor" do |sp|
sp.dependency 'QuickDialog/Core'
sp.source_files = 'extras/QColor*.{h,m}', 'extras/UIColor*.{h,m}'
end

end
2 changes: 1 addition & 1 deletion extras/QPickerTableViewCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ @implementation QPickerTableViewCell

- (QPickerTableViewCell *)initWithStyle:(UITableViewCellStyle)style reuseIdentifier:(NSString *)reuseIdentifier
{
if ((self = [self initWithStyle:style reuseIdentifier:reuseIdentifier]))
if ((self = [super initWithStyle:style reuseIdentifier:reuseIdentifier]))
{
[self createSubviews];
self.selectionStyle = UITableViewCellSelectionStyleBlue;
Expand Down
2 changes: 1 addition & 1 deletion quickdialog/QEntryTableViewCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ -(UIToolbar *)createActionBar {
_prevNext = [[UISegmentedControl alloc] initWithItems:[NSArray arrayWithObjects:NSLocalizedString(@"Previous", @""), NSLocalizedString(@"Next", @""), nil]];
_prevNext.momentary = YES;
_prevNext.segmentedControlStyle = UISegmentedControlStyleBar;
_prevNext.tintColor = actionBar.tintColor;
_prevNext.tintColor = [UIToolbar appearance].tintColor;
[_prevNext addTarget:self action:@selector(handleActionBarPreviousNext:) forControlEvents:UIControlEventValueChanged];
UIBarButtonItem *prevNextWrapper = [[UIBarButtonItem alloc] initWithCustomView:_prevNext];
UIBarButtonItem *flexible = [[UIBarButtonItem alloc] initWithBarButtonSystemItem:UIBarButtonSystemItemFlexibleSpace target:nil action:nil];
Expand Down
3 changes: 2 additions & 1 deletion quickdialog/QuickDialogTableView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ - (QuickDialogTableView *)initWithController:(QuickDialogController *)controller
self = [super initWithFrame:CGRectMake(0, 0, 0, 0) style:controller.root.grouped ? UITableViewStyleGrouped : UITableViewStylePlain];
if (self!=nil){
self.controller = controller;
self.root = _controller.root;
self.deselectRowWhenViewAppears = YES;

self.quickDialogDataSource = [[QuickDialogDataSource alloc] initForTableView:self];
Expand All @@ -44,6 +43,8 @@ - (QuickDialogTableView *)initWithController:(QuickDialogController *)controller
self.quickDialogTableDelegate = [[QuickDialogTableDelegate alloc] initForTableView:self];
self.delegate = self.quickDialogTableDelegate;

self.root = _controller.root;

self.autoresizingMask = UIViewAutoresizingFlexibleHeight | UIViewAutoresizingFlexibleWidth;
}
return self;
Expand Down