Merge pull request philc#1747 from gdh1995/master

smblott-github · smblott-github · commit f9939fdb5b85 · 2015-06-22T05:46:26.000+01:00
fix a bug that `pasteFromClipboard` does not return text from clipboard
diff --git a/background_scripts/main.coffee b/background_scripts/main.coffee
@@ -217,7 +217,7 @@ openUrlInIncognito = (request) ->
 # We return null to avoid the return value from the copy operations being passed to sendResponse.
 #
 copyToClipboard = (request) -> Clipboard.copy(request.data); null
-pasteFromClipboard = (request) -> Clipboard.paste(); null
+pasteFromClipboard = (request) -> Clipboard.paste()
 
 #
 # Selects the tab with the ID specified in request.id

Original file line number	Diff line number	Diff line change
`@@ -217,7 +217,7 @@ openUrlInIncognito = (request) ->`
`217`	`217`	`# We return null to avoid the return value from the copy operations being passed to sendResponse.`
`218`	`218`	`#`
`219`	`219`	`copyToClipboard = (request) -> Clipboard.copy(request.data); null`
`220`		`-pasteFromClipboard = (request) -> Clipboard.paste(); null`
	`220`	`+pasteFromClipboard = (request) -> Clipboard.paste()`
`221`	`221`
`222`	`222`	`#`
`223`	`223`	`# Selects the tab with the ID specified in request.id`