<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[210483] trunk/Tools</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/210483">210483</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2017-01-07 13:10:21 -0800 (Sat, 07 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add the ability to create empty contentEditable windows in MiniBrowser
https://bugs.webkit.org/show_bug.cgi?id=166801
Reviewed by Wenson Hsieh.
* MiniBrowser/mac/AppDelegate.h:
* MiniBrowser/mac/AppDelegate.m:
(-[BrowserAppDelegate createBrowserWindowController:]):
(-[BrowserAppDelegate newWindow:]):
(-[BrowserAppDelegate newEditorWindow:]):
(-[BrowserAppDelegate openDocument:]):
(-[BrowserAppDelegate _updateNewWindowKeyEquivalents]):
* MiniBrowser/mac/BrowserWindowController.h:
* MiniBrowser/mac/BrowserWindowController.m:
(-[BrowserWindowController loadHTMLString:]):
(-[BrowserWindowController toggleEditable:]):
* MiniBrowser/mac/MainMenu.xib:
* MiniBrowser/mac/WK1BrowserWindowController.m:
(-[WK1BrowserWindowController awakeFromNib]):
(-[WK1BrowserWindowController loadHTMLString:]):
(-[WK1BrowserWindowController validateMenuItem:]):
(-[WK1BrowserWindowController setEditable:]):
(-[WK1BrowserWindowController updateTitle:]):
* MiniBrowser/mac/WK2BrowserWindowController.m:
(-[WK2BrowserWindowController awakeFromNib]):
(-[WK2BrowserWindowController validateMenuItem:]):
(-[WK2BrowserWindowController setEditable:]):
(-[WK2BrowserWindowController updateTitle:]):
(-[WK2BrowserWindowController loadHTMLString:]):
Merge more functionality from WebEditingTester.
Add two menu items for creating empty editable WebKit1/2 windows.
Add a menu item to the Edit menu to toggle editability on any window.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegateh">trunk/Tools/MiniBrowser/mac/AppDelegate.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacAppDelegatem">trunk/Tools/MiniBrowser/mac/AppDelegate.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowControllerh">trunk/Tools/MiniBrowser/mac/BrowserWindowController.h</a></li>
<li><a href="#trunkToolsMiniBrowsermacBrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacMainMenuxib">trunk/Tools/MiniBrowser/mac/MainMenu.xib</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK1BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m</a></li>
<li><a href="#trunkToolsMiniBrowsermacWK2BrowserWindowControllerm">trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (210482 => 210483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2017-01-07 21:09:41 UTC (rev 210482)
+++ trunk/Tools/ChangeLog 2017-01-07 21:10:21 UTC (rev 210483)
</span><span class="lines">@@ -1,5 +1,40 @@
</span><span class="cx"> 2017-01-07 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><ins>+ Add the ability to create empty contentEditable windows in MiniBrowser
+ https://bugs.webkit.org/show_bug.cgi?id=166801
+
+ Reviewed by Wenson Hsieh.
+
+ * MiniBrowser/mac/AppDelegate.h:
+ * MiniBrowser/mac/AppDelegate.m:
+ (-[BrowserAppDelegate createBrowserWindowController:]):
+ (-[BrowserAppDelegate newWindow:]):
+ (-[BrowserAppDelegate newEditorWindow:]):
+ (-[BrowserAppDelegate openDocument:]):
+ (-[BrowserAppDelegate _updateNewWindowKeyEquivalents]):
+ * MiniBrowser/mac/BrowserWindowController.h:
+ * MiniBrowser/mac/BrowserWindowController.m:
+ (-[BrowserWindowController loadHTMLString:]):
+ (-[BrowserWindowController toggleEditable:]):
+ * MiniBrowser/mac/MainMenu.xib:
+ * MiniBrowser/mac/WK1BrowserWindowController.m:
+ (-[WK1BrowserWindowController awakeFromNib]):
+ (-[WK1BrowserWindowController loadHTMLString:]):
+ (-[WK1BrowserWindowController validateMenuItem:]):
+ (-[WK1BrowserWindowController setEditable:]):
+ (-[WK1BrowserWindowController updateTitle:]):
+ * MiniBrowser/mac/WK2BrowserWindowController.m:
+ (-[WK2BrowserWindowController awakeFromNib]):
+ (-[WK2BrowserWindowController validateMenuItem:]):
+ (-[WK2BrowserWindowController setEditable:]):
+ (-[WK2BrowserWindowController updateTitle:]):
+ (-[WK2BrowserWindowController loadHTMLString:]):
+ Merge more functionality from WebEditingTester.
+ Add two menu items for creating empty editable WebKit1/2 windows.
+ Add a menu item to the Edit menu to toggle editability on any window.
+
+2017-01-07 Tim Horton <timothy_horton@apple.com>
+
</ins><span class="cx"> Implement find-in-page in MiniBrowser
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=166799
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.h (210482 => 210483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.h 2017-01-07 21:09:41 UTC (rev 210482)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.h 2017-01-07 21:10:21 UTC (rev 210483)
</span><span class="lines">@@ -33,6 +33,8 @@
</span><span class="cx">
</span><span class="cx"> IBOutlet NSMenuItem *_newWebKit1WindowItem;
</span><span class="cx"> IBOutlet NSMenuItem *_newWebKit2WindowItem;
</span><ins>+ IBOutlet NSMenuItem *_newWebKit1EditorItem;
+ IBOutlet NSMenuItem *_newWebKit2EditorItem;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)browserWindowWillClose:(NSWindow *)window;
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacAppDelegatem"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/AppDelegate.m (210482 => 210483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/AppDelegate.m 2017-01-07 21:09:41 UTC (rev 210482)
+++ trunk/Tools/MiniBrowser/mac/AppDelegate.m 2017-01-07 21:10:21 UTC (rev 210483)
</span><span class="lines">@@ -44,7 +44,9 @@
</span><span class="cx">
</span><span class="cx"> enum {
</span><span class="cx"> WebKit1NewWindowTag = 1,
</span><del>- WebKit2NewWindowTag = 2
</del><ins>+ WebKit2NewWindowTag = 2,
+ WebKit1NewEditorTag = 3,
+ WebKit2NewEditorTag = 4
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> @interface NSApplication (TouchBar)
</span><span class="lines">@@ -120,18 +122,19 @@
</span><span class="cx">
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-
-- (IBAction)newWindow:(id)sender
</del><ins>+- (BrowserWindowController *)createBrowserWindowController:(id)sender
</ins><span class="cx"> {
</span><span class="cx"> BrowserWindowController *controller = nil;
</span><del>-
</del><span class="cx"> BOOL useWebKit2 = NO;
</span><ins>+ BOOL makeEditable = NO;
</ins><span class="cx">
</span><span class="cx"> if (![sender respondsToSelector:@selector(tag)])
</span><span class="cx"> useWebKit2 = [SettingsController shared].useWebKit2ByDefault;
</span><del>- else
- useWebKit2 = [sender tag] == WebKit2NewWindowTag;
-
</del><ins>+ else {
+ useWebKit2 = [sender tag] == WebKit2NewWindowTag || [sender tag] == WebKit2NewEditorTag;
+ makeEditable = [sender tag] == WebKit1NewEditorTag || [sender tag] == WebKit2NewEditorTag;
+ }
+
</ins><span class="cx"> if (!useWebKit2)
</span><span class="cx"> controller = [[WK1BrowserWindowController alloc] initWithWindowNibName:@"BrowserWindow"];
</span><span class="cx"> #if WK_API_ENABLED
</span><span class="lines">@@ -138,12 +141,25 @@
</span><span class="cx"> else
</span><span class="cx"> controller = [[WK2BrowserWindowController alloc] initWithConfiguration:defaultConfiguration()];
</span><span class="cx"> #endif
</span><ins>+
+ if (makeEditable)
+ controller.editable = YES;
+
</ins><span class="cx"> if (!controller)
</span><ins>+ return nil;
+
+ [_browserWindowControllers addObject:controller];
+
+ return controller;
+}
+
+- (IBAction)newWindow:(id)sender
+{
+ BrowserWindowController *controller = [self createBrowserWindowController:sender];
+ if (!controller)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> [[controller window] makeKeyAndOrderFront:sender];
</span><del>- [_browserWindowControllers addObject:controller];
-
</del><span class="cx"> [controller loadURLString:[SettingsController shared].defaultURL];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -163,6 +179,16 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (IBAction)newEditorWindow:(id)sender
+{
+ BrowserWindowController *controller = [self createBrowserWindowController:sender];
+ if (!controller)
+ return;
+
+ [[controller window] makeKeyAndOrderFront:sender];
+ [controller loadHTMLString:@"<html><body></body></html>"];
+}
+
</ins><span class="cx"> - (void)browserWindowWillClose:(NSWindow *)window
</span><span class="cx"> {
</span><span class="cx"> [_browserWindowControllers removeObject:window.windowController];
</span><span class="lines">@@ -222,11 +248,11 @@
</span><span class="cx"> if (result != NSFileHandlingPanelOKButton)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- BrowserWindowController *newBrowserWindowController = [[WK1BrowserWindowController alloc] initWithWindowNibName:@"BrowserWindow"];
- [newBrowserWindowController.window makeKeyAndOrderFront:self];
</del><ins>+ BrowserWindowController *controller = [self createBrowserWindowController:nil];
+ [controller.window makeKeyAndOrderFront:self];
</ins><span class="cx">
</span><span class="cx"> NSURL *url = [openPanel.URLs objectAtIndex:0];
</span><del>- [newBrowserWindowController loadURLString:[url absoluteString]];
</del><ins>+ [controller loadURLString:[url absoluteString]];
</ins><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -241,13 +267,13 @@
</span><span class="cx">
</span><span class="cx"> - (void)_updateNewWindowKeyEquivalents
</span><span class="cx"> {
</span><del>- if ([[SettingsController shared] useWebKit2ByDefault]) {
- [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption];
- [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
- } else {
- [_newWebKit1WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand];
- [_newWebKit2WindowItem setKeyEquivalentModifierMask:NSEventModifierFlagCommand | NSEventModifierFlagOption];
- }
</del><ins>+ NSEventModifierFlags webKit1Flags = [SettingsController shared].useWebKit2ByDefault ? NSEventModifierFlagOption : 0;
+ NSEventModifierFlags webKit2Flags = [SettingsController shared].useWebKit2ByDefault ? 0 : NSEventModifierFlagOption;
+
+ _newWebKit1WindowItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit1Flags;
+ _newWebKit2WindowItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit2Flags;
+ _newWebKit1EditorItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit1Flags;
+ _newWebKit2EditorItem.keyEquivalentModifierMask = NSEventModifierFlagCommand | webKit2Flags;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (IBAction)showExtensionsManager:(id)sender
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.h (210482 => 210483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2017-01-07 21:09:41 UTC (rev 210482)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.h 2017-01-07 21:10:21 UTC (rev 210483)
</span><span class="lines">@@ -40,6 +40,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)loadURLString:(NSString *)urlString;
</span><ins>+- (void)loadHTMLString:(NSString *)HTMLString;
</ins><span class="cx"> - (NSString *)addProtocolIfNecessary:(NSString *)address;
</span><span class="cx">
</span><span class="cx"> - (void)applicationTerminating;
</span><span class="lines">@@ -79,5 +80,8 @@
</span><span class="cx">
</span><span class="cx"> - (CGFloat)pageScaleForMenuItemTag:(NSInteger)tag;
</span><span class="cx">
</span><ins>+@property (nonatomic, assign, getter=isEditable) BOOL editable;
+- (IBAction)toggleEditable:(id)sender;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacBrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/BrowserWindowController.m (210482 => 210483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2017-01-07 21:09:41 UTC (rev 210482)
+++ trunk/Tools/MiniBrowser/mac/BrowserWindowController.m 2017-01-07 21:10:21 UTC (rev 210483)
</span><span class="lines">@@ -58,6 +58,10 @@
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)loadHTMLString:(NSString *)HTMLString
+{
+}
+
</ins><span class="cx"> - (void)applicationTerminating
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -211,6 +215,11 @@
</span><span class="cx"> return nil;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (IBAction)toggleEditable:(id)sender
+{
+ self.editable = !self.isEditable;
+}
+
</ins><span class="cx"> #pragma mark -
</span><span class="cx"> #pragma mark NSSharingServicePickerDelegate
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacMainMenuxib"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/MainMenu.xib (210482 => 210483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/MainMenu.xib 2017-01-07 21:09:41 UTC (rev 210482)
+++ trunk/Tools/MiniBrowser/mac/MainMenu.xib 2017-01-07 21:10:21 UTC (rev 210483)
</span><span class="lines">@@ -88,6 +88,17 @@
</span><span class="cx"> <action selector="newPrivateWindow:" target="-1" id="mf5-zi-a5R"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><ins>+ <menuItem title="New WebKit1 Editor" tag="3" keyEquivalent="N" id="jNR-Z3-YWi" userLabel="New WebKit1 Editor">
+ <connections>
+ <action selector="newEditorWindow:" target="-1" id="Nv5-c0-KRP"/>
+ </connections>
+ </menuItem>
+ <menuItem title="New WebKit2 Editor" tag="4" keyEquivalent="N" id="IdI-wb-1JD" userLabel="New WebKit2 Editor">
+ <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+ <connections>
+ <action selector="newEditorWindow:" target="-1" id="kk6-R4-iec"/>
+ </connections>
+ </menuItem>
</ins><span class="cx"> <menuItem title="Openโฆ" keyEquivalent="o" id="72">
</span><span class="cx"> <connections>
</span><span class="cx"> <action selector="openDocument:" target="-1" id="374"/>
</span><span class="lines">@@ -160,6 +171,15 @@
</span><span class="cx"> <action selector="redo:" target="-1" id="231"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </menuItem>
</span><ins>+ <menuItem isSeparatorItem="YES" id="fUL-7k-Dqg">
+ <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+ </menuItem>
+ <menuItem title="Editable" id="kG4-hS-JbX">
+ <modifierMask key="keyEquivalentModifierMask"/>
+ <connections>
+ <action selector="toggleEditable:" target="-1" id="6my-b2-eff"/>
+ </connections>
+ </menuItem>
</ins><span class="cx"> <menuItem isSeparatorItem="YES" id="206">
</span><span class="cx"> <modifierMask key="keyEquivalentModifierMask" command="YES"/>
</span><span class="cx"> </menuItem>
</span><span class="lines">@@ -566,7 +586,9 @@
</span><span class="cx"> </menu>
</span><span class="cx"> <customObject id="494" customClass="BrowserAppDelegate">
</span><span class="cx"> <connections>
</span><ins>+ <outlet property="_newWebKit1EditorItem" destination="jNR-Z3-YWi" id="6wB-Aa-CK7"/>
</ins><span class="cx"> <outlet property="_newWebKit1WindowItem" destination="573" id="ZCj-u2-PU7"/>
</span><ins>+ <outlet property="_newWebKit2EditorItem" destination="IdI-wb-1JD" id="DIr-pe-XI8"/>
</ins><span class="cx"> <outlet property="_newWebKit2WindowItem" destination="571" id="1Gv-mK-aul"/>
</span><span class="cx"> </connections>
</span><span class="cx"> </customObject>
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK1BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m (210482 => 210483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-01-07 21:09:41 UTC (rev 210482)
+++ trunk/Tools/MiniBrowser/mac/WK1BrowserWindowController.m 2017-01-07 21:10:21 UTC (rev 210483)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> _webView = [[WebView alloc] initWithFrame:[containerView bounds] frameName:nil groupName:@"MiniBrowser"];
</span><span class="cx"> [_webView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
</span><span class="cx">
</span><ins>+ _webView.editable = self.isEditable;
+
</ins><span class="cx"> [_webView setFrameLoadDelegate:self];
</span><span class="cx"> [_webView setUIDelegate:self];
</span><span class="cx"> [_webView setResourceLoadDelegate:self];
</span><span class="lines">@@ -79,6 +81,11 @@
</span><span class="cx"> [self fetch:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)loadHTMLString:(NSString *)HTMLString
+{
+ [_webView.mainFrame loadHTMLString:HTMLString baseURL:nil];
+}
+
</ins><span class="cx"> - (IBAction)fetch:(id)sender
</span><span class="cx"> {
</span><span class="cx"> [urlText setStringValue:[self addProtocolIfNecessary:[urlText stringValue]]];
</span><span class="lines">@@ -139,6 +146,8 @@
</span><span class="cx"> [menuItem setTitle:[_webView window] ? @"Remove Web View" : @"Insert Web View"];
</span><span class="cx"> else if (action == @selector(toggleZoomMode:))
</span><span class="cx"> [menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
</span><ins>+ else if (action == @selector(toggleEditable:))
+ [menuItem setState:self.isEditable ? NSOnState : NSOffState];
</ins><span class="cx">
</span><span class="cx"> if (action == @selector(setPageScale:))
</span><span class="cx"> [menuItem setState:areEssentiallyEqual([_webView _viewScaleFactor], [self pageScaleForMenuItemTag:[menuItem tag]])];
</span><span class="lines">@@ -247,6 +256,12 @@
</span><span class="cx"> return _webView;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setEditable:(BOOL)editable
+{
+ [super setEditable:editable];
+ _webView.editable = editable;
+}
+
</ins><span class="cx"> - (void)didChangeSettings
</span><span class="cx"> {
</span><span class="cx"> SettingsController *settings = [SettingsController shared];
</span><span class="lines">@@ -317,8 +332,8 @@
</span><span class="cx"> NSURL *url = _webView.mainFrame.dataSource.request.URL;
</span><span class="cx"> title = url.lastPathComponent ?: url._web_userVisibleString;
</span><span class="cx"> }
</span><del>-
- [self.window setTitle:[title stringByAppendingString:@" [WK1]"]];
</del><ins>+
+ [self.window setTitle:[title stringByAppendingFormat:@" [WK1]%@", _webView.editable ? @" [Editable]" : @""]];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (WebView *)webView:(WebView *)sender createWebViewWithRequest:(NSURLRequest *)request
</span></span></pre></div>
<a id="trunkToolsMiniBrowsermacWK2BrowserWindowControllerm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m (210482 => 210483)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2017-01-07 21:09:41 UTC (rev 210482)
+++ trunk/Tools/MiniBrowser/mac/WK2BrowserWindowController.m 2017-01-07 21:10:21 UTC (rev 210483)
</span><span class="lines">@@ -69,6 +69,7 @@
</span><span class="cx">
</span><span class="cx"> _webView.allowsMagnification = YES;
</span><span class="cx"> _webView.allowsBackForwardNavigationGestures = YES;
</span><ins>+ _webView._editable = self.isEditable;
</ins><span class="cx">
</span><span class="cx"> [_webView setAutoresizingMask:(NSViewWidthSizable | NSViewHeightSizable)];
</span><span class="cx"> [containerView addSubview:_webView];
</span><span class="lines">@@ -201,6 +202,8 @@
</span><span class="cx"> [menuItem setTitle:[_webView window] ? @"Remove Web View" : @"Insert Web View"];
</span><span class="cx"> else if (action == @selector(toggleZoomMode:))
</span><span class="cx"> [menuItem setState:_zoomTextOnly ? NSOnState : NSOffState];
</span><ins>+ else if (action == @selector(toggleEditable:))
+ [menuItem setState:self.isEditable ? NSOnState : NSOffState];
</ins><span class="cx">
</span><span class="cx"> if (action == @selector(setPageScale:))
</span><span class="cx"> [menuItem setState:areEssentiallyEqual([_webView _pageScale], [self pageScaleForMenuItemTag:[menuItem tag]])];
</span><span class="lines">@@ -284,6 +287,12 @@
</span><span class="cx"> return _webView;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)setEditable:(BOOL)editable
+{
+ [super setEditable:editable];
+ _webView._editable = editable;
+}
+
</ins><span class="cx"> - (BOOL)validateUserInterfaceItem:(id <NSValidatedUserInterfaceItem>)item
</span><span class="cx"> {
</span><span class="cx"> SEL action = item.action;
</span><span class="lines">@@ -415,7 +424,7 @@
</span><span class="cx"> title = url.lastPathComponent ?: url._web_userVisibleString;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- self.window.title = [NSString stringWithFormat:@"%@%@ [WK2 %d]", _isPrivateBrowsingWindow ? @"๐ " : @"", title, _webView._webProcessIdentifier];
</del><ins>+ self.window.title = [NSString stringWithFormat:@"%@%@ [WK2 %d]%@", _isPrivateBrowsingWindow ? @"๐ " : @"", title, _webView._webProcessIdentifier, _webView._editable ? @" [Editable]" : @""];
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context
</span><span class="lines">@@ -525,6 +534,11 @@
</span><span class="cx"> [self fetch:nil];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (void)loadHTMLString:(NSString *)HTMLString
+{
+ [_webView loadHTMLString:HTMLString baseURL:nil];
+}
+
</ins><span class="cx"> static NSSet *dataTypes()
</span><span class="cx"> {
</span><span class="cx"> return [WKWebsiteDataStore allWebsiteDataTypes];
</span></span></pre>
</div>
</div>
</body>
</html>