Title: [177111] trunk/Source
- Revision
- 177111
- Author
- timothy_hor...@apple.com
- Date
- 2014-12-10 15:48:41 -0800 (Wed, 10 Dec 2014)
Log Message
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.
* 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.
Modified Paths
Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (177110 => 177111)
--- trunk/Source/WebKit/mac/ChangeLog 2014-12-10 23:42:51 UTC (rev 177110)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-12-10 23:48:41 UTC (rev 177111)
@@ -1,3 +1,18 @@
+2014-12-10 Timothy Horton <timothy_hor...@apple.com>
+
+ 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 Anders Carlsson <ander...@apple.com>
Add WebStorageNamespaceProvider::closeLocalStorage
Modified: trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm (177110 => 177111)
--- trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-10 23:42:51 UTC (rev 177110)
+++ trunk/Source/WebKit/mac/WebView/WebActionMenuController.mm 2014-12-10 23:48:41 UTC (rev 177111)
@@ -477,8 +477,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
@@ -685,9 +687,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: trunk/Source/WebKit2/ChangeLog (177110 => 177111)
--- trunk/Source/WebKit2/ChangeLog 2014-12-10 23:42:51 UTC (rev 177110)
+++ trunk/Source/WebKit2/ChangeLog 2014-12-10 23:48:41 UTC (rev 177111)
@@ -1,3 +1,18 @@
+2014-12-10 Timothy Horton <timothy_hor...@apple.com>
+
+ 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 Martin Hock <mh...@apple.com>
[iOS] Add setting to ignore viewport scaling constraints
Modified: trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (177110 => 177111)
--- trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-10 23:42:51 UTC (rev 177110)
+++ trunk/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-12-10 23:48:41 UTC (rev 177111)
@@ -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
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
