Title: [176061] branches/safari-600.3-branch/Source/WebKit2
- Revision
- 176061
- Author
- [email protected]
- Date
- 2014-11-12 18:31:09 -0800 (Wed, 12 Nov 2014)
Log Message
Merged r176038. rdar://problems/18960409
Modified Paths
Diff
Modified: branches/safari-600.3-branch/Source/WebKit2/ChangeLog (176060 => 176061)
--- branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-13 02:31:04 UTC (rev 176060)
+++ branches/safari-600.3-branch/Source/WebKit2/ChangeLog 2014-11-13 02:31:09 UTC (rev 176061)
@@ -1,5 +1,22 @@
2014-11-12 Matthew Hanson <[email protected]>
+ Merge r176038. <rdar://problem/18960409>
+
+ 2014-11-12 Tim Horton <[email protected]>
+
+ Two action menu item titles are swapped
+ https://bugs.webkit.org/show_bug.cgi?id=138667
+ <rdar://problem/18960409>
+
+ Reviewed by Beth Dakin.
+
+ * UIProcess/mac/WKActionMenuController.mm:
+ (-[WKActionMenuController _createActionMenuItemForTag:]):
+ Swap them back.
+
+
+2014-11-12 Matthew Hanson <[email protected]>
+
Merge r176037. <rdar://problem/18869900>
2014-11-12 Tim Horton <[email protected]>
Modified: branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm (176060 => 176061)
--- branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-13 02:31:04 UTC (rev 176060)
+++ branches/safari-600.3-branch/Source/WebKit2/UIProcess/mac/WKActionMenuController.mm 2014-11-13 02:31:09 UTC (rev 176061)
@@ -850,12 +850,12 @@
case kWKContextActionItemTagSaveVideoToDownloads:
selector = @selector(_saveVideoToDownloads:);
- title = WEB_UI_STRING_KEY("Share", "Share (video action menu item)", "video action menu item");
+ title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (video action menu item)", "video action menu item");
image = [NSImage imageNamed:@"NSActionMenuSaveToDownloads"];
break;
case kWKContextActionItemTagShareVideo:
- title = WEB_UI_STRING_KEY("Save to Downloads", "Save to Downloads (video action menu item)", "video action menu item");
+ title = WEB_UI_STRING_KEY("Share", "Share (video action menu item)", "video action menu item");
image = [NSImage imageNamed:@"NSActionMenuShare"];
break;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
