diff --git a/spec/text-editor-component-spec.coffee b/spec/text-editor-component-spec.coffee index cc76c4f6f..180efeeb5 100644 --- a/spec/text-editor-component-spec.coffee +++ b/spec/text-editor-component-spec.coffee @@ -1734,11 +1734,11 @@ describe "TextEditorComponent", -> nextAnimationFrame() expect(verticalScrollbarNode.scrollTop).toBe 10 - it "parses negative scrollSensitivity values as positive", -> + it "parses negative scrollSensitivity values at the minimum", -> atom.config.set('editor.scrollSensitivity', -50) componentNode.dispatchEvent(new WheelEvent('mousewheel', wheelDeltaX: 0, wheelDeltaY: -10)) nextAnimationFrame() - expect(verticalScrollbarNode.scrollTop).toBe 5 + expect(verticalScrollbarNode.scrollTop).toBe 1 describe "when the mousewheel event's target is a line", -> it "keeps the line on the DOM if it is scrolled off-screen", -> diff --git a/src/text-editor-view.coffee b/src/text-editor-view.coffee index 3746f43f2..a457100d3 100644 --- a/src/text-editor-view.coffee +++ b/src/text-editor-view.coffee @@ -113,7 +113,7 @@ class EditorView extends View scrollSensitivity: type: 'integer' default: 40 - minimum: 1 + minimum: 10 maximum: 200 useHardwareAcceleration: type: 'boolean' @@ -128,16 +128,16 @@ class EditorView extends View type: 'object' properties: eol: - type: 'string' + type: ['string', 'boolean'] default: '\u00ac' space: - type: 'string' + type: ['string', 'boolean'] default: '\u00b7' tab: - type: 'string' + type: ['string', 'boolean'] default: '\u00bb' cr: - type: 'string' + type: ['string', 'boolean'] default: '\u00a4' >>>>>>> Editor config uses a schema:src/editor-view.coffee