From b805af2056a8db32215238ab579c0e05757d9174 Mon Sep 17 00:00:00 2001 From: Mihai Sucan Date: Sun, 20 Feb 2011 17:48:24 +0200 Subject: [PATCH] improvements for Workspace --- build/src/mode-html-uncompressed.js | 2 +- build/src/mode-java-uncompressed.js | 2 +- build/src/mode-javascript-uncompressed.js | 2 +- lib/ace/keyboard/textinput.js | 7 ++++--- lib/ace/layer/cursor.js | 8 ++++---- lib/ace/layer/gutter.js | 6 +++--- lib/ace/layer/marker.js | 6 +++--- lib/ace/layer/text.js | 9 ++++----- lib/ace/scrollbar.js | 5 ++--- lib/ace/virtual_renderer.js | 14 ++++++-------- lib/ace/worker/worker_client.js | 2 +- 11 files changed, 30 insertions(+), 33 deletions(-) diff --git a/build/src/mode-html-uncompressed.js b/build/src/mode-html-uncompressed.js index aecb7c52..316942bf 100644 --- a/build/src/mode-html-uncompressed.js +++ b/build/src/mode-html-uncompressed.js @@ -528,7 +528,7 @@ exports.DocCommentHighlightRules = DocCommentHighlightRules; }); /* vim:ts=4:sts=4:sw=4: -/** + * * Ajax.org Code Editor (ACE) * * @copyright 2010, Ajax.org Services B.V. diff --git a/build/src/mode-java-uncompressed.js b/build/src/mode-java-uncompressed.js index 04a901f5..ed1b06b1 100644 --- a/build/src/mode-java-uncompressed.js +++ b/build/src/mode-java-uncompressed.js @@ -451,7 +451,7 @@ exports.DocCommentHighlightRules = DocCommentHighlightRules; }); /* vim:ts=4:sts=4:sw=4: -/** + * * Ajax.org Code Editor (ACE) * * @copyright 2010, Ajax.org Services B.V. diff --git a/build/src/mode-javascript-uncompressed.js b/build/src/mode-javascript-uncompressed.js index 797dc96b..cb259ba7 100644 --- a/build/src/mode-javascript-uncompressed.js +++ b/build/src/mode-javascript-uncompressed.js @@ -427,7 +427,7 @@ exports.DocCommentHighlightRules = DocCommentHighlightRules; }); /* vim:ts=4:sts=4:sw=4: -/** + * * Ajax.org Code Editor (ACE) * * @copyright 2010, Ajax.org Services B.V. diff --git a/lib/ace/keyboard/textinput.js b/lib/ace/keyboard/textinput.js index 3cec016f..2ecb1b6e 100644 --- a/lib/ace/keyboard/textinput.js +++ b/lib/ace/keyboard/textinput.js @@ -1,4 +1,5 @@ -/* ***** BEGIN LICENSE BLOCK ***** +/* vim:ts=4:sts=4:sw=4: + * ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Mozilla Public License Version @@ -39,11 +40,11 @@ define(function(require, exports, module) { var event = require("pilot/event"); var useragent = require("pilot/useragent"); -var XHTML_NS = "http://www.w3.org/1999/xhtml"; +var dom = require("pilot/dom"); var TextInput = function(parentNode, host) { - var text = document.createElementNS(XHTML_NS, "textarea"); + var text = dom.createElement("textarea"); text.style.left = "-10000px"; parentNode.appendChild(text); diff --git a/lib/ace/layer/cursor.js b/lib/ace/layer/cursor.js index 0d70e89c..a1cd4698 100644 --- a/lib/ace/layer/cursor.js +++ b/lib/ace/layer/cursor.js @@ -1,4 +1,5 @@ -/* ***** BEGIN LICENSE BLOCK ***** +/* vim:ts=4:sts=4:sw=4: + * ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Mozilla Public License Version @@ -39,14 +40,13 @@ define(function(require, exports, module) { var dom = require("pilot/dom"); -var XHTML_NS = "http://www.w3.org/1999/xhtml"; var Cursor = function(parentEl) { - this.element = document.createElementNS(XHTML_NS, "div"); + this.element = dom.createElement("div"); this.element.className = "ace_layer ace_cursor-layer"; parentEl.appendChild(this.element); - this.cursor = document.createElementNS(XHTML_NS, "div"); + this.cursor = dom.createElement("div"); this.cursor.className = "ace_cursor"; this.isVisible = false; diff --git a/lib/ace/layer/gutter.js b/lib/ace/layer/gutter.js index ec5628d7..3650fc0d 100644 --- a/lib/ace/layer/gutter.js +++ b/lib/ace/layer/gutter.js @@ -1,4 +1,5 @@ -/* ***** BEGIN LICENSE BLOCK ***** +/* vim:ts=4:sts=4:sw=4: + * ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Mozilla Public License Version @@ -39,10 +40,9 @@ define(function(require, exports, module) { var dom = require("pilot/dom"); -var XHTML_NS = "http://www.w3.org/1999/xhtml"; var Gutter = function(parentEl) { - this.element = document.createElementNS(XHTML_NS, "div"); + this.element = dom.createElement("div"); this.element.className = "ace_layer ace_gutter-layer"; parentEl.appendChild(this.element); diff --git a/lib/ace/layer/marker.js b/lib/ace/layer/marker.js index 303e5d9e..028bef33 100644 --- a/lib/ace/layer/marker.js +++ b/lib/ace/layer/marker.js @@ -1,4 +1,5 @@ -/* ***** BEGIN LICENSE BLOCK ***** +/* vim:ts=4:sts=4:sw=4: + * ***** BEGIN LICENSE BLOCK ***** * Version: MPL 1.1/GPL 2.0/LGPL 2.1 * * The contents of this file are subject to the Mozilla Public License Version @@ -40,10 +41,9 @@ define(function(require, exports, module) { var Range = require("ace/range").Range; var dom = require("pilot/dom"); -var XHTML_NS = "http://www.w3.org/1999/xhtml"; var Marker = function(parentEl) { - this.element = document.createElementNS(XHTML_NS, "div"); + this.element = dom.createElement("div"); this.element.className = "ace_layer ace_marker-layer"; parentEl.appendChild(this.element); }; diff --git a/lib/ace/layer/text.js b/lib/ace/layer/text.js index 0f68c3ce..7f71fc8d 100644 --- a/lib/ace/layer/text.js +++ b/lib/ace/layer/text.js @@ -22,6 +22,7 @@ * Contributor(s): * Fabian Jakobs * Julian Viereck + * Mihai Sucan * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -44,10 +45,8 @@ var dom = require("pilot/dom"); var lang = require("pilot/lang"); var EventEmitter = require("pilot/event_emitter").EventEmitter; -var XHTML_NS = "http://www.w3.org/1999/xhtml"; - var Text = function(parentEl) { - this.element = document.createElementNS(XHTML_NS, "div"); + this.element = dom.createElement("div"); this.element.className = "ace_layer ace_text-layer"; parentEl.appendChild(this.element); @@ -98,7 +97,7 @@ var Text = function(parentEl) { this.$measureSizes = function() { var n = 1000; if (!this.$measureNode) { - var measureNode = this.$measureNode = document.createElementNS(XHTML_NS, "div"); + var measureNode = this.$measureNode = dom.createElement("div"); var style = measureNode.style; style.width = style.height = "auto"; @@ -228,7 +227,7 @@ var Text = function(parentEl) { var fragment = document.createDocumentFragment(); var tokens = this.tokenizer.getTokens(firstRow, lastRow); for (var row=firstRow; row<=lastRow; row++) { - var lineEl = document.createElementNS(XHTML_NS, "div"); + var lineEl = dom.createElement("div"); lineEl.className = "ace_line"; var style = lineEl.style; style.height = this.session.getRowHeight(config, row) + "px"; diff --git a/lib/ace/scrollbar.js b/lib/ace/scrollbar.js index 98c08aeb..a5a31873 100644 --- a/lib/ace/scrollbar.js +++ b/lib/ace/scrollbar.js @@ -41,13 +41,12 @@ var oop = require("pilot/oop"); var dom = require("pilot/dom"); var event = require("pilot/event"); var EventEmitter = require("pilot/event_emitter").EventEmitter; -var XHTML_NS = "http://www.w3.org/1999/xhtml"; var ScrollBar = function(parent) { - this.element = document.createElementNS(XHTML_NS, "div"); + this.element = dom.createElement("div"); this.element.className = "ace_sb"; - this.inner = document.createElementNS(XHTML_NS, "div"); + this.inner = dom.createElement("div"); this.element.appendChild(this.inner); parent.appendChild(this.element); diff --git a/lib/ace/virtual_renderer.js b/lib/ace/virtual_renderer.js index 7230c5e6..8d3f745c 100644 --- a/lib/ace/virtual_renderer.js +++ b/lib/ace/virtual_renderer.js @@ -53,8 +53,6 @@ var RenderLoop = require("ace/renderloop").RenderLoop; var EventEmitter = require("pilot/event_emitter").EventEmitter; var editorCss = require("text!ace/css/editor.css"); -var XHTML_NS = "http://www.w3.org/1999/xhtml"; - // import CSS once dom.importCssString(editorCss); @@ -64,15 +62,15 @@ var VirtualRenderer = function(container, theme) { this.setTheme(theme); - this.$gutter = document.createElementNS(XHTML_NS, "div"); + this.$gutter = dom.createElement("div"); this.$gutter.className = "ace_gutter"; this.container.appendChild(this.$gutter); - this.scroller = document.createElementNS(XHTML_NS, "div"); + this.scroller = dom.createElement("div"); this.scroller.className = "ace_scroller"; this.container.appendChild(this.scroller); - this.content = document.createElementNS(XHTML_NS, "div"); + this.content = dom.createElement("div"); this.content.className = "ace_content"; this.scroller.appendChild(this.content); @@ -295,9 +293,9 @@ var VirtualRenderer = function(container, theme) { return; if (!this.$printMarginEl) { - containerEl = document.createElementNS(XHTML_NS, "div"); + containerEl = dom.createElement("div"); containerEl.className = "ace_print_margin_layer"; - this.$printMarginEl = document.createElementNS(XHTML_NS, "div") + this.$printMarginEl = dom.createElement("div") this.$printMarginEl.className = "ace_print_margin"; containerEl.appendChild(this.$printMarginEl); this.content.insertBefore(containerEl, this.$textLayer.element); @@ -703,7 +701,7 @@ var VirtualRenderer = function(container, theme) { this.showComposition = function(position) { if (!this.$composition) { - this.$composition = document.createElementNS(XHTML_NS, "div"); + this.$composition = dom.createElement("div"); this.$composition.className = "ace_composition"; this.content.appendChild(this.$composition); } diff --git a/lib/ace/worker/worker_client.js b/lib/ace/worker/worker_client.js index 6e0d0167..3a47ab71 100644 --- a/lib/ace/worker/worker_client.js +++ b/lib/ace/worker/worker_client.js @@ -1,5 +1,5 @@ /* vim:ts=4:sts=4:sw=4: -/** + * * Ajax.org Code Editor (ACE) * * @copyright 2010, Ajax.org Services B.V.