basecamp · afcapel · Sep 27, 2021 · Sep 27, 2021 · Sep 27, 2021
diff --git a/src/inspector/control_element.coffee b/src/inspector/control_element.coffee
@@ -1,4 +1,4 @@
-class Trix.Inspector.ControlElement
+export default class ControlElement
   keyEvents = "keydown keypress input".split(" ")
   compositionEvents = "compositionstart compositionupdate compositionend textInput".split(" ")
 

diff --git a/src/inspector/debugger.coffee b/src/inspector/debugger.coffee
@@ -2,7 +2,7 @@
 # should be explicitly required to enable the debugger.
 
 DEBUG_METHODS =
-  "Trix.AttachmentEditorController": "
+  "AttachmentEditorController": "
     didClickRemoveButton
     uninstall
   "
@@ -11,7 +11,7 @@ DEBUG_METHODS =
     didClickAttachment
   "
 
-  "Trix.EditorController": "
+  "EditorController": "
     setEditor
     loadDocument
   "

diff --git a/src/inspector/view.coffee b/src/inspector/view.coffee
@@ -1,6 +1,6 @@
 {handleEvent} = Trix
 
-class Trix.Inspector.View
+export default class View
   constructor: (@editorElement) ->
     {@editorController, @editor} = @editorElement
     {@compositionController, @composition} = @editorController

diff --git a/src/inspector/views/debug_view.coffee b/src/inspector/views/debug_view.coffee
@@ -1,8 +1,8 @@
-import "inspector/view"
+import View from "inspector/view"
 
 {handleEvent} = Trix
 
-Trix.Inspector.registerView class extends Trix.Inspector.View
+Trix.Inspector.registerView class extends View
   title: "Debug"
   template: "debug"
 

diff --git a/src/inspector/views/document_view.coffee b/src/inspector/views/document_view.coffee
@@ -1,6 +1,6 @@
-import "inspector/view"
+import View from "inspector/view"
 
-Trix.Inspector.registerView class extends Trix.Inspector.View
+Trix.Inspector.registerView class extends View
   title: "Document"
   template: "document"
   events:

diff --git a/src/inspector/views/performance_view.coffee b/src/inspector/views/performance_view.coffee
@@ -1,6 +1,6 @@
-import "inspector/view"
+import View from "inspector/view"
 
-Trix.Inspector.registerView class extends Trix.Inspector.View
+Trix.Inspector.registerView class extends View
   title: "Performance"
   template: "performance"
 

diff --git a/src/inspector/views/render_view.coffee b/src/inspector/views/render_view.coffee
@@ -1,6 +1,6 @@
-import "inspector/view"
+import View from "inspector/view"
 
-Trix.Inspector.registerView class extends Trix.Inspector.View
+Trix.Inspector.registerView class extends View
   title: "Renders"
   template: "render"
   events:

diff --git a/src/inspector/views/selection_view.coffee b/src/inspector/views/selection_view.coffee
@@ -1,6 +1,7 @@
-import "inspector/view"
+import View from "inspector/view"
+import UTF16String from "trix/core/utilities/utf16_string"
 
-Trix.Inspector.registerView class extends Trix.Inspector.View
+Trix.Inspector.registerView class extends View
   title: "Selection"
   template: "selection"
   events:
@@ -18,7 +19,7 @@ Trix.Inspector.registerView class extends Trix.Inspector.View
 
   getCharacters: ->
     chars = []
-    utf16string = Trix.UTF16String.box(@document.toString())
+    utf16string = UTF16String.box(@document.toString())
     rangeIsExpanded = @range[0] isnt @range[1]
     position = 0
     while position < utf16string.length

diff --git a/src/inspector/views/undo_view.coffee b/src/inspector/views/undo_view.coffee
@@ -1,6 +1,6 @@
-import "inspector/view"
+import View from "inspector/view"
 
-Trix.Inspector.registerView class extends Trix.Inspector.View
+Trix.Inspector.registerView class extends View
   title: "Undo"
   template: "undo"
   events:

diff --git a/src/inspector/watchdog/deserializer.coffee b/src/inspector/watchdog/deserializer.coffee
@@ -1,4 +1,4 @@
-class Trix.Watchdog.Deserializer
+export default class Deserializer
   constructor: (@document, @snapshot) ->
     {@tree, @selection} = @snapshot
     @deserializeTree()

diff --git a/src/inspector/watchdog/player.coffee b/src/inspector/watchdog/player.coffee
@@ -1,6 +1,6 @@
 import "inspector/watchdog/recording"
 
-class Trix.Watchdog.Player
+export default class Player
   constructor: (@recording) ->
     @playing = false
     @index = -1

diff --git a/src/inspector/watchdog/player_controller.coffee b/src/inspector/watchdog/player_controller.coffee
@@ -1,12 +1,12 @@
-import "inspector/watchdog/player"
-import "inspector/watchdog/player_view"
+import Player from "inspector/watchdog/player"
+import PlayerView from "inspector/watchdog/player_view"
 
-class Trix.Watchdog.PlayerController
+export default class PlayerController
   constructor: (@element, @recording) ->
-    @player = new Trix.Watchdog.Player @recording
+    @player = new Player @recording
     @player.delegate = this
 
-    @view = new Trix.Watchdog.PlayerView @element
+    @view = new PlayerView @element
     @view.delegate = this
 
     @view.setLength(@player.length)

diff --git a/src/inspector/watchdog/player_element.coffee b/src/inspector/watchdog/player_element.coffee
@@ -1,5 +1,5 @@
-import "inspector/watchdog/recording"
-import "inspector/watchdog/player_controller"
+import Recording from "inspector/watchdog/recording"
+import PlayerController from "inspector/watchdog/player_controller"
 
 Trix.registerElement "trix-watchdog-player",
   defaultCSS: """
@@ -25,8 +25,8 @@ Trix.registerElement "trix-watchdog-player",
     @activeRequest.onload = =>
       json = @activeRequest.responseText
       @activeRequest = null
-      recording = Trix.Watchdog.Recording.fromJSON(JSON.parse(json))
+      recording = Recording.fromJSON(JSON.parse(json))
       @loadRecording(recording)
 
   loadRecording: (recording) ->
-    @controller = new Trix.Watchdog.PlayerController this, recording
+    @controller = new PlayerController this, recording
diff --git a/src/inspector/watchdog/player_view.coffee b/src/inspector/watchdog/player_view.coffee
@@ -1,6 +1,6 @@
-import "inspector/watchdog/deserializer"
+import Deserializer from "inspector/watchdog/deserializer"
 
-class Trix.Watchdog.PlayerView
+export default class PlayerView
   @documentClassName: "trix-watchdog-player"
   @playingClassName: "trix-watchdog-player-playing"
 
@@ -108,7 +108,7 @@ class Trix.Watchdog.PlayerView
     "[#{index}] #{description}"
 
   deserializeSnapshot: (snapshot) ->
-    deserializer = new Trix.Watchdog.Deserializer @document, snapshot
+    deserializer = new Deserializer @document, snapshot
     element: deserializer.getElement()
     range: deserializer.getRange()
 

diff --git a/src/inspector/watchdog/recorder.coffee b/src/inspector/watchdog/recorder.coffee
@@ -1,9 +1,9 @@
-import "inspector/watchdog/recording"
-import "inspector/watchdog/serializer"
+import Recording from "inspector/watchdog/recording"
+import Serializer from "inspector/watchdog/serializer"
 
-class Trix.Watchdog.Recorder
+export default class Recorder
   constructor: (@element, {@snapshotLimit} = {}) ->
-    @recording = new Trix.Watchdog.Recording
+    @recording = new Recording
 
   start: ->
     return if @started
@@ -72,7 +72,7 @@ class Trix.Watchdog.Recorder
     @recording.truncateToSnapshotCount(@snapshotLimit) if @snapshotLimit?
 
   getSnapshot: ->
-    serializer = new Trix.Watchdog.Serializer @element
+    serializer = new Serializer @element
     serializer.getSnapshot()
 
   characterFromKeyboardEvent = (event) ->

diff --git a/src/inspector/watchdog/recording.coffee b/src/inspector/watchdog/recording.coffee
@@ -1,4 +1,4 @@
-class Trix.Watchdog.Recording
+export default class Recording
   @fromJSON: ({snapshots, frames}) ->
     new this snapshots, frames
 

diff --git a/src/inspector/watchdog/serializer.coffee b/src/inspector/watchdog/serializer.coffee
@@ -1,4 +1,4 @@
-class Trix.Watchdog.Serializer
+export default class Serializer
   constructor: (@element) ->
     @id = 0
     @serializeTree()

diff --git a/src/test/system/attachment_caption_test.coffee b/src/test/system/attachment_caption_test.coffee
@@ -1,4 +1,5 @@
 import Trix from "trix/global"
+import config from "trix/config"
 
 {assert, insertImageAttachment, test, testGroup} = Trix.TestHelpers
 
@@ -28,16 +29,16 @@ testGroup "Attachment captions", template: "editor_empty", ->
       insertImageAttachment()
       element = getCaptionElement()
       assert.ok element.hasAttribute("data-trix-placeholder")
-      assert.equal element.getAttribute("data-trix-placeholder"), Trix.config.lang.captionPlaceholder
+      assert.equal element.getAttribute("data-trix-placeholder"), config.lang.captionPlaceholder
       assert.equal element.textContent, ""
 
-withPreviewCaptionConfig = (config = {}, fn) ->
-  {caption} = Trix.config.attachments.preview
-  Trix.config.attachments.preview.caption = config
+withPreviewCaptionConfig = (captionConfig = {}, fn) ->
+  {caption} = config.attachments.preview
+  config.attachments.preview.caption = captionConfig
   try
     fn()
   finally
-    Trix.config.attachments.preview.caption = caption
+    config.attachments.preview.caption = caption
 
 getCaptionElement = ->
   getEditorElement().querySelector("figcaption")
diff --git a/src/test/system/attachment_test.coffee b/src/test/system/attachment_test.coffee
@@ -1,4 +1,5 @@
 import Trix from "trix/global"
+import config from "trix/config"
 
 {after, assert, clickElement, clickToolbarButton, createFile, defer, dragToCoordinates, moveCursor, pressKey, test, testGroup, triggerEvent, typeCharacters} = Trix.TestHelpers
 
@@ -44,12 +45,12 @@ testGroup "Attachments", template: "editor_with_image", ->
     after 20, ->
       captionElement = findElement("figcaption")
       assert.ok captionElement.clientHeight > 0
-      assert.equal captionElement.getAttribute("data-trix-placeholder"), Trix.config.lang.captionPlaceholder
+      assert.equal captionElement.getAttribute("data-trix-placeholder"), config.lang.captionPlaceholder
 
       clickElement findElement("figure"), ->
         captionElement = findElement("figcaption")
         assert.ok captionElement.clientHeight > 0
-        assert.equal captionElement.getAttribute("data-trix-placeholder"), Trix.config.lang.captionPlaceholder
+        assert.equal captionElement.getAttribute("data-trix-placeholder"), config.lang.captionPlaceholder
         done()
 
   test "updating an attachment's href attribute while editing its caption", (expectDocument) ->

diff --git a/src/test/system/basic_input_test.coffee b/src/test/system/basic_input_test.coffee
@@ -1,4 +1,5 @@
 import Trix from "trix/global"
+import config from "trix/config"
 
 {assert, defer, dragToCoordinates, expandSelection, insertNode, moveCursor, pressKey, selectAll, test, testIf, testGroup, triggerEvent, typeCharacters} = Trix.TestHelpers
 
@@ -70,15 +71,15 @@ testGroup "Basic input", template: "editor_empty", ->
             dragToCoordinates coordinates, ->
               expectDocument "acb\n"
 
-  testIf Trix.config.input.getLevel() is 0, "inserting newline after cursor (control + o)", (expectDocument) ->
+  testIf config.input.getLevel() is 0, "inserting newline after cursor (control + o)", (expectDocument) ->
     typeCharacters "ab", ->
       moveCursor "left", ->
         triggerEvent(document.activeElement, "keydown", charCode: 0, keyCode: 79, which: 79, ctrlKey: true)
         defer ->
           assert.locationRange index: 0, offset: 1
           expectDocument "a\nb\n"
 
-  testIf Trix.config.input.getLevel() is 0, "inserting ó with control + alt + o (AltGr)", (expectDocument) ->
+  testIf config.input.getLevel() is 0, "inserting ó with control + alt + o (AltGr)", (expectDocument) ->
     typeCharacters "ab", ->
       moveCursor "left", ->
         if triggerEvent(document.activeElement, "keydown", charCode: 0, keyCode: 79, which: 79, altKey: true, ctrlKey: true)