mirror of
https://github.com/textmate/textmate.git
synced 2026-04-28 03:00:34 -04:00
Rename loadHTMLString: method to setContent:
The previous name was inspired by WebView’s default API but it sounds like it is just the default implementation with a default baseURL: parameter, hence why I prefer to name it something different.
This commit is contained in:
@@ -3,7 +3,7 @@
|
||||
@interface OakHTMLOutputView : NSView
|
||||
- (void)loadRequest:(NSURLRequest*)aRequest environment:(std::map<std::string, std::string> const&)anEnvironment autoScrolls:(BOOL)flag;
|
||||
- (void)stopLoadingWithUserInteraction:(BOOL)askUserFlag completionHandler:(void(^)(BOOL didStop))handler;
|
||||
- (void)loadHTMLString:(NSString*)someHTML;
|
||||
- (void)setContent:(NSString*)someHTML;
|
||||
|
||||
@property (nonatomic) NSUUID* commandIdentifier; // UUID from initial load request
|
||||
@property (nonatomic, getter = isRunningCommand, readonly) BOOL runningCommand;
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
PUBLIC @interface OakHTMLOutputView : HOBrowserView
|
||||
- (void)loadRequest:(NSURLRequest*)aRequest environment:(std::map<std::string, std::string> const&)anEnvironment autoScrolls:(BOOL)flag;
|
||||
- (void)stopLoadingWithUserInteraction:(BOOL)askUserFlag completionHandler:(void(^)(BOOL didStop))handler;
|
||||
- (void)loadHTMLString:(NSString*)someHTML;
|
||||
- (void)setContent:(NSString*)someHTML;
|
||||
|
||||
@property (nonatomic, readonly) NSString* mainFrameTitle;
|
||||
@property (nonatomic) NSUUID* commandIdentifier; // UUID from initial load request
|
||||
|
||||
@@ -83,7 +83,7 @@
|
||||
}
|
||||
}
|
||||
|
||||
- (void)loadHTMLString:(NSString*)someHTML
|
||||
- (void)setContent:(NSString*)someHTML
|
||||
{
|
||||
self.pendingVisibleRect = [[[[self.webView mainFrame] frameView] documentView] visibleRect];
|
||||
[[self.webView mainFrame] loadHTMLString:someHTML baseURL:[NSURL fileURLWithPath:NSHomeDirectory()]];
|
||||
|
||||
Reference in New Issue
Block a user