projects
/
enjoyable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7438479
)
Don't re-save mappings immediately upon load.
author
Joe Wreschnig
<joe.wreschnig@gmail.com>
Fri, 15 Mar 2013 00:36:26 +0000
(
01:36
+0100)
committer
Joe Wreschnig
<joe.wreschnig@gmail.com>
Fri, 15 Mar 2013 00:36:26 +0000
(
01:36
+0100)
Classes/NJMappingsController.m
patch
|
blob
|
history
diff --git
a/Classes/NJMappingsController.m
b/Classes/NJMappingsController.m
index
4a9c3ff
..
fa851b1
100644
(file)
--- a/
Classes/NJMappingsController.m
+++ b/
Classes/NJMappingsController.m
@@
-46,8
+46,7
@@
return idx < _mappings.count ? _mappings[idx] : nil;
}
return idx < _mappings.count ? _mappings[idx] : nil;
}
-- (void)mappingsChanged {
- [self save];
+- (void)mappingsSet {
[tableView reloadData];
[self updateInterfaceForCurrentMapping];
[NSNotificationCenter.defaultCenter
[tableView reloadData];
[self updateInterfaceForCurrentMapping];
[NSNotificationCenter.defaultCenter
@@
-57,6
+56,11
@@
NJMappingKey: _currentMapping }];
}
NJMappingKey: _currentMapping }];
}
+- (void)mappingsChanged {
+ [self save];
+ [self mappingsSet];
+}
+
- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
objects:(__unsafe_unretained id [])buffer
count:(NSUInteger)len {
- (NSUInteger)countByEnumeratingWithState:(NSFastEnumerationState *)state
objects:(__unsafe_unretained id [])buffer
count:(NSUInteger)len {
@@
-168,11
+172,7
@@
- (void)load {
NSUInteger selected = [NSUserDefaults.standardUserDefaults integerForKey:@"selected"];
- (void)load {
NSUInteger selected = [NSUserDefaults.standardUserDefaults integerForKey:@"selected"];
- NSArray *mappings = [NSUserDefaults.standardUserDefaults arrayForKey:@"mappings"];
- [self loadAllFrom:mappings andActivate:selected];
-}
-
-- (void)loadAllFrom:(NSArray *)storedMappings andActivate:(NSUInteger)selected {
+ NSArray *storedMappings = [NSUserDefaults.standardUserDefaults arrayForKey:@"mappings"];
NSMutableArray* newMappings = [[NSMutableArray alloc] initWithCapacity:storedMappings.count];
// Requires two passes to deal with inter-mapping references. First make
NSMutableArray* newMappings = [[NSMutableArray alloc] initWithCapacity:storedMappings.count];
// Requires two passes to deal with inter-mapping references. First make
@@
-195,7
+195,7
@@
if (selected >= newMappings.count)
selected = 0;
[self activateMapping:_mappings[selected]];
if (selected >= newMappings.count)
selected = 0;
[self activateMapping:_mappings[selected]];
- [self mappings
Changed
];
+ [self mappings
Set
];
}
}
}
}