diff --git a/plugins/c9.ide.ace/ace.js b/plugins/c9.ide.ace/ace.js index 7b647f0d..d9f6d66c 100644 --- a/plugins/c9.ide.ace/ace.js +++ b/plugins/c9.ide.ace/ace.js @@ -1605,41 +1605,6 @@ return s; } - /***** Gutter Renderers *****/ - - var relativeNumbers = { - getText: function(session, row) { - return (Math.abs(session.selection.lead.row - row) || (row + 1 + (row < 9 ? "\xb7" : ""))) + ""; - }, - getWidth: function(session, lastLineNumber, config) { - return session.getLength().toString().length * config.characterWidth; - }, - update: function(e, editor) { - editor.renderer.$loop.schedule(editor.renderer.CHANGE_GUTTER); - }, - attach: function(editor) { - editor.renderer.$gutterLayer.$renderer = this; - editor.on("changeSelection", this.update); - }, - detach: function(editor) { - editor.renderer.$gutterLayer.$renderer = null; - editor.off("changeSelection", this.update); - } - }; - - var noNumbers = { - getText: function(session, row) { - return ""; - }, - getWidth: function(session, lastLineNumber, config) { - return ""; - }, - attach: function(editor) { - }, - detach: function(editor) { - }, - }; - /** * The ace handle, responsible for events that involve all ace * instances. This is the object you get when you request the ace @@ -2259,20 +2224,9 @@ break; case "showLineNumbers": var renderer = ace.renderer; - var gutterRenderer = renderer.$gutterLayer.$renderer; - if (gutterRenderer && gutterRenderer.detach) - gutterRenderer.detach(ace); - if (value == "relative") - gutterRenderer = relativeNumbers; - else if (value) - gutterRenderer = null; - else - gutterRenderer = noNumbers; + ace.setOption("relativeLineNumbers", value == "relative"); + ace.setOption("showLineNumbers", !!value); dom.setCssClass(renderer.$gutter, "ace_gutter-compact", !value); - renderer.$gutterLayer.$renderer = gutterRenderer; - if (gutterRenderer && gutterRenderer.attach) - gutterRenderer.attach(ace); - renderer.$loop.schedule(renderer.CHANGE_GUTTER); return; } diff --git a/plugins/node_modules/ace/lib/ace/layer/gutter.js b/plugins/node_modules/ace/lib/ace/layer/gutter.js index fc372e10..4e75ee66 100644 --- a/plugins/node_modules/ace/lib/ace/layer/gutter.js +++ b/plugins/node_modules/ace/lib/ace/layer/gutter.js @@ -307,7 +307,6 @@ var Gutter = function(parentEl) { var firstLineNumber = session.$firstLineNumber; - var session = this.session; var breakpoints = session.$breakpoints; var decorations = session.$decorations; var gutterRenderer = session.gutterRenderer || this.$renderer; diff --git a/plugins/node_modules/ace/lib/ace/virtual_renderer.js b/plugins/node_modules/ace/lib/ace/virtual_renderer.js index aa69708e..8ed755f8 100644 --- a/plugins/node_modules/ace/lib/ace/virtual_renderer.js +++ b/plugins/node_modules/ace/lib/ace/virtual_renderer.js @@ -1686,7 +1686,10 @@ config.defineOptions(VirtualRenderer.prototype, "renderer", { initialValue: false }, showFoldWidgets: { - set: function(show) {this.$gutterLayer.setShowFoldWidgets(show);}, + set: function(show) { + this.$gutterLayer.setShowFoldWidgets(show); + this.$loop.schedule(this.CHANGE_GUTTER); + }, initialValue: true }, displayIndentGuides: {