Title: [177138] branches/safari-600.3-branch/Source
- Revision
- 177138
- Author
- [email protected]
- Date
- 2014-12-11 00:50:49 -0800 (Thu, 11 Dec 2014)
Log Message
Merged r177111. rdar://problems/19198388
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog (177137 => 177138)
--- branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-11 08:25:41 UTC (rev 177137)
+++ branches/safari-600.3-branch/Source/WebKit/mac/ChangeLog 2014-12-11 08:50:49 UTC (rev 177138)
@@ -1,3 +1,22 @@
+2014-12-11 Matthew Hanson <[email protected]>
+
+ Merge r177111. rdar://problem/19198388
+
+ 2014-12-10 Timothy Horton <[email protected]>
+
+ Should have copy and paste items in all text menus
+ https://bugs.webkit.org/show_bug.cgi?id=139510
+ <rdar://problem/19198388>
+
+ Reviewed by Beth Dakin.
+
+ * WebView/WebActionMenuController.mm:
+ (-[WebActionMenuController _defaultMenuItemsForText]):
+ Add a disabled paste menu item into the read-only text menu.
+
+ (-[WebActionMenuController _defaultMenuItemsForWhitespaceInEditableArea]):
+ Add a disabled copy menu item into the editable whitespace text menu.
+
2014-12-10 Matthew Hanson <[email protected]>
Merge r176999. rdar://problem/19149219
Modified: branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm (177137 => 177138)
--- branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-11 08:25:41 UTC (rev 177137)
+++ branches/safari-600.3-branch/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-11 08:50:49 UTC (rev 177138)
@@ -478,8 +478,10 @@
{
RetainPtr<NSMenuItem> copyTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyText];
RetainPtr<NSMenuItem> lookupTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagLookupText];
+ RetainPtr<NSMenuItem> pasteItem = [self _createActionMenuItemForTag:WebActionMenuItemTagPaste];
+ [pasteItem setEnabled:NO];
- return @[ copyTextItem.get(), lookupTextItem.get() ];
+ return @[ copyTextItem.get(), lookupTextItem.get(), pasteItem.get() ];
}
- (NSArray *)_defaultMenuItemsForEditableText
@@ -686,9 +688,11 @@
- (NSArray *)_defaultMenuItemsForWhitespaceInEditableArea
{
+ RetainPtr<NSMenuItem> copyTextItem = [self _createActionMenuItemForTag:WebActionMenuItemTagCopyText];
RetainPtr<NSMenuItem> pasteItem = [self _createActionMenuItemForTag:WebActionMenuItemTagPaste];
+ [copyTextItem setEnabled:NO];
- return @[ [NSMenuItem separatorItem], [NSMenuItem separatorItem], pasteItem.get() ];
+ return @[ copyTextItem.get(), [NSMenuItem separatorItem], pasteItem.get() ];
}
#pragma mark NSSharingServicePickerDelegate implementation
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (177137 => 177138)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-11 08:25:41 UTC (rev 177137)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-12-11 08:50:49 UTC (rev 177138)
@@ -1,3 +1,22 @@
+2014-12-11 Matthew Hanson <[email protected]>
+
+ Merge r177111. rdar://problem/19198388
+
+ 2014-12-10 Timothy Horton <[email protected]>
+
+ Should have copy and paste items in all text menus
+ https://bugs.webkit.org/show_bug.cgi?id=139510
+ <rdar://problem/19198388>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _defaultMenuItemsForText]):
+ Add a disabled paste menu item into the read-only text menu.
+
+ (-[WKActionMenuController _defaultMenuItemsForWhitespaceInEditableArea]):
+ Add a disabled copy menu item into the editable whitespace text menu.
+
2014-12-10 Matthew Hanson <[email protected]>
Merge r176999. rdar://problem/19149219
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (177137 => 177138)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-11 08:25:41 UTC (rev 177137)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-11 08:50:49 UTC (rev 177138)
@@ -778,8 +778,10 @@
{
RetainPtr<NSMenuItem> copyTextItem = [self _createActionMenuItemForTag:kWKContextActionItemTagCopyText];
RetainPtr<NSMenuItem> lookupTextItem = [self _createActionMenuItemForTag:kWKContextActionItemTagLookupText];
+ RetainPtr<NSMenuItem> pasteItem = [self _createActionMenuItemForTag:kWKContextActionItemTagPaste];
+ [pasteItem setEnabled:NO];
- return @[ copyTextItem.get(), lookupTextItem.get() ];
+ return @[ copyTextItem.get(), lookupTextItem.get(), pasteItem.get() ];
}
- (NSArray *)_defaultMenuItemsForEditableText
@@ -854,9 +856,11 @@
- (NSArray *)_defaultMenuItemsForWhitespaceInEditableArea
{
+ RetainPtr<NSMenuItem> copyTextItem = [self _createActionMenuItemForTag:kWKContextActionItemTagCopyText];
RetainPtr<NSMenuItem> pasteItem = [self _createActionMenuItemForTag:kWKContextActionItemTagPaste];
+ [copyTextItem setEnabled:NO];
- return @[ [NSMenuItem separatorItem], [NSMenuItem separatorItem], pasteItem.get() ];
+ return @[ copyTextItem.get(), [NSMenuItem separatorItem], pasteItem.get() ];
}
#pragma mark mailto: and tel: Link actions
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
