kopia lustrzana https://github.com/c9/core
adapt statusbar to ace api changes
rodzic
3b162a1fe8
commit
cd9a8aaf93
|
@ -131,7 +131,7 @@ var KeyBinding = function(editor) {
|
||||||
success = commands.exec("insertstring", this.$editor, keyString);
|
success = commands.exec("insertstring", this.$editor, keyString);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (success)
|
if (success && this.$editor._signal)
|
||||||
this.$editor._signal("keyboardActivity", toExecute);
|
this.$editor._signal("keyboardActivity", toExecute);
|
||||||
|
|
||||||
return success;
|
return success;
|
||||||
|
|
|
@ -1619,7 +1619,7 @@ dom.importCssString(".normal-mode .ace_cursor{\
|
||||||
// TODO: Look into using CodeMirror's multi-key handling.
|
// TODO: Look into using CodeMirror's multi-key handling.
|
||||||
// Return no-op since we are caching the key. Counts as handled, but
|
// Return no-op since we are caching the key. Counts as handled, but
|
||||||
// don't want act on it just yet.
|
// don't want act on it just yet.
|
||||||
return function() {};
|
return function() { return true; };
|
||||||
} else {
|
} else {
|
||||||
return function() {
|
return function() {
|
||||||
if ((command.operator || command.isEdit) && cm.getOption('readOnly'))
|
if ((command.operator || command.isEdit) && cm.getOption('readOnly'))
|
||||||
|
|
|
@ -36,7 +36,7 @@ var TextMode = require("./text").Mode;
|
||||||
var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
|
var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
|
||||||
var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
|
var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
|
||||||
var WorkerClient = require("../worker/worker_client").WorkerClient;
|
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 CssBehaviour = require("./behaviour/css").CssBehaviour;
|
||||||
var CStyleFoldMode = require("./folding/cstyle").FoldMode;
|
var CStyleFoldMode = require("./folding/cstyle").FoldMode;
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ var Mode = function() {
|
||||||
this.HighlightRules = CssHighlightRules;
|
this.HighlightRules = CssHighlightRules;
|
||||||
this.$outdent = new MatchingBraceOutdent();
|
this.$outdent = new MatchingBraceOutdent();
|
||||||
this.$behaviour = new CssBehaviour();
|
this.$behaviour = new CssBehaviour();
|
||||||
this.$completer = new CssCompletions();
|
// this.$completer = new CssCompletions();
|
||||||
this.foldingRules = new CStyleFoldMode();
|
this.foldingRules = new CStyleFoldMode();
|
||||||
};
|
};
|
||||||
oop.inherits(Mode, TextMode);
|
oop.inherits(Mode, TextMode);
|
||||||
|
|
|
@ -39,7 +39,7 @@ var CssMode = require("./css").Mode;
|
||||||
var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
|
var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
|
||||||
var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
|
var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
|
||||||
var HtmlFoldMode = require("./folding/html").FoldMode;
|
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;
|
var WorkerClient = require("../worker/worker_client").WorkerClient;
|
||||||
|
|
||||||
// http://www.w3.org/TR/html5/syntax.html#void-elements
|
// http://www.w3.org/TR/html5/syntax.html#void-elements
|
||||||
|
@ -50,7 +50,7 @@ var Mode = function(options) {
|
||||||
this.fragmentContext = options && options.fragmentContext;
|
this.fragmentContext = options && options.fragmentContext;
|
||||||
this.HighlightRules = HtmlHighlightRules;
|
this.HighlightRules = HtmlHighlightRules;
|
||||||
this.$behaviour = new XmlBehaviour();
|
this.$behaviour = new XmlBehaviour();
|
||||||
this.$completer = new HtmlCompletions();
|
// this.$completer = new HtmlCompletions();
|
||||||
|
|
||||||
this.createModeDelegates({
|
this.createModeDelegates({
|
||||||
"js-": JavaScriptMode,
|
"js-": JavaScriptMode,
|
||||||
|
|
|
@ -36,7 +36,7 @@ var TextMode = require("./text").Mode;
|
||||||
var LessHighlightRules = require("./less_highlight_rules").LessHighlightRules;
|
var LessHighlightRules = require("./less_highlight_rules").LessHighlightRules;
|
||||||
var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
|
var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
|
||||||
var CssBehaviour = require("./behaviour/css").CssBehaviour;
|
var CssBehaviour = require("./behaviour/css").CssBehaviour;
|
||||||
var CssCompletions = require("./css_completions").CssCompletions;
|
// var CssCompletions = require("./css_completions").CssCompletions;
|
||||||
|
|
||||||
var CStyleFoldMode = require("./folding/cstyle").FoldMode;
|
var CStyleFoldMode = require("./folding/cstyle").FoldMode;
|
||||||
|
|
||||||
|
@ -44,7 +44,7 @@ var Mode = function() {
|
||||||
this.HighlightRules = LessHighlightRules;
|
this.HighlightRules = LessHighlightRules;
|
||||||
this.$outdent = new MatchingBraceOutdent();
|
this.$outdent = new MatchingBraceOutdent();
|
||||||
this.$behaviour = new CssBehaviour();
|
this.$behaviour = new CssBehaviour();
|
||||||
this.$completer = new CssCompletions();
|
// this.$completer = new CssCompletions();
|
||||||
this.foldingRules = new CStyleFoldMode();
|
this.foldingRules = new CStyleFoldMode();
|
||||||
};
|
};
|
||||||
oop.inherits(Mode, TextMode);
|
oop.inherits(Mode, TextMode);
|
||||||
|
|
|
@ -78,7 +78,7 @@
|
||||||
"c9.ide.ace.keymaps": "#2e3c6e3c8f",
|
"c9.ide.ace.keymaps": "#2e3c6e3c8f",
|
||||||
"c9.ide.ace.repl": "#4b88a85b7b",
|
"c9.ide.ace.repl": "#4b88a85b7b",
|
||||||
"c9.ide.ace.split": "#0ae0151c78",
|
"c9.ide.ace.split": "#0ae0151c78",
|
||||||
"c9.ide.ace.statusbar": "#2155083cf6",
|
"c9.ide.ace.statusbar": "#3aab0b67e0",
|
||||||
"c9.ide.ace.stripws": "#cf0f42ac59",
|
"c9.ide.ace.stripws": "#cf0f42ac59",
|
||||||
"c9.ide.behaviors": "#5ae88f87e1",
|
"c9.ide.behaviors": "#5ae88f87e1",
|
||||||
"c9.ide.closeconfirmation": "#cee4674141",
|
"c9.ide.closeconfirmation": "#cee4674141",
|
||||||
|
|
Ładowanie…
Reference in New Issue