From cd9a8aaf93266347a9a7905495e515d733d6491e Mon Sep 17 00:00:00 2001 From: nightwing Date: Mon, 16 Nov 2015 21:48:43 +0400 Subject: [PATCH] adapt statusbar to ace api changes --- node_modules/ace/lib/ace/keyboard/keybinding.js | 2 +- node_modules/ace/lib/ace/keyboard/vim.js | 2 +- node_modules/ace/lib/ace/mode/css.js | 4 ++-- node_modules/ace/lib/ace/mode/html.js | 4 ++-- node_modules/ace/lib/ace/mode/less.js | 4 ++-- package.json | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/node_modules/ace/lib/ace/keyboard/keybinding.js b/node_modules/ace/lib/ace/keyboard/keybinding.js index 3aadef27..4879a3b9 100644 --- a/node_modules/ace/lib/ace/keyboard/keybinding.js +++ b/node_modules/ace/lib/ace/keyboard/keybinding.js @@ -131,7 +131,7 @@ var KeyBinding = function(editor) { success = commands.exec("insertstring", this.$editor, keyString); } - if (success) + if (success && this.$editor._signal) this.$editor._signal("keyboardActivity", toExecute); return success; diff --git a/node_modules/ace/lib/ace/keyboard/vim.js b/node_modules/ace/lib/ace/keyboard/vim.js index 1c2791b3..b280545f 100644 --- a/node_modules/ace/lib/ace/keyboard/vim.js +++ b/node_modules/ace/lib/ace/keyboard/vim.js @@ -1619,7 +1619,7 @@ dom.importCssString(".normal-mode .ace_cursor{\ // TODO: Look into using CodeMirror's multi-key handling. // Return no-op since we are caching the key. Counts as handled, but // don't want act on it just yet. - return function() {}; + return function() { return true; }; } else { return function() { if ((command.operator || command.isEdit) && cm.getOption('readOnly')) diff --git a/node_modules/ace/lib/ace/mode/css.js b/node_modules/ace/lib/ace/mode/css.js index cafa502c..f905fe65 100644 --- a/node_modules/ace/lib/ace/mode/css.js +++ b/node_modules/ace/lib/ace/mode/css.js @@ -36,7 +36,7 @@ var TextMode = require("./text").Mode; var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules; var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; var WorkerClient = require("../worker/worker_client").WorkerClient; -var CssCompletions = require("./css_completions").CssCompletions; +// var CssCompletions = require("./css_completions").CssCompletions; var CssBehaviour = require("./behaviour/css").CssBehaviour; var CStyleFoldMode = require("./folding/cstyle").FoldMode; @@ -44,7 +44,7 @@ var Mode = function() { this.HighlightRules = CssHighlightRules; this.$outdent = new MatchingBraceOutdent(); this.$behaviour = new CssBehaviour(); - this.$completer = new CssCompletions(); + // this.$completer = new CssCompletions(); this.foldingRules = new CStyleFoldMode(); }; oop.inherits(Mode, TextMode); diff --git a/node_modules/ace/lib/ace/mode/html.js b/node_modules/ace/lib/ace/mode/html.js index a74ee3de..9382b76f 100644 --- a/node_modules/ace/lib/ace/mode/html.js +++ b/node_modules/ace/lib/ace/mode/html.js @@ -39,7 +39,7 @@ var CssMode = require("./css").Mode; var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules; var XmlBehaviour = require("./behaviour/xml").XmlBehaviour; var HtmlFoldMode = require("./folding/html").FoldMode; -var HtmlCompletions = require("./html_completions").HtmlCompletions; +// var HtmlCompletions = require("./html_completions").HtmlCompletions; var WorkerClient = require("../worker/worker_client").WorkerClient; // http://www.w3.org/TR/html5/syntax.html#void-elements @@ -50,7 +50,7 @@ var Mode = function(options) { this.fragmentContext = options && options.fragmentContext; this.HighlightRules = HtmlHighlightRules; this.$behaviour = new XmlBehaviour(); - this.$completer = new HtmlCompletions(); + // this.$completer = new HtmlCompletions(); this.createModeDelegates({ "js-": JavaScriptMode, diff --git a/node_modules/ace/lib/ace/mode/less.js b/node_modules/ace/lib/ace/mode/less.js index 752558bd..0607614d 100644 --- a/node_modules/ace/lib/ace/mode/less.js +++ b/node_modules/ace/lib/ace/mode/less.js @@ -36,7 +36,7 @@ var TextMode = require("./text").Mode; var LessHighlightRules = require("./less_highlight_rules").LessHighlightRules; var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; var CssBehaviour = require("./behaviour/css").CssBehaviour; -var CssCompletions = require("./css_completions").CssCompletions; +// var CssCompletions = require("./css_completions").CssCompletions; var CStyleFoldMode = require("./folding/cstyle").FoldMode; @@ -44,7 +44,7 @@ var Mode = function() { this.HighlightRules = LessHighlightRules; this.$outdent = new MatchingBraceOutdent(); this.$behaviour = new CssBehaviour(); - this.$completer = new CssCompletions(); + // this.$completer = new CssCompletions(); this.foldingRules = new CStyleFoldMode(); }; oop.inherits(Mode, TextMode); diff --git a/package.json b/package.json index 0a5ff951..9d1c0c28 100644 --- a/package.json +++ b/package.json @@ -78,7 +78,7 @@ "c9.ide.ace.keymaps": "#2e3c6e3c8f", "c9.ide.ace.repl": "#4b88a85b7b", "c9.ide.ace.split": "#0ae0151c78", - "c9.ide.ace.statusbar": "#2155083cf6", + "c9.ide.ace.statusbar": "#3aab0b67e0", "c9.ide.ace.stripws": "#cf0f42ac59", "c9.ide.behaviors": "#5ae88f87e1", "c9.ide.closeconfirmation": "#cee4674141",