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

Add bookmark key to clipboard.write

Browse source
This commit is contained in:
Kevin Sawicki 2016-06-24 15:14:28 -07:00
parent 358bf1bf69
commit e802d0e4a0
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
atom/common/api/atom_api_clipboard.cc
View file

@ -54,12 +54,16 @@ std::string Read(const std::string& format_string,
void Write(const mate::Dictionary& data, void Write(const mate::Dictionary& data,
mate::Arguments* args) { mate::Arguments* args) {
ui::ScopedClipboardWriter writer(GetClipboardType(args)); ui::ScopedClipboardWriter writer(GetClipboardType(args));
base::string16 text, html; base::string16 text, html, bookmark;
gfx::Image image; gfx::Image image;
if (data.Get("text", &text)) if (data.Get("text", &text)) {
writer.WriteText(text); writer.WriteText(text);
if (data.Get("bookmark", &bookmark))
writer.WriteBookmark(bookmark, base::UTF16ToUTF8(text));
}
if (data.Get("rtf", &text)) { if (data.Get("rtf", &text)) {
std::string rtf = base::UTF16ToUTF8(text); std::string rtf = base::UTF16ToUTF8(text);
writer.WriteRTF(rtf); writer.WriteRTF(rtf);

3
spec/api-clipboard-spec.js
View file

@ -58,16 +58,19 @@ describe('clipboard module', function () {
var p = path.join(fixtures, 'assets', 'logo.png') var p = path.join(fixtures, 'assets', 'logo.png')
var i = nativeImage.createFromPath(p) var i = nativeImage.createFromPath(p)
var markup = process.platform === 'darwin' ? "<meta charset='utf-8'><b>Hi</b>" : process.platform === 'linux' ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><b>Hi</b>' : '<b>Hi</b>' var markup = process.platform === 'darwin' ? "<meta charset='utf-8'><b>Hi</b>" : process.platform === 'linux' ? '<meta http-equiv="content-type" ' + 'content="text/html; charset=utf-8"><b>Hi</b>' : '<b>Hi</b>'
var bookmark = {title: 'a title', url: 'test'}
clipboard.write({ clipboard.write({
text: 'test', text: 'test',
html: '<b>Hi</b>', html: '<b>Hi</b>',
rtf: '{\\rtf1\\utf8 text}', rtf: '{\\rtf1\\utf8 text}',
bookmark: 'a title',
image: p image: p
}) })
assert.equal(clipboard.readText(), text) assert.equal(clipboard.readText(), text)
assert.equal(clipboard.readHTML(), markup) assert.equal(clipboard.readHTML(), markup)
assert.equal(clipboard.readRTF(), rtf) assert.equal(clipboard.readRTF(), rtf)
assert.equal(clipboard.readImage().toDataURL(), i.toDataURL()) assert.equal(clipboard.readImage().toDataURL(), i.toDataURL())
assert.deepEqual(clipboard.readBookmark(), bookmark)
}) })
}) })
}) })