mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Merge pull request #1701 from CharlieHess/paste-and-match-style

Browse source 
Paste and Match Style
This commit is contained in:
Cheng Zhao 2015-05-20 23:12:46 +08:00
commit dbecc8d5f5
5 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
atom/browser/api/atom_api_web_contents.cc
View file

@ -540,6 +540,10 @@ void WebContents::Paste() {
web_contents()->Paste(); web_contents()->Paste();
} }
void WebContents::PasteAndMatchStyle() {
web_contents()->PasteAndMatchStyle();
}
void WebContents::Delete() { void WebContents::Delete() {
web_contents()->Delete(); web_contents()->Delete();
} }
@ -662,6 +666,7 @@ mate::ObjectTemplateBuilder WebContents::GetObjectTemplateBuilder(
.SetMethod("cut", &WebContents::Cut) .SetMethod("cut", &WebContents::Cut)
.SetMethod("copy", &WebContents::Copy) .SetMethod("copy", &WebContents::Copy)
.SetMethod("paste", &WebContents::Paste) .SetMethod("paste", &WebContents::Paste)
.SetMethod("pasteAndMatchStyle", &WebContents::PasteAndMatchStyle)
.SetMethod("delete", &WebContents::Delete) .SetMethod("delete", &WebContents::Delete)
.SetMethod("selectAll", &WebContents::SelectAll) .SetMethod("selectAll", &WebContents::SelectAll)
.SetMethod("unselect", &WebContents::Unselect) .SetMethod("unselect", &WebContents::Unselect)

1
atom/browser/api/atom_api_web_contents.h
View file

@ -77,6 +77,7 @@ class WebContents : public mate::EventEmitter,
void Cut(); void Cut();
void Copy(); void Copy();
void Paste(); void Paste();
void PasteAndMatchStyle();
void Delete(); void Delete();
void SelectAll(); void SelectAll();
void Unselect(); void Unselect();

1
atom/renderer/lib/web-view/web-view.coffee
View file

@ -261,6 +261,7 @@ registerWebViewElement = ->
"cut" "cut"
"copy" "copy"
"paste" "paste"
"pasteAndMatchStyle"
"delete" "delete"
"selectAll" "selectAll"
"unselect" "unselect"

4
docs/api/browser-window.md
View file

@ -854,6 +854,10 @@ Executes editing command `copy` in page.
Executes editing command `paste` in page. Executes editing command `paste` in page.
### WebContents.pasteAndMatchStyle()
Executes editing command `pasteAndMatchStyle` in page.
### WebContents.delete() ### WebContents.delete()
Executes editing command `delete` in page. Executes editing command `delete` in page.

4
docs/api/web-view-tag.md
View file

@ -254,6 +254,10 @@ Executes editing command `copy` in page.
Executes editing command `paste` in page. Executes editing command `paste` in page.
### `<webview>`.pasteAndMatchStyle()
Executes editing command `pasteAndMatchStyle` in page.
### `<webview>`.delete() ### `<webview>`.delete()
Executes editing command `delete` in page. Executes editing command `delete` in page.