diff --git a/demo/demo.js b/demo/demo.js index 7c07eaad..d3a68480 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -365,6 +365,29 @@ exports.launch = function(env) { env.editor.getSession().setUseSoftTabs(checked); }); + var secondSplitSession = null; + bindDropdown("split", function(value) { + var sp = env.split; + if (value == "none") { + sp.setSplits(1); + } else { + var newEditor = (sp.getSplits() == 1); + if (value == "below") { + sp.setOriantation(sp.BELOW); + } else { + sp.setOriantation(sp.BESIDE); + } + sp.setSplits(2); + + if (newEditor) { + var session = secondSplitSession || sp.getEditor(0).session; + var newSession = sp.setSession(session, 1); + newSession.name = session.name; + secondSplitSession = newSession; + } + } + }); + function bindCheckbox(id, callback) { var el = document.getElementById(id); var onCheck = function() { @@ -577,11 +600,6 @@ exports.launch = function(env) { session.addFold(placeHolder, range); } } - - env.split.setSplits(2); - sp = env.split; - session = sp.setSession(sp.getEditor(0).session, 1); - session.name = sp.getEditor(0).session.name; }; }); diff --git a/index.html b/index.html index 03373d09..c381fee9 100644 --- a/index.html +++ b/index.html @@ -11,6 +11,17 @@ + + +
+ + + +
diff --git a/lib/ace/split.js b/lib/ace/split.js index fd54bb18..57054c0f 100644 --- a/lib/ace/split.js +++ b/lib/ace/split.js @@ -47,15 +47,20 @@ var Renderer = require("ace/virtual_renderer").VirtualRenderer; var EditSession = require("ace/edit_session").EditSession; var Split = function(container, theme, splits) { + this.BELOW = 1; + this.BESIDE = 0; + this.$container = container; this.$theme = theme; this.$splits = 0; this.$editorCSS = ""; this.$editors = []; + this.$oriantation = this.BESIDE; this.setSplits(splits || 1); this.$cEditor = this.$editors[0]; + this.on("focus", function(editor) { this.$cEditor = editor; }.bind(this)); @@ -106,6 +111,10 @@ var Split = function(container, theme, splits) { this.resize(); } + this.getSplits = function() { + return this.$splits; + } + this.getEditor = function(idx) { return this.$editors[idx]; } @@ -191,17 +200,43 @@ var Split = function(container, theme, splits) { return session; } + this.getOriantation = function() { + return this.$oriantation; + } + + this.setOriantation = function(oriantation) { + if (this.$oriantation == oriantation) { + return; + } + this.$oriantation = oriantation; + this.resize(); + } + this.resize = function() { var width = this.$container.clientWidth; var height = this.$container.clientHeight; var editor; - var editorWidth = width / this.$splits; - for (var i = 0; i < this.$splits; i++) { - editor = this.$editors[i]; - editor.container.style.width = editorWidth + "px"; - editor.container.style.left = i * editorWidth + "px"; - editor.container.style.height = height + "px"; - editor.resize(); + + if (this.$oriantation == this.BESIDE) { + var editorWidth = width / this.$splits; + for (var i = 0; i < this.$splits; i++) { + editor = this.$editors[i]; + editor.container.style.width = editorWidth + "px"; + editor.container.style.top = "0px"; + editor.container.style.left = i * editorWidth + "px"; + editor.container.style.height = height + "px"; + editor.resize(); + } + } else { + var editorHeight = height / this.$splits; + for (var i = 0; i < this.$splits; i++) { + editor = this.$editors[i]; + editor.container.style.width = width + "px"; + editor.container.style.top = i * editorHeight + "px" + editor.container.style.left = "0px"; + editor.container.style.height = editorHeight + "px"; + editor.resize(); + } } }