Skip to content

Commit

Permalink
FIX: key and controller as separate item in the stack
Browse files Browse the repository at this point in the history
  • Loading branch information
yamdraco committed Aug 12, 2014
1 parent c7bad6d commit 9e5e6b3
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Conductor/lib/Conductor.m
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ - (void) push:(UIViewController*)vctr {
}

- (void) push:(UIViewController*)vctr withKey:(NSString*)key {
[ctrStack addObject:@{key:vctr}];
[ctrStack addObject:@{@"key":key, @"controller":vctr}];
}

- (UIViewController*) pop {
Expand All @@ -37,7 +37,7 @@ - (UIViewController*) pop {
}

- (UIViewController*) last {
return ([ctrStack count] > 0) ? [[ctrStack lastObject] allValues][0] : nil;
return ([ctrStack count] > 0) ? [ctrStack lastObject][@"controller"] : nil;
}

#pragma mark -
Expand Down
4 changes: 2 additions & 2 deletions conductor.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ Pod::Spec.new do |s|
#

s.name = "conductor"
s.version = "0.1.0"
s.version = "0.1.1"
s.summary = "Conductor for managing uiviewcontrollers instead of using story board"

s.homepage = "https://github.com/yamdraco/conductor"
s.license = { :type => "MIT" }
s.author = { "Draco Yam" => "[email protected]" }
s.platform = :ios, "6.0"
s.source = { :git => "https://github.com/yamdraco/conductor.git", :tag => "0.1.0" }
s.source = { :git => "https://github.com/yamdraco/conductor.git", :tag => "0.1.1" }

s.source_files = "Conductor/lib/*.{h,m}", "Conductor/lib/segue/*.{h,m}"
s.requires_arc = true
Expand Down

0 comments on commit 9e5e6b3

Please sign in to comment.