github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused HTMLOutputWindow properties

Browse Source
This commit is contained in:
Allan Odgaard
2016-08-25 14:10:08 +02:00
parent bd61830833
commit bb038b0670
2 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.h
View File

@@ -4,8 +4,6 @@
PUBLIC @interface HTMLOutputWindowController : NSObject <NSWindowDelegate>
@property (nonatomic) NSWindow* window;
@property (nonatomic) OakHTMLOutputView* htmlOutputView;
@property (nonatomic) command::runner_ptr commandRunner;
@property (nonatomic, readonly) BOOL running;
@property (nonatomic, readonly) BOOL needsNewWebView;
+ (instancetype)HTMLOutputWindowWithRunner:(command::runner_ptr const&)aRunner;

11
Frameworks/HTMLOutputWindow/src/HTMLOutputWindow.mm
View File

@@ -85,17 +85,10 @@ OAK_DEBUG_VAR(HTMLOutputWindow);
- (void)setCommandRunner:(command::runner_ptr)aRunner
{
_commandRunner = aRunner;
[self.htmlOutputView loadRequest:URLRequestForCommandRunner(_commandRunner) environment:_commandRunner->environment() autoScrolls:_commandRunner->auto_scroll_output()];
[self.htmlOutputView loadRequest:URLRequestForCommandRunner(aRunner) environment:aRunner->environment() autoScrolls:aRunner->auto_scroll_output()];
[self showWindow:self];
}
- (BOOL)running
{
return self.htmlOutputView.isRunningCommand;
}
- (BOOL)needsNewWebView
{
return _htmlOutputView.needsNewWebView;
@@ -104,7 +97,7 @@ OAK_DEBUG_VAR(HTMLOutputWindow);
- (BOOL)windowShouldClose:(id)sender
{
D(DBF_HTMLOutputWindow, bug("\n"););
if(!self.running)
if(!_htmlOutputView.isRunningCommand)
return YES;
[_htmlOutputView stopLoadingWithUserInteraction:YES completionHandler:^(BOOL didStop){