diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 0f5496b..3a362d5 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -8,8 +8,8 @@
352.00
-
+
orderFrontFontPanel:
@@ -652,7 +652,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
@@ -757,7 +757,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
0
@@ -767,7 +767,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
@@ -775,12 +775,12 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
@@ -2201,8 +2201,8 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
1048576
2147483647
-
-
+
+
submenuAction:
@@ -2235,8 +2235,8 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
1048576
2147483647
-
-
+
+
submenuAction:
_NSWindowsMenu
@@ -2292,8 +2292,8 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
1048576
2147483647
-
-
+
+
submenuAction:
@@ -2362,6 +2362,9 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
leaf
+
-
-
-
-
-
816
-
+
@@ -4332,10 +4337,10 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
- {{392, 183}, {850, 418}}
+ {{558, 115}, {850, 418}}
-
+ {{558, 115}, {850, 418}}
{3.40282e+38, 3.40282e+38}
@@ -4486,6 +4491,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
+ com.apple.InterfaceBuilder.CocoaPlugin
@@ -4510,13 +4516,13 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
- 826
+ 846
+
0
@@ -4633,7 +4667,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ
3
diff --git a/GitX.xcodeproj/project.pbxproj b/GitX.xcodeproj/project.pbxproj
index b7d90fa..5be4b8b 100644
--- a/GitX.xcodeproj/project.pbxproj
+++ b/GitX.xcodeproj/project.pbxproj
@@ -24,6 +24,7 @@
F57ABE0B0E0442DD00A088B8 /* commit.js in Resources */ = {isa = PBXBuildFile; fileRef = F57ABDDE0E0441DE00A088B8 /* commit.js */; };
F57ABE2B0E04435100A088B8 /* prototype.js in Resources */ = {isa = PBXBuildFile; fileRef = F57ABE180E04431D00A088B8 /* prototype.js */; };
F57CC3910E05DDF2000472E2 /* PBEasyPipe.m in Sources */ = {isa = PBXBuildFile; fileRef = F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */; };
+ F57CC4410E05E496000472E2 /* PBDetailController.m in Sources */ = {isa = PBXBuildFile; fileRef = F57CC4400E05E496000472E2 /* PBDetailController.m */; };
F58A8F280E043698007E3FC0 /* commits.css in Resources */ = {isa = PBXBuildFile; fileRef = F58A8F270E043698007E3FC0 /* commits.css */; };
F5945E170E02B0C200706420 /* PBGitRepository.m in Sources */ = {isa = PBXBuildFile; fileRef = F5945E160E02B0C200706420 /* PBGitRepository.m */; };
F5B721C40E05CF7E00AF29DC /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = F5B721C20E05CF7E00AF29DC /* MainMenu.xib */; };
@@ -59,6 +60,8 @@
F57ABE180E04431D00A088B8 /* prototype.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; name = prototype.js; path = html/prototype.js; sourceTree = ""; };
F57CC38F0E05DDF2000472E2 /* PBEasyPipe.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBEasyPipe.h; sourceTree = ""; };
F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBEasyPipe.m; sourceTree = ""; };
+ F57CC43F0E05E496000472E2 /* PBDetailController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBDetailController.h; sourceTree = ""; };
+ F57CC4400E05E496000472E2 /* PBDetailController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBDetailController.m; sourceTree = ""; };
F58A8F270E043698007E3FC0 /* commits.css */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.css; name = commits.css; path = html/commits.css; sourceTree = ""; };
F5945E150E02B0C200706420 /* PBGitRepository.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PBGitRepository.h; sourceTree = ""; };
F5945E160E02B0C200706420 /* PBGitRepository.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = PBGitRepository.m; sourceTree = ""; };
@@ -81,8 +84,6 @@
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
- F56524B90E02D22D00F03B52 /* NSFileHandleExt.m */,
- F56524BA0E02D22D00F03B52 /* NSFileHandleExt.h */,
);
name = Classes;
sourceTree = "";
@@ -117,6 +118,7 @@
29B97314FDCFA39411CA2CEA /* GitTest */ = {
isa = PBXGroup;
children = (
+ F57CC43E0E05E472000472E2 /* Aux */,
F57CC3850E05DDC1000472E2 /* Controllers */,
F561777C0E05C88E001DCD79 /* DetailView.png */,
F56174540E05887E001DCD79 /* Git */,
@@ -187,10 +189,21 @@
F565262A0E03D89B00F03B52 /* PBWebGitController.m */,
77C8280B06725ACE000B614F /* ApplicationController.h */,
77C8280C06725ACE000B614F /* ApplicationController.m */,
+ F57CC43F0E05E496000472E2 /* PBDetailController.h */,
+ F57CC4400E05E496000472E2 /* PBDetailController.m */,
+ );
+ name = Controllers;
+ sourceTree = "";
+ };
+ F57CC43E0E05E472000472E2 /* Aux */ = {
+ isa = PBXGroup;
+ children = (
+ F56524B90E02D22D00F03B52 /* NSFileHandleExt.m */,
+ F56524BA0E02D22D00F03B52 /* NSFileHandleExt.h */,
F57CC38F0E05DDF2000472E2 /* PBEasyPipe.h */,
F57CC3900E05DDF2000472E2 /* PBEasyPipe.m */,
);
- name = Controllers;
+ name = Aux;
sourceTree = "";
};
F58A8F250E04368A007E3FC0 /* HTML */ = {
@@ -277,6 +290,7 @@
F565262B0E03D89B00F03B52 /* PBWebGitController.m in Sources */,
F56174570E058893001DCD79 /* PBGitTree.m in Sources */,
F57CC3910E05DDF2000472E2 /* PBEasyPipe.m in Sources */,
+ F57CC4410E05E496000472E2 /* PBDetailController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
diff --git a/PBDetailController.h b/PBDetailController.h
index c88a9e2..f2cd9c7 100644
--- a/PBDetailController.h
+++ b/PBDetailController.h
@@ -23,7 +23,6 @@
@property (copy) NSNumber* selectedTab;
@property (retain) PBGitCommit* webCommit;
@property (retain) PBGitCommit* rawCommit;
-@property (retain) PBGitCommit* realCommit;
@property (retain) PBGitTree* gitTree;
@end
diff --git a/PBDetailController.m b/PBDetailController.m
index d63fdc7..d728144 100644
--- a/PBDetailController.m
+++ b/PBDetailController.m
@@ -11,17 +11,24 @@
@implementation PBDetailController
-@synthesize selectedTab, webCommit, rawCommit, realCommit, gitTree;
+@synthesize selectedTab, webCommit, rawCommit, gitTree;
-- init
+- awakeFromNib
{
self.selectedTab = [NSNumber numberWithInt:0];
- [commitController bind:@"realCommit" toObject:self withKeyPath:@"selection" options:nil];
+ [commitController addObserver:self forKeyPath:@"selection" options:(NSKeyValueObservingOptionNew,NSKeyValueObservingOptionOld) context:@"commitChange"];
+
return self;
}
- (void) updateKeys
{
+ NSArray* selection = [commitController selectedObjects];
+ if ([selection count] > 0)
+ realCommit = [selection objectAtIndex:0];
+ else
+ realCommit = nil;
+
self.webCommit = nil;
self.rawCommit = nil;
self.gitTree = nil;
@@ -29,22 +36,29 @@
int num = [self.selectedTab intValue];
if (num == 0) // Detailed view
- self.webCommit = self.realCommit;
- if (num == 1)
- self.rawCommit = self.realCommit;
- if (num == 2)
- self.gitTree = self.realCommit.tree;
+ self.webCommit = realCommit;
+ else if (num == 1)
+ self.rawCommit = realCommit;
+ else if (num == 2)
+ self.gitTree = realCommit.tree;
}
-- (void) setRealCommit: (PBGitCommit*) commit
-{
- realCommit = commit;
- [self updateKeys];
-}
- (void) setSelectedTab: (NSNumber*) number
{
selectedTab = number;
[self updateKeys];
}
+
+- (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
+{
+ if ([(NSString *)context isEqualToString: @"commitChange"]) {
+ [self updateKeys];
+ return;
+ }
+ else {
+ [super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
+ }
+}
+
@end
diff --git a/PBWebGitController.h b/PBWebGitController.h
index bb946dc..ebc368d 100644
--- a/PBWebGitController.h
+++ b/PBWebGitController.h
@@ -9,12 +9,13 @@
#import
#import "ApplicationController.h"
#import "PBGitCommit.h"
+#import "PBDetailController.h"
#import
@interface PBWebGitController : NSObject {
IBOutlet ApplicationController* controller;
IBOutlet WebView* view;
- IBOutlet NSArrayController* commitsController;
+ IBOutlet PBDetailController* detailController;
NSString* currentSha;
NSString* diff;
}
diff --git a/PBWebGitController.m b/PBWebGitController.m
index 9b4af7f..ccf6394 100644
--- a/PBWebGitController.m
+++ b/PBWebGitController.m
@@ -15,7 +15,7 @@
- (void) awakeFromNib
{
- [commitsController addObserver:self forKeyPath:@"selection" options:0 context:@"ChangedCommit"];
+ [detailController addObserver:self forKeyPath:@"webCommit" options:0 context:@"ChangedCommit"];
NSLog([[NSBundle mainBundle] resourcePath]);
NSString* file = [[NSBundle mainBundle] pathForResource:@"commit" ofType:@"html"];
@@ -29,17 +29,14 @@
id script = [view windowScriptObject];
[script setValue: self forKey:@"Controller"];
currentSha = @"";
- if ([[commitsController selectedObjects] count] == 0)
- return;
- [self changeContentTo: [[commitsController selectedObjects] objectAtIndex:0]];
+ [self changeContentTo: detailController.webCommit];
}
- (void) observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
{
if (context == @"ChangedCommit") {
- if ([[commitsController selectedObjects] count] != 0)
- [self changeContentTo: [[commitsController selectedObjects] objectAtIndex:0]];
+ [self changeContentTo: detailController.webCommit];
}
else {
[super observeValueForKeyPath:keyPath ofObject:object change:change context:context];
@@ -48,6 +45,9 @@
- (void) changeContentTo: (PBGitCommit *) content
{
+ if (content == nil)
+ return;
+
if ([currentSha isEqualToString: content.sha] || [currentSha isEqualToString:@"Not Loaded"])
return;
@@ -65,8 +65,8 @@
- (void) selectCommit: (NSString*) sha
{
NSPredicate* selection = [NSPredicate predicateWithFormat:@"sha == %@", sha];
- NSArray* selectedCommits = [[commitsController arrangedObjects] filteredArrayUsingPredicate:selection];
- [commitsController setSelectedObjects:selectedCommits];
+ NSArray* selectedCommits = [controller.repository.commits filteredArrayUsingPredicate:selection];
+ // TODO: reimplement this. How can we set the new commit? Our detailscontroller is read-only
}
+ (BOOL)isSelectorExcludedFromWebScript:(SEL)aSelector
diff --git a/html/commit.js b/html/commit.js
index 8b17d28..616fae0 100644
--- a/html/commit.js
+++ b/html/commit.js
@@ -1,9 +1,9 @@
var Commit = Class.create({
initialize: function(obj) {
- this.raw = obj.details();
+ this.raw = obj.details;
+
var messageStart = this.raw.indexOf("\n\n") + 2;
var diffStart = this.raw.indexOf("\ndiff ");
-
this.header = this.raw.substring(0, messageStart);
this.sha = this.header.match(/^commit ([0-9a-f]{40,40})/)[1];