mirror of
https://github.com/atom/atom.git
synced 2026-01-24 14:28:14 -05:00
Check deprecations flag for space pen shim inclusion
This commit is contained in:
@@ -721,7 +721,9 @@ class Atom extends Model
|
||||
|
||||
deserializeWorkspaceView: ->
|
||||
Workspace = require './workspace'
|
||||
WorkspaceView = require './workspace-view'
|
||||
|
||||
if includeDeprecations
|
||||
WorkspaceView = require './workspace-view'
|
||||
|
||||
startTime = Date.now()
|
||||
@workspace = Workspace.deserialize(@state.workspace) ? new Workspace
|
||||
|
||||
@@ -152,9 +152,10 @@ class TextEditorComponent
|
||||
if @editor.isAlive()
|
||||
@updateParentViewFocusedClassIfNeeded()
|
||||
@updateParentViewMiniClass()
|
||||
@hostElement.__spacePenView.trigger 'cursor:moved' if cursorMoved
|
||||
@hostElement.__spacePenView.trigger 'selection:changed' if selectionChanged
|
||||
@hostElement.__spacePenView.trigger 'editor:display-updated'
|
||||
if grim.includeDeprecations
|
||||
@hostElement.__spacePenView.trigger 'cursor:moved' if cursorMoved
|
||||
@hostElement.__spacePenView.trigger 'selection:changed' if selectionChanged
|
||||
@hostElement.__spacePenView.trigger 'editor:display-updated'
|
||||
|
||||
readAfterUpdateSync: =>
|
||||
@linesComponent.measureCharactersInNewLines() if @isVisible() and not @newState.content.scrollingVertically
|
||||
|
||||
@@ -3,6 +3,7 @@
|
||||
Path = require 'path'
|
||||
{defaults} = require 'underscore-plus'
|
||||
TextBuffer = require 'text-buffer'
|
||||
Grim = require 'grim'
|
||||
TextEditor = require './text-editor'
|
||||
TextEditorComponent = require './text-editor-component'
|
||||
TextEditorView = null
|
||||
@@ -20,7 +21,7 @@ class TextEditorElement extends HTMLElement
|
||||
createdCallback: ->
|
||||
@emitter = new Emitter
|
||||
@initializeContent()
|
||||
@createSpacePenShim()
|
||||
@createSpacePenShim() if Grim.includeDeprecations
|
||||
@addEventListener 'focus', @focused.bind(this)
|
||||
@addEventListener 'blur', @blurred.bind(this)
|
||||
|
||||
@@ -86,7 +87,7 @@ class TextEditorElement extends HTMLElement
|
||||
@model.onDidChangeGrammar => @addGrammarScopeAttribute()
|
||||
@model.onDidChangeEncoding => @addEncodingAttribute()
|
||||
@model.onDidDestroy => @unmountComponent()
|
||||
@__spacePenView.setModel(@model)
|
||||
@__spacePenView.setModel(@model) if Grim.includeDeprecations
|
||||
@model
|
||||
|
||||
getModel: ->
|
||||
|
||||
@@ -16,10 +16,10 @@ class WorkspaceElement extends HTMLElement
|
||||
@initializeContent()
|
||||
@observeScrollbarStyle()
|
||||
@observeTextEditorFontConfig()
|
||||
@createSpacePenShim()
|
||||
@createSpacePenShim() if Grim.includeDeprecations
|
||||
|
||||
attachedCallback: ->
|
||||
callAttachHooks(this)
|
||||
callAttachHooks(this) if Grim.includeDeprecations
|
||||
@focus()
|
||||
|
||||
detachedCallback: ->
|
||||
@@ -82,7 +82,7 @@ class WorkspaceElement extends HTMLElement
|
||||
|
||||
@appendChild(@panelContainers.modal)
|
||||
|
||||
@__spacePenView.setModel(@model)
|
||||
@__spacePenView.setModel(@model) if Grim.includeDeprecations
|
||||
this
|
||||
|
||||
getModel: -> @model
|
||||
|
||||
Reference in New Issue
Block a user