From 16dbb7d0bb1edb1bf2fe542e5dfe122bc5273fa7 Mon Sep 17 00:00:00 2001 From: Antonio Scandurra Date: Mon, 13 Apr 2015 12:02:06 +0200 Subject: [PATCH] :penguin: :green_heart: Mock native clipboard appropriately --- spec/spec-helper.coffee | 2 +- spec/text-editor-spec.coffee | 2 +- src/clipboard.coffee | 8 +------- src/native-clipboard.coffee | 6 ++++++ 4 files changed, 9 insertions(+), 9 deletions(-) create mode 100644 src/native-clipboard.coffee diff --git a/spec/spec-helper.coffee b/spec/spec-helper.coffee index 1c9e6fb6b..33ec8c521 100644 --- a/spec/spec-helper.coffee +++ b/spec/spec-helper.coffee @@ -24,7 +24,7 @@ TextEditorElement = require '../src/text-editor-element' TokenizedBuffer = require '../src/tokenized-buffer' TextEditorComponent = require '../src/text-editor-component' pathwatcher = require 'pathwatcher' -clipboard = require 'clipboard' +clipboard = require "../src/native-clipboard" atom.themes.loadBaseStylesheets() atom.themes.requireStylesheet '../static/jasmine' diff --git a/spec/text-editor-spec.coffee b/spec/text-editor-spec.coffee index 06f285fd0..38f17072d 100644 --- a/spec/text-editor-spec.coffee +++ b/spec/text-editor-spec.coffee @@ -1,4 +1,4 @@ -clipboard = require 'clipboard' +clipboard = require '../src/native-clipboard' TextEditor = require '../src/text-editor' describe "TextEditor", -> diff --git a/src/clipboard.coffee b/src/clipboard.coffee index bc0926521..80ec464e7 100644 --- a/src/clipboard.coffee +++ b/src/clipboard.coffee @@ -1,11 +1,5 @@ crypto = require 'crypto' - -# Using clipboard in renderer process is not safe on Linux. -clipboard = - if process.platform is 'linux' - require('remote').require 'clipboard' - else - require 'clipboard' +clipboard = require "./native-clipboard" # Extended: Represents the clipboard used for copying and pasting in Atom. # diff --git a/src/native-clipboard.coffee b/src/native-clipboard.coffee new file mode 100644 index 000000000..f66d44646 --- /dev/null +++ b/src/native-clipboard.coffee @@ -0,0 +1,6 @@ +# Using clipboard in renderer process is not safe on Linux. +module.exports = + if process.platform is 'linux' + require('remote').require 'clipboard' + else + require 'clipboard'