mirror of
https://github.com/atom/atom.git
synced 2026-04-28 03:01:47 -04:00
Auto-insert clipboard when it is a GUID
This commit is contained in:
committed by
Nathan Sobo
parent
9f31f9a76b
commit
b999c71ad6
@@ -1,4 +1,4 @@
|
||||
Prompt = require './prompt'
|
||||
JoinPromptView = require './join-prompt-view'
|
||||
{createSite, Document} = require 'telepath'
|
||||
{createPeer, connectDocument} = require './session-utils'
|
||||
|
||||
@@ -24,7 +24,7 @@ module.exports =
|
||||
pasteboard.write(sessionId)
|
||||
|
||||
rootView.command 'collaboration:join-session', ->
|
||||
new Prompt (id) ->
|
||||
new JoinPromptView (id) ->
|
||||
windowSettings =
|
||||
bootstrapScript: require.resolve('collaboration/lib/bootstrap')
|
||||
resourcePath: window.resourcePath
|
||||
|
||||
@@ -3,9 +3,10 @@ Editor = require 'editor'
|
||||
$ = require 'jquery'
|
||||
Point = require 'point'
|
||||
_ = require 'underscore'
|
||||
Guid = require 'guid'
|
||||
|
||||
module.exports =
|
||||
class Prompt extends View
|
||||
class JoinPromptView extends View
|
||||
@activate: -> new Prompt
|
||||
|
||||
@content: ->
|
||||
@@ -17,6 +18,11 @@ class Prompt extends View
|
||||
@miniEditor.on 'focusout', => @remove()
|
||||
@on 'core:confirm', => @confirm()
|
||||
@on 'core:cancel', => @remove()
|
||||
|
||||
clipboard = pasteboard.read()[0]
|
||||
if Guid.isGuid(clipboard)
|
||||
@miniEditor.setText(clipboard)
|
||||
|
||||
@attach()
|
||||
|
||||
beforeRemove: ->
|
||||
Reference in New Issue
Block a user