From 3913e18447cce589725336799860843ce8e54474 Mon Sep 17 00:00:00 2001 From: Charlie Hess Date: Fri, 15 May 2015 00:15:19 -0700 Subject: [PATCH] Add WebContents API for PasteAndMatchStyle. --- atom/browser/api/atom_api_web_contents.cc | 5 +++++ atom/browser/api/atom_api_web_contents.h | 1 + atom/renderer/lib/web-view/web-view.coffee | 1 + 3 files changed, 7 insertions(+) diff --git a/atom/browser/api/atom_api_web_contents.cc b/atom/browser/api/atom_api_web_contents.cc index e228a064f413..99d6fd7cfede 100644 --- a/atom/browser/api/atom_api_web_contents.cc +++ b/atom/browser/api/atom_api_web_contents.cc @@ -523,6 +523,10 @@ void WebContents::Paste() { web_contents()->Paste(); } +void WebContents::PasteAndMatchStyle() { + web_contents()->PasteAndMatchStyle(); +} + void WebContents::Delete() { web_contents()->Delete(); } @@ -645,6 +649,7 @@ mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder( .SetMethod("cut", &WebContents::Cut) .SetMethod("copy", &WebContents::Copy) .SetMethod("paste", &WebContents::Paste) + .SetMethod("pasteAndMatchStyle", &WebContents::PasteAndMatchStyle) .SetMethod("delete", &WebContents::Delete) .SetMethod("selectAll", &WebContents::SelectAll) .SetMethod("unselect", &WebContents::Unselect) diff --git a/atom/browser/api/atom_api_web_contents.h b/atom/browser/api/atom_api_web_contents.h index e75cfb0267f0..4661a570f5af 100644 --- a/atom/browser/api/atom_api_web_contents.h +++ b/atom/browser/api/atom_api_web_contents.h @@ -75,6 +75,7 @@ class WebContents : public mate::EventEmitter, void Cut(); void Copy(); void Paste(); + void PasteAndMatchStyle(); void Delete(); void SelectAll(); void Unselect(); diff --git a/atom/renderer/lib/web-view/web-view.coffee b/atom/renderer/lib/web-view/web-view.coffee index bf163c0cfb5c..881300c4dd0a 100644 --- a/atom/renderer/lib/web-view/web-view.coffee +++ b/atom/renderer/lib/web-view/web-view.coffee @@ -261,6 +261,7 @@ registerWebViewElement = -> "cut" "copy" "paste" + "pasteAndMatchStyle" "delete" "selectAll" "unselect"