diff --git a/demo/demo_startup.js b/demo/demo_startup.js index 9ce6b585..139850e8 100644 --- a/demo/demo_startup.js +++ b/demo/demo_startup.js @@ -50,6 +50,7 @@ exports.launch = function(env) { var CssMode = require("ace/mode/css").Css; var HtmlMode = require("ace/mode/html").Html; var XmlMode = require("ace/mode/xml").Xml; + var PythonMode = require("ace/mode/python").Python; var TextMode = require("ace/mode/text").Text; var UndoManager = require("ace/undomanager").UndoManager; @@ -67,6 +68,10 @@ exports.launch = function(env) { docs.html.setMode(new HtmlMode()); docs.html.setUndoManager(new UndoManager()); + docs.python = new Document(document.getElementById("pythontext").innerHTML); + docs.python.setMode(new PythonMode()); + docs.python.setUndoManager(new UndoManager()); + var docEl = document.getElementById("doc"); var container = document.getElementById("editor"); @@ -89,6 +94,9 @@ exports.launch = function(env) { else if (mode instanceof XmlMode) { modeEl.value = "xml"; } + else if (mode instanceof PythonMode) { + modeEl.value = "python"; + } else { modeEl.value = "text"; } @@ -111,7 +119,8 @@ exports.launch = function(env) { xml: new XmlMode(), html: new HtmlMode(), css: new CssMode(), - javascript: new JavaScriptMode() + javascript: new JavaScriptMode(), + python: new PythonMode() }; function getMode() { @@ -182,6 +191,8 @@ exports.launch = function(env) { mode = "html"; } else if (/^.*\.css$/i.test(file.name)) { mode = "css"; + } else if (/^.*\.py$/i.test(file.name)) { + mode = "python"; } env.editor.onTextInput(reader.result); diff --git a/editor.html b/editor.html index ba91335a..cb2919cb 100644 --- a/editor.html +++ b/editor.html @@ -150,6 +150,23 @@ } + + +

Juhu Kinners

+ + + + + +

Juhu Kinners

diff --git a/lib/ace/mode/python.js b/lib/ace/mode/python.js index d1e9a6bd..1e7c9796 100644 --- a/lib/ace/mode/python.js +++ b/lib/ace/mode/python.js @@ -37,12 +37,12 @@ define(function(require, exports, module) { -var oop = require("../lib/oop"); -var TextMode = require("./text"); -var Tokenizer = require("../tokenizer"); -var PythonHighlightRules = require("./python_highlight_rules"); -var MatchingBraceOutdent = require("./matching_brace_outdent"); -var Range = require("../range"); +var oop = require("pilot/oop").oop; +var TextMode = require("./text").Text; +var Tokenizer = require("../tokenizer").Tokenizer; +var PythonHighlightRules = require("./python_highlight_rules").PythonHighlightRules; +var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent; +var Range = require("../range").Range; var Python = function() { this.$tokenizer = new Tokenizer(new PythonHighlightRules().getRules()); @@ -112,5 +112,5 @@ oop.inherits(Python, TextMode); }).call(Python.prototype); -return Python; +exports.Python = Python; }); diff --git a/lib/ace/mode/python_highlight_rules.js b/lib/ace/mode/python_highlight_rules.js index 57053e8c..0a48fcd3 100644 --- a/lib/ace/mode/python_highlight_rules.js +++ b/lib/ace/mode/python_highlight_rules.js @@ -40,9 +40,9 @@ define(function(require, exports, module) { -var oop = require("../lib/oop"); -var lang = require("../lib/lang"); -var TextHighlightRules = require("./text_highlight_rules"); +var oop = require("pilot/oop").oop; +var lang = require("pilot/lang").lang; +var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules; PythonHighlightRules = function() { @@ -172,5 +172,5 @@ PythonHighlightRules = function() { oop.inherits(PythonHighlightRules, TextHighlightRules); -return PythonHighlightRules; +exports.PythonHighlightRules = PythonHighlightRules; }); \ No newline at end of file diff --git a/support/requirejs b/support/requirejs index 0095dc02..819c4e7b 160000 --- a/support/requirejs +++ b/support/requirejs @@ -1 +1 @@ -Subproject commit 0095dc028d0e6f3d40587071fa67622930aa880e +Subproject commit 819c4e7b9b1e6e5f99696b5c9f2805891a9e7cfd