test falsy display() values in Scratchpad"; } -function testFalsy(sp) +function testFalsy() { - gScratchpadWindow.removeEventListener("load", testFalsy, false); - let sp = gScratchpadWindow.Scratchpad; verifyFalsies(sp); diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_bug_699130_edit_ui_updates.js b/browser/devtools/scratchpad/test/browser_scratchpad_bug_699130_edit_ui_updates.js index d9d4b001e10..06f95ef3b60 100644 --- a/browser/devtools/scratchpad/test/browser_scratchpad_bug_699130_edit_ui_updates.js +++ b/browser/devtools/scratchpad/test/browser_scratchpad_bug_699130_edit_ui_updates.js @@ -13,9 +13,7 @@ function test() gBrowser.selectedTab = gBrowser.addTab(); gBrowser.selectedBrowser.addEventListener("load", function onLoad() { gBrowser.selectedBrowser.removeEventListener("load", onLoad, true); - - gScratchpadWindow = Scratchpad.openScratchpad(); - gScratchpadWindow.addEventListener("load", runTests, false); + openScratchpad(runTests); }, true); content.location = "data:text/html,test Edit menu updates Scratchpad - bug 699130"; @@ -23,8 +21,6 @@ function test() function runTests() { - gScratchpadWindow.removeEventListener("load", runTests, false); - let sp = gScratchpadWindow.Scratchpad; let doc = gScratchpadWindow.document; let winUtils = gScratchpadWindow.QueryInterface(Ci.nsIInterfaceRequestor). diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_contexts.js b/browser/devtools/scratchpad/test/browser_scratchpad_contexts.js index 4d9f8ebee2d..51919b65d12 100644 --- a/browser/devtools/scratchpad/test/browser_scratchpad_contexts.js +++ b/browser/devtools/scratchpad/test/browser_scratchpad_contexts.js @@ -2,19 +2,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -// Reference to the Scratchpad chrome window object. -let gScratchpadWindow; - function test() { waitForExplicitFinish(); gBrowser.selectedTab = gBrowser.addTab(); - gBrowser.selectedBrowser.addEventListener("load", function() { - gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true); - - gScratchpadWindow = Scratchpad.openScratchpad(); - gScratchpadWindow.addEventListener("load", runTests, false); + gBrowser.selectedBrowser.addEventListener("load", function onLoad() { + gBrowser.selectedBrowser.removeEventListener("load", onLoad, true); + openScratchpad(runTests); }, true); content.location = "data:text/html,test context switch in Scratchpad"; @@ -22,8 +17,6 @@ function test() function runTests() { - gScratchpadWindow.removeEventListener("load", arguments.callee, false); - let sp = gScratchpadWindow.Scratchpad; let contentMenu = gScratchpadWindow.document.getElementById("sp-menu-content"); @@ -42,7 +35,7 @@ function runTests() is(contentMenu.getAttribute("checked"), "true", "content menuitem is checked"); - ok(!chromeMenu.hasAttribute("checked"), + isnot(chromeMenu.getAttribute("checked"), "true", "chrome menuitem is not checked"); ok(!notificationBox.currentNotification, @@ -66,7 +59,7 @@ function runTests() is(chromeMenu.getAttribute("checked"), "true", "chrome menuitem is checked"); - ok(!contentMenu.hasAttribute("checked"), + isnot(contentMenu.getAttribute("checked"), "true", "content menuitem is not checked"); ok(notificationBox.currentNotification, diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_execute_print.js b/browser/devtools/scratchpad/test/browser_scratchpad_execute_print.js index 0acf948e95c..5278fcffc32 100644 --- a/browser/devtools/scratchpad/test/browser_scratchpad_execute_print.js +++ b/browser/devtools/scratchpad/test/browser_scratchpad_execute_print.js @@ -7,11 +7,9 @@ function test() waitForExplicitFinish(); gBrowser.selectedTab = gBrowser.addTab(); - gBrowser.selectedBrowser.addEventListener("load", function() { - gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true); - - gScratchpadWindow = Scratchpad.openScratchpad(); - gScratchpadWindow.addEventListener("load", runTests, false); + gBrowser.selectedBrowser.addEventListener("load", function onTabLoad() { + gBrowser.selectedBrowser.removeEventListener("load", onTabLoad, true); + openScratchpad(runTests); }, true); content.location = "data:text/html,
test run() and display() in Scratchpad"; @@ -19,8 +17,6 @@ function test() function runTests() { - gScratchpadWindow.removeEventListener("load", arguments.callee, false); - let sp = gScratchpadWindow.Scratchpad; content.wrappedJSObject.foobarBug636725 = 1; diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_files.js b/browser/devtools/scratchpad/test/browser_scratchpad_files.js index e5ffddaed70..5e50c24bc4e 100644 --- a/browser/devtools/scratchpad/test/browser_scratchpad_files.js +++ b/browser/devtools/scratchpad/test/browser_scratchpad_files.js @@ -5,9 +5,6 @@ Cu.import("resource://gre/modules/NetUtil.jsm"); Cu.import("resource://gre/modules/FileUtils.jsm"); -// Reference to the Scratchpad chrome window object. -let gScratchpadWindow; - // Reference to the Scratchpad object. let gScratchpad; @@ -22,11 +19,9 @@ function test() waitForExplicitFinish(); gBrowser.selectedTab = gBrowser.addTab(); - gBrowser.selectedBrowser.addEventListener("load", function() { - gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true); - - gScratchpadWindow = Scratchpad.openScratchpad(); - gScratchpadWindow.addEventListener("load", runTests, false); + gBrowser.selectedBrowser.addEventListener("load", function onLoad() { + gBrowser.selectedBrowser.removeEventListener("load", onLoad, true); + openScratchpad(runTests); }, true); content.location = "data:text/html,
test file open and save in Scratchpad"; @@ -34,8 +29,6 @@ function test() function runTests() { - gScratchpadWindow.removeEventListener("load", arguments.callee, false); - gScratchpad = gScratchpadWindow.Scratchpad; // Create a temporary file. diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_initialization.js b/browser/devtools/scratchpad/test/browser_scratchpad_initialization.js index b926598f1ce..67bca826a20 100644 --- a/browser/devtools/scratchpad/test/browser_scratchpad_initialization.js +++ b/browser/devtools/scratchpad/test/browser_scratchpad_initialization.js @@ -2,21 +2,17 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -// Reference to the Scratchpad chrome window object. -let gScratchpadWindow; - function test() { waitForExplicitFinish(); gBrowser.selectedTab = gBrowser.addTab(); - gBrowser.selectedBrowser.addEventListener("load", function() { - gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true); + gBrowser.selectedBrowser.addEventListener("load", function onLoad() { + gBrowser.selectedBrowser.removeEventListener("load", onLoad, true); - ok(Scratchpad, "Scratchpad variable exists"); + ok(window.Scratchpad, "Scratchpad variable exists"); - gScratchpadWindow = Scratchpad.openScratchpad(); - gScratchpadWindow.addEventListener("load", runTests, false); + openScratchpad(runTests); }, true); content.location = "data:text/html,initialization test for Scratchpad"; @@ -24,8 +20,6 @@ function test() function runTests() { - gScratchpadWindow.removeEventListener("load", arguments.callee, false); - let sp = gScratchpadWindow.Scratchpad; ok(sp, "Scratchpad object exists in new window"); is(typeof sp.run, "function", "Scratchpad.run() exists"); diff --git a/browser/devtools/scratchpad/test/browser_scratchpad_inspect.js b/browser/devtools/scratchpad/test/browser_scratchpad_inspect.js index cd52d7a0349..ed4c19f0d08 100644 --- a/browser/devtools/scratchpad/test/browser_scratchpad_inspect.js +++ b/browser/devtools/scratchpad/test/browser_scratchpad_inspect.js @@ -2,19 +2,14 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ -// Reference to the Scratchpad chrome window object. -let gScratchpadWindow; - function test() { waitForExplicitFinish(); gBrowser.selectedTab = gBrowser.addTab(); - gBrowser.selectedBrowser.addEventListener("load", function() { - gBrowser.selectedBrowser.removeEventListener("load", arguments.callee, true); - - gScratchpadWindow = Scratchpad.openScratchpad(); - gScratchpadWindow.addEventListener("load", runTests, false); + gBrowser.selectedBrowser.addEventListener("load", function onLoad() { + gBrowser.selectedBrowser.removeEventListener("load", onLoad, true); + openScratchpad(runTests); }, true); content.location = "data:text/html,
moduleName.
+ * + * This function is intented to by used when RequireJS is not available. + *
+ * + * @param {String[]} deps The array of dependency names. + * @param {Function} callback The definition function. + * @param {String} moduleName The mixin module name. + */ +if (!window.define) { + window.define = function(deps, callback, moduleName) { + var module = this; + var split = (moduleName || "").split("/"), i, j; + for (i = 0; i < split.length; i++) { + module = module[split[i]] = (module[split[i]] || {}); + } + var depModules = [], depModule; + for (j = 0; j < deps.length; j++) { + depModule = this; + split = deps[j].split("/"); + for (i = 0; i < split.length - 1; i++) { + depModule = depModule[split[i]] = (depModule[split[i]] || {}); + } + depModules.push(depModule); + } + var newModule = callback.apply(this, depModules); + for (var p in newModule) { + if (newModule.hasOwnProperty(p)) { + module[p] = newModule[p]; + } + } + }; +} + +/** + * Require/get the defined modules. + *+ * This function is intented to by used when RequireJS is not available. + *
+ * + * @param {String[]|String} deps The array of dependency names. This can also be + * a string, a single dependency name. + * @param {Function} [callback] Optional, the callback function to execute when + * multiple dependencies are required. The callback arguments will have + * references to each module in the same order as the deps array. + * @returns {Object|undefined} If the deps parameter is a string, then this + * function returns the required module definition, otherwise undefined is + * returned. + */ +if (!window.require) { + window.require = function(deps, callback) { + var depsArr = typeof deps === "string" ? [deps] : deps; + var depModules = [], depModule, split, i, j; + for (j = 0; j < depsArr.length; j++) { + depModule = this; + split = depsArr[j].split("/"); + for (i = 0; i < split.length - 1; i++) { + depModule = depModule[split[i]] = (depModule[split[i]] || {}); + } + depModules.push(depModule); + } + if (callback) { + callback.apply(this, depModules); + } + return typeof deps === "string" ? depModules[0] : undefined; + }; +}/******************************************************************************* + * Copyright (c) 2010, 2011 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials are made + * available under the terms of the Eclipse Public License v1.0 + * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution + * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html). + * + * Contributors: + * Felipe Heidrich (IBM Corporation) - initial API and implementation + * Silenio Quarti (IBM Corporation) - initial API and implementation + ******************************************************************************/ + +/*global define */ +define([], function() { + /** + * Constructs a new EventTarget object. + * + * @class + * @name orion.textview.EventTarget + */ + function EventTarget() { + } + /** + * Adds in the event target interface into the specified object. + * + * @param {Object} object The object to add in the event target interface. + */ + EventTarget.addMixin = function(object) { + var proto = EventTarget.prototype; + for (var p in proto) { + if (proto.hasOwnProperty(p)) { + object[p] = proto[p]; + } + } + }; + EventTarget.prototype = /** @lends orion.textview.EventTarget.prototype */ { + /** + * Adds an event listener to this event target. + * + * @param {String} type The event type. + * @param {Function|EventListener} listener The function or the EventListener that will be executed when the event happens. + * @param {Boolean} [useCapture=false]true if the listener should be trigged in the capture phase.
+ *
+ * @see #removeEventListener
+ */
+ addEventListener: function(type, listener, useCapture) {
+ if (!this._eventTypes) { this._eventTypes = {}; }
+ var state = this._eventTypes[type];
+ if (!state) {
+ state = this._eventTypes[type] = {level: 0, listeners: []};
+ }
+ var listeners = state.listeners;
+ listeners.push({listener: listener, useCapture: useCapture});
+ },
+ /**
+ * Dispatches the given event to the listeners added to this event target.
+ * @param {Event} evt The event to dispatch.
+ */
+ dispatchEvent: function(evt) {
+ if (!this._eventTypes) { return; }
+ var type = evt.type;
+ var state = this._eventTypes[type];
+ if (state) {
+ var listeners = state.listeners;
+ try {
+ state.level++;
+ if (listeners) {
+ for (var i=0, len=listeners.length; i < len; i++) {
+ if (listeners[i]) {
+ var l = listeners[i].listener;
+ if (typeof l === "function") {
+ l.call(this, evt);
+ } else if (l.handleEvent && typeof l.handleEvent === "function") {
+ l.handleEvent(evt);
+ }
+ }
+ }
+ }
+ } finally {
+ state.level--;
+ if (state.compact && state.level === 0) {
+ for (var j=listeners.length - 1; j >= 0; j--) {
+ if (!listeners[j]) {
+ listeners.splice(j, 1);
+ }
+ }
+ if (listeners.length === 0) {
+ delete this._eventTypes[type];
+ }
+ state.compact = false;
+ }
+ }
+ }
+ },
+ /**
+ * Returns whether there is a listener for the specified event type.
+ *
+ * @param {String} type The event type
+ *
+ * @see #addEventListener
+ * @see #removeEventListener
+ */
+ isListening: function(type) {
+ if (!this._eventTypes) { return false; }
+ return this._eventTypes[type] !== undefined;
+ },
+ /**
+ * Removes an event listener from the event target.
+ * + * All the parameters must be the same ones used to add the listener. + *
+ * + * @param {String} type The event type + * @param {Function|EventListener} listener The function or the EventListener that will be executed when the event happens. + * @param {Boolean} [useCapture=false]true if the listener should be trigged in the capture phase.
+ *
+ * @see #addEventListener
+ */
+ removeEventListener: function(type, listener, useCapture){
+ if (!this._eventTypes) { return; }
+ var state = this._eventTypes[type];
+ if (state) {
+ var listeners = state.listeners;
+ for (var i=0, len=listeners.length; i < len; i++) {
+ var l = listeners[i];
+ if (l && l.listener === listener && l.useCapture === useCapture) {
+ if (state.level !== 0) {
+ listeners[i] = null;
+ state.compact = true;
+ } else {
+ listeners.splice(i, 1);
+ }
+ break;
+ }
+ }
+ if (listeners.length === 0) {
+ delete this._eventTypes[type];
+ }
+ }
+ }
+ };
+ return {EventTarget: EventTarget};
+}, "orion/textview");
+/*******************************************************************************
+ * @license
+ * Copyright (c) 2011 IBM Corporation and others.
+ * All rights reserved. This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License v1.0
+ * (http://www.eclipse.org/legal/epl-v10.html), and the Eclipse Distribution
+ * License v1.0 (http://www.eclipse.org/org/documents/edl-v10.html).
+ *
+ * Contributors:
+ * IBM Corporation - initial API and implementation
+ *******************************************************************************/
+/*global define */
+/*jslint browser:true regexp:false*/
+/**
+ * @name orion.editor.regex
+ * @class Utilities for dealing with regular expressions.
+ * @description Utilities for dealing with regular expressions.
+ */
+define([], function() {
+ /**
+ * @methodOf orion.editor.regex
+ * @static
+ * @description Escapes regex special characters in the input string.
+ * @param {String} str The string to escape.
+ * @returns {String} A copy of str with regex special characters escaped.
+ */
+ function escape(str) {
+ return str.replace(/([\\$\^*\/+?\.\(\)|{}\[\]])/g, "\\$&");
+ }
+
+ /**
+ * @methodOf orion.editor.regex
+ * @static
+ * @description Parses a pattern and flags out of a regex literal string.
+ * @param {String} str The string to parse. Should look something like "/ab+c/" or "/ab+c/i".
+ * @returns {Object} If str looks like a regex literal, returns an object with properties
+ *
+ * - pattern
- {String}
+ * - flags
- {String}
+ *
null.
+ */
+ function parse(str) {
+ var regexp = /^\s*\/(.+)\/([gim]{0,3})\s*$/.exec(str);
+ if (regexp) {
+ return {
+ pattern : regexp[1],
+ flags : regexp[2]
+ };
+ }
+ return null;
+ }
+
+ return {
+ escape: escape,
+ parse: parse
+ };
+}, "orion/editor");
+/*******************************************************************************
+ * @license
* Copyright (c) 2010, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials are made
* available under the terms of the Eclipse Public License v1.0
@@ -12,38 +297,29 @@
/*global window define */
-/**
- * @namespace The global container for Orion APIs.
- */
-var orion = orion || {};
-/**
- * @namespace The container for textview APIs.
- */
-orion.textview = orion.textview || {};
-
-/**
- * Constructs a new key binding with the given key code and modifiers.
- *
- * @param {String|Number} keyCode the key code.
- * @param {Boolean} mod1 the primary modifier (usually Command on Mac and Control on other platforms).
- * @param {Boolean} mod2 the secondary modifier (usually Shift).
- * @param {Boolean} mod3 the third modifier (usually Alt).
- * @param {Boolean} mod4 the fourth modifier (usually Control on the Mac).
- *
- * @class A KeyBinding represents of a key code and a modifier state that can be triggered by the user using the keyboard.
- * @name orion.textview.KeyBinding
- *
- * @property {String|Number} keyCode The key code.
- * @property {Boolean} mod1 The primary modifier (usually Command on Mac and Control on other platforms).
- * @property {Boolean} mod2 The secondary modifier (usually Shift).
- * @property {Boolean} mod3 The third modifier (usually Alt).
- * @property {Boolean} mod4 The fourth modifier (usually Control on the Mac).
- *
- * @see orion.textview.TextView#setKeyBinding
- */
-orion.textview.KeyBinding = (function() {
+define([], function() {
var isMac = window.navigator.platform.indexOf("Mac") !== -1;
- /** @private */
+
+ /**
+ * Constructs a new key binding with the given key code and modifiers.
+ *
+ * @param {String|Number} keyCode the key code.
+ * @param {Boolean} mod1 the primary modifier (usually Command on Mac and Control on other platforms).
+ * @param {Boolean} mod2 the secondary modifier (usually Shift).
+ * @param {Boolean} mod3 the third modifier (usually Alt).
+ * @param {Boolean} mod4 the fourth modifier (usually Control on the Mac).
+ *
+ * @class A KeyBinding represents of a key code and a modifier state that can be triggered by the user using the keyboard.
+ * @name orion.textview.KeyBinding
+ *
+ * @property {String|Number} keyCode The key code.
+ * @property {Boolean} mod1 The primary modifier (usually Command on Mac and Control on other platforms).
+ * @property {Boolean} mod2 The secondary modifier (usually Shift).
+ * @property {Boolean} mod3 The third modifier (usually Alt).
+ * @property {Boolean} mod4 The fourth modifier (usually Control on the Mac).
+ *
+ * @see orion.textview.TextView#setKeyBinding
+ */
function KeyBinding (keyCode, mod1, mod2, mod3, mod4) {
if (typeof(keyCode) === "string") {
this.keyCode = keyCode.toUpperCase().charCodeAt(0);
@@ -89,16 +365,10 @@ orion.textview.KeyBinding = (function() {
return true;
}
};
- return KeyBinding;
-}());
-
-if (typeof window !== "undefined" && typeof window.define !== "undefined") {
- define([], function() {
- return orion.textview;
- });
-}
-
+ return {KeyBinding: KeyBinding};
+}, "orion/textview");
/*******************************************************************************
+ * @license
* Copyright (c) 2010, 2011 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials are made
* available under the terms of the Eclipse Public License v1.0
@@ -108,49 +378,40 @@ if (typeof window !== "undefined" && typeof window.define !== "undefined") {
* Contributors: IBM Corporation - initial API and implementation
******************************************************************************/
-/*global window define setTimeout clearTimeout setInterval clearInterval Node */
+/*global define setTimeout clearTimeout setInterval clearInterval Node */
-/**
- * @namespace The global container for Orion APIs.
- */
-var orion = orion || {};
-/**
- * @namespace The container for textview APIs.
- */
-orion.textview = orion.textview || {};
+define(['orion/textview/tooltip'], function(mTooltip) {
-/**
- * Constructs a new ruler.
- * - * The default implementation does not implement all the methods in the interface - * and is useful only for objects implementing rulers. - *
- * - * @param {orion.textview.AnnotationModel} annotationModel the annotation model for the ruler. - * @param {String} [rulerLocation="left"] the location for the ruler. - * @param {String} [rulerOverview="page"] the overview for the ruler. - * @param {orion.textview.Style} [rulerStyle] the style for the ruler. - * - * @class This interface represents a ruler for the text view. - *- * A Ruler is a graphical element that is placed either on the left or on the right side of - * the view. It can be used to provide the view with per line decoration such as line numbering, - * bookmarks, breakpoints, folding disclosures, etc. - *
- * There are two types of rulers: page and document. A page ruler only shows the content for the lines that are - * visible, while a document ruler always shows the whole content. - *
- * See:+ * The default implementation does not implement all the methods in the interface + * and is useful only for objects implementing rulers. + *
+ * + * @param {orion.textview.AnnotationModel} annotationModel the annotation model for the ruler. + * @param {String} [rulerLocation="left"] the location for the ruler. + * @param {String} [rulerOverview="page"] the overview for the ruler. + * @param {orion.textview.Style} [rulerStyle] the style for the ruler. + * + * @class This interface represents a ruler for the text view. + *+ * A Ruler is a graphical element that is placed either on the left or on the right side of + * the view. It can be used to provide the view with per line decoration such as line numbering, + * bookmarks, breakpoints, folding disclosures, etc. + *
+ * There are two types of rulers: page and document. A page ruler only shows the content for the lines that are + * visible, while a document ruler always shows the whole content. + *
+ * See:See:
- * {@link orion.textview.Ruler}
- *
See:
+ * {@link orion.textview.Ruler}
+ *
- * See:
- * {@link orion.textview.AnnotationRuler}
- *
See:
- * {@link orion.textview.Ruler}
- * {@link orion.textview.Annotation}
- *
- * The overview ruler is used in conjunction with a AnnotationRuler, for each annotation in the - * AnnotationRuler this ruler displays a mark in the overview. Clicking on the mark causes the - * view to scroll to the annotated line. - *
- * - * @param {String} [rulerLocation="left"] the location for the ruler. - * @param {orion.textview.Style} [rulerStyle=undefined] the style for the ruler. - * @param {orion.textview.AnnotationRuler} [annotationRuler] the annotation ruler for the overview. - * - * @augments orion.textview.Ruler - * @class This objects implements an overview ruler. - * - *See:
- * {@link orion.textview.AnnotationRuler}
- * {@link orion.textview.Ruler}
- *
+ * See:
+ * {@link orion.textview.AnnotationRuler}
+ *
See:
+ * {@link orion.textview.Ruler}
+ * {@link orion.textview.Annotation}
+ *
+ * The overview ruler is used in conjunction with a AnnotationRuler, for each annotation in the + * AnnotationRuler this ruler displays a mark in the overview. Clicking on the mark causes the + * view to scroll to the annotated line. + *
+ * + * @param {orion.textview.AnnotationModel} annotationModel the annotation model for the ruler. + * @param {String} [rulerLocation="left"] the location for the ruler. + * @param {orion.textview.Style} [rulerStyle=undefined] the style for the ruler. + * + * @augments orion.textview.Ruler + * @class This objects implements an overview ruler. + * + *See:
+ * {@link orion.textview.AnnotationRuler}
+ * {@link orion.textview.Ruler}
+ *
See:
+ * {@link orion.textview.AnnotationRuler}
+ * {@link orion.textview.Ruler}
+ *
- * See:
- * {@link orion.textview.TextView}
- *
+ * See:
+ * {@link orion.textview.TextView}
+ *
- * See:
- * {@link orion.textview.TextView}
- * {@link orion.textview.TextView#setModel}
- *
+ * See:
+ * {@link orion.textview.TextView}
+ * {@link orion.textview.TextView#setModel}
+ *
AnnotationModel which is attached to a TextModel.
+ *
+ * See:
+ * {@link orion.textview.AnnotationModel}
+ * {@link orion.textview.Ruler}
+ *
TextModel.
+ *
+ * See:
+ * {@link orion.textview.Annotation}
+ * {@link orion.textview.TextModel}
+ *
The annotation model listeners are notified of this change.
+ * + * @param {orion.textview.Annotation} annotation the annotation to be added. + * + * @see #removeAnnotation + */ + addAnnotation: function(annotation) { + if (!annotation) { return; } + var annotations = this._annotations; + var index = this._binarySearch(annotations, annotation.start); + annotations.splice(index, 0, annotation); + var e = { + type: "Changed", + added: [annotation], + removed: [], + changed: [] + }; + this.onChanged(e); + }, + /** + * Returns the text model. + * + * @return {orion.textview.TextModel} The text model. + * + * @see #setTextModel + */ + getTextModel: function() { + return this._model; + }, + /** + * @class This object represents an annotation iterator. + *
+ * See:
+ * {@link orion.textview.AnnotationModel#getAnnotations}
+ *
The annotation model listeners are notified of this change.
+ * + * @param {orion.textview.Annotation} annotation the modified annotation. + * + * @see #addAnnotation + */ + modifyAnnotation: function(annotation) { + if (!annotation) { return; } + var index = this._getAnnotationIndex(annotation); + if (index < 0) { return; } + var e = { + type: "Changed", + added: [], + removed: [], + changed: [annotation] + }; + this.onChanged(e); + }, + /** + * Notifies all listeners that the annotation model has changed. + * + * @param {orion.textview.Annotation[]} added The list of annotation being added to the model. + * @param {orion.textview.Annotation[]} changed The list of annotation modified in the model. + * @param {orion.textview.Annotation[]} removed The list of annotation being removed from the model. + * @param {ModelChangedEvent} textModelChangedEvent the text model changed event that trigger this change, can be null if the change was trigger by a method call (for example, {@link #addAnnotation}). + */ + onChanged: function(e) { + return this.dispatchEvent(e); + }, + /** + * Removes all annotations of the giventype. All annotations
+ * are removed if the type is not specified.
+ * The annotation model listeners are notified of this change. Only one changed event is generated.
+ * + * @param {Object} type the type of annotations to be removed. + * + * @see #removeAnnotation + */ + removeAnnotations: function(type) { + var annotations = this._annotations; + var removed, i; + if (type) { + removed = []; + for (i = annotations.length - 1; i >= 0; i--) { + var annotation = annotations[i]; + if (annotation.type === type) { + annotations.splice(i, 1); + } + removed.splice(0, 0, annotation); + } + } else { + removed = annotations; + annotations = []; + } + var e = { + type: "Changed", + removed: removed, + added: [], + changed: [] + }; + this.onChanged(e); + }, + /** + * Removes an annotation from the annotation model. + *The annotation model listeners are notified of this change.
+ * + * @param {orion.textview.Annotation} annotation the annotation to be removed. + * + * @see #addAnnotation + */ + removeAnnotation: function(annotation) { + if (!annotation) { return; } + var index = this._getAnnotationIndex(annotation); + if (index < 0) { return; } + var e = { + type: "Changed", + removed: this._annotations.splice(index, 1), + added: [], + changed: [] + }; + this.onChanged(e); + }, + /** + * Removes and adds the specifed annotations to the annotation model. + *The annotation model listeners are notified of this change. Only one changed event is generated.
+ * + * @param {orion.textview.Annotation} remove the annotations to be removed. + * @param {orion.textview.Annotation} add the annotations to be added. + * + * @see #addAnnotation + * @see #removeAnnotation + */ + replaceAnnotations: function(remove, add) { + var annotations = this._annotations, i, index, annotation, removed = []; + if (remove) { + for (i = remove.length - 1; i >= 0; i--) { + annotation = remove[i]; + index = this._getAnnotationIndex(annotation); + if (index < 0) { continue; } + annotations.splice(index, 1); + removed.splice(0, 0, annotation); + } + } + if (!add) { add = []; } + for (i = 0; i < add.length; i++) { + annotation = add[i]; + index = this._binarySearch(annotations, annotation.start); + annotations.splice(index, 0, annotation); + } + var e = { + type: "Changed", + removed: removed, + added: add, + changed: [] + }; + this.onChanged(e); + }, + /** + * Sets the text model of the annotation model. The annotation + * model listens for changes in the text model to update and remove + * annotations that are affected by the change. + * + * @param {orion.textview.TextModel} textModel the text model. + * + * @see #getTextModel + */ + setTextModel: function(textModel) { + if (this._model) { + this._model.removeEventListener("Changed", this._listener.onChanged); + } + this._model = textModel; + if (this._model) { + this._model.addEventListener("Changed", this._listener.onChanged); + } + }, + /** @ignore */ + _binarySearch: function (array, offset) { + var high = array.length, low = -1, index; + while (high - low > 1) { + index = Math.floor((high + low) / 2); + if (offset <= array[index].start) { + high = index; + } else { + low = index; + } + } + return high; + }, + /** @ignore */ + _getAnnotationIndex: function(annotation) { + var annotations = this._annotations; + var index = this._binarySearch(annotations, annotation.start); + while (index < annotations.length && annotations[index].start === annotation.start) { + if (annotations[index] === annotation) { + return index; + } + index++; + } + return -1; + }, + /** @ignore */ + _onChanged: function(modelChangedEvent) { + var start = modelChangedEvent.start; + var addedCharCount = modelChangedEvent.addedCharCount; + var removedCharCount = modelChangedEvent.removedCharCount; + var annotations = this._annotations, end = start + removedCharCount; + //TODO binary search does not work for range intersection when there are overlaping ranges, need interval search tree for this + var startIndex = 0; + if (!(0 <= startIndex && startIndex < annotations.length)) { return; } + var e = { + type: "Changed", + added: [], + removed: [], + changed: [], + textModelChangedEvent: modelChangedEvent + }; + var changeCount = addedCharCount - removedCharCount, i; + for (i = startIndex; i < annotations.length; i++) { + var annotation = annotations[i]; + if (annotation.start >= end) { + annotation.start += changeCount; + annotation.end += changeCount; + e.changed.push(annotation); + } else if (annotation.end <= start) { + //nothing + } else if (annotation.start < start && end < annotation.end) { + annotation.end += changeCount; + e.changed.push(annotation); + } else { + annotations.splice(i, 1); + e.removed.push(annotation); + i--; + } + } + if (e.added.length > 0 || e.removed.length > 0 || e.changed.length > 0) { + this.onChanged(e); + } + } + }; + mEventTarget.EventTarget.addMixin(AnnotationModel.prototype); + + /** + * Constructs a new styler for annotations. + * + * @param {orion.textview.TextView} view The styler view. + * @param {orion.textview.AnnotationModel} view The styler annotation model. + * + * @class This object represents a styler for annotation attached to a text view. + * @name orion.textview.AnnotationStyler + */ + function AnnotationStyler (view, annotationModel) { + this._view = view; + this._annotationModel = annotationModel; + this._types = []; + var self = this; + this._listener = { + onDestroy: function(e) { + self._onDestroy(e); + }, + onLineStyle: function(e) { + self._onLineStyle(e); + }, + onChanged: function(e) { + self._onAnnotationModelChanged(e); + } + }; + view.addEventListener("Destroy", this._listener.onDestroy); + view.addEventListener("LineStyle", this._listener.onLineStyle); + annotationModel.addEventListener("Changed", this._listener.onChanged); + } + AnnotationStyler.prototype = /** @lends orion.textview.AnnotationStyler.prototype */ { + /** + * Adds an annotation type to the receiver. + *+ * Only annotations of the specified types will be shown by + * this receiver. + *
+ * + * @param type {Object} the annotation type to be shown + * + * @see #removeAnnotationType + * @see #isAnnotationTypeVisible + */ + addAnnotationType: function(type) { + this._types.push(type); + }, + /** + * Destroys the styler. + *+ * Removes all listeners added by this styler. + *
+ */ + destroy: function() { + var view = this._view; + if (view) { + view.removeEventListener("Destroy", this._listener.onDestroy); + view.removeEventListener("LineStyle", this._listener.onLineStyle); + this.view = null; + } + var annotationModel = this._annotationModel; + if (annotationModel) { + annotationModel.removeEventListener("Changed", this._listener.onChanged); + annotationModel = null; + } + }, + /** + * Returns whether the receiver shows annotations of the specified type. + * + * @param {Object} type the annotation type + * @returns {Boolean} whether the specified annotation type is shown + * + * @see #addAnnotationType + * @see #removeAnnotationType + */ + isAnnotationTypeVisible: function(type) { + for (var i = 0; i < this._types.length; i++) { + if (this._types[i] === type) { + return true; + } + } + return false; + }, + /** + * Removes an annotation type from the receiver. + * + * @param {Object} type the annotation type to be removed + * + * @see #addAnnotationType + * @see #isAnnotationTypeVisible + */ + removeAnnotationType: function(type) { + for (var i = 0; i < this._types.length; i++) { + if (this._types[i] === type) { + this._types.splice(i, 1); + break; + } + } + }, + _mergeStyle: function(result, style) { + if (style) { + if (!result) { result = {}; } + if (result.styleClass && style.styleClass && result.styleClass !== style.styleClass) { + result.styleClass += " " + style.styleClass; + } else { + result.styleClass = style.styleClass; + } + var prop; + if (style.style) { + if (!result.style) { result.style = {}; } + for (prop in style.style) { + if (!result.style[prop]) { + result.style[prop] = style.style[prop]; + } + } + } + if (style.attributes) { + if (!result.attributes) { result.attributes = {}; } + for (prop in style.attributes) { + if (!result.attributes[prop]) { + result.attributes[prop] = style.attributes[prop]; + } + } + } + } + return result; + }, + _mergeStyleRanges: function(ranges, styleRange) { + if (!ranges) { return; } + for (var i=0; i
+ * See:
+ * {@link orion.textview.TextView}
+ * {@link orion.textview.TextView#setOptions}
+ * {@link orion.textview.TextView#getOptions}
+ *
false.
+ */
+ hasFocus: function() {
+ return this._hasFocus;
+ },
/**
* Returns all action names defined in the text view.
* @@ -2466,6 +3206,7 @@ orion.textview.TextView = (function() { * @see #setTopIndex */ getBottomIndex: function(fullyVisible) { + if (!this._clientDiv) { return 0; } return this._getBottomIndex(fullyVisible); }, /** @@ -2483,6 +3224,7 @@ orion.textview.TextView = (function() { * @see #convert */ getBottomPixel: function() { + if (!this._clientDiv) { return 0; } return this._getScroll().y + this._getClientHeight(); }, /** @@ -2513,6 +3255,7 @@ orion.textview.TextView = (function() { * @see #convert */ getClientArea: function() { + if (!this._clientDiv) { return {x: 0, y: 0, width: 0, height: 0}; } var scroll = this._getScroll(); return {x: scroll.x, y: scroll.y, width: this._getClientWidth(), height: this._getClientHeight()}; }, @@ -2530,6 +3273,7 @@ orion.textview.TextView = (function() { * @see #convert */ getHorizontalPixel: function() { + if (!this._clientDiv) { return 0; } return this._getScroll().x; }, /** @@ -2561,6 +3305,7 @@ orion.textview.TextView = (function() { * @see #getLinePixel */ getLineHeight: function(lineIndex) { + if (!this._clientDiv) { return 0; } return this._getLineHeight(); }, /** @@ -2577,6 +3322,7 @@ orion.textview.TextView = (function() { * @see #convert */ getLinePixel: function(lineIndex) { + if (!this._clientDiv) { return 0; } lineIndex = Math.min(Math.max(0, lineIndex), this._model.getLineCount()); var lineHeight = this._getLineHeight(); return lineHeight * lineIndex; @@ -2596,6 +3342,7 @@ orion.textview.TextView = (function() { * @see #convert */ getLocationAtOffset: function(offset) { + if (!this._clientDiv) { return {x: 0, y: 0}; } var model = this._model; offset = Math.min(Math.max(0, offset), model.getCharCount()); var lineIndex = model.getLineAtOffset(offset); @@ -2606,6 +3353,44 @@ orion.textview.TextView = (function() { var y = this.getLinePixel(lineIndex); return {x: x, y: y}; }, + /** + * Returns the specified view options. + *
+ * The returned value is either a orion.textview.TextViewOptions or an option value. An option value is returned when only one string paremeter
+ * is specified. A orion.textview.TextViewOptions is returned when there are no paremeters, or the parameters are a list of options names or a
+ * orion.textview.TextViewOptions. All view options are returned when there no paremeters.
+ *
@@ -2782,7 +3592,7 @@ orion.textview.TextView = (function() { * @see #destroy */ onDestroy: function(destroyEvent) { - this._eventTable.sendEvent("Destroy", destroyEvent); + return this.dispatchEvent(destroyEvent); }, /** * @class This object is used to define style information for the text view. @@ -2834,7 +3644,25 @@ orion.textview.TextView = (function() { * @param {orion.textview.LineStyleEvent} lineStyleEvent the event */ onLineStyle: function(lineStyleEvent) { - this._eventTable.sendEvent("LineStyle", lineStyleEvent); + return this.dispatchEvent(lineStyleEvent); + }, + /** + * @class This is the event sent when the text view has loaded its contents. + *
+ * See:
+ * {@link orion.textview.TextView}
+ * {@link orion.textview.TextView#event:onLoad}
+ *
+ * See:
+ * {@link orion.textview.TextView}
+ * {@link orion.textview.TextView#event:onLoad}
+ *
+ * See:
+ * {@link orion.textview.TextView}
+ * {@link orion.textview.TextView#event:onFocus}
+ *
+ * See:
+ * {@link orion.textview.TextView}
+ * {@link orion.textview.TextView#event:onBlur}
+ *
- * All the parameters must be the same ones used to add the listener. - *
- * - * @param {String} type the event type. - * @param {Object} context the context of the function. - * @param {Function} func the function that will be executed when the event happens. - * @param {Object} [data] optional data passed to the function. - * - * @see #addEventListener - */ - removeEventListener: function(type, context, func, data) { - this._eventTable.removeEventListener(type, context, func, data); - }, /** * Removes a ruler from the text view. * @@ -3187,19 +4092,28 @@ orion.textview.TextView = (function() { * @see #convert */ setHorizontalPixel: function(pixel) { + if (!this._clientDiv) { return; } pixel = Math.max(0, pixel); this._scrollView(pixel - this._getScroll().x, 0); }, + /** + * Sets whether the view should update the DOM. + *+ * This can be used to improve the performance. + *
+ * When the flag is set to true,
+ * the entire view is marked as needing to be redrawn.
+ * Nested calls to this method are stacked.
+ *
@@ -3307,14 +4269,7 @@ orion.textview.TextView = (function() { * force the clientDiv to loose and receive focus if the it is focused. */ if (isFirefox) { - var clientDiv = this._clientDiv; - if (clientDiv) { - var hasFocus = this._hasFocus; - if (hasFocus) { clientDiv.blur(); } - clientDiv.contentEditable = false; - clientDiv.contentEditable = true; - if (hasFocus) { clientDiv.focus(); } - } + this._fixCaret(); } } }, @@ -3331,6 +4286,7 @@ orion.textview.TextView = (function() { * @see #getTopIndex */ setTopIndex: function(topIndex) { + if (!this._clientDiv) { return; } var model = this._model; if (model.getCharCount() === 0) { return; @@ -3361,6 +4317,7 @@ orion.textview.TextView = (function() { * @see #convert */ setTopPixel: function(pixel) { + if (!this._clientDiv) { return; } var lineHeight = this._getLineHeight(); var clientHeight = this._getClientHeight(); var lineCount = this._model.getLineCount(); @@ -3382,6 +4339,12 @@ orion.textview.TextView = (function() { /**************************************** Event handlers *********************************/ _handleBodyMouseDown: function (e) { if (!e) { e = window.event; } + if (isFirefox) { + this._clientDiv.contentEditable = false; + (this._overlayDiv || this._clientDiv).draggable = true; + this._ignoreBlur = true; + } + /* * Prevent clicks outside of the view from taking focus * away the view. Note that in Firefox and Opera clicking on the @@ -3389,7 +4352,7 @@ orion.textview.TextView = (function() { * do not have this problem and stopping the click over the * scrollbar for them causes mouse capture problems. */ - var topNode = isOpera ? this._clientDiv : this._overlayDiv || this._viewDiv; + var topNode = isOpera || (isFirefox && !this._overlayDiv) ? this._clientDiv : this._overlayDiv || this._viewDiv; var temp = e.target ? e.target : e.srcElement; while (temp) { @@ -3409,8 +4372,26 @@ orion.textview.TextView = (function() { setTimeout(function() { topNode.releaseCapture(); }, 0); } }, + _handleBodyMouseUp: function (e) { + if (!e) { e = window.event; } + if (isFirefox) { + this._clientDiv.contentEditable = true; + (this._overlayDiv || this._clientDiv).draggable = false; + + /* + * Bug in Firefox. For some reason, Firefox stops showing the caret + * in some cases. For example when the user cancels a drag operation + * by pressing ESC. The fix is to detect that the drag operation was + * cancelled, toggle the contentEditable state and force the clientDiv + * to loose and receive focus if the it is focused. + */ + this._fixCaret(); + this._ignoreBlur = false; + } + }, _handleBlur: function (e) { if (!e) { e = window.event; } + if (this._ignoreBlur) { return; } this._hasFocus = false; /* * Bug in IE 8 and earlier. For some reason when text is deselected @@ -3434,15 +4415,27 @@ orion.textview.TextView = (function() { this._selDiv3.style.background = color; } } + if (!this._ignoreFocus) { + this.onBlur({type: "Blur"}); + } }, _handleContextMenu: function (e) { if (!e) { e = window.event; } - var scroll = this._getScroll(); - var viewRect = this._viewDiv.getBoundingClientRect(); - var viewPad = this._getViewPadding(); - var x = e.clientX + scroll.x - viewRect.left - viewPad.left; - var y = e.clientY + scroll.y - viewRect.top - viewPad.top; - this.onContextMenu({x: x, y: y, screenX: e.screenX, screenY: e.screenY}); + if (isFirefox && this._lastMouseButton === 3) { + // We need to update the DOM selection, because on + // right-click the caret moves to the mouse location. + // See bug 366312. + var timeDiff = e.timeStamp - this._lastMouseTime; + if (timeDiff <= this._clickTime) { + this._updateDOMSelection(); + } + } + if (this.isListening("ContextMenu")) { + var evt = this._createMouseEvent("ContextMenu", e); + evt.screenX = e.screenX; + evt.screenY = e.screenY; + this.onContextMenu(evt); + } if (e.preventDefault) { e.preventDefault(); } return false; }, @@ -3494,129 +4487,98 @@ orion.textview.TextView = (function() { }, _handleDragStart: function (e) { if (!e) { e = window.event; } - if (isDnD) { - var sel = this._getSelection(); - var text = !sel.isEmpty() ? this._getBaseText(sel.start, sel.end) : ""; - if (text) { - e.dataTransfer.effectAllowed = "copyMove"; - e.dataTransfer.setData("text/plain", text); - // TODO: generate a drag image to be a better visual indicatator of the drag operation. - this._dragStartSelection = {start: sel.start, end: sel.end}; - this.focus(); - return; - } + if (isFirefox) { + var self = this; + setTimeout(function() { + self._clientDiv.contentEditable = true; + self._clientDiv.draggable = false; + self._ignoreBlur = false; + }, 0); + } + if (this.isListening("DragStart") && this._dragOffset !== -1) { + this._isMouseDown = false; + this.onDragStart(this._createMouseEvent("DragStart", e)); + this._dragOffset = -1; + } else { + if (e.preventDefault) { e.preventDefault(); } + return false; + } + }, + _handleDrag: function (e) { + if (!e) { e = window.event; } + if (this.isListening("Drag")) { + this.onDrag(this._createMouseEvent("Drag", e)); } - if (e.preventDefault) { e.preventDefault(); } - return false; }, _handleDragEnd: function (e) { if (!e) { e = window.event; } - if (e.preventDefault) { e.preventDefault(); } - var startSel = this._dragStartSelection; - var drop = this._dropDestination; - if (startSel && e.dataTransfer.dropEffect === "move") { - var offset = 0; - if (drop && drop.offset < Math.min(startSel.start, startSel.end)) { - offset = drop.length; - } - var change = { - text: "", - start: startSel.start + offset, - end: startSel.end + offset - }; - this._modifyContent(change, false); + this._dropTarget = false; + this._dragOffset = -1; + if (this.isListening("DragEnd")) { + this.onDragEnd(this._createMouseEvent("DragEnd", e)); } - if (this._undoStack && drop) { - this._undoStack.endCompoundChange(); + if (isFirefox) { + this._fixCaret(); } - this._dragNode.draggable = false; - this._dragStartSelection = null; - this._dropDestination = null; - return false; }, _handleDragEnter: function (e) { if (!e) { e = window.event; } - if (e.preventDefault) { e.preventDefault(); } - var types = e.dataTransfer.types; - var allowed = false; - var types = isDnD ? e.dataTransfer.types : null; - if (types) { - // Firefox gives a .types of type StringList, while Webkit gives us an actual string. - allowed = types.contains ? types.contains("text/plain") : types.indexOf("text/plain"); + var prevent = true; + this._dropTarget = true; + if (this.isListening("DragEnter")) { + prevent = false; + this.onDragEnter(this._createMouseEvent("DragEnter", e)); } - if (allowed) { - e.dataTransfer.dropEffect = "copyMove"; - this.focus(); - return true; + /* + * Webkit will not send drop events if this event is not prevented, as spec in HTML5. + * Firefox and IE do not follow this spec for contentEditable. Note that preventing this + * event will result is loss of functionality (insertion mark, etc). + */ + if (isWebkit || prevent) { + if (e.preventDefault) { e.preventDefault(); } + return false; } - e.dataTransfer.dropEffect = "none"; - return false; }, _handleDragOver: function (e) { if (!e) { e = window.event; } - if (e.preventDefault) { e.preventDefault(); } - var allowed = false; - var types = isDnD ? e.dataTransfer.types : null; - if (types) { - allowed = types.contains ? types.contains("text/plain") : types.indexOf("text/plain"); + var prevent = true; + if (this.isListening("DragOver")) { + prevent = false; + this.onDragOver(this._createMouseEvent("DragOver", e)); } - if (!allowed) { - e.dataTransfer.dropEffect = "none"; + /* + * Webkit will not send drop events if this event is not prevented, as spec in HTML5. + * Firefox and IE do not follow this spec for contentEditable. Note that preventing this + * event will result is loss of functionality (insertion mark, etc). + */ + if (isWebkit || prevent) { + if (prevent) { e.dataTransfer.dropEffect = "none"; } + if (e.preventDefault) { e.preventDefault(); } return false; } - - var destLine = this._getYToLine(e.clientY); - var destOffset = this._getXToOffset(destLine, e.clientX); - - var startSel = this._dragStartSelection; - if (startSel && startSel.start <= destOffset && destOffset <= startSel.end) { - e.dataTransfer.dropEffect = "none"; - return false; + }, + _handleDragLeave: function (e) { + if (!e) { e = window.event; } + this._dropTarget = false; + if (this.isListening("DragLeave")) { + this.onDragLeave(this._createMouseEvent("DragLeave", e)); } - - if (!startSel) { - // Hide the selection when the user drags something coming from the outside. - // TODO: make sure the cursor is actually visible. It's not visible in Firefox during drag, only in Chrome... - this.setSelection(destOffset, destOffset, true); - } - - return true; }, _handleDrop: function (e) { if (!e) { e = window.event; } + this._dropTarget = false; + if (this.isListening("Drop")) { + this.onDrop(this._createMouseEvent("Drop", e)); + } + /* + * This event must be prevented otherwise the user agent will modify + * the DOM. Note that preventing the event on some user agents (i.e. IE) + * indicates that the operation is cancelled. This causes the dropEffect to + * be set to none in the dragend event causing the implementor to not execute + * the code responsible by the move effect. + */ if (e.preventDefault) { e.preventDefault(); } - var allowed = false; - var types = isDnD ? e.dataTransfer.types : null; - if (types) { - allowed = types.contains ? types.contains("text/plain") : types.indexOf("text/plain"); - } - if (!allowed) { - return false; - } - - var destLine = this._getYToLine(e.clientY); - var destOffset = this._getXToOffset(destLine, e.clientX); - var startSel = this._dragStartSelection; - - if (startSel && startSel.start <= destOffset && destOffset <= startSel.end) { - return false; - } - - var text = e.dataTransfer.getData("text/plain"); - this.setSelection(destOffset, destOffset, true); - - if (startSel) { - this._dropDestination = {offset: destOffset, length: text.length}; - if (this._undoStack) { - this._undoStack.startCompoundChange(); - } - } else { - this._dragNode.draggable = false; - } - - this._doContent(text); - this.focus(); - return true; + return false; }, _handleDocFocus: function (e) { if (!e) { e = window.event; } @@ -3642,6 +4604,9 @@ orion.textview.TextView = (function() { this._selDiv3.style.background = color; } } + if (!this._ignoreFocus) { + this.onFocus({type: "Focus"}); + } }, _handleKeyDown: function (e) { if (!e) { e = window.event; } @@ -3662,7 +4627,7 @@ orion.textview.TextView = (function() { this._setLinksVisible(false); } if (e.keyCode === 229) { - if (this.readonly) { + if (this._readonly) { if (e.preventDefault) { e.preventDefault(); } return false; } @@ -3775,21 +4740,26 @@ orion.textview.TextView = (function() { _handleLoad: function (e) { var state = this._getVisible(); if (state === "visible" || (state === "hidden" && isWebkit)) { - this._createView(!e); + this._createView(); } }, _handleMouse: function (e) { + var result = true; var target = this._frameWindow; - if (isIE) { target = this._clientDiv; } + if (isIE || (isFirefox && !this._overlayDiv)) { target = this._clientDiv; } if (this._overlayDiv) { + if (this._hasFocus) { + this._ignoreFocus = true; + } var self = this; setTimeout(function () { self.focus(); + self._ignoreFocus = false; }, 0); } if (this._clickCount === 1) { - this._setGrab(target); - this._setSelectionTo(e.clientX, e.clientY, e.shiftKey); + result = this._setSelectionTo(e.clientX, e.clientY, e.shiftKey, !isOpera && this.isListening("DragStart")); + if (result) { this._setGrab(target); } } else { /* * Feature in IE8 and older, the sequence of events in the IE8 event model @@ -3810,9 +4780,13 @@ orion.textview.TextView = (function() { this._setSelectionTo(e.clientX, e.clientY, e.shiftKey); this._doubleClickSelection = this._getSelection(); } + return result; }, _handleMouseDown: function (e) { if (!e) { e = window.event; } + if (this.isListening("MouseDown")) { + this.onMouseDown(this._createMouseEvent("MouseDown", e)); + } if (this._linksVisible) { var target = e.target || e.srcElement; if (target.tagName !== "A") { @@ -3821,59 +4795,82 @@ orion.textview.TextView = (function() { return; } } - var left = e.which ? e.button === 0 : e.button === 1; this._commitIME(); - if (left) { - var deltaX = Math.abs(this._lastMouseX - e.clientX); - var deltaY = Math.abs(this._lastMouseY - e.clientY); - var time = e.timeStamp ? e.timeStamp : new Date().getTime(); - if ((time - this._lastMouseTime) <= this._clickTime && deltaX <= this._clickDist && deltaY <= this._clickDist) { + + var button = e.which; // 1 - left, 2 - middle, 3 - right + if (!button) { + // if IE 8 or older + if (e.button === 4) { button = 2; } + if (e.button === 2) { button = 3; } + if (e.button === 1) { button = 1; } + } + + // For middle click we always need getTime(). See _getClipboardText(). + var time = button !== 2 && e.timeStamp ? e.timeStamp : new Date().getTime(); + var timeDiff = time - this._lastMouseTime; + var deltaX = Math.abs(this._lastMouseX - e.clientX); + var deltaY = Math.abs(this._lastMouseY - e.clientY); + var sameButton = this._lastMouseButton === button; + this._lastMouseX = e.clientX; + this._lastMouseY = e.clientY; + this._lastMouseTime = time; + this._lastMouseButton = button; + + if (button === 1) { + this._isMouseDown = true; + if (sameButton && timeDiff <= this._clickTime && deltaX <= this._clickDist && deltaY <= this._clickDist) { this._clickCount++; } else { this._clickCount = 1; } - this._lastMouseX = e.clientX; - this._lastMouseY = e.clientY; - this._lastMouseTime = time; - - // Selection drag support - if (isDnD && this._clickCount === 1) { - var inSelection = false; - var selection = this._getSelection(); - if (!selection.isEmpty()) { - var clickLine = this._getYToLine(e.clientY); - var clickOffset = this._getXToOffset(clickLine, e.clientX); - inSelection = selection.start < clickOffset && clickOffset < selection.end; - } - - // Webkit fails to allow dragging if .draggable is set to true during mousedown. - // But Firefox makes it a requirement to set .draggable to true. - this._dragNode.draggable = !isWebkit && inSelection; - - if (inSelection) { - return; // allow the dragstart event - } - } - if (this._dragNode && this._dragNode.draggable) { - this._dragNode.draggable = false; - } - - this._isMouseDown = true; - this._handleMouse(e); - if (isOpera || isChrome) { + if (this._handleMouse(e) && (isOpera || isChrome || (isFirefox && !this._overlayDiv))) { if (!this._hasFocus) { this.focus(); } - } - if (e.preventDefault) { e.preventDefault(); } } }, + _handleMouseOver: function (e) { + if (!e) { e = window.event; } + if (this.isListening("MouseOver")) { + this.onMouseOver(this._createMouseEvent("MouseOver", e)); + } + }, + _handleMouseOut: function (e) { + if (!e) { e = window.event; } + if (this.isListening("MouseOut")) { + this.onMouseOut(this._createMouseEvent("MouseOut", e)); + } + }, _handleMouseMove: function (e) { if (!e) { e = window.event; } - this._setLinksVisible(!this._isMouseDown && (isMac ? e.metaKey : e.ctrlKey)); - if (!this._isMouseDown) { + if (this.isListening("MouseMove")) { + var topNode = this._overlayDiv || this._clientDiv; + var temp = e.target ? e.target : e.srcElement; + while (temp) { + if (topNode === temp) { + this.onMouseMove(this._createMouseEvent("MouseMove", e)); + break; + } + temp = temp.parentNode; + } + } + if (this._dropTarget) { + return; + } + /* + * Bug in IE9. IE sends one mouse event when the user changes the text by + * pasting or undo. These operations usually happen with the Ctrl key + * down which causes the view to enter link mode. Link mode does not end + * because there are no further events. The fix is to only enter link + * mode when the coordinates of the mouse move event have changed. + */ + var changed = this._linksVisible || this._lastMouseMoveX !== e.clientX || this._lastMouseMoveY !== e.clientY; + this._lastMouseMoveX = e.clientX; + this._lastMouseMoveY = e.clientY; + this._setLinksVisible(changed && !this._isMouseDown && (isMac ? e.metaKey : e.ctrlKey)); + if (!this._isMouseDown || this._dragOffset !== -1) { return; } /* @@ -3946,21 +4943,36 @@ orion.textview.TextView = (function() { } } }, + _createMouseEvent: function(type, e) { + var scroll = this._getScroll(); + var viewRect = this._viewDiv.getBoundingClientRect(); + var viewPad = this._getViewPadding(); + var x = e.clientX + scroll.x - viewRect.left - viewPad.left; + var y = e.clientY + scroll.y - viewRect.top; + return { + type: type, + event: e, + x: x, + y: y + }; + }, _handleMouseUp: function (e) { if (!e) { e = window.event; } + if (this.isListening("MouseUp")) { + this.onMouseUp(this._createMouseEvent("MouseUp", e)); + } if (this._linksVisible) { return; } var left = e.which ? e.button === 0 : e.button === 1; if (left) { - if (this._dragNode && this._dragNode.draggable) { - this._dragNode.draggable = false; - if (!this._dragStartSelection) { - this._setSelectionTo(e.clientX, e.clientY, false); - } - this.focus(); + if (this._dragOffset !== -1) { + var selection = this._getSelection(); + selection.extend(this._dragOffset); + selection.collapse(); + this._setSelection(selection, true, true); + this._dragOffset = -1; } - this._isMouseDown = false; this._endAutoScroll(); @@ -3978,6 +4990,17 @@ orion.textview.TextView = (function() { * mouse down and ungrab on mouse move when the button 1 is not set. */ if (isW3CEvents) { this._setGrab(null); } + + /* + * Note that there cases when Firefox sets the DOM selection in mouse up. + * This happens for example after a cancelled drag operation. + * + * Note that on Chrome and IE, the caret stops blicking if mouse up is + * prevented. + */ + if (isFirefox) { + e.preventDefault(); + } } }, _handleMouseWheel: function (e) { @@ -4062,7 +5085,11 @@ orion.textview.TextView = (function() { * Bug in IE, */ var self = this; - setTimeout(function() {self._updateDOMSelection();}, 0); + this._ignoreFocus = true; + setTimeout(function() { + self._updateDOMSelection(); + this._ignoreFocus = false; + }, 0); } if (e.preventDefault) { e.preventDefault(); } return false; @@ -4130,8 +5157,9 @@ orion.textview.TextView = (function() { this._hScroll = scroll.x; this._vScroll = scroll.y; this._commitIME(); - this._updatePage(); + this._updatePage(oldY === scroll.y); var e = { + type: "Scroll", oldValue: {x: oldX, y: oldY}, newValue: scroll }; @@ -4320,7 +5348,7 @@ orion.textview.TextView = (function() { } }, 0); } -// e.preventDefault(); +// e.preventDefault(); }, /************************************ Actions ******************************************/ @@ -4360,12 +5388,22 @@ orion.textview.TextView = (function() { var model = this._model; var caret = selection.getCaret(); var lineIndex = model.getLineAtOffset(caret); - if (caret === model.getLineStart(lineIndex)) { + var lineStart = model.getLineStart(lineIndex); + if (caret === lineStart) { if (lineIndex > 0) { selection.extend(model.getLineEnd(lineIndex - 1)); } } else { - selection.extend(this._getOffset(caret, args.unit, -1)); + var removeTab = false; + if (this._expandTab && args.unit === "character" && (caret - lineStart) % this._tabSize === 0) { + var lineText = model.getText(lineStart, caret); + removeTab = !/[^ ]/.test(lineText); // Only spaces between line start and caret. + } + if (removeTab) { + selection.extend(caret - this._tabSize); + } else { + selection.extend(this._getOffset(caret, args.unit, -1)); + } } } this._modifyContent({text: "", start: selection.start, end: selection.end}, true); @@ -4491,7 +5529,7 @@ orion.textview.TextView = (function() { if (lineIndex + 1 < model.getLineCount()) { var scrollX = this._getScroll().x; var x = this._columnX; - if (x === -1 || args.select || args.wholeLine) { + if (x === -1 || args.wholeLine || (args.select && isIE)) { var offset = args.wholeLine ? model.getLineEnd(lineIndex + 1) : caret; x = this._getOffsetToX(offset) + scrollX; } @@ -4510,7 +5548,7 @@ orion.textview.TextView = (function() { if (lineIndex > 0) { var scrollX = this._getScroll().x; var x = this._columnX; - if (x === -1 || args.select || args.wholeLine) { + if (x === -1 || args.wholeLine || (args.select && isIE)) { var offset = args.wholeLine ? model.getLineStart(lineIndex - 1) : caret; x = this._getOffsetToX(offset) + scrollX; } @@ -4535,7 +5573,7 @@ orion.textview.TextView = (function() { var scrollLines = Math.min(lineCount - caretLine - 1, lines); scrollLines = Math.max(1, scrollLines); var x = this._columnX; - if (x === -1 || args.select) { + if (x === -1 || (args.select && isIE)) { x = this._getOffsetToX(caret) + scroll.x; } selection.extend(this._getXToOffset(caretLine + scrollLines, x - scroll.x)); @@ -4562,7 +5600,7 @@ orion.textview.TextView = (function() { var lines = Math.floor(clientHeight / lineHeight); var scrollLines = Math.max(1, Math.min(caretLine, lines)); var x = this._columnX; - if (x === -1 || args.select) { + if (x === -1 || (args.select && isIE)) { x = this._getOffsetToX(caret) + scroll.x; } selection.extend(this._getXToOffset(caretLine - scrollLines, x - scroll.x)); @@ -4574,11 +5612,19 @@ orion.textview.TextView = (function() { return true; }, _doPaste: function(e) { - var text = this._getClipboardText(e); - if (text) { - this._doContent(text); - } - return text !== null; + var self = this; + var result = this._getClipboardText(e, function(text) { + if (text) { + if (isLinux && self._lastMouseButton === 2) { + var timeDiff = new Date().getTime() - self._lastMouseTime; + if (timeDiff <= self._clickTime) { + self._setSelectionTo(self._lastMouseX, self._lastMouseY); + } + } + self._doContent(text); + } + }); + return result !== null; }, _doScroll: function (args) { var type = args.type; @@ -4616,12 +5662,27 @@ orion.textview.TextView = (function() { return true; }, _doTab: function (args) { - this._doContent("\t"); + var text = "\t"; + if (this._expandTab) { + var model = this._model; + var caret = this._getSelection().getCaret(); + var lineIndex = model.getLineAtOffset(caret); + var lineStart = model.getLineStart(lineIndex); + var spaces = this._tabSize - ((caret - lineStart) % this._tabSize); + text = (new Array(spaces + 1)).join(" "); + } + this._doContent(text); return true; }, /************************************ Internals ******************************************/ - _applyStyle: function(style, node) { + _applyStyle: function(style, node, reset) { + if (reset) { + var attrs = node.attributes; + for (var i= attrs.length; i-->0;) { + node.removeAttributeNode(attrs[i]); + } + } if (!style) { return; } @@ -4710,7 +5771,17 @@ orion.textview.TextView = (function() { if (h4 > h3) { fontStyle = 3; } - this._largestFontStyle = fontStyle; + var style; + if (fontStyle !== 0) { + style = {style: {}}; + if ((fontStyle & 1) !== 0) { + style.style.fontStyle = "italic"; + } + if ((fontStyle & 2) !== 0) { + style.style.fontWeight = "bold"; + } + } + this._largestFontStyle = style; parent.removeChild(line); return lineHeight; }, @@ -4754,6 +5825,40 @@ orion.textview.TextView = (function() { this._setSelection(selection, true); return true; }, + _clone: function (obj) { + /*Note that this code only works because of the limited types used in TextViewOptions */ + if (obj instanceof Array) { + return obj.slice(0); + } + return obj; + }, + _compare: function (s1, s2) { + if (s1 === s2) { return true; } + if (s1 && !s2 || !s1 && s2) { return false; } + if ((s1 && s1.constructor === String) || (s2 && s2.constructor === String)) { return false; } + if (s1 instanceof Array || s2 instanceof Array) { + if (!(s1 instanceof Array && s2 instanceof Array)) { return false; } + if (s1.length !== s2.length) { return false; } + for (var i = 0; i < s1.length; i++) { + if (!this._compare(s1[i], s2[i])) { + return false; + } + } + return true; + } + if (!(s1 instanceof Object) || !(s2 instanceof Object)) { return false; } + var p; + for (p in s1) { + if (s1.hasOwnProperty(p)) { + if (!s2.hasOwnProperty(p)) { return false; } + if (!this._compare(s1[p], s2[p])) {return false; } + } + } + for (p in s2) { + if (!s1.hasOwnProperty(p)) { return false; } + } + return true; + }, _commitIME: function () { if (this._imeOffset === -1) { return; } // make the state of the IME match the state the view expects it be in @@ -4805,7 +5910,7 @@ orion.textview.TextView = (function() { } }, _createActions: function () { - var KeyBinding = orion.textview.KeyBinding; + var KeyBinding = mKeyBinding.KeyBinding; //no duplicate keybindings var bindings = this._keyBindings = []; @@ -4827,20 +5932,27 @@ orion.textview.TextView = (function() { bindings.push({name: "scrollTextEnd", keyBinding: new KeyBinding(35), predefined: true}); bindings.push({name: "textStart", keyBinding: new KeyBinding(38, true), predefined: true}); bindings.push({name: "textEnd", keyBinding: new KeyBinding(40, true), predefined: true}); + bindings.push({name: "scrollPageUp", keyBinding: new KeyBinding(38, null, null, null, true), predefined: true}); + bindings.push({name: "scrollPageDown", keyBinding: new KeyBinding(40, null, null, null, true), predefined: true}); + bindings.push({name: "lineStart", keyBinding: new KeyBinding(37, null, null, null, true), predefined: true}); + bindings.push({name: "lineEnd", keyBinding: new KeyBinding(39, null, null, null, true), predefined: true}); + //TODO These two actions should be changed to paragraph start and paragraph end when word wrap is implemented + bindings.push({name: "lineStart", keyBinding: new KeyBinding(38, null, null, true), predefined: true}); + bindings.push({name: "lineEnd", keyBinding: new KeyBinding(40, null, null, true), predefined: true}); } else { bindings.push({name: "pageUp", keyBinding: new KeyBinding(33), predefined: true}); bindings.push({name: "pageDown", keyBinding: new KeyBinding(34), predefined: true}); bindings.push({name: "lineStart", keyBinding: new KeyBinding(36), predefined: true}); bindings.push({name: "lineEnd", keyBinding: new KeyBinding(35), predefined: true}); - if (isLinux) { - bindings.push({name: "lineStartUp", keyBinding: new KeyBinding(38, true), predefined: true}); - bindings.push({name: "lineEndDown", keyBinding: new KeyBinding(40, true), predefined: true}); - } bindings.push({name: "wordPrevious", keyBinding: new KeyBinding(37, true), predefined: true}); bindings.push({name: "wordNext", keyBinding: new KeyBinding(39, true), predefined: true}); bindings.push({name: "textStart", keyBinding: new KeyBinding(36, true), predefined: true}); bindings.push({name: "textEnd", keyBinding: new KeyBinding(35, true), predefined: true}); } + if (isFirefox && isLinux) { + bindings.push({name: "lineUp", keyBinding: new KeyBinding(38, true), predefined: true}); + bindings.push({name: "lineDown", keyBinding: new KeyBinding(40, true), predefined: true}); + } // Select Cursor Navigation bindings.push({name: "selectLineUp", keyBinding: new KeyBinding(38, null, true), predefined: true}); @@ -4858,6 +5970,11 @@ orion.textview.TextView = (function() { bindings.push({name: "selectTextEnd", keyBinding: new KeyBinding(35, null, true), predefined: true}); bindings.push({name: "selectTextStart", keyBinding: new KeyBinding(38, true, true), predefined: true}); bindings.push({name: "selectTextEnd", keyBinding: new KeyBinding(40, true, true), predefined: true}); + bindings.push({name: "selectLineStart", keyBinding: new KeyBinding(37, null, true, null, true), predefined: true}); + bindings.push({name: "selectLineEnd", keyBinding: new KeyBinding(39, null, true, null, true), predefined: true}); + //TODO These two actions should be changed to select paragraph start and select paragraph end when word wrap is implemented + bindings.push({name: "selectLineStart", keyBinding: new KeyBinding(38, null, true, true), predefined: true}); + bindings.push({name: "selectLineEnd", keyBinding: new KeyBinding(40, null, true, true), predefined: true}); } else { if (isLinux) { bindings.push({name: "selectWholeLineUp", keyBinding: new KeyBinding(38, true, true), predefined: true}); @@ -4936,8 +6053,6 @@ orion.textview.TextView = (function() { {name: "lineDown", defaultHandler: function() {return self._doLineDown({select: false});}}, {name: "lineStart", defaultHandler: function() {return self._doHome({select: false, ctrl:false});}}, {name: "lineEnd", defaultHandler: function() {return self._doEnd({select: false, ctrl:false});}}, - {name: "lineStartUp", defaultHandler: function() {return self._doLineUp({select: false, wholeLine:true});}}, - {name: "lineEndDown", defaultHandler: function() {return self._doLineDown({select: false, wholeLine:true});}}, {name: "charPrevious", defaultHandler: function() {return self._doCursorPrevious({select: false, unit:"character"});}}, {name: "charNext", defaultHandler: function() {return self._doCursorNext({select: false, unit:"character"});}}, {name: "pageUp", defaultHandler: function() {return self._doPageUp({select: false});}}, @@ -4982,49 +6097,20 @@ orion.textview.TextView = (function() { {name: "paste", defaultHandler: function() {return self._doPaste();}} ]; }, - _createLine: function(parent, sibling, document, lineIndex, model) { + _createLine: function(parent, div, document, lineIndex, model) { var lineText = model.getLine(lineIndex); var lineStart = model.getLineStart(lineIndex); - var e = {textView: this, lineIndex: lineIndex, lineText: lineText, lineStart: lineStart}; + var e = {type:"LineStyle", textView: this, lineIndex: lineIndex, lineText: lineText, lineStart: lineStart}; this.onLineStyle(e); - var child = document.createElement("DIV"); - child.lineIndex = lineIndex; - this._applyStyle(e.style, child); - if (lineText.length !== 0) { - var start = 0; - var tabSize = this._customTabSize; - if (tabSize && tabSize !== 8) { - var tabIndex = lineText.indexOf("\t"), ignoreChars = 0; - while (tabIndex !== -1) { - this._createRanges(child, document, e.ranges, start, tabIndex, lineText, lineStart); - var spacesCount = tabSize - ((tabIndex + ignoreChars) % tabSize); - var spaces = "\u00A0"; - for (var i = 1; i < spacesCount; i++) { - spaces += " "; - } - var tabSpan = document.createElement("SPAN"); - tabSpan.appendChild(document.createTextNode(spaces)); - tabSpan.ignoreChars = spacesCount - 1; - ignoreChars += tabSpan.ignoreChars; - if (e.ranges) { - for (var j = 0; j < e.ranges.length; j++) { - var range = e.ranges[j]; - var styleStart = range.start - lineStart; - var styleEnd = range.end - lineStart; - if (styleStart > tabIndex) { break; } - if (styleStart <= tabIndex && tabIndex < styleEnd) { - this._applyStyle(range.style, tabSpan); - break; - } - } - } - child.appendChild(tabSpan); - start = tabIndex + 1; - tabIndex = lineText.indexOf("\t", start); - } - } - this._createRanges(child, document, e.ranges, start, lineText.length, lineText, lineStart); + var lineDiv = div || document.createElement("DIV"); + if (!div || !this._compare(div.viewStyle, e.style)) { + this._applyStyle(e.style, lineDiv, div); + lineDiv.viewStyle = e.style; } + lineDiv.lineIndex = lineIndex; + var ranges = []; + var data = {tabOffset: 0, ranges: ranges}; + this._createRanges(e.ranges, lineText, 0, lineText.length, lineStart, data); /* * A trailing span with a whitespace is added for three different reasons: @@ -5034,14 +6120,6 @@ orion.textview.TextView = (function() { * selection at the end of the line when the line is fully selected. * 3. The height of a div with only an empty span is zero. */ - var span = document.createElement("SPAN"); - span.ignoreChars = 1; - if ((this._largestFontStyle & 1) !== 0) { - span.style.fontStyle = "italic"; - } - if ((this._largestFontStyle & 2) !== 0) { - span.style.fontWeight = "bold"; - } var c = " "; if (!this._fullSelection && isIE < 9) { /* @@ -5061,13 +6139,76 @@ orion.textview.TextView = (function() { */ c = "\u200C"; } - span.appendChild(document.createTextNode(c)); - child.appendChild(span); + ranges.push({text: c, style: this._largestFontStyle, ignoreChars: 1}); - parent.insertBefore(child, sibling); - return child; + var range, span, style, oldSpan, oldStyle, text, oldText, end = 0, oldEnd = 0, next; + var changeCount, changeStart; + if (div) { + var modelChangedEvent = div.modelChangedEvent; + if (modelChangedEvent) { + if (modelChangedEvent.removedLineCount === 0 && modelChangedEvent.addedLineCount === 0) { + changeStart = modelChangedEvent.start - lineStart; + changeCount = modelChangedEvent.addedCharCount - modelChangedEvent.removedCharCount; + } else { + changeStart = -1; + } + delete div.modelChangedEvent; + } + oldSpan = div.firstChild; + } + for (var i = 0; i < ranges.length; i++) { + range = ranges[i]; + text = range.text; + end += text.length; + style = range.style; + if (oldSpan) { + oldText = oldSpan.firstChild.data; + oldStyle = oldSpan.viewStyle; + if (oldText === text && this._compare(style, oldStyle)) { + oldEnd += oldText.length; + delete oldSpan._rectsCache; + span = oldSpan = oldSpan.nextSibling; + continue; + } else { + while (oldSpan) { + if (changeStart !== -1) { + var spanEnd = end; + if (spanEnd >= changeStart) { + spanEnd -= changeCount; + } + var length = oldSpan.firstChild.data.length; + if (oldEnd + length > spanEnd) { break; } + oldEnd += length; + } + next = oldSpan.nextSibling; + lineDiv.removeChild(oldSpan); + oldSpan = next; + } + } + } + span = this._createSpan(lineDiv, document, text, style, range.ignoreChars); + if (oldSpan) { + lineDiv.insertBefore(span, oldSpan); + } else { + lineDiv.appendChild(span); + } + if (div) { + div.lineWidth = undefined; + } + } + if (div) { + var tmp = span ? span.nextSibling : null; + while (tmp) { + next = tmp.nextSibling; + div.removeChild(tmp); + tmp = next; + } + } else { + parent.appendChild(lineDiv); + } + return lineDiv; }, - _createRanges: function(parent, document, ranges, start, end, text, lineStart) { + _createRanges: function(ranges, text, start, end, lineStart, data) { if (start >= end) { return; } if (ranges) { for (var i = 0; i < ranges.length; i++) { @@ -5080,18 +6221,55 @@ orion.textview.TextView = (function() { styleStart = Math.max(start, styleStart); styleEnd = Math.min(end, styleEnd); if (start < styleStart) { - parent.appendChild(this._createRange(parent, document, text.substring(start, styleStart), null)); + this._createRange(text, start, styleStart, null, data); } - parent.appendChild(this._createRange(parent, document, text.substring(styleStart, styleEnd), range.style)); + while (i + 1 < ranges.length && ranges[i + 1].start - lineStart === styleEnd && this._compare(range.style, ranges[i + 1].style)) { + range = ranges[i + 1]; + styleEnd = Math.min(lineStart + end, range.end) - lineStart; + i++; + } + this._createRange(text, styleStart, styleEnd, range.style, data); start = styleEnd; } } } if (start < end) { - parent.appendChild(this._createRange(parent, document, text.substring(start, end), null)); + this._createRange(text, start, end, null, data); } }, - _createRange: function(parent, document, text, style) { + _createRange: function(text, start, end, style, data) { + if (start >= end) { return; } + var tabSize = this._customTabSize, range; + if (tabSize && tabSize !== 8) { + var tabIndex = text.indexOf("\t", start); + while (tabIndex !== -1 && tabIndex < end) { + if (start < tabIndex) { + range = {text: text.substring(start, tabIndex), style: style}; + data.ranges.push(range); + data.tabOffset += range.text.length; + } + var spacesCount = tabSize - (data.tabOffset % tabSize); + if (spacesCount > 0) { + //TODO hack to preserve text length in getDOMText() + var spaces = "\u00A0"; + for (var i = 1; i < spacesCount; i++) { + spaces += " "; + } + range = {text: spaces, style: style, ignoreChars: spacesCount - 1}; + data.ranges.push(range); + data.tabOffset += range.text.length; + } + start = tabIndex + 1; + tabIndex = text.indexOf("\t", start); + } + } + if (start < end) { + range = {text: text.substring(start, end), style: style}; + data.ranges.push(range); + data.tabOffset += range.text.length; + } + }, + _createSpan: function(parent, document, text, style, ignoreChars) { var isLink = style && style.tagName === "A"; if (isLink) { parent.hasLink = true; } var tagName = isLink && this._linksVisible ? "A" : "SPAN"; @@ -5103,6 +6281,9 @@ orion.textview.TextView = (function() { addHandler(child, "click", function(e) { return self._handleLinkClick(e); }, false); } child.viewStyle = style; + if (ignoreChars) { + child.ignoreChars = ignoreChars; + } return child; }, _createRuler: function(ruler) { @@ -5172,7 +6353,10 @@ orion.textview.TextView = (function() { * parent is not connected to the document. Only create it when the load * event is trigged. */ - addHandler(frame, "load", this._loadHandler = function(e) { self._handleLoad(e); }); + this._loadHandler = function(e) { + self._handleLoad(e); + }; + addHandler(frame, "load", this._loadHandler, !!isFirefox); if (!isWebkit) { /* * Feature in IE and Firefox. It is not possible to get the style of an @@ -5188,9 +6372,11 @@ orion.textview.TextView = (function() { } parent.appendChild(frame); /* create synchronously if possible */ - this._handleLoad(); + if (this._sync) { + this._handleLoad(); + } }, - _getFrameHTML: function(sync) { + _getFrameHTML: function() { var html = []; html.push(""); html.push(""); @@ -5206,9 +6392,8 @@ orion.textview.TextView = (function() { if (this._stylesheet) { var stylesheet = typeof(this._stylesheet) === "string" ? [this._stylesheet] : this._stylesheet; for (var i = 0; i < stylesheet.length; i++) { - if (sync) { + if (this._sync) { try { - //Force CSS to be loaded synchronously so lineHeight can be calculated var objXml = new XMLHttpRequest(); if (objXml.overrideMimeType) { objXml.overrideMimeType("text/css"); @@ -5226,29 +6411,64 @@ orion.textview.TextView = (function() { html.push("'>"); } } + /* + * Feature in WebKit. In WebKit, window load will not wait for the style sheets + * to be loaded unless there is script element after the style sheet link elements. + */ + html.push(""); html.push(""); html.push("
"); html.push("