mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-15 11:13:50 +00:00
Merge branch '0.9.1' of github.com:280north/cappuccino into 0.9.1
This commit is contained in:
commit
1a0b69c10b
3 files changed
+31
-7
No files matched your search
@@ -1641,14 +1641,14 @@ var _loadItemInfoForItem = function(/*CPOutlineView*/ anOutlineView, /*id*/ anIt
|
||||
if (!(_outlineView._implementedOutlineViewDataSourceMethods & CPOutlineViewDataSource_outlineView_writeItems_toPasteboard_))
|
||||
return NO;
|
||||
|
||||
var rowIndexes = [];
|
||||
[theIndexes getIndexes:rowIndexes maxCount:[theIndexes count] inIndexRange:nil];
|
||||
var items = [],
|
||||
index = [theIndexes firstIndex];
|
||||
|
||||
var rowIndex = [rowIndexes count],
|
||||
items = [];
|
||||
|
||||
while (rowIndex--)
|
||||
[items addObject:[_outlineView itemAtRow:[rowIndexes objectAtIndex:rowIndex]]];
|
||||
while (index !== CPNotFound)
|
||||
{
|
||||
[items addObject:[_outlineView itemAtRow:index]]
|
||||
index = [theIndexes indexGreaterThanIndex:index];
|
||||
}
|
||||
|
||||
return [_outlineView._outlineViewDataSource outlineView:_outlineView writeItems:items toPasteboard:thePasteboard];
|
||||
}
|
||||
|
||||
@@ -145,3 +145,24 @@
|
||||
}
|
||||
|
||||
@end
|
||||
|
||||
var CPIndexPathIndexesKey = @"CPIndexPathIndexes";
|
||||
|
||||
@implementation CPIndexPath (CPCoding)
|
||||
|
||||
- (id)initWithCoder:(CPCoder)theCoder
|
||||
{
|
||||
if (self = [self init])
|
||||
{
|
||||
_indexes = [theCoder decodeObjectForKey:CPIndexPathIndexesKey];
|
||||
}
|
||||
|
||||
return self;
|
||||
}
|
||||
|
||||
- (void)encodeWithCoder:(CPCoder)theCoder
|
||||
{
|
||||
[theCoder encodeObject:_indexes forKey:CPIndexPathIndexesKey];
|
||||
}
|
||||
|
||||
@end
|
||||
Executable → Regular
+3
@@ -55,8 +55,11 @@ function ask_append_shell_config () {
|
||||
shell_config_file="$HOME/.profile"
|
||||
elif [ -f "$HOME/.bashrc" ]; then
|
||||
shell_config_file="$HOME/.bashrc"
|
||||
elif [ -f "$HOME/.zshrc" ]; then
|
||||
shell_config_file="$HOME/.zshrc"
|
||||
fi
|
||||
|
||||
|
||||
echo " \"$config_string\" will be appended to \"$shell_config_file\"."
|
||||
if prompt "no"; then
|
||||
if [ "$shell_config_file" ]; then
|
||||
|
||||
Reference in new issue
Block a user