>();
-
- var window = new Window();
- window.title = "Hello, World!";
- window.border_width = 10;
- window.window_position = WindowPosition.CENTER;
- window.set_default_size(350, 70);
- window.destroy.connect(Gtk.main_quit);
-
- var label = new Label("Hello, World!");
-
- window.add(label);
- window.show_all();
-
- Gtk.main();
- return 0;
-}
\ No newline at end of file
diff --git a/demo/kitchen-sink/docs/vbscript.vbs b/demo/kitchen-sink/docs/vbscript.vbs
deleted file mode 100644
index ace5c9f9..00000000
--- a/demo/kitchen-sink/docs/vbscript.vbs
+++ /dev/null
@@ -1,23 +0,0 @@
-myfilename = "C:\Wikipedia - VBScript - Example - Hello World.txt"
-MakeHelloWorldFile myfilename
-
-Sub MakeHelloWorldFile (FileName)
-'Create a new file in C: drive or overwrite existing file
- Set FSO = CreateObject("Scripting.FileSystemObject")
- If FSO.FileExists(FileName) Then
- Answer = MsgBox ("File " & FileName & " exists ... OK to overwrite?", vbOKCancel)
- 'If button selected is not OK, then quit now
- 'vbOK is a language constant
- If Answer <> vbOK Then Exit Sub
- Else
- 'Confirm OK to create
- Answer = MsgBox ("File " & FileName & " ... OK to create?", vbOKCancel)
- If Answer <> vbOK Then Exit Sub
- End If
- 'Create new file (or replace an existing file)
- Set FileObject = FSO.CreateTextFile (FileName)
- FileObject.WriteLine "Time ... " & Now()
- FileObject.WriteLine "Hello World"
- FileObject.Close()
- MsgBox "File " & FileName & " ... updated."
-End Sub
\ No newline at end of file
diff --git a/demo/kitchen-sink/docs/velocity.vm b/demo/kitchen-sink/docs/velocity.vm
deleted file mode 100644
index 9156020b..00000000
--- a/demo/kitchen-sink/docs/velocity.vm
+++ /dev/null
@@ -1,44 +0,0 @@
-#*
- This is a sample comment block that
- spans multiple lines.
-*#
-
-#macro ( outputItem $item )
- ${item}
-#end
-
-## Define the items to iterate
-#set ( $items = [1, 2, 3, 4] )
-
-
- ## Iterate over the items and output the evens.
- #foreach ( $item in $items )
- #if ( $_MathTool.mod($item, 2) == 0 )
- #outputItem ($item)
- #end
- #end
-
-
-
-
-
\ No newline at end of file
diff --git a/demo/kitchen-sink/docs/verilog.v b/demo/kitchen-sink/docs/verilog.v
deleted file mode 100644
index b1f79265..00000000
--- a/demo/kitchen-sink/docs/verilog.v
+++ /dev/null
@@ -1,12 +0,0 @@
-always @(negedge reset or posedge clk) begin
- if (reset == 0) begin
- d_out <= 16'h0000;
- d_out_mem[resetcount] <= d_out;
- laststoredvalue <= d_out;
- end else begin
- d_out <= d_out + 1'b1;
- end
-end
-
-always @(bufreadaddr)
- bufreadval = d_out_mem[bufreadaddr];
\ No newline at end of file
diff --git a/demo/kitchen-sink/docs/vhdl.vhd b/demo/kitchen-sink/docs/vhdl.vhd
deleted file mode 100644
index 662375e8..00000000
--- a/demo/kitchen-sink/docs/vhdl.vhd
+++ /dev/null
@@ -1,34 +0,0 @@
-library IEEE
-user IEEE.std_logic_1164.all;
-use IEEE.numeric_std.all;
-
-entity COUNT16 is
-
- port (
- cOut :out std_logic_vector(15 downto 0); -- counter output
- clkEn :in std_logic; -- count enable
- clk :in std_logic; -- clock input
- rst :in std_logic -- reset input
- );
-
-end entity;
-
-architecture count_rtl of COUNT16 is
- signal count :std_logic_vector (15 downto 0);
-
-begin
- process (clk, rst) begin
-
- if(rst = '1') then
- count <= (others=>'0');
- elsif(rising_edge(clk)) then
- if(clkEn = '1') then
- count <= count + 1;
- end if;
- end if;
-
- end process;
- cOut <= count;
-
-end architecture;
-
\ No newline at end of file
diff --git a/demo/kitchen-sink/file_drop.js b/demo/kitchen-sink/file_drop.js
deleted file mode 100644
index 8b89d5f1..00000000
--- a/demo/kitchen-sink/file_drop.js
+++ /dev/null
@@ -1,73 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-
-var config = require("ace/config");
-var event = require("ace/lib/event");
-var modelist = require("ace/ext/modelist");
-
-module.exports = function(editor) {
- event.addListener(editor.container, "dragover", function(e) {
- var types = e.dataTransfer.types;
- if (types && Array.prototype.indexOf.call(types, 'Files') !== -1)
- return event.preventDefault(e);
- });
-
- event.addListener(editor.container, "drop", function(e) {
- var file;
- try {
- file = e.dataTransfer.files[0];
- if (window.FileReader) {
- var reader = new FileReader();
- reader.onload = function() {
- var mode = modelist.getModeForPath(file.name);
- editor.session.doc.setValue(reader.result);
- editor.session.setMode(mode.mode);
- editor.session.modeName = mode.name;
- };
- reader.readAsText(file);
- }
- return event.preventDefault(e);
- } catch(err) {
- return event.stopEvent(e);
- }
- });
-};
-
-var Editor = require("ace/editor").Editor;
-config.defineOptions(Editor.prototype, "editor", {
- loadDroppedFile: {
- set: function() { module.exports(this); },
- value: true
- }
-});
-
-});
\ No newline at end of file
diff --git a/demo/kitchen-sink/inline_editor.js b/demo/kitchen-sink/inline_editor.js
deleted file mode 100644
index 6b56887d..00000000
--- a/demo/kitchen-sink/inline_editor.js
+++ /dev/null
@@ -1,102 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-
-define(function(require, exports, module) {
-"use strict";
-
-var LineWidgets = require("ace/line_widgets").LineWidgets;
-var Editor = require("ace/editor").Editor;
-var Renderer = require("ace/virtual_renderer").VirtualRenderer;
-var dom = require("ace/lib/dom");
-
-
-require("ace/commands/default_commands").commands.push({
- name: "openInlineEditor",
- bindKey: "F3",
- exec: function(editor) {
- var split = window.env.split;
- var s = editor.session;
- var inlineEditor = new Editor(new Renderer());
- var splitSession = split.$cloneSession(s);
-
- var row = editor.getCursorPosition().row;
- if (editor.session.lineWidgets && editor.session.lineWidgets[row]) {
- editor.session.lineWidgets[row].destroy();
- return;
- }
-
- var rowCount = 10;
- var w = {
- row: row,
- // rowCount: rowCount,
- fixedWidth: true,
- el: dom.createElement("div"),
- editor: inlineEditor
- };
- var el = w.el;
- el.appendChild(inlineEditor.container);
-
- if (!editor.session.widgetManager) {
- editor.session.widgetManager = new LineWidgets(editor.session);
- editor.session.widgetManager.attach(editor);
- }
-
- var h = rowCount*editor.renderer.layerConfig.lineHeight;
- inlineEditor.container.style.height = h + "px";
-
- el.style.position = "absolute";
- el.style.zIndex = "4";
- el.style.borderTop = "solid blue 2px";
- el.style.borderBottom = "solid blue 2px";
-
- inlineEditor.setSession(splitSession);
- editor.session.widgetManager.addLineWidget(w);
-
- var kb = {
- handleKeyboard:function(_,hashId, keyString) {
- if (hashId === 0 && keyString === "esc") {
- w.destroy();
- return true;
- }
- }
- };
-
- w.destroy = function() {
- editor.keyBinding.removeKeyboardHandler(kb);
- s.widgetManager.removeLineWidget(w);
- };
-
- editor.keyBinding.addKeyboardHandler(kb);
- inlineEditor.keyBinding.addKeyboardHandler(kb);
- inlineEditor.setTheme("ace/theme/solarized_light");
- }
-});
-});
diff --git a/demo/kitchen-sink/layout.js b/demo/kitchen-sink/layout.js
deleted file mode 100644
index 1332eef3..00000000
--- a/demo/kitchen-sink/layout.js
+++ /dev/null
@@ -1,132 +0,0 @@
-
-define(function(require, exports, module) {
-"use strict";
-
-var dom = require("ace/lib/dom");
-var event = require("ace/lib/event");
-
-var EditSession = require("ace/edit_session").EditSession;
-var UndoManager = require("ace/undomanager").UndoManager;
-var Renderer = require("ace/virtual_renderer").VirtualRenderer;
-var Editor = require("ace/editor").Editor;
-var MultiSelect = require("ace/multi_select").MultiSelect;
-
-dom.importCssString("\
-splitter {\
- border: 1px solid #C6C6D2;\
- width: 0px;\
- cursor: ew-resize;\
- z-index:10}\
-splitter:hover {\
- margin-left: -2px;\
- width:3px;\
- border-color: #B5B4E0;\
-}\
-", "splitEditor");
-
-exports.edit = function(el) {
- if (typeof(el) == "string")
- el = document.getElementById(el);
-
- var editor = new Editor(new Renderer(el, require("ace/theme/textmate")));
-
- editor.resize();
- event.addListener(window, "resize", function() {
- editor.resize();
- });
- return editor;
-};
-
-
-var SplitRoot = function(el, theme, position, getSize) {
- el.style.position = position || "relative";
- this.container = el;
- this.getSize = getSize || this.getSize;
- this.resize = this.$resize.bind(this);
-
- event.addListener(el.ownerDocument.defaultView, "resize", this.resize);
- this.editor = this.createEditor();
-};
-
-(function(){
- this.createEditor = function() {
- var el = document.createElement("div");
- el.className = this.$editorCSS;
- el.style.cssText = "position: absolute; top:0px; bottom:0px";
- this.$container.appendChild(el);
- var session = new EditSession("");
- var editor = new Editor(new Renderer(el, this.$theme));
-
- /*editor.on("focus", function() {
- this._emit("focus", editor);
- }.bind(this));*/
-
- this.$editors.push(editor);
- editor.setFontSize(this.$fontSize);
- return editor;
- };
- this.$resize = function() {
- var size = this.getSize(this.container);
- this.rect = {
- x: size.left,
- y: size.top,
- w: size.width,
- h: size.height
- };
- this.item.resize(this.rect);
- };
- this.getSize = function(el) {
- return el.getBoundingClientRect();
- };
- this.destroy = function() {
- var win = this.container.ownerDocument.defaultView;
- event.removeListener(win, "resize", this.resize);
- };
-
-
-}).call(SplitRoot.prototype);
-
-
-
-var Split = function(){
-
-};
-(function(){
- this.execute = function(options) {
- this.$u.execute(options);
- };
-
-}).call(Split.prototype);
-
-
-
-exports.singleLineEditor = function(el) {
- var renderer = new Renderer(el);
- el.style.overflow = "hidden";
-
- renderer.screenToTextCoordinates = function(x, y) {
- var pos = this.pixelToScreenCoordinates(x, y);
- return this.session.screenToDocumentPosition(
- Math.min(this.session.getScreenLength() - 1, Math.max(pos.row, 0)),
- Math.max(pos.column, 0)
- );
- };
-
- renderer.$maxLines = 4;
-
- renderer.setStyle("ace_one-line");
- var editor = new Editor(renderer);
- editor.session.setUndoManager(new UndoManager());
-
- editor.setShowPrintMargin(false);
- editor.renderer.setShowGutter(false);
- editor.renderer.setHighlightGutterLine(false);
- editor.$mouseHandler.$focusWaitTimout = 0;
-
- return editor;
-};
-
-
-
-});
-
diff --git a/demo/kitchen-sink/logo.png b/demo/kitchen-sink/logo.png
index a722472f..58df6062 100644
Binary files a/demo/kitchen-sink/logo.png and b/demo/kitchen-sink/logo.png differ
diff --git a/demo/kitchen-sink/package.json b/demo/kitchen-sink/package.json
new file mode 100644
index 00000000..2345fccd
--- /dev/null
+++ b/demo/kitchen-sink/package.json
@@ -0,0 +1,16 @@
+{
+ "main": "./demo.js",
+ "mappings": {
+ "ace": "../.."
+ },
+ "config": {
+ "github.com/sourcemint/bundler-js/0/-meta/config/0": {
+ "adapter": "github.com/sourcemint/sdk-requirejs/0",
+ "resources": [
+ "./icons/*",
+ "./logo.png",
+ "./styles.css"
+ ]
+ }
+ }
+}
\ No newline at end of file
diff --git a/demo/kitchen-sink/require.js b/demo/kitchen-sink/require.js
index 203843c1..d016e1da 100644
--- a/demo/kitchen-sink/require.js
+++ b/demo/kitchen-sink/require.js
@@ -1,28 +1,25 @@
/** vim: et:ts=4:sw=4:sts=4
- * @license RequireJS 2.1.11+ Copyright (c) 2010-2014, The Dojo Foundation All Rights Reserved.
+ * @license RequireJS 2.0.1 Copyright (c) 2010-2012, The Dojo Foundation All Rights Reserved.
* Available via the MIT or new BSD license.
* see: http://github.com/jrburke/requirejs for details
*/
-//Not using strict: uneven strict support in browsers, #392, and causes
-//problems with requirejs.exec()/transpiler plugins that may not be strict.
-/*jslint regexp: true, nomen: true, sloppy: true */
-/*global window, navigator, document, importScripts, setTimeout, opera */
+/*jslint regexp: true, nomen: true */
+/*global window, navigator, document, importScripts, jQuery, setTimeout, opera */
var requirejs, require, define;
(function (global) {
- var req, s, head, baseElement, dataMain, src,
- interactiveScript, currentlyAddingScript, mainScript, subPath,
- version = '2.1.11+',
+ 'use strict';
+
+ var version = '2.0.1',
commentRegExp = /(\/\*([\s\S]*?)\*\/|([^:]|^)\/\/(.*)$)/mg,
- cjsRequireRegExp = /[^.]\s*require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
+ cjsRequireRegExp = /require\s*\(\s*["']([^'"\s]+)["']\s*\)/g,
jsSuffixRegExp = /\.js$/,
currDirRegExp = /^\.\//,
- op = Object.prototype,
- ostring = op.toString,
- hasOwn = op.hasOwnProperty,
+ ostring = Object.prototype.toString,
ap = Array.prototype,
+ aps = ap.slice,
apsp = ap.splice,
- isBrowser = !!(typeof window !== 'undefined' && typeof navigator !== 'undefined' && window.document),
+ isBrowser = !!(typeof window !== 'undefined' && navigator && document),
isWebWorker = !isBrowser && typeof importScripts !== 'undefined',
//PS3 indicates loaded and complete, but need to wait for complete
//specifically. Sequence is 'loading', 'loaded', execution,
@@ -36,7 +33,9 @@ var requirejs, require, define;
contexts = {},
cfg = {},
globalDefQueue = [],
- useInteractive = false;
+ useInteractive = false,
+ req, s, head, baseElement, dataMain, src,
+ interactiveScript, currentlyAddingScript, mainScript, subPath;
function isFunction(it) {
return ostring.call(it) === '[object Function]';
@@ -54,7 +53,7 @@ var requirejs, require, define;
if (ary) {
var i;
for (i = 0; i < ary.length; i += 1) {
- if (ary[i] && func(ary[i], i, ary)) {
+ if (func(ary[i], i, ary)) {
break;
}
}
@@ -69,7 +68,7 @@ var requirejs, require, define;
if (ary) {
var i;
for (i = ary.length - 1; i > -1; i -= 1) {
- if (ary[i] && func(ary[i], i, ary)) {
+ if (func(ary[i], i, ary)) {
break;
}
}
@@ -77,11 +76,7 @@ var requirejs, require, define;
}
function hasProp(obj, prop) {
- return hasOwn.call(obj, prop);
- }
-
- function getOwn(obj, prop) {
- return hasProp(obj, prop) && obj[prop];
+ return obj.hasOwnProperty(prop);
}
/**
@@ -92,7 +87,7 @@ var requirejs, require, define;
function eachProp(obj, func) {
var prop;
for (prop in obj) {
- if (hasProp(obj, prop)) {
+ if (obj.hasOwnProperty(prop)) {
if (func(obj[prop], prop)) {
break;
}
@@ -103,26 +98,18 @@ var requirejs, require, define;
/**
* Simple function to mix in properties from source into target,
* but only if target does not already have a property of the same name.
+ * This is not robust in IE for transferring methods that match
+ * Object.prototype names, but the uses of mixin here seem unlikely to
+ * trigger a problem related to that.
*/
- function mixin(target, source, force, deepStringMixin) {
+ function mixin(target, source, force) {
if (source) {
eachProp(source, function (value, prop) {
if (force || !hasProp(target, prop)) {
- if (deepStringMixin && typeof value === 'object' && value &&
- !isArray(value) && !isFunction(value) &&
- !(value instanceof RegExp)) {
-
- if (!target[prop]) {
- target[prop] = {};
- }
- mixin(target[prop], value, force, deepStringMixin);
- } else {
- target[prop] = value;
- }
+ target[prop] = value;
}
});
}
- return target;
}
//Similar to Function.prototype.bind, but the 'this' object is specified
@@ -137,11 +124,7 @@ var requirejs, require, define;
return document.getElementsByTagName('script');
}
- function defaultOnError(err) {
- throw err;
- }
-
- //Allow getting a global that is expressed in
+ //Allow getting a global that expressed in
//dot notation, like 'a.b.c'.
function getGlobal(value) {
if (!value) {
@@ -154,6 +137,32 @@ var requirejs, require, define;
return g;
}
+ function makeContextModuleFunc(func, relMap, enableBuildCallback) {
+ return function () {
+ //A version of a require function that passes a moduleName
+ //value for items that may need to
+ //look up paths relative to the moduleName
+ var args = aps.call(arguments, 0), lastArg;
+ if (enableBuildCallback &&
+ isFunction((lastArg = args[args.length - 1]))) {
+ lastArg.__requireJsBuild = true;
+ }
+ args.push(relMap);
+ return func.apply(null, args);
+ };
+ }
+
+ function addRequireMethods(req, context, relMap) {
+ each([
+ ['toUrl'],
+ ['undef'],
+ ['defined', 'requireDefined'],
+ ['specified', 'requireSpecified']
+ ], function (item) {
+ req[item[0]] = makeContextModuleFunc(context[item[1] || item[0]], relMap);
+ });
+ }
+
/**
* Constructs an error with a pointer to an URL with more information.
* @param {String} id the error ID that maps to an ID on a web page.
@@ -180,7 +189,7 @@ var requirejs, require, define;
if (typeof requirejs !== 'undefined') {
if (isFunction(requirejs)) {
- //Do not overwrite an existing requirejs instance.
+ //Do not overwrite and existing requirejs instance.
return;
}
cfg = requirejs;
@@ -195,32 +204,28 @@ var requirejs, require, define;
}
function newContext(contextName) {
- var inCheckLoaded, Module, context, handlers,
- checkLoadedTimeoutId,
- config = {
- //Defaults. Do not set a default for map
- //config to speed up normalize(), which
- //will run faster if there is no default.
+ var config = {
waitSeconds: 7,
baseUrl: './',
paths: {},
- bundles: {},
pkgs: {},
- shim: {},
- config: {}
+ shim: {}
},
registry = {},
- //registry of just enabled modules, to speed
- //cycle breaking code when lots of modules
- //are registered, but not activated.
- enabledRegistry = {},
undefEvents = {},
defQueue = [],
defined = {},
+ urlMap = {},
urlFetched = {},
- bundlesMap = {},
requireCounter = 1,
- unnormalizedCounter = 1;
+ unnormalizedCounter = 1,
+ //Used to track the order in which modules
+ //should be executed, by the order they
+ //load. Important for consistent cycle resolution
+ //behavior.
+ waitAry = [],
+ inCheckLoaded, Module, context, handlers,
+ checkLoadedTimeoutId;
/**
* Trims the . and .. from an array of path segments.
@@ -232,8 +237,8 @@ var requirejs, require, define;
* @param {Array} ary the array of path segments.
*/
function trimDots(ary) {
- var i, part, length = ary.length;
- for (i = 0; i < length; i++) {
+ var i, part;
+ for (i = 0; ary[i]; i+= 1) {
part = ary[i];
if (part === '.') {
ary.splice(i, 1);
@@ -266,12 +271,11 @@ var requirejs, require, define;
* @returns {String} normalized name
*/
function normalize(name, baseName, applyMap) {
- var pkgMain, mapValue, nameParts, i, j, nameSegment, lastIndex,
- foundMap, foundI, foundStarMap, starI,
- baseParts = baseName && baseName.split('/'),
- normalizedBaseParts = baseParts,
+ var baseParts = baseName && baseName.split('/'),
map = config.map,
- starMap = map && map['*'];
+ starMap = map && map['*'],
+ pkgName, pkgConfig, mapValue, nameParts, i, j, nameSegment,
+ foundMap;
//Adjust any relative paths.
if (name && name.charAt(0) === '.') {
@@ -279,26 +283,29 @@ var requirejs, require, define;
//otherwise, assume it is a top-level require that will
//be relative to baseUrl in the end.
if (baseName) {
- //Convert baseName to array, and lop off the last part,
- //so that . matches that 'directory' and not name of the baseName's
- //module. For instance, baseName of 'one/two/three', maps to
- //'one/two/three.js', but we want the directory, 'one/two' for
- //this normalization.
- normalizedBaseParts = baseParts.slice(0, baseParts.length - 1);
- name = name.split('/');
- lastIndex = name.length - 1;
-
- // If wanting node ID compatibility, strip .js from end
- // of IDs. Have to do this here, and not in nameToUrl
- // because node allows either .js or non .js to map
- // to same file.
- if (config.nodeIdCompat && jsSuffixRegExp.test(name[lastIndex])) {
- name[lastIndex] = name[lastIndex].replace(jsSuffixRegExp, '');
+ if (config.pkgs[baseName]) {
+ //If the baseName is a package name, then just treat it as one
+ //name to concat the name with.
+ baseParts = [baseName];
+ } else {
+ //Convert baseName to array, and lop off the last part,
+ //so that . matches that 'directory' and not name of the baseName's
+ //module. For instance, baseName of 'one/two/three', maps to
+ //'one/two/three.js', but we want the directory, 'one/two' for
+ //this normalization.
+ baseParts = baseParts.slice(0, baseParts.length - 1);
}
- name = normalizedBaseParts.concat(name);
+ name = baseParts.concat(name.split('/'));
trimDots(name);
+
+ //Some use of packages may use a . path to reference the
+ //'main' module name, so normalize for that.
+ pkgConfig = config.pkgs[(pkgName = name[0])];
name = name.join('/');
+ if (pkgConfig && name === pkgName + '/' + pkgConfig.main) {
+ name = pkgName;
+ }
} else if (name.indexOf('./') === 0) {
// No baseName, so this is ID is resolved relative
// to baseUrl, pull off the leading dot.
@@ -307,64 +314,51 @@ var requirejs, require, define;
}
//Apply map config if available.
- if (applyMap && map && (baseParts || starMap)) {
+ if (applyMap && (baseParts || starMap) && map) {
nameParts = name.split('/');
- outerLoop: for (i = nameParts.length; i > 0; i -= 1) {
+ for (i = nameParts.length; i > 0; i -= 1) {
nameSegment = nameParts.slice(0, i).join('/');
if (baseParts) {
//Find the longest baseName segment match in the config.
//So, do joins on the biggest to smallest lengths of baseParts.
for (j = baseParts.length; j > 0; j -= 1) {
- mapValue = getOwn(map, baseParts.slice(0, j).join('/'));
+ mapValue = map[baseParts.slice(0, j).join('/')];
- //baseName segment has config, find if it has one for
+ //baseName segment has config, find if it has one for
//this name.
if (mapValue) {
- mapValue = getOwn(mapValue, nameSegment);
+ mapValue = mapValue[nameSegment];
if (mapValue) {
//Match, update name to the new value.
foundMap = mapValue;
- foundI = i;
- break outerLoop;
+ break;
}
}
}
}
- //Check for a star map match, but just hold on to it,
- //if there is a shorter segment match later in a matching
- //config, then favor over this star map.
- if (!foundStarMap && starMap && getOwn(starMap, nameSegment)) {
- foundStarMap = getOwn(starMap, nameSegment);
- starI = i;
+ if (!foundMap && starMap && starMap[nameSegment]) {
+ foundMap = starMap[nameSegment];
}
- }
- if (!foundMap && foundStarMap) {
- foundMap = foundStarMap;
- foundI = starI;
- }
-
- if (foundMap) {
- nameParts.splice(0, foundI, foundMap);
- name = nameParts.join('/');
+ if (foundMap) {
+ nameParts.splice(0, i, foundMap);
+ name = nameParts.join('/');
+ break;
+ }
}
}
- // If the name points to a package's name, use
- // the package main instead.
- pkgMain = getOwn(config.pkgs, name);
-
- return pkgMain ? pkgMain : name;
+ return name;
}
function removeScript(name) {
if (isBrowser) {
each(scripts(), function (scriptNode) {
if (scriptNode.getAttribute('data-requiremodule') === name &&
- scriptNode.getAttribute('data-requirecontext') === context.contextName) {
+ scriptNode.getAttribute('data-requirecontext') === context.contextName) {
scriptNode.parentNode.removeChild(scriptNode);
return true;
}
@@ -373,36 +367,18 @@ var requirejs, require, define;
}
function hasPathFallback(id) {
- var pathConfig = getOwn(config.paths, id);
+ var pathConfig = config.paths[id];
if (pathConfig && isArray(pathConfig) && pathConfig.length > 1) {
+ removeScript(id);
//Pop off the first array value, since it failed, and
//retry
pathConfig.shift();
- context.require.undef(id);
-
- //Custom require that does not do map translation, since
- //ID is "absolute", already mapped/resolved.
- context.makeRequire(null, {
- skipMap: true
- })([id]);
-
+ context.undef(id);
+ context.require([id]);
return true;
}
}
- //Turns a plugin!resource to [plugin, resource]
- //with the plugin being undefined if the name
- //did not have a plugin prefix.
- function splitPrefix(name) {
- var prefix,
- index = name ? name.indexOf('!') : -1;
- if (index > -1) {
- prefix = name.substring(0, index);
- name = name.substring(index + 1, name.length);
- }
- return [prefix, name];
- }
-
/**
* Creates a module mapping that includes plugin prefix, module
* name, and path. If parentModuleMap is provided it will
@@ -419,12 +395,13 @@ var requirejs, require, define;
* @returns {Object}
*/
function makeModuleMap(name, parentModuleMap, isNormalized, applyMap) {
- var url, pluginModule, suffix, nameParts,
+ var index = name ? name.indexOf('!') : -1,
prefix = null,
parentName = parentModuleMap ? parentModuleMap.name : null,
originalName = name,
isDefine = true,
- normalizedName = '';
+ normalizedName = '',
+ url, pluginModule, suffix;
//If no name, then it means it is a require call, generate an
//internal name.
@@ -433,13 +410,14 @@ var requirejs, require, define;
name = '_@r' + (requireCounter += 1);
}
- nameParts = splitPrefix(name);
- prefix = nameParts[0];
- name = nameParts[1];
+ if (index !== -1) {
+ prefix = name.substring(0, index);
+ name = name.substring(index + 1, name.length);
+ }
if (prefix) {
prefix = normalize(prefix, parentName, applyMap);
- pluginModule = getOwn(defined, prefix);
+ pluginModule = defined[prefix];
}
//Account for relative paths if there is a base name.
@@ -457,15 +435,22 @@ var requirejs, require, define;
//A regular module.
normalizedName = normalize(name, parentName, applyMap);
- //Normalized name may be a plugin ID due to map config
- //application in normalize. The map config values must
- //already be normalized, so do not need to redo that part.
- nameParts = splitPrefix(normalizedName);
- prefix = nameParts[0];
- normalizedName = nameParts[1];
- isNormalized = true;
+ url = urlMap[normalizedName];
+ if (!url) {
+ //Calculate url for the module, if it has a name.
+ //Use name here since nameToUrl also calls normalize,
+ //and for relative names that are outside the baseUrl
+ //this causes havoc. Was thinking of just removing
+ //parentModuleMap to avoid extra normalization, but
+ //normalize() still does a dot removal because of
+ //issue #142, so just pass in name here and redo
+ //the normalization. Paths outside baseUrl are just
+ //messy to support.
+ url = context.nameToUrl(name, null, parentModuleMap);
- url = context.nameToUrl(normalizedName);
+ //Store the URL mapping for later.
+ urlMap[normalizedName] = url;
+ }
}
}
@@ -485,14 +470,14 @@ var requirejs, require, define;
originalName: originalName,
isDefine: isDefine,
id: (prefix ?
- prefix + '!' + normalizedName :
- normalizedName) + suffix
+ prefix + '!' + normalizedName :
+ normalizedName) + suffix
};
}
function getModule(depMap) {
var id = depMap.id,
- mod = getOwn(registry, id);
+ mod = registry[id];
if (!mod) {
mod = registry[id] = new context.Module(depMap);
@@ -503,20 +488,15 @@ var requirejs, require, define;
function on(depMap, name, fn) {
var id = depMap.id,
- mod = getOwn(registry, id);
+ mod = registry[id];
if (hasProp(defined, id) &&
- (!mod || mod.defineEmitComplete)) {
+ (!mod || mod.defineEmitComplete)) {
if (name === 'defined') {
fn(defined[id]);
}
} else {
- mod = getModule(depMap);
- if (mod.error && name === 'error') {
- fn(mod.error);
- } else {
- mod.on(name, fn);
- }
+ getModule(depMap).on(name, fn);
}
}
@@ -528,7 +508,7 @@ var requirejs, require, define;
errback(err);
} else {
each(ids, function (id) {
- var mod = getOwn(registry, id);
+ var mod = registry[id];
if (mod) {
//Set error on module, so it skips timeout checks.
mod.error = err;
@@ -556,88 +536,168 @@ var requirejs, require, define;
//local var ref to defQueue, so cannot just reassign the one
//on context.
apsp.apply(defQueue,
- [defQueue.length, 0].concat(globalDefQueue));
+ [defQueue.length - 1, 0].concat(globalDefQueue));
globalDefQueue = [];
}
}
+ /**
+ * Helper function that creates a require function object to give to
+ * modules that ask for it as a dependency. It needs to be specific
+ * per module because of the implication of path mappings that may
+ * need to be relative to the module name.
+ */
+ function makeRequire(mod, enableBuildCallback, altRequire) {
+ var relMap = mod && mod.map,
+ modRequire = makeContextModuleFunc(altRequire || context.require,
+ relMap,
+ enableBuildCallback);
+
+ addRequireMethods(modRequire, context, relMap);
+ modRequire.isBrowser = isBrowser;
+
+ return modRequire;
+ }
+
handlers = {
'require': function (mod) {
- if (mod.require) {
- return mod.require;
- } else {
- return (mod.require = context.makeRequire(mod.map));
- }
+ return makeRequire(mod);
},
'exports': function (mod) {
mod.usingExports = true;
if (mod.map.isDefine) {
- if (mod.exports) {
- return (defined[mod.map.id] = mod.exports);
- } else {
- return (mod.exports = defined[mod.map.id] = {});
- }
+ return (mod.exports = defined[mod.map.id] = {});
}
},
'module': function (mod) {
- if (mod.module) {
- return mod.module;
- } else {
- return (mod.module = {
- id: mod.map.id,
- uri: mod.map.url,
- config: function () {
- return getOwn(config.config, mod.map.id) || {};
- },
- exports: mod.exports || (mod.exports = {})
- });
- }
+ return (mod.module = {
+ id: mod.map.id,
+ uri: mod.map.url,
+ config: function () {
+ return (config.config && config.config[mod.map.id]) || {};
+ },
+ exports: defined[mod.map.id]
+ });
}
};
- function cleanRegistry(id) {
+ function removeWaiting(id) {
//Clean up machinery used for waiting modules.
delete registry[id];
- delete enabledRegistry[id];
+
+ each(waitAry, function (mod, i) {
+ if (mod.map.id === id) {
+ waitAry.splice(i, 1);
+ if (!mod.defined) {
+ context.waitCount -= 1;
+ }
+ return true;
+ }
+ });
}
- function breakCycle(mod, traced, processed) {
- var id = mod.map.id;
+ function findCycle(mod, traced) {
+ var id = mod.map.id,
+ depArray = mod.depMaps,
+ foundModule;
- if (mod.error) {
- mod.emit('error', mod.error);
- } else {
- traced[id] = true;
- each(mod.depMaps, function (depMap, i) {
- var depId = depMap.id,
- dep = getOwn(registry, depId);
-
- //Only force things that have not completed
- //being defined, so still in the registry,
- //and only if it has not been matched up
- //in the module already.
- if (dep && !mod.depMatched[i] && !processed[depId]) {
- if (getOwn(traced, depId)) {
- mod.defineDep(i, defined[depId]);
- mod.check(); //pass false?
- } else {
- breakCycle(dep, traced, processed);
- }
- }
- });
- processed[id] = true;
+ //Do not bother with unitialized modules or not yet enabled
+ //modules.
+ if (!mod.inited) {
+ return;
}
+
+ //Found the cycle.
+ if (traced[id]) {
+ return mod;
+ }
+
+ traced[id] = true;
+
+ //Trace through the dependencies.
+ each(depArray, function (depMap) {
+ var depId = depMap.id,
+ depMod = registry[depId];
+
+ if (!depMod) {
+ return;
+ }
+
+ if (!depMod.inited || !depMod.enabled) {
+ //Dependency is not inited, so this cannot
+ //be used to determine a cycle.
+ foundModule = null;
+ delete traced[id];
+ return true;
+ }
+
+ return (foundModule = findCycle(depMod, traced));
+ });
+
+ return foundModule;
+ }
+
+ function forceExec(mod, traced, uninited) {
+ var id = mod.map.id,
+ depArray = mod.depMaps;
+
+ if (!mod.inited || !mod.map.isDefine) {
+ return;
+ }
+
+ if (traced[id]) {
+ return defined[id];
+ }
+
+ traced[id] = mod;
+
+ each(depArray, function(depMap) {
+ var depId = depMap.id,
+ depMod = registry[depId],
+ value;
+
+ if (handlers[depId]) {
+ return;
+ }
+
+ if (depMod) {
+ if (!depMod.inited || !depMod.enabled) {
+ //Dependency is not inited,
+ //so this module cannot be
+ //given a forced value yet.
+ uninited[id] = true;
+ return;
+ }
+
+ //Get the value for the current dependency
+ value = forceExec(depMod, traced, uninited);
+
+ //Even with forcing it may not be done,
+ //in particular if the module is waiting
+ //on a plugin resource.
+ if (!uninited[depId]) {
+ mod.defineDepById(depId, value);
+ }
+ }
+ });
+
+ mod.check(true);
+
+ return defined[id];
+ }
+
+ function modCheck(mod) {
+ mod.check();
}
function checkLoaded() {
- var err, usingPathFallback,
- waitInterval = config.waitSeconds * 1000,
+ var waitInterval = config.waitSeconds * 1000,
//It is possible to disable the wait interval by using waitSeconds of 0.
expired = waitInterval && (context.startTime + waitInterval) < new Date().getTime(),
noLoads = [],
- reqCalls = [],
stillLoading = false,
- needCycleCheck = true;
+ needCycleCheck = true,
+ map, modId, err, usingPathFallback;
//Do not bother if this call was a result of a cycle break.
if (inCheckLoaded) {
@@ -647,19 +707,15 @@ var requirejs, require, define;
inCheckLoaded = true;
//Figure out the state of all the modules.
- eachProp(enabledRegistry, function (mod) {
- var map = mod.map,
- modId = map.id;
+ eachProp(registry, function (mod) {
+ map = mod.map;
+ modId = map.id;
//Skip things that are not enabled or in error state.
if (!mod.enabled) {
return;
}
- if (!map.isDefine) {
- reqCalls.push(mod);
- }
-
if (!mod.error) {
//If the module should be executed, and it has not
//been inited and time is up, remember it.
@@ -694,9 +750,31 @@ var requirejs, require, define;
//Not expired, check for a cycle.
if (needCycleCheck) {
- each(reqCalls, function (mod) {
- breakCycle(mod, {}, {});
+
+ each(waitAry, function (mod) {
+ if (mod.defined) {
+ return;
+ }
+
+ var cycleMod = findCycle(mod, {}),
+ traced = {};
+
+ if (cycleMod) {
+ forceExec(cycleMod, traced, {});
+
+ //traced modules may have been
+ //removed from the registry, but
+ //their listeners still need to
+ //be called.
+ eachProp(traced, modCheck);
+ }
});
+
+ //Now that dependencies have
+ //been satisfied, trigger the
+ //completion check that then
+ //notifies listeners.
+ eachProp(registry, modCheck);
}
//If still waiting on loads, and the waiting load is something
@@ -717,9 +795,9 @@ var requirejs, require, define;
}
Module = function (map) {
- this.events = getOwn(undefEvents, map.id) || {};
+ this.events = undefEvents[map.id] || {};
this.map = map;
- this.shim = getOwn(config.shim, map.id);
+ this.shim = config.shim[map.id];
this.depExports = [];
this.depMaps = [];
this.depMatched = [];
@@ -733,7 +811,7 @@ var requirejs, require, define;
};
Module.prototype = {
- init: function (depMaps, factory, errback, options) {
+ init: function(depMaps, factory, errback, options) {
options = options || {};
//Do not do more inits if already done. Can happen if there
@@ -756,14 +834,33 @@ var requirejs, require, define;
});
}
- //Do a copy of the dependency array, so that
- //source inputs are not modified. For example
- //"shim" deps are passed in here directly, and
- //doing a direct modification of the depMaps array
- //would affect that config.
- this.depMaps = depMaps && depMaps.slice(0);
+ each(depMaps, bind(this, function (depMap, i) {
+ if (typeof depMap === 'string') {
+ depMap = makeModuleMap(depMap,
+ (this.map.isDefine ? this.map : this.map.parentMap),
+ false,
+ true);
+ this.depMaps.push(depMap);
+ }
- this.errback = errback;
+ var handler = handlers[depMap.id];
+
+ if (handler) {
+ this.depExports[i] = handler(this);
+ return;
+ }
+
+ this.depCount += 1;
+
+ on(depMap, 'defined', bind(this, function (depExports) {
+ this.defineDep(i, depExports);
+ this.check();
+ }));
+
+ if (errback) {
+ on(depMap, 'error', errback);
+ }
+ }));
//Indicate this module has be initialized
this.inited = true;
@@ -783,6 +880,20 @@ var requirejs, require, define;
}
},
+ defineDepById: function (id, depExports) {
+ var i;
+
+ //Find the index for this dependency.
+ each(this.depMaps, function (map, index) {
+ if (map.id === id) {
+ i = index;
+ return true;
+ }
+ });
+
+ return this.defineDep(i, depExports);
+ },
+
defineDep: function (i, depExports) {
//Because of cycles, defined callback for a given
//export can be called more than once.
@@ -805,19 +916,19 @@ var requirejs, require, define;
//If the manager is for a plugin managed resource,
//ask the plugin to load it now.
- if (this.shim) {
- context.makeRequire(this.map, {
- enableBuildCallback: true
- })(this.shim.deps || [], bind(this, function () {
- return map.prefix ? this.callPlugin() : this.load();
+ if (map.prefix) {
+ this.callPlugin();
+ } else if (this.shim) {
+ makeRequire(this, true)(this.shim.deps || [], bind(this, function () {
+ this.load();
}));
} else {
//Regular dependency.
- return map.prefix ? this.callPlugin() : this.load();
+ this.load();
}
},
- load: function () {
+ load: function() {
var url = this.map.url;
//Regular dependency.
@@ -828,19 +939,21 @@ var requirejs, require, define;
},
/**
- * Checks if the module is ready to define itself, and if so,
- * define it.
+ * Checks is the module is ready to define itself, and if so,
+ * define it. If the silent argument is true, then it will just
+ * define, but not notify listeners, and not ask for a context-wide
+ * check of all loaded modules. That is useful for cycle breaking.
*/
- check: function () {
- if (!this.enabled || this.enabling) {
+ check: function (silent) {
+ if (!this.enabled) {
return;
}
- var err, cjsModule,
- id = this.map.id,
+ var id = this.map.id,
depExports = this.depExports,
exports = this.exports,
- factory = this.factory;
+ factory = this.factory,
+ err, cjsModule;
if (!this.inited) {
this.fetch();
@@ -856,13 +969,8 @@ var requirejs, require, define;
if (this.depCount < 1 && !this.defined) {
if (isFunction(factory)) {
//If there is an error listener, favor passing
- //to that instead of throwing an error. However,
- //only do it for define()'d modules. require
- //errbacks should not be called for failures in
- //their callbacks (#699). However if a global
- //onError is set, use that.
- if ((this.events.error && this.map.isDefine) ||
- req.onError !== defaultOnError) {
+ //to that instead of throwing an error.
+ if (this.events.error) {
try {
exports = context.execCb(id, factory, depExports, exports);
} catch (e) {
@@ -872,14 +980,17 @@ var requirejs, require, define;
exports = context.execCb(id, factory, depExports, exports);
}
- // Favor return value over exports. If node/cjs in play,
- // then will not have a return value anyway. Favor
- // module.exports assignment over exports object.
- if (this.map.isDefine && exports === undefined) {
+ if (this.map.isDefine) {
+ //If setting exports via 'module' is in play,
+ //favor that over return value and exports. After that,
+ //favor a non-undefined return value over exports use.
cjsModule = this.module;
- if (cjsModule) {
+ if (cjsModule &&
+ cjsModule.exports !== undefined &&
+ //Make sure it is not already the exports value
+ cjsModule.exports !== this.exports) {
exports = cjsModule.exports;
- } else if (this.usingExports) {
+ } else if (exports === undefined && this.usingExports) {
//exports already set the defined value.
exports = this.exports;
}
@@ -887,8 +998,8 @@ var requirejs, require, define;
if (err) {
err.requireMap = this.map;
- err.requireModules = this.map.isDefine ? [this.map.id] : null;
- err.requireType = this.map.isDefine ? 'define' : 'require';
+ err.requireModules = [this.map.id];
+ err.requireType = 'define';
return onError((this.error = err));
}
@@ -908,9 +1019,14 @@ var requirejs, require, define;
}
//Clean up
- cleanRegistry(id);
+ delete registry[id];
this.defined = true;
+ context.waitCount -= 1;
+ if (context.waitCount === 0) {
+ //Clear the wait array used for cycles.
+ waitAry = [];
+ }
}
//Finished the define stage. Allow calling check again
@@ -918,33 +1034,25 @@ var requirejs, require, define;
//cycle.
this.defining = false;
- if (this.defined && !this.defineEmitted) {
- this.defineEmitted = true;
- this.emit('defined', this.exports);
- this.defineEmitComplete = true;
+ if (!silent) {
+ if (this.defined && !this.defineEmitted) {
+ this.defineEmitted = true;
+ this.emit('defined', this.exports);
+ this.defineEmitComplete = true;
+ }
}
-
}
},
- callPlugin: function () {
+ callPlugin: function() {
var map = this.map,
id = map.id,
- //Map already normalized the prefix.
- pluginMap = makeModuleMap(map.prefix);
-
- //Mark this as a dependency for this plugin, so it
- //can be traced for cycles.
- this.depMaps.push(pluginMap);
+ pluginMap = makeModuleMap(map.prefix, null, false, true);
on(pluginMap, 'defined', bind(this, function (plugin) {
- var load, normalizedMap, normalizedMod,
- bundleId = getOwn(bundlesMap, this.map.id),
- name = this.map.name,
+ var name = this.map.name,
parentName = this.map.parentMap ? this.map.parentMap.name : null,
- localRequire = context.makeRequire(map.parentMap, {
- enableBuildCallback: true
- });
+ load, normalizedMap, normalizedMod;
//If current map is not normalized, wait for that
//normalized name to load instead of continuing.
@@ -956,24 +1064,16 @@ var requirejs, require, define;
}) || '';
}
- //prefix and name should already be normalized, no need
- //for applying map config again either.
- normalizedMap = makeModuleMap(map.prefix + '!' + name,
- this.map.parentMap);
+ normalizedMap = makeModuleMap(map.prefix + '!' + name);
on(normalizedMap,
- 'defined', bind(this, function (value) {
- this.init([], function () { return value; }, null, {
- enabled: true,
- ignore: true
- });
- }));
-
- normalizedMod = getOwn(registry, normalizedMap.id);
+ 'defined', bind(this, function (value) {
+ this.init([], function () { return value; }, null, {
+ enabled: true,
+ ignore: true
+ });
+ }));
+ normalizedMod = registry[normalizedMap.id];
if (normalizedMod) {
- //Mark this as a dependency for this plugin, so it
- //can be traced for cycles.
- this.depMaps.push(normalizedMap);
-
if (this.events.error) {
normalizedMod.on('error', bind(this, function (err) {
this.emit('error', err);
@@ -985,14 +1085,6 @@ var requirejs, require, define;
return;
}
- //If a paths config, then just load that file instead to
- //resolve the plugin, as it is built into that paths layer.
- if (bundleId) {
- this.map.url = context.nameToUrl(bundleId);
- this.load();
- return;
- }
-
load = bind(this, function (value) {
this.init([], function () { return value; }, null, {
enabled: true
@@ -1008,7 +1100,7 @@ var requirejs, require, define;
//since they will never be resolved otherwise now.
eachProp(registry, function (mod) {
if (mod.map.id.indexOf(id + '_unnormalized') === 0) {
- cleanRegistry(mod.map.id);
+ removeWaiting(mod.map.id);
}
});
@@ -1017,19 +1109,9 @@ var requirejs, require, define;
//Allow plugins to load other code without having to know the
//context or how to 'complete' the load.
- load.fromText = bind(this, function (text, textAlt) {
+ load.fromText = function (moduleName, text) {
/*jslint evil: true */
- var moduleName = map.name,
- moduleMap = makeModuleMap(moduleName),
- hasInteractive = useInteractive;
-
- //As of 2.1.0, support just passing the text, to reinforce
- //fromText only being called once per resource. Still
- //support old style of passing moduleName but discard
- //that moduleName in favor of the internal ref.
- if (textAlt) {
- text = textAlt;
- }
+ var hasInteractive = useInteractive;
//Turn off interactive script matching for IE for any define
//calls in the text, then turn it back on at the end.
@@ -1037,45 +1119,22 @@ var requirejs, require, define;
useInteractive = false;
}
- //Prime the system by creating a module instance for
- //it.
- getModule(moduleMap);
-
- //Transfer any config to this other module.
- if (hasProp(config.config, id)) {
- config.config[moduleName] = config.config[id];
- }
-
- try {
- req.exec(text);
- } catch (e) {
- return onError(makeError('fromtexteval',
- 'fromText eval for ' + id +
- ' failed: ' + e,
- e,
- [id]));
- }
+ req.exec(text);
if (hasInteractive) {
useInteractive = true;
}
- //Mark this as a dependency for the plugin
- //resource
- this.depMaps.push(moduleMap);
-
//Support anonymous modules.
context.completeLoad(moduleName);
-
- //Bind the value of that module to the value for this
- //resource ID.
- localRequire([moduleName], load);
- });
+ };
//Use parentName here since the plugin's name is not reliable,
//could be some weird string with no path that actually wants to
//reference the parentName's path.
- plugin.load(map.name, localRequire, load, config);
+ plugin.load(map.name, makeRequire(map.parentMap, true, function (deps, cb) {
+ return context.require(deps, cb);
+ }), load, config);
}));
context.enable(pluginMap, this);
@@ -1083,73 +1142,39 @@ var requirejs, require, define;
},
enable: function () {
- enabledRegistry[this.map.id] = this;
this.enabled = true;
- //Set flag mentioning that the module is enabling,
- //so that immediate calls to the defined callbacks
- //for dependencies do not trigger inadvertent load
- //with the depCount still being zero.
- this.enabling = true;
+ if (!this.waitPushed) {
+ waitAry.push(this);
+ context.waitCount += 1;
+ this.waitPushed = true;
+ }
//Enable each dependency
- each(this.depMaps, bind(this, function (depMap, i) {
- var id, mod, handler;
-
- if (typeof depMap === 'string') {
- //Dependency needs to be converted to a depMap
- //and wired up to this module.
- depMap = makeModuleMap(depMap,
- (this.map.isDefine ? this.map : this.map.parentMap),
- false,
- !this.skipMap);
- this.depMaps[i] = depMap;
-
- handler = getOwn(handlers, depMap.id);
-
- if (handler) {
- this.depExports[i] = handler(this);
- return;
- }
-
- this.depCount += 1;
-
- on(depMap, 'defined', bind(this, function (depExports) {
- this.defineDep(i, depExports);
- this.check();
- }));
-
- if (this.errback) {
- on(depMap, 'error', bind(this, this.errback));
- }
- }
-
- id = depMap.id;
- mod = registry[id];
-
+ each(this.depMaps, bind(this, function (map) {
+ var id = map.id,
+ mod = registry[id];
//Skip special modules like 'require', 'exports', 'module'
//Also, don't call enable if it is already enabled,
//important in circular dependency cases.
- if (!hasProp(handlers, id) && mod && !mod.enabled) {
- context.enable(depMap, this);
+ if (!handlers[id] && mod && !mod.enabled) {
+ context.enable(map, this);
}
}));
//Enable each plugin that is used in
//a dependency
eachProp(this.pluginMaps, bind(this, function (pluginMap) {
- var mod = getOwn(registry, pluginMap.id);
+ var mod = registry[pluginMap.id];
if (mod && !mod.enabled) {
context.enable(pluginMap, this);
}
}));
- this.enabling = false;
-
this.check();
},
- on: function (name, cb) {
+ on: function(name, cb) {
var cbs = this.events[name];
if (!cbs) {
cbs = this.events[name] = [];
@@ -1164,17 +1189,14 @@ var requirejs, require, define;
if (name === 'error') {
//Now that the error handler was triggered, remove
//the listeners, since this broken Module instance
- //can stay around for a while in the registry.
+ //can stay around for a while in the registry/waitAry.
delete this.events[name];
}
}
};
function callGetModule(args) {
- //Skip modules already defined.
- if (!hasProp(defined, args[0])) {
- getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
- }
+ getModule(makeModuleMap(args[0], null, true)).init(args[1], args[2]);
}
function removeListener(node, func, name, ieName) {
@@ -1214,36 +1236,17 @@ var requirejs, require, define;
};
}
- function intakeDefines() {
- var args;
-
- //Any defined modules in the global queue, intake them now.
- takeGlobalQueue();
-
- //Make sure any remaining defQueue items get properly processed.
- while (defQueue.length) {
- args = defQueue.shift();
- if (args[0] === null) {
- return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
- } else {
- //args are id, deps, factory. Should be normalized by the
- //define() function.
- callGetModule(args);
- }
- }
- }
-
- context = {
+ return (context = {
config: config,
contextName: contextName,
registry: registry,
defined: defined,
+ urlMap: urlMap,
urlFetched: urlFetched,
+ waitCount: 0,
defQueue: defQueue,
Module: Module,
makeModuleMap: makeModuleMap,
- nextTick: req.nextTick,
- onError: onError,
/**
* Set a configuration for the context.
@@ -1257,36 +1260,25 @@ var requirejs, require, define;
}
}
- //Save off the paths since they require special processing,
+ //Save off the paths and packages since they require special processing,
//they are additive.
- var shim = config.shim,
- objs = {
- paths: true,
- bundles: true,
- config: true,
- map: true
- };
+ var paths = config.paths,
+ pkgs = config.pkgs,
+ shim = config.shim,
+ map = config.map || {};
- eachProp(cfg, function (value, prop) {
- if (objs[prop]) {
- if (!config[prop]) {
- config[prop] = {};
- }
- mixin(config[prop], value, true, true);
- } else {
- config[prop] = value;
- }
- });
+ //Mix in the config values, favoring the new values over
+ //existing ones in context.config.
+ mixin(config, cfg, true);
- //Reverse map the bundles
- if (cfg.bundles) {
- eachProp(cfg.bundles, function (value, prop) {
- each(value, function (v) {
- if (v !== prop) {
- bundlesMap[v] = prop;
- }
- });
- });
+ //Merge paths.
+ mixin(paths, cfg.paths, true);
+ config.paths = paths;
+
+ //Merge map
+ if (cfg.map) {
+ mixin(map, cfg.map, true);
+ config.map = map;
}
//Merge shim
@@ -1298,8 +1290,8 @@ var requirejs, require, define;
deps: value
};
}
- if ((value.exports || value.init) && !value.exportsFn) {
- value.exportsFn = context.makeShimExports(value);
+ if (value.exports && !value.exports.__buildReady) {
+ value.exports = context.makeShimExports(value.exports);
}
shim[id] = value;
});
@@ -1309,38 +1301,30 @@ var requirejs, require, define;
//Adjust packages if necessary.
if (cfg.packages) {
each(cfg.packages, function (pkgObj) {
- var location, name;
+ var location;
pkgObj = typeof pkgObj === 'string' ? { name: pkgObj } : pkgObj;
-
- name = pkgObj.name;
location = pkgObj.location;
- if (location) {
- config.paths[name] = pkgObj.location;
- }
- //Save pointer to main module ID for pkg name.
- //Remove leading dot in main, so main paths are normalized,
- //and remove any trailing .js, since different package
- //envs have different conventions: some use a module name,
- //some use a file name.
- config.pkgs[name] = pkgObj.name + '/' + (pkgObj.main || 'main')
- .replace(currDirRegExp, '')
- .replace(jsSuffixRegExp, '');
+ //Create a brand new object on pkgs, since currentPackages can
+ //be passed in again, and config.pkgs is the internal transformed
+ //state for all package configs.
+ pkgs[pkgObj.name] = {
+ name: pkgObj.name,
+ location: location || pkgObj.name,
+ //Remove leading dot in main, so main paths are normalized,
+ //and remove any trailing .js, since different package
+ //envs have different conventions: some use a module name,
+ //some use a file name.
+ main: (pkgObj.main || 'main')
+ .replace(currDirRegExp, '')
+ .replace(jsSuffixRegExp, '')
+ };
});
- }
- //If there are any "waiting to execute" modules in the registry,
- //update the maps for them, since their info, like URLs to load,
- //may have changed.
- eachProp(registry, function (mod, id) {
- //If module already has init called, since it is too
- //late to modify them, and ignore unnormalized ones
- //since they are transient.
- if (!mod.inited && !mod.map.unnormalized) {
- mod.map = makeModuleMap(id);
- }
- });
+ //Done with modifications, assing packages back to context config
+ config.pkgs = pkgs;
+ }
//If a deps array or a config callback is specified, then call
//require with those args. This is useful when require is defined as a
@@ -1350,169 +1334,131 @@ var requirejs, require, define;
}
},
- makeShimExports: function (value) {
- function fn() {
- var ret;
- if (value.init) {
- ret = value.init.apply(global, arguments);
- }
- return ret || (value.exports && getGlobal(value.exports));
- }
- return fn;
- },
-
- makeRequire: function (relMap, options) {
- options = options || {};
-
- function localRequire(deps, callback, errback) {
- var id, map, requireMod;
-
- if (options.enableBuildCallback && callback && isFunction(callback)) {
- callback.__requireJsBuild = true;
- }
-
- if (typeof deps === 'string') {
- if (isFunction(callback)) {
- //Invalid call
- return onError(makeError('requireargs', 'Invalid require call'), errback);
- }
-
- //If require|exports|module are requested, get the
- //value for them from the special handlers. Caveat:
- //this only works while module is being defined.
- if (relMap && hasProp(handlers, deps)) {
- return handlers[deps](registry[relMap.id]);
- }
-
- //Synchronous access to one module. If require.get is
- //available (as in the Node adapter), prefer that.
- if (req.get) {
- return req.get(context, deps, relMap, localRequire);
- }
-
- //Normalize module name, if it contains . or ..
- map = makeModuleMap(deps, relMap, false, true);
- id = map.id;
-
- if (!hasProp(defined, id)) {
- return onError(makeError('notloaded', 'Module name "' +
- id +
- '" has not been loaded yet for context: ' +
- contextName +
- (relMap ? '' : '. Use require([])')));
- }
- return defined[id];
- }
-
- //Grab defines waiting in the global queue.
- intakeDefines();
-
- //Mark all the dependencies as needing to be loaded.
- context.nextTick(function () {
- //Some defines could have been added since the
- //require call, collect them.
- intakeDefines();
-
- requireMod = getModule(makeModuleMap(null, relMap));
-
- //Store if map config should be applied to this require
- //call for dependencies.
- requireMod.skipMap = options.skipMap;
-
- requireMod.init(deps, callback, errback, {
- enabled: true
- });
-
- checkLoaded();
- });
-
- return localRequire;
- }
-
- mixin(localRequire, {
- isBrowser: isBrowser,
-
- /**
- * Converts a module name + .extension into an URL path.
- * *Requires* the use of a module name. It does not support using
- * plain URLs like nameToUrl.
- */
- toUrl: function (moduleNamePlusExt) {
- var ext,
- index = moduleNamePlusExt.lastIndexOf('.'),
- segment = moduleNamePlusExt.split('/')[0],
- isRelative = segment === '.' || segment === '..';
-
- //Have a file extension alias, and it is not the
- //dots from a relative path.
- if (index !== -1 && (!isRelative || index > 1)) {
- ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
- moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
- }
-
- return context.nameToUrl(normalize(moduleNamePlusExt,
- relMap && relMap.id, true), ext, true);
- },
-
- defined: function (id) {
- return hasProp(defined, makeModuleMap(id, relMap, false, true).id);
- },
-
- specified: function (id) {
- id = makeModuleMap(id, relMap, false, true).id;
- return hasProp(defined, id) || hasProp(registry, id);
- }
- });
-
- //Only allow undef on top level require calls
- if (!relMap) {
- localRequire.undef = function (id) {
- //Bind any waiting define() calls to this context,
- //fix for #408
- takeGlobalQueue();
-
- var map = makeModuleMap(id, relMap, true),
- mod = getOwn(registry, id);
-
- removeScript(id);
-
- delete defined[id];
- delete urlFetched[map.url];
- delete undefEvents[id];
-
- //Clean queued defines too. Go backwards
- //in array so that the splices do not
- //mess up the iteration.
- eachReverse(defQueue, function(args, i) {
- if(args[0] === id) {
- defQueue.splice(i, 1);
- }
- });
-
- if (mod) {
- //Hold on to listeners in case the
- //module will be attempted to be reloaded
- //using a different config.
- if (mod.events.defined) {
- undefEvents[id] = mod.events;
- }
-
- cleanRegistry(id);
- }
+ makeShimExports: function (exports) {
+ var func;
+ if (typeof exports === 'string') {
+ func = function () {
+ return getGlobal(exports);
+ };
+ //Save the exports for use in nodefine checking.
+ func.exports = exports;
+ return func;
+ } else {
+ return function () {
+ return exports.apply(global, arguments);
};
}
+ },
- return localRequire;
+ requireDefined: function (id, relMap) {
+ return hasProp(defined, makeModuleMap(id, relMap, false, true).id);
+ },
+
+ requireSpecified: function (id, relMap) {
+ id = makeModuleMap(id, relMap, false, true).id;
+ return hasProp(defined, id) || hasProp(registry, id);
+ },
+
+ require: function (deps, callback, errback, relMap) {
+ var moduleName, id, map, requireMod, args;
+ if (typeof deps === 'string') {
+ if (isFunction(callback)) {
+ //Invalid call
+ return onError(makeError('requireargs', 'Invalid require call'), errback);
+ }
+
+ //Synchronous access to one module. If require.get is
+ //available (as in the Node adapter), prefer that.
+ //In this case deps is the moduleName and callback is
+ //the relMap
+ if (req.get) {
+ return req.get(context, deps, callback);
+ }
+
+ //Just return the module wanted. In this scenario, the
+ //second arg (if passed) is just the relMap.
+ moduleName = deps;
+ relMap = callback;
+
+ //Normalize module name, if it contains . or ..
+ map = makeModuleMap(moduleName, relMap, false, true);
+ id = map.id;
+
+ if (!hasProp(defined, id)) {
+ return onError(makeError('notloaded', 'Module name "' +
+ id +
+ '" has not been loaded yet for context: ' +
+ contextName));
+ }
+ return defined[id];
+ }
+
+ //Callback require. Normalize args. if callback or errback is
+ //not a function, it means it is a relMap. Test errback first.
+ if (errback && !isFunction(errback)) {
+ relMap = errback;
+ errback = undefined;
+ }
+ if (callback && !isFunction(callback)) {
+ relMap = callback;
+ callback = undefined;
+ }
+
+ //Any defined modules in the global queue, intake them now.
+ takeGlobalQueue();
+
+ //Make sure any remaining defQueue items get properly processed.
+ while (defQueue.length) {
+ args = defQueue.shift();
+ if (args[0] === null) {
+ return onError(makeError('mismatch', 'Mismatched anonymous define() module: ' + args[args.length - 1]));
+ } else {
+ //args are id, deps, factory. Should be normalized by the
+ //define() function.
+ callGetModule(args);
+ }
+ }
+
+ //Mark all the dependencies as needing to be loaded.
+ requireMod = getModule(makeModuleMap(null, relMap));
+
+ requireMod.init(deps, callback, errback, {
+ enabled: true
+ });
+
+ checkLoaded();
+
+ return context.require;
+ },
+
+ undef: function (id) {
+ var map = makeModuleMap(id, null, true),
+ mod = registry[id];
+
+ delete defined[id];
+ delete urlMap[id];
+ delete urlFetched[map.url];
+ delete undefEvents[id];
+
+ if (mod) {
+ //Hold on to listeners in case the
+ //module will be attempted to be reloaded
+ //using a different config.
+ if (mod.events.defined) {
+ undefEvents[id] = mod.events;
+ }
+
+ removeWaiting(id);
+ }
},
/**
* Called to enable a module if it is still in the registry
- * awaiting enablement. A second arg, parent, the parent module,
- * is passed in for context, when this method is overridden by
- * the optimizer. Not shown here to keep code compact.
+ * awaiting enablement. parent module is passed in for context,
+ * used by the optimizer.
*/
- enable: function (depMap) {
- var mod = getOwn(registry, depMap.id);
+ enable: function (depMap, parent) {
+ var mod = registry[depMap.id];
if (mod) {
getModule(depMap).enable();
}
@@ -1525,9 +1471,9 @@ var requirejs, require, define;
* @param {String} moduleName the name of the module to potentially complete.
*/
completeLoad: function (moduleName) {
- var found, args, mod,
- shim = getOwn(config.shim, moduleName) || {},
- shExports = shim.exports;
+ var shim = config.shim[moduleName] || {},
+ shExports = shim.exports && shim.exports.exports,
+ found, args, mod;
takeGlobalQueue();
@@ -1552,9 +1498,11 @@ var requirejs, require, define;
//Do this after the cycle of callGetModule in case the result
//of those calls/init calls changes the registry.
- mod = getOwn(registry, moduleName);
+ mod = registry[moduleName];
- if (!found && !hasProp(defined, moduleName) && mod && !mod.inited) {
+ if (!found &&
+ !defined[moduleName] &&
+ mod && !mod.inited) {
if (config.enforceDefine && (!shExports || !getGlobal(shExports))) {
if (hasPathFallback(moduleName)) {
return;
@@ -1567,34 +1515,40 @@ var requirejs, require, define;
} else {
//A script that does not call define(), so just simulate
//the call for it.
- callGetModule([moduleName, (shim.deps || []), shim.exportsFn]);
+ callGetModule([moduleName, (shim.deps || []), shim.exports]);
}
}
checkLoaded();
},
+ /**
+ * Converts a module name + .extension into an URL path.
+ * *Requires* the use of a module name. It does not support using
+ * plain URLs like nameToUrl.
+ */
+ toUrl: function (moduleNamePlusExt, relModuleMap) {
+ var index = moduleNamePlusExt.lastIndexOf('.'),
+ ext = null;
+
+ if (index !== -1) {
+ ext = moduleNamePlusExt.substring(index, moduleNamePlusExt.length);
+ moduleNamePlusExt = moduleNamePlusExt.substring(0, index);
+ }
+
+ return context.nameToUrl(moduleNamePlusExt, ext, relModuleMap);
+ },
+
/**
* Converts a module name to a file path. Supports cases where
* moduleName may actually be just an URL.
- * Note that it **does not** call normalize on the moduleName,
- * it is assumed to have already been normalized. This is an
- * internal API, not a public one. Use toUrl for the public API.
*/
- nameToUrl: function (moduleName, ext, skipExt) {
- var paths, syms, i, parentModule, url,
- parentPath, bundleId,
- pkgMain = getOwn(config.pkgs, moduleName);
+ nameToUrl: function (moduleName, ext, relModuleMap) {
+ var paths, pkgs, pkg, pkgPath, syms, i, parentModule, url,
+ parentPath;
- if (pkgMain) {
- moduleName = pkgMain;
- }
-
- bundleId = getOwn(bundlesMap, moduleName);
-
- if (bundleId) {
- return context.nameToUrl(bundleId, ext, skipExt);
- }
+ //Normalize module name if have a base relative module name to work from.
+ moduleName = normalize(moduleName, relModuleMap && relModuleMap.id, true);
//If a colon is in the URL, it indicates a protocol is used and it is just
//an URL to a file, or if it starts with a slash, contains a query arg (i.e. ?)
@@ -1608,6 +1562,7 @@ var requirejs, require, define;
} else {
//A module that needs to be converted to a path.
paths = config.paths;
+ pkgs = config.pkgs;
syms = moduleName.split('/');
//For each module name segment, see if there is a path
@@ -1615,8 +1570,8 @@ var requirejs, require, define;
//and work up from it.
for (i = syms.length; i > 0; i -= 1) {
parentModule = syms.slice(0, i).join('/');
-
- parentPath = getOwn(paths, parentModule);
+ pkg = pkgs[parentModule];
+ parentPath = paths[parentModule];
if (parentPath) {
//If an array, it means there are a few choices,
//Choose the one that is desired
@@ -1625,12 +1580,21 @@ var requirejs, require, define;
}
syms.splice(0, i, parentPath);
break;
+ } else if (pkg) {
+ //If module name is just the package name, then looking
+ //for the main module.
+ if (moduleName === pkg.name) {
+ pkgPath = pkg.location + '/' + pkg.main;
+ } else {
+ pkgPath = pkg.location;
+ }
+ syms.splice(0, i, pkgPath);
+ break;
}
}
//Join the path parts together, then figure out if baseUrl is needed.
- url = syms.join('/');
- url += (ext || (/^data\:|\?/.test(url) || skipExt ? '' : '.js'));
+ url = syms.join('/') + (ext || '.js');
url = (url.charAt(0) === '/' || url.match(/^[\w\+\.\-]+:/) ? '' : config.baseUrl) + url;
}
@@ -1646,7 +1610,7 @@ var requirejs, require, define;
},
/**
- * Executes a module callback function. Broken out as a separate function
+ * Executes a module callack function. Broken out as a separate function
* solely to allow the build system to sequence the files in the built
* layer in the right sequence.
*
@@ -1667,7 +1631,7 @@ var requirejs, require, define;
//all old browsers will be supported, but this one was easy enough
//to support and still makes sense.
if (evt.type === 'load' ||
- (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) {
+ (readyRegExp.test((evt.currentTarget || evt.srcElement).readyState))) {
//Reset interactive script so a script node is not held onto for
//to long.
interactiveScript = null;
@@ -1684,13 +1648,10 @@ var requirejs, require, define;
onScriptError: function (evt) {
var data = getScriptData(evt);
if (!hasPathFallback(data.id)) {
- return onError(makeError('scripterror', 'Script error for: ' + data.id, evt, [data.id]));
+ return onError(makeError('scripterror', 'Script error', evt, [data.id]));
}
}
- };
-
- context.require = context.makeRequire();
- return context;
+ });
}
/**
@@ -1710,8 +1671,8 @@ var requirejs, require, define;
req = requirejs = function (deps, callback, errback, optional) {
//Find the right context, use default
- var context, config,
- contextName = defContextName;
+ var contextName = defContextName,
+ context, config;
// Determine if have config object in the call.
if (!isArray(deps) && typeof deps !== 'string') {
@@ -1731,7 +1692,7 @@ var requirejs, require, define;
contextName = config.context;
}
- context = getOwn(contexts, contextName);
+ context = contexts[contextName];
if (!context) {
context = contexts[contextName] = req.s.newContext(contextName);
}
@@ -1751,16 +1712,6 @@ var requirejs, require, define;
return req(config);
};
- /**
- * Execute something after the current tick
- * of the event loop. Override for other envs
- * that have a better solution than setTimeout.
- * @param {Function} fn function to execute later.
- */
- req.nextTick = typeof setTimeout !== 'undefined' ? function (fn) {
- setTimeout(fn, 4);
- } : function (fn) { fn(); };
-
/**
* Export require as a global, but only if it does not already exist.
*/
@@ -1781,21 +1732,9 @@ var requirejs, require, define;
//Create default context.
req({});
- //Exports some context-sensitive methods on global require.
- each([
- 'toUrl',
- 'undef',
- 'defined',
- 'specified'
- ], function (prop) {
- //Reference from contexts instead of early binding to default context,
- //so that during builds, the latest instance of the default context
- //with its config gets used.
- req[prop] = function () {
- var ctx = contexts[defContextName];
- return ctx.require[prop].apply(ctx, arguments);
- };
- });
+ //Exports some context-sensitive methods on global require, using
+ //default context if no context specified.
+ addRequireMethods(req, contexts[defContextName]);
if (isBrowser) {
head = s.head = document.getElementsByTagName('head')[0];
@@ -1813,19 +1752,8 @@ var requirejs, require, define;
* function. Intercept/override it if you want custom error handling.
* @param {Error} err the error object.
*/
- req.onError = defaultOnError;
-
- /**
- * Creates the node for the load command. Only used in browser envs.
- */
- req.createNode = function (config, moduleName, url) {
- var node = config.xhtml ?
- document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
- document.createElement('script');
- node.type = config.scriptType || 'text/javascript';
- node.charset = 'utf-8';
- node.async = true;
- return node;
+ req.onError = function (err) {
+ throw err;
};
/**
@@ -1842,7 +1770,11 @@ var requirejs, require, define;
node;
if (isBrowser) {
//In the browser so use a script tag
- node = req.createNode(config, moduleName, url);
+ node = config.xhtml ?
+ document.createElementNS('http://www.w3.org/1999/xhtml', 'html:script') :
+ document.createElement('script');
+ node.type = config.scriptType || 'text/javascript';
+ node.charset = 'utf-8';
node.setAttribute('data-requirecontext', context.contextName);
node.setAttribute('data-requiremodule', moduleName);
@@ -1856,15 +1788,15 @@ var requirejs, require, define;
//UNFORTUNATELY Opera implements attachEvent but does not follow the script
//script execution mode.
if (node.attachEvent &&
- //Check if node.attachEvent is artificially added by custom script or
- //natively supported by browser
- //read https://github.com/jrburke/requirejs/issues/187
- //if we can NOT find [native code] then it must NOT natively supported.
- //in IE8, node.attachEvent does not have toString()
- //Note the test for "[native code" with no closing brace, see:
- //https://github.com/jrburke/requirejs/issues/273
- !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) &&
- !isOpera) {
+ //Check if node.attachEvent is artificially added by custom script or
+ //natively supported by browser
+ //read https://github.com/jrburke/requirejs/issues/187
+ //if we can NOT find [native code] then it must NOT natively supported.
+ //in IE8, node.attachEvent does not have toString()
+ //Note the test for "[native code" with no closing brace, see:
+ //https://github.com/jrburke/requirejs/issues/273
+ !(node.attachEvent.toString && node.attachEvent.toString().indexOf('[native code') < 0) &&
+ !isOpera) {
//Probably IE. IE (at least 6-8) do not fire
//script onload right after executing the script, so
//we cannot tie the anonymous define call to a name.
@@ -1875,7 +1807,7 @@ var requirejs, require, define;
node.attachEvent('onreadystatechange', context.onScriptLoad);
//It would be great to add an error handler here to catch
//404s in IE9+. However, onreadystatechange will fire before
- //the error handler, so that does not help. If addEventListener
+ //the error handler, so that does not help. If addEvenListener
//is used, then IE will fire error before load, but we cannot
//use that pathway given the connect.microsoft.com issue
//mentioned above about not doing the 'script execute,
@@ -1904,24 +1836,16 @@ var requirejs, require, define;
return node;
} else if (isWebWorker) {
- try {
- //In a web worker, use importScripts. This is not a very
- //efficient use of importScripts, importScripts will block until
- //its script is downloaded and evaluated. However, if web workers
- //are in play, the expectation that a build has been done so that
- //only one script needs to be loaded anyway. This may need to be
- //reevaluated if other use cases become common.
- importScripts(url);
+ //In a web worker, use importScripts. This is not a very
+ //efficient use of importScripts, importScripts will block until
+ //its script is downloaded and evaluated. However, if web workers
+ //are in play, the expectation that a build has been done so that
+ //only one script needs to be loaded anyway. This may need to be
+ //reevaluated if other use cases become common.
+ importScripts(url);
- //Account for anonymous modules
- context.completeLoad(moduleName);
- } catch (e) {
- context.onError(makeError('importscripts',
- 'importScripts failed for ' +
- moduleName + ' at ' + url,
- e,
- [moduleName]));
- }
+ //Account for anonymous modules
+ context.completeLoad(moduleName);
}
};
@@ -1939,7 +1863,7 @@ var requirejs, require, define;
}
//Look for a data-main script attribute, which could also adjust the baseUrl.
- if (isBrowser && !cfg.skipDataMain) {
+ if (isBrowser) {
//Figure out baseUrl. Get it from the script tag with require.js in it.
eachReverse(scripts(), function (script) {
//Set the 'head' where we can append children by
@@ -1953,31 +1877,22 @@ var requirejs, require, define;
//baseUrl, if it is not already set.
dataMain = script.getAttribute('data-main');
if (dataMain) {
- //Preserve dataMain in case it is a path (i.e. contains '?')
- mainScript = dataMain;
-
- //Set final baseUrl if there is not already an explicit one.
if (!cfg.baseUrl) {
//Pull off the directory of data-main for use as the
//baseUrl.
- src = mainScript.split('/');
+ src = dataMain.split('/');
mainScript = src.pop();
subPath = src.length ? src.join('/') + '/' : './';
+ //Set final config.
cfg.baseUrl = subPath;
- }
-
- //Strip off any trailing .js since mainScript is now
- //like a module name.
- mainScript = mainScript.replace(jsSuffixRegExp, '');
-
- //If mainScript is still a path, fall back to dataMain
- if (req.jsExtRegExp.test(mainScript)) {
- mainScript = dataMain;
+ //Strip off any trailing .js since dataMain is now
+ //like a module name.
+ dataMain = mainScript.replace(jsSuffixRegExp, '');
}
//Put the data-main script in the files to load.
- cfg.deps = cfg.deps ? cfg.deps.concat(mainScript) : [mainScript];
+ cfg.deps = cfg.deps ? cfg.deps.concat(dataMain) : [dataMain];
return true;
}
@@ -1994,7 +1909,7 @@ var requirejs, require, define;
define = function (name, deps, callback) {
var node, context;
- //Allow for anonymous modules
+ //Allow for anonymous functions
if (typeof name !== 'string') {
//Adjust args appropriately
callback = deps;
@@ -2005,13 +1920,12 @@ var requirejs, require, define;
//This module may not have dependencies
if (!isArray(deps)) {
callback = deps;
- deps = null;
+ deps = [];
}
//If no name, and callback is a function, then figure out if it a
//CommonJS thing with dependencies.
- if (!deps && isFunction(callback)) {
- deps = [];
+ if (!deps.length && isFunction(callback)) {
//Remove comments from the callback string,
//look for require calls, and pull them into the dependencies,
//but only if there are function args.
diff --git a/demo/kitchen-sink/styles.css b/demo/kitchen-sink/styles.css
index 3f46f701..e5909787 100644
--- a/demo/kitchen-sink/styles.css
+++ b/demo/kitchen-sink/styles.css
@@ -1,3 +1,7 @@
+/*PACKAGE
+@import url(//fonts.googleapis.com/css?family=Droid+Sans+Mono);
+ PACKAGE*/
+
html {
height: 100%;
width: 100%;
@@ -16,12 +20,12 @@ body {
color: white;
}
-#c9-logo, #ace-logo {
- padding: 0;
- border: none;
+#logo {
+ padding: 15px;
+ margin-left: 70px;
}
-#editor-container {
+#editor {
position: absolute;
top: 0px;
left: 280px;
@@ -40,16 +44,4 @@ body {
#controls td + td {
text-align: left;
-}
-.ace_status-indicator {
- color: gray;
- position: absolute;
- right: 0;
- border-left: 1px solid;
-}
-
-/* .ace_text-input {
- z-index: 10!important;
- opacity: 1!important;
- background: rgb(84, 0, 255)!important;
-}*/
+}
\ No newline at end of file
diff --git a/demo/kitchen-sink/token_tooltip.js b/demo/kitchen-sink/token_tooltip.js
deleted file mode 100644
index 9e607f69..00000000
--- a/demo/kitchen-sink/token_tooltip.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-"use strict";
-
-var dom = require("ace/lib/dom");
-var oop = require("ace/lib/oop");
-var event = require("ace/lib/event");
-var Range = require("ace/range").Range;
-var Tooltip = require("ace/tooltip").Tooltip;
-
-function TokenTooltip (editor) {
- if (editor.tokenTooltip)
- return;
- Tooltip.call(this, editor.container);
- editor.tokenTooltip = this;
- this.editor = editor;
-
- this.update = this.update.bind(this);
- this.onMouseMove = this.onMouseMove.bind(this);
- this.onMouseOut = this.onMouseOut.bind(this);
- event.addListener(editor.renderer.scroller, "mousemove", this.onMouseMove);
- event.addListener(editor.renderer.content, "mouseout", this.onMouseOut);
-}
-
-oop.inherits(TokenTooltip, Tooltip);
-
-(function(){
- this.token = {};
- this.range = new Range();
-
- this.update = function() {
- this.$timer = null;
-
- var r = this.editor.renderer;
- if (this.lastT - (r.timeStamp || 0) > 1000) {
- r.rect = null;
- r.timeStamp = this.lastT;
- this.maxHeight = window.innerHeight;
- this.maxWidth = window.innerWidth;
- }
-
- var canvasPos = r.rect || (r.rect = r.scroller.getBoundingClientRect());
- var offset = (this.x + r.scrollLeft - canvasPos.left - r.$padding) / r.characterWidth;
- var row = Math.floor((this.y + r.scrollTop - canvasPos.top) / r.lineHeight);
- var col = Math.round(offset);
-
- var screenPos = {row: row, column: col, side: offset - col > 0 ? 1 : -1};
- var session = this.editor.session;
- var docPos = session.screenToDocumentPosition(screenPos.row, screenPos.column);
- var token = session.getTokenAt(docPos.row, docPos.column);
-
- if (!token && !session.getLine(docPos.row)) {
- token = {
- type: "",
- value: "",
- state: session.bgTokenizer.getState(0)
- };
- }
- if (!token) {
- session.removeMarker(this.marker);
- this.hide();
- return;
- }
-
- var tokenText = token.type;
- if (token.state)
- tokenText += "|" + token.state;
- if (token.merge)
- tokenText += "\n merge";
- if (token.stateTransitions)
- tokenText += "\n " + token.stateTransitions.join("\n ");
-
- if (this.tokenText != tokenText) {
- this.setText(tokenText);
- this.width = this.getWidth();
- this.height = this.getHeight();
- this.tokenText = tokenText;
- }
-
- this.show(null, this.x, this.y);
-
- this.token = token;
- session.removeMarker(this.marker);
- this.range = new Range(docPos.row, token.start, docPos.row, token.start + token.value.length);
- this.marker = session.addMarker(this.range, "ace_bracket", "text");
- };
-
- this.onMouseMove = function(e) {
- this.x = e.clientX;
- this.y = e.clientY;
- if (this.isOpen) {
- this.lastT = e.timeStamp;
- this.setPosition(this.x, this.y);
- }
- if (!this.$timer)
- this.$timer = setTimeout(this.update, 100);
- };
-
- this.onMouseOut = function(e) {
- if (e && e.currentTarget.contains(e.relatedTarget))
- return;
- this.hide();
- this.editor.session.removeMarker(this.marker);
- this.$timer = clearTimeout(this.$timer);
- };
-
- this.setPosition = function(x, y) {
- if (x + 10 + this.width > this.maxWidth)
- x = window.innerWidth - this.width - 10;
- if (y > window.innerHeight * 0.75 || y + 20 + this.height > this.maxHeight)
- y = y - this.height - 30;
-
- Tooltip.prototype.setPosition.call(this, x + 10, y + 20);
- };
-
- this.destroy = function() {
- this.onMouseOut();
- event.removeListener(this.editor.renderer.scroller, "mousemove", this.onMouseMove);
- event.removeListener(this.editor.renderer.content, "mouseout", this.onMouseOut);
- delete this.editor.tokenTooltip;
- };
-
-}).call(TokenTooltip.prototype);
-
-exports.TokenTooltip = TokenTooltip;
-
-});
diff --git a/demo/kitchen-sink/util.js b/demo/kitchen-sink/util.js
deleted file mode 100644
index c4b74f38..00000000
--- a/demo/kitchen-sink/util.js
+++ /dev/null
@@ -1,235 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-"use strict";
-
-var dom = require("ace/lib/dom");
-var event = require("ace/lib/event");
-
-var EditSession = require("ace/edit_session").EditSession;
-var UndoManager = require("ace/undomanager").UndoManager;
-var Renderer = require("ace/virtual_renderer").VirtualRenderer;
-var Editor = require("ace/editor").Editor;
-var MultiSelect = require("ace/multi_select").MultiSelect;
-
-exports.createEditor = function(el) {
- return new Editor(new Renderer(el));
-};
-
-exports.createSplitEditor = function(el) {
- if (typeof(el) == "string")
- el = document.getElementById(el);
-
- var e0 = document.createElement("div");
- var s = document.createElement("splitter");
- var e1 = document.createElement("div");
- el.appendChild(e0);
- el.appendChild(e1);
- el.appendChild(s);
- e0.style.position = e1.style.position = s.style.position = "absolute";
- el.style.position = "relative";
- var split = {$container: el};
-
- split.editor0 = split[0] = new Editor(new Renderer(e0));
- split.editor1 = split[1] = new Editor(new Renderer(e1));
- split.splitter = s;
-
- s.ratio = 0.5;
-
- split.resize = function resize(){
- var height = el.parentNode.clientHeight - el.offsetTop;
- var total = el.clientWidth;
- var w1 = total * s.ratio;
- var w2 = total * (1- s.ratio);
- s.style.left = w1 - 1 + "px";
- s.style.height = el.style.height = height + "px";
-
- var st0 = split[0].container.style;
- var st1 = split[1].container.style;
- st0.width = w1 + "px";
- st1.width = w2 + "px";
- st0.left = 0 + "px";
- st1.left = w1 + "px";
-
- st0.top = st1.top = "0px";
- st0.height = st1.height = height + "px";
-
- split[0].resize();
- split[1].resize();
- };
-
- split.onMouseDown = function(e) {
- var rect = el.getBoundingClientRect();
- var x = e.clientX;
- var y = e.clientY;
-
- var button = e.button;
- if (button !== 0) {
- return;
- }
-
- var onMouseMove = function(e) {
- x = e.clientX;
- y = e.clientY;
- };
- var onResizeEnd = function(e) {
- clearInterval(timerId);
- };
-
- var onResizeInterval = function() {
- s.ratio = (x - rect.left) / rect.width;
- split.resize();
- };
-
- event.capture(s, onMouseMove, onResizeEnd);
- var timerId = setInterval(onResizeInterval, 40);
-
- return e.preventDefault();
- };
-
-
-
- event.addListener(s, "mousedown", split.onMouseDown);
- event.addListener(window, "resize", split.resize);
- split.resize();
- return split;
-};
-
-/***************************/
-exports.stripLeadingComments = function(str) {
- if(str.slice(0,2)=='/*') {
- var j = str.indexOf('*/')+2;
- str = str.substr(j);
- }
- return str.trim() + "\n";
-};
-
-/***************************/
-exports.saveOption = function(el, val) {
- if (!el.onchange && !el.onclick)
- return;
-
- if ("checked" in el) {
- if (val !== undefined)
- el.checked = val;
-
- localStorage && localStorage.setItem(el.id, el.checked ? 1 : 0);
- }
- else {
- if (val !== undefined)
- el.value = val;
-
- localStorage && localStorage.setItem(el.id, el.value);
- }
-};
-
-exports.bindCheckbox = function(id, callback, noInit) {
- if (typeof id == "string")
- var el = document.getElementById(id);
- else {
- var el = id;
- id = el.id;
- }
- var el = document.getElementById(id);
- if (localStorage && localStorage.getItem(id))
- el.checked = localStorage.getItem(id) == "1";
-
- var onCheck = function() {
- callback(!!el.checked);
- exports.saveOption(el);
- };
- el.onclick = onCheck;
- noInit || onCheck();
- return el;
-};
-
-exports.bindDropdown = function(id, callback, noInit) {
- if (typeof id == "string")
- var el = document.getElementById(id);
- else {
- var el = id;
- id = el.id;
- }
- if (localStorage && localStorage.getItem(id))
- el.value = localStorage.getItem(id);
-
- var onChange = function() {
- callback(el.value);
- exports.saveOption(el);
- };
-
- el.onchange = onChange;
- noInit || onChange();
-};
-
-exports.fillDropdown = function(el, values) {
- if (typeof el == "string")
- el = document.getElementById(el);
-
- dropdown(values).forEach(function(e) {
- el.appendChild(e);
- });
-};
-
-function elt(tag, attributes, content) {
- var el = dom.createElement(tag);
- if (typeof content == "string") {
- el.appendChild(document.createTextNode(content));
- } else if (content) {
- content.forEach(function(ch) {
- el.appendChild(ch);
- });
- }
-
- for (var i in attributes)
- el.setAttribute(i, attributes[i]);
- return el;
-}
-
-function optgroup(values) {
- return values.map(function(item) {
- if (typeof item == "string")
- item = {name: item, caption: item};
- return elt("option", {value: item.value || item.name}, item.caption || item.desc);
- });
-}
-
-function dropdown(values) {
- if (Array.isArray(values))
- return optgroup(values);
-
- return Object.keys(values).map(function(i) {
- return elt("optgroup", {"label": i}, optgroup(values[i]));
- });
-}
-
-
-});
diff --git a/demo/modelist.html b/demo/modelist.html
deleted file mode 100644
index 9b4b6039..00000000
--- a/demo/modelist.html
+++ /dev/null
@@ -1,51 +0,0 @@
-
-
-
- ACE Editor Modelist Demo
-
-
-
-
-Editor
-
-
- demo showing Ace usage with r.js:
-
- install r.js and almond
- and run `
r.js -o demo/r.js/build.js`
-
- note that you also need ace/build/src to lazy load modes and themes
- require("ace/config").set("basePath", "../../build/src");
- require("ace/config").set("packaged", true);
-
-
-
-
-
-
-
diff --git a/demo/requirejs+build.html b/demo/requirejs+build.html
index 72d50dbc..4a494063 100644
--- a/demo/requirejs+build.html
+++ b/demo/requirejs+build.html
@@ -29,20 +29,14 @@
}
+
diff --git a/demo/scrollable-page.html b/demo/scrollable-page.html
index ef725c4a..308208ed 100644
--- a/demo/scrollable-page.html
+++ b/demo/scrollable-page.html
@@ -5,18 +5,19 @@
Editor
-
-
-
-
-
-
-
-
-
-
-
diff --git a/demo/show_own_source.js b/demo/show_own_source.js
deleted file mode 100644
index a9e0ec69..00000000
--- a/demo/show_own_source.js
+++ /dev/null
@@ -1,16 +0,0 @@
-if (typeof ace == "undefined" && typeof require == "undefined") {
- document.body.innerHTML = "
couldn't find ace.js file, node Makefile.dryice.js full"
-} else if (typeof ace == "undefined" && typeof require != "undefined") {
- require(["ace/ace"], setValue)
-} else {
- require = ace.require;
- setValue()
-}
-
-function setValue() {
- require("ace/lib/net").get(document.baseURI, function(t){
- var el = document.getElementById("editor");
- el.env.editor.setValue(t, 1);
- })
-}
\ No newline at end of file
diff --git a/demo/static-highlighter.html b/demo/static-highlighter.html
deleted file mode 100644
index 8e43789d..00000000
--- a/demo/static-highlighter.html
+++ /dev/null
@@ -1,83 +0,0 @@
-
-
-
- Static Code highlighter using Ace
- Client Side Syntax Highlighting
-
-Syntax highlighting using Ace language modes and themes.
-
-
-.code {
- width: 50%;
- white-space: pre-wrap;
- border: solid lightgrey 1px
-}
-
-
-
-
-function wobble (flam) {
- return flam.wobbled = true;
-}
-
-
-
-
-
---[[--
-num_args takes in 5.1 byte code and extracts the number of arguments from its function header.
---]]--
-
-function int(t)
- return t:byte(1) + t:byte(2) * 0x100 + t:byte(3) * 0x10000 + t:byte(4) * 0x1000000
-end
-
-function num_args(func)
- local dump = string.dump(func)
- local offset, cursor = int(dump:sub(13)), offset + 26
- --Get the params and var flag (whether there's a ... in the param)
- return dump:sub(cursor):byte(), dump:sub(cursor+1):byte()
-end
-
-
-
-
-
-
-
-
-
diff --git a/demo/static-highlighter/client.html b/demo/static-highlighter/client.html
index 93d20909..c3e6cef6 100644
--- a/demo/static-highlighter/client.html
+++ b/demo/static-highlighter/client.html
@@ -23,8 +23,8 @@
}
};
-
-
+
-
-
-
-
-
diff --git a/doc/Contributor_License_Agreement-v2.pdf b/doc/Contributor_License_Agreement-v2.pdf
new file mode 100644
index 00000000..1c4baa87
Binary files /dev/null and b/doc/Contributor_License_Agreement-v2.pdf differ
diff --git a/doc/Corporate_Contributor_License_Agreement-v2.pdf b/doc/Corporate_Contributor_License_Agreement-v2.pdf
new file mode 100644
index 00000000..dbeaf37c
Binary files /dev/null and b/doc/Corporate_Contributor_License_Agreement-v2.pdf differ
diff --git a/doc/Editor.mm b/doc/Editor.mm
new file mode 100644
index 00000000..ebcd7a5f
--- /dev/null
+++ b/doc/Editor.mm
@@ -0,0 +1,66 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/doc/additionalObjs.json b/doc/additionalObjs.json
index dd734f78..45903778 100644
--- a/doc/additionalObjs.json
+++ b/doc/additionalObjs.json
@@ -1,24 +1,23 @@
{
- "Array" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array",
- "Boolean" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Boolean",
- "Date" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Date",
- "Error" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Error",
- "EvalError" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/EvalError",
- "RangeError" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/RangeError",
- "ReferenceError" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/ReferenceError",
- "SyntaxError" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/SyntaxError",
- "TypeError" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/TypeError",
- "URIError" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/URIError",
- "Function" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Function",
- "Infinity" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Infinity",
- "JSON" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/JSON",
- "Math" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Math",
- "NaN" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/NaN",
- "Number" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Number",
- "Object" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Object",
- "RegExp" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/RegExp",
- "String" : "https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/String",
-
+ "Array" : "http://www.nodemanual.org/latest/js_doc/Array.html",
+ "Boolean" : "http://www.nodemanual.org/latest/js_doc/Boolean.html",
+ "Date" : "http://www.nodemanual.org/latest/js_doc/Date.html",
+ "Error" : "http://www.nodemanual.org/latest/js_doc/Error.html",
+ "EvalError" : "http://www.nodemanual.org/latest/js_doc/EvalError.html",
+ "RangeError" : "http://www.nodemanual.org/latest/js_doc/RangeError.html",
+ "ReferenceError" : "http://www.nodemanual.org/latest/js_doc/ReferenceError.html",
+ "SyntaxError" : "http://www.nodemanual.org/latest/js_doc/SyntaxError.html",
+ "TypeError" : "http://www.nodemanual.org/latest/js_doc/TypeError.html",
+ "URIError" : "http://www.nodemanual.org/latest/js_doc/URIError.html",
+ "Function" : "http://www.nodemanual.org/latest/js_doc/Function.html",
+ "Infinity" : "http://www.nodemanual.org/latest/js_doc/Infinity.html",
+ "JSON" : "http://www.nodemanual.org/latest/js_doc/JSON.html",
+ "Math" : "http://www.nodemanual.org/latest/js_doc/Math.html",
+ "NaN" : "http://www.nodemanual.org/latest/js_doc/NaN.html",
+ "Number" : "http://www.nodemanual.org/latest/js_doc/Number.html",
+ "Object" : "http://www.nodemanual.org/latest/js_doc/Object.html",
+ "RegExp" : "http://www.nodemanual.org/latest/js_doc/RegExp.html",
+ "String" : "http://www.nodemanual.org/latest/js_doc/String.html",
"DOMElement": "https://developer.mozilla.org/en/DOM/element",
"Event": "https://github.com/ajaxorg/ace/blob/master/lib/ace/lib/event.js",
"TextMode": "https://github.com/ajaxorg/ace/blob/master/lib/ace/mode/text.js",
diff --git a/doc/build.js b/doc/build.js
index 2b1b469c..fcc6f599 100644
--- a/doc/build.js
+++ b/doc/build.js
@@ -1,31 +1,23 @@
-var fs = require("fs");
var path = require("path");
+
var panino = require("panino");
+
var srcPath = __dirname + "/../lib/ace";
-var buildType = process.argv.splice(2)[0];
+
+var buildOptions = {
+ parseOptions: "./parseOptions.json",
+ additionalObjs: "./additionalObjs.json"
+}
var options = {
title : "Ace API",
- parseType : "jsd",
- linkFormat : function(linkHtml) {
- var href = linkHtml.href;
- var o = href.match(/(.+)\.html(#.+)/);
- var c = href.match(/#(.+)/);
-
- if ( o !== null ) {
- href = href.replace(href, '#nav=api&api=' + o[1]);// + '§ion=' + o[2]);
- }
-
- linkHtml.href = href;
-
- return linkHtml;
- },
+ linkFormat : 'http://example.com/{file}#{line}',
output : "../api/",
outputAssets : "../api/resources",
- skin : "./template/jade/layout.jade",
- assets : "./template/resources",
+ skin : "./resources/ace/templates/layout.jade",
+ assets : "./resources/ace/skeleton",
additionalObjs : "./additionalObjs.json",
- exclude : ["**/*_test.js", "**/mode/**", "default_commands.js", "multi_select_commands.js", "**/test/**", "**/theme/**", "**/worker/**"],
+ exclude : ["**/*_test.js", "**/mode/**", "**/test/**", "**/theme/**", "**/worker/**"],
index : "./index.md"
};
@@ -36,32 +28,11 @@ panino.parse(files, options, function (err, ast) {
console.error(err);
process.exit(1);
}
-
- panino.render(buildType || 'html', ast, options, function (err) {
+
+ panino.render('html', ast, options, function (err) {
if (err) {
console.error(err);
process.exit(1);
}
-
- /*fs.readdir(options.output, function (err, files) {
- files.forEach(function(file) {
- if (file.match(/\.html$/)) {
- var outFile = options.output + "/" + file;
- fs.readFile(outFile, "utf8", function(err, data) {
- var otherPageRegExp = new RegExp('=2.2.0",
+ "panino" : ">=2.0.1",
"asset-smasher": "0.2.0"
}
}
\ No newline at end of file
diff --git a/doc/template/resources/csses/ace_api.css b/doc/resources/ace/skeleton/csses/ace_api.css
similarity index 81%
rename from doc/template/resources/csses/ace_api.css
rename to doc/resources/ace/skeleton/csses/ace_api.css
index 7a90b4c3..b703b26b 100644
--- a/doc/template/resources/csses/ace_api.css
+++ b/doc/resources/ace/skeleton/csses/ace_api.css
@@ -1,21 +1,22 @@
/*
Generic "affects everything" stuff
*/
-
-#wrapper .content .column2 {
- float: none;
+body {
+ min-width: 1010px;
+ color: #2D2D2D;
+ background: #EDF5FA url(../images/main_bg.png) 0 0 repeat;
}
-#documentation ul {
+ul {
font-size: 13px;
}
-#documentation li {
+li {
color: black;
}
-pre {
- background-color: #FFFFFF;
+a, a:hover {
+ color : #00438a;
}
code {
@@ -24,13 +25,14 @@ code {
font-family: 'Ubuntu Mono',Monaco,Consolas,monospace !important;
background-color: #F9F9F9;
border-radius: 3px 3px 3px 3px;
+ box-shadow: 0 0 2px #888888;
display: inline-block;
padding: 0 4px;
margin: 2px 1px;
color: inherit;
}
-#documentation pre {
+pre {
margin-top: 10px;
border-radius: none;
box-shadow: none;
@@ -49,27 +51,29 @@ code {
background : white;
}
-#documentation pre code {
+pre code {
background-color: transparent;
border-radius: none;
box-shadow: none;
}
-#documentation a code {
+a code {
color: #00438a;
}
-#documentation h2 {
+h2 {
font-size: 26px;
}
-#documentation p {
+p {
font-size: 13px;
+ line-height : 20px;
+ margin-bottom : 13px;
}
-#documentation li p:last-child {
+li p:last-child {
margin-bottom : 5px;
}
-#documentation blockquote p{
+blockquote p{
font-size: 14px;
font-weight: 500;
line-height: 23px;
@@ -90,10 +94,6 @@ code {
zoom:1; /* hasLayout ie7 trigger */
}
-.navbar .nav > li > a {
- padding: 10px 15px 11px;
-}
-
.navbar {
text-align:center;
}
@@ -111,8 +111,8 @@ code {
margin-left: 0px;
}
.brand {
- background: transparent url(../images/ace_logo_menu.png) no-repeat 33px 5px;
- width: 80px;
+ background: transparent url(../images/ace_logo_menu.png) no-repeat 13px 5px;
+ width: 105px;
outline: none;
height: 40px;
padding: 0 10px !important;
@@ -142,34 +142,25 @@ code {
Menu venue
*/
-
-h3.api_title {
- padding-top: 10px;
-}
-
ul.menu {
- margin-left: 2px;
+ margin-left: 16px;
}
.menu li {
list-style-image: url(../images/menu_disc.png);
- margin-bottom: 4px;
- font-weight: 700;
- padding-left: 10px;
- margin-left: 0;
+ margin-bottom: 3px;
+ font-weight : 700;
}
.menu li .menu-item a.menuLink, .menu li .menu-item span.menuLink {
- color: #3E7096;
- font-weight: 100;
+ color: #262626;
}
.menuTwo {
margin-bottom: 5px;
margin-top: 2px;
}
.menuTwo li .menu-item a.menuLink {
- color: #3E7096;
- font-weight: 100;
+ color: #262626;
}
/* need specificity to "beat" the above colors */
@@ -181,6 +172,50 @@ ul.menu {
Members and the tabs that represent them
*/
+.members {
+/* width: 800px; */
+ /*width: 700px;*/
+/* margin: 0 10px;*/
+
+ height: 42px;
+ left: 0;
+/* position: fixed;*/
+ top: 0;
+/* transition-duration: 300ms, 300ms;
+ transition-property: box-shadow, height;
+ transition-timing-function: ease-out, ease-out;
+ -moz-transition-duration: 300ms, 300ms;
+ -moz-transition-property: -moz-box-shadow, height;
+ -moz-transition-timing-function: ease-out, ease-out;
+ -o-transition-duration: 300ms, 300ms;
+ -o-transition-property: -o-box-shadow, height;
+ -o-transition-timing-function: ease-out, ease-out;
+ -webkit-transition-duration: 300ms, 300ms;
+ -webkit-transition-property: -webkit-box-shadow, height;
+ -webkit-transition-timing-function: ease-out, ease-out;*/
+/* width: 100%;*/
+ /*transition-duration: 300ms;
+ transition-property: box-shadow;
+ transition-timing-function: ease-out;
+ -moz-transition-duration: 300ms, 300ms;
+ -moz-transition-property: -moz-box-shadow, height;
+ -moz-transition-timing-function: ease-out, ease-out;
+ -o-transition-duration: 300ms;
+ -o-transition-property: -o-box-shadow;
+ -o-transition-timing-function: ease-out;*/
+ -webkit-transition-duration: 400ms, 0ms;
+ -webkit-transition-property: -webkit-box-shadow, background;
+ -webkit-transition-timing-function: ease-out, ease-out;
+ z-index: 100;
+ padding-bottom : 5px;
+ overflow: visible !important;
+
+/* background: #FFF;
+ width: 100%;
+ padding-bottom: 13px;
+ top: 40px;
+ position: fixed;*/
+}
.srolled .members {
width: 100%;
/* -webkit-box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.35);
@@ -188,6 +223,7 @@ ul.menu {
box-shadow: 0 1px 4px 0 rgba(0, 0, 0, 0.35); */
padding-bottom: 15px;
/* height: 31px;*/
+ top: 40px;
position: fixed;
}
.shadow.members{
@@ -234,15 +270,10 @@ ul.menu {
}
.srolled .membersContent {
/*top : 0;*/
- width: 625px;
- padding-left: 327px;
+ width : 695px;
+ padding-left : 305px;
margin : 0 auto 0 auto;
}
-
-.srolled ul.nav {
- padding-right: 10px;
-}
-
.membersBackground {
/* background-color: white;
position: fixed;
@@ -276,18 +307,13 @@ ul.menu {
}
-ul.tabs li:first-child ul{
- left: -63px;
-}
-
.tabs a.menu:after, .tabs .dropdown-toggle:after {
margin-top: 22px;
}
-.nav .dropdown-toggle .caret {
- margin-top: 12px;
- border-top-color: #6D8CA0;
- border-bottom-color: #6D8CA0;
+.dropdown .caret {
+ margin-top: 14px;
+ color: #6D8CA0;
}
li.dropdown {
@@ -295,12 +321,14 @@ li.dropdown {
font-weight: bold;
}
-.editInC9 {
+
+.backToMDN, .editInC9 {
font-size: 11px;
color: #657383;
+ margin : 0 0 0 5px;
}
-.editInC9 a {
+.backToMDN a, .editInC9 a {
color: #657383;
font-weight: normal;
position : relative;
@@ -308,7 +336,7 @@ li.dropdown {
}
.tabs {
- padding-top: 14px;
+ padding-top: 10px;
/*border-bottom: 1px solid #848484;*/
min-height : 27px;
padding-bottom : 5px;
@@ -335,10 +363,14 @@ li.dropdown {
margin-left: 6px;
}
+.members .tabs ul li {
+ font-weight: bold;
+}
+
.memberLink a {
margin-left: 0 !important;
}
-.menu-dropdown {
+.menu-dropdown, .dropdown-menu {
min-width : 105px;
max-height: 350px;
overflow: auto;
@@ -351,6 +383,9 @@ li.dropdown {
background-color: #ffffff;
color: #000000;
}
+.dropdown-menu {
+ border-top: none;
+}
.tabs a.menu:after, .tabs .dropdown-toggle:after {
margin-top: 13px;
@@ -398,8 +433,9 @@ li.dropdown {
}
.tabs .menu-dropdown, .tabs .dropdown-menu {
border-radius: 0 0 6px 6px;
- left: 10px;
- width: 160px;
+ top: 32px;
+ right: 0px;
+ width: 150px;
}
.srolled .tabs .menu-dropdown, .srolled .tabs .dropdown-menu {
top: 32px;
@@ -435,6 +471,11 @@ ul.tabs .double ul, ul.tabs .triple ul, ul.tabs .quad ul{
.content {
height: 100%;
}
+.content .row {
+ width: 1060px;
+ margin-left: auto;
+ margin-right: auto;
+}
header.filler {
position: relative;
@@ -442,6 +483,11 @@ header.filler {
width: 100%;
}
+.centerpiece {
+ background: url(../images/sidebar_border.png) repeat-y 230px 0;
+ height: 100%;
+}
+
/*
.container-fluid .row-fluid {
width: 1000px;
@@ -455,42 +501,44 @@ header.filler {
margin-bottom: 3px;
}
+#sidebarContainer {
+ margin-right: 60px;
+}
+
+#sidebar {
+ margin-top: 9px;
+ /*background: url(../images/sidebar-border.png) repeat-y right 0;*/
+ margin-left: 12px;
+/* width: 280px;*/
+/* overflow: auto;*/
+ padding-right : 10px;
+}
+
#sidebar h3 a,
#sidebar h3 a:hover {
color: #404040;
}
-#sidebarContainer {
- padding-top: 20px;
-}
-
#mainContent {
margin-left: 30px;
}
#documentation {
- padding-top: 35px;
padding-bottom: 10px;
}
#documentation article.article {
+/* border-bottom: 1px solid #e9e9e9;*/
border-top: 1px solid #e9e9e9;
padding: 16px 10px 2px;
- -webkit-transition: padding 0.2s;
- -moz-transition: padding 0.2s;
- -o-transition: padding 0.2s;
}
-
-#documentation h3.sectionHeader + article.article {
- border-top: none;
-}
-
div#documentation article:last-child {
border-bottom: 1px solid #e9e9e9;
padding-bottom: 40px;
}
#documentation article.article.methodToggleOpen {
background: rgba(255, 255, 255, 0.5);
+ padding: 20px;
font-size: 13px;
line-height: 24px;
margin: 0 0 10px 0;
@@ -615,7 +663,7 @@ li.signature {
cursor: pointer;
}
-#documentation .signature-call a {
+.signature-call a {
color: #8e487e;
}
@@ -626,7 +674,7 @@ li.signature {
.eventObjName {
font-style: italic;
}
-.eventListenerStart, .eventListenerClose, .eventFunctionOpen, .eventFunctionClose {
+.eventListenerStart, .eventFunctionOpen, .eventFunctionClose {
color: #999999;
}
.eventMember {
@@ -662,19 +710,14 @@ li.signature {
text-transform: capitalize;
}
-.undocumented {
- background-color: #B94A48;
- color: #ffffff;
-}
-
-#documentation .alias a, #documentation .related-to a {
+.alias a, .related-to a {
color: #ffffff;
/* text-decoration: underline; */
}
-#documentation .alias a:hover, #documentation .related-to a:hover {
+.alias a:hover, .related-to a:hover {
text-decoration: none;
}
-.#documentation alias:hover, #documentation .related-to:hover {
+.alias:hover, .related-to:hover {
opacity: 0.8;
cursor: pointer;
}
@@ -698,8 +741,8 @@ li.signature {
color: #ffffff;
}
.description h4 {
- padding-top: 10px;
font-size: 18px;
+ margin: 20px 0 10px;
line-height : 18px;
}
@@ -722,34 +765,15 @@ li.signature {
Everyday I'm togglin'
*/
-#documentation i.methodToggle {
- cursor: pointer;
- color: #9f9f9f;
- padding-top: 2px;
- float: left;
+#documentation h3 {
+ font-size: 24px;
+ margin-top: 5px;
}
-#documentation i.methodToggle.methodToggleHover {
- text-shadow: 0 0 10px #4699d5;
- color: #4699d5;
+#documentation h3.methodToggle {
+ margin: 0;
}
-#documentation i.methodToggle.active {
- text-shadow: 0 0 10px #4699d5;
- color: #4699d5;
- /* Safari */
- -webkit-transform: rotate(45deg);
-
- /* Firefox */
- -moz-transform: rotate(45deg);
-
- /* IE */
- -ms-transform: rotate(45deg);
-
- /* Opera */
- -o-transform: rotate(45deg);
- padding-top: 9px;
-}
-
#documentation h3.sectionHeader {
+ margin: 10px 0 17px 0;
line-height : 24px;
}
@@ -910,3 +934,25 @@ body #dsq-reply h3{
#dsq-global-toolbar, #dsq-pagination, .dsq-trackback-url{
display : none;
}
+
+/* Sticky footer stuff */
+
+* {
+ margin: 0;
+}
+html, body {
+ height: 100%;
+}
+#nonFooter {
+ height: 100%;
+ margin: 0 auto -40px; /* the bottom margin is the negative value of the footer's height */
+}
+div.push {
+ height: 40px; /* .push must be the same height as .footer */
+}
+#footer, div.push {
+clear: both;
+}
+#footer {
+ margin-top: 40px;
+}
\ No newline at end of file
diff --git a/doc/resources/ace/skeleton/csses/bootstrap.min.css b/doc/resources/ace/skeleton/csses/bootstrap.min.css
new file mode 100644
index 00000000..c9514677
--- /dev/null
+++ b/doc/resources/ace/skeleton/csses/bootstrap.min.css
@@ -0,0 +1,689 @@
+article,aside,details,figcaption,figure,footer,header,hgroup,nav,section{display:block;}
+audio,canvas,video{display:inline-block;*display:inline;*zoom:1;}
+audio:not([controls]){display:none;}
+html{font-size:100%;-webkit-text-size-adjust:100%;-ms-text-size-adjust:100%;}
+a:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+a:hover,a:active{outline:0;}
+sub,sup{position:relative;font-size:75%;line-height:0;vertical-align:baseline;}
+sup{top:-0.5em;}
+sub{bottom:-0.25em;}
+img{height:auto;border:0;-ms-interpolation-mode:bicubic;vertical-align:middle;}
+button,input,select,textarea{margin:0;font-size:100%;vertical-align:middle;}
+button,input{*overflow:visible;line-height:normal;}
+button::-moz-focus-inner,input::-moz-focus-inner{padding:0;border:0;}
+button,input[type="button"],input[type="reset"],input[type="submit"]{cursor:pointer;-webkit-appearance:button;}
+input[type="search"]{-webkit-appearance:textfield;-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;}
+input[type="search"]::-webkit-search-decoration,input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none;}
+textarea{overflow:auto;vertical-align:top;}
+.clearfix{*zoom:1;}.clearfix:before,.clearfix:after{display:table;content:"";}
+.clearfix:after{clear:both;}
+.hide-text{overflow:hidden;text-indent:100%;white-space:nowrap;}
+.input-block-level{display:block;width:100%;min-height:28px;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;}
+body{margin:0;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;color:#333333;background-color:#ffffff;}
+a{color:#0088cc;text-decoration:none;}
+a:hover{color:#005580;text-decoration:underline;}
+.row{margin-left:-20px;*zoom:1;}.row:before,.row:after{display:table;content:"";}
+.row:after{clear:both;}
+[class*="span"]{float:left;margin-left:20px;}
+.container,.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;}
+.span12{width:940px;}
+.span11{width:860px;}
+.span10{width:780px;}
+.span9{width:700px;}
+.span8{width:620px;}
+.span7{width:540px;}
+.span6{width:460px;}
+.span5{width:380px;}
+.span4{width:300px;}
+.span3{width:220px;}
+.span2{width:140px;}
+.span1{width:60px;}
+.offset12{margin-left:980px;}
+.offset11{margin-left:900px;}
+.offset10{margin-left:820px;}
+.offset9{margin-left:740px;}
+.offset8{margin-left:660px;}
+.offset7{margin-left:580px;}
+.offset6{margin-left:500px;}
+.offset5{margin-left:420px;}
+.offset4{margin-left:340px;}
+.offset3{margin-left:260px;}
+.offset2{margin-left:180px;}
+.offset1{margin-left:100px;}
+.row-fluid{width:100%;*zoom:1;}.row-fluid:before,.row-fluid:after{display:table;content:"";}
+.row-fluid:after{clear:both;}
+.row-fluid>[class*="span"]{float:left;margin-left:2.127659574%;}
+.row-fluid>[class*="span"]:first-child{margin-left:0;}
+.row-fluid > .span12{width:99.99999998999999%;}
+.row-fluid > .span11{width:91.489361693%;}
+.row-fluid > .span10{width:82.97872339599999%;}
+.row-fluid > .span9{width:74.468085099%;}
+.row-fluid > .span8{width:65.95744680199999%;}
+.row-fluid > .span7{width:57.446808505%;}
+.row-fluid > .span6{width:48.93617020799999%;}
+.row-fluid > .span5{width:40.425531911%;}
+.row-fluid > .span4{width:31.914893614%;}
+.row-fluid > .span3{width:23.404255317%;}
+.row-fluid > .span2{width:14.89361702%;}
+.row-fluid > .span1{width:6.382978723%;}
+.container{margin-left:auto;margin-right:auto;*zoom:1;}.container:before,.container:after{display:table;content:"";}
+.container:after{clear:both;}
+.container-fluid{padding-left:20px;padding-right:20px;*zoom:1;}.container-fluid:before,.container-fluid:after{display:table;content:"";}
+.container-fluid:after{clear:both;}
+p{margin:0 0 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;line-height:18px;}p small{font-size:11px;color:#999999;}
+.lead{margin-bottom:18px;font-size:20px;font-weight:200;line-height:27px;}
+h1,h2,h3,h4,h5,h6{margin:0;font-family:inherit;font-weight:bold;color:inherit;text-rendering:optimizelegibility;}h1 small,h2 small,h3 small,h4 small,h5 small,h6 small{font-weight:normal;color:#999999;}
+h1{font-size:30px;line-height:36px;}h1 small{font-size:18px;}
+h2{font-size:24px;line-height:36px;}h2 small{font-size:18px;}
+h3{line-height:27px;font-size:18px;}h3 small{font-size:14px;}
+h4,h5,h6{line-height:18px;}
+h4{font-size:14px;}h4 small{font-size:12px;}
+h5{font-size:12px;}
+h6{font-size:11px;color:#999999;text-transform:uppercase;}
+.page-header{padding-bottom:17px;margin:18px 0;border-bottom:1px solid #eeeeee;}
+.page-header h1{line-height:1;}
+ul,ol{padding:0;margin:0 0 9px 25px;}
+ul ul,ul ol,ol ol,ol ul{margin-bottom:0;}
+ul{list-style:disc;}
+ol{list-style:decimal;}
+li{line-height:18px;}
+ul.unstyled,ol.unstyled{margin-left:0;list-style:none;}
+dl{margin-bottom:18px;}
+dt,dd{line-height:18px;}
+dt{font-weight:bold;line-height:17px;}
+dd{margin-left:9px;}
+.dl-horizontal dt{float:left;clear:left;width:120px;text-align:right;}
+.dl-horizontal dd{margin-left:130px;}
+hr{margin:18px 0;border:0;border-top:1px solid #eeeeee;border-bottom:1px solid #ffffff;}
+strong{font-weight:bold;}
+em{font-style:italic;}
+.muted{color:#999999;}
+abbr[title]{border-bottom:1px dotted #ddd;cursor:help;}
+abbr.initialism{font-size:90%;text-transform:uppercase;}
+blockquote{padding:0 0 0 15px;margin:0 0 18px;border-left:5px solid #eeeeee;}blockquote p{margin-bottom:0;font-size:16px;font-weight:300;line-height:22.5px;}
+blockquote small{display:block;line-height:18px;color:#999999;}blockquote small:before{content:'\2014 \00A0';}
+blockquote.pull-right{float:right;padding-left:0;padding-right:15px;border-left:0;border-right:5px solid #eeeeee;}blockquote.pull-right p,blockquote.pull-right small{text-align:right;}
+q:before,q:after,blockquote:before,blockquote:after{content:"";}
+address{display:block;margin-bottom:18px;line-height:18px;font-style:normal;}
+small{font-size:100%;}
+cite{font-style:normal;}
+code,pre{padding:0 3px 2px;font-family:Menlo,Monaco,"Courier New",monospace;font-size:12px;color:#333333;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+code{padding:2px 4px;color:#d14;background-color:#f7f7f9;border:1px solid #e1e1e8;}
+pre{display:block;padding:8.5px;margin:0 0 9px;font-size:12.025px;line-height:18px;background-color:#f5f5f5;border:1px solid #ccc;border:1px solid rgba(0, 0, 0, 0.15);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;white-space:pre;white-space:pre-wrap;word-break:break-all;word-wrap:break-word;}pre.prettyprint{margin-bottom:18px;}
+pre code{padding:0;color:inherit;background-color:transparent;border:0;}
+.pre-scrollable{max-height:340px;overflow-y:scroll;}
+form{margin:0 0 18px;}
+fieldset{padding:0;margin:0;border:0;}
+legend{display:block;width:100%;padding:0;margin-bottom:27px;font-size:19.5px;line-height:36px;color:#333333;border:0;border-bottom:1px solid #eee;}legend small{font-size:13.5px;color:#999999;}
+label,input,button,select,textarea{font-size:13px;font-weight:normal;line-height:18px;}
+input,button,select,textarea{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;}
+label{display:block;margin-bottom:5px;color:#333333;}
+input,textarea,select,.uneditable-input{display:inline-block;width:210px;height:18px;padding:4px;margin-bottom:9px;font-size:13px;line-height:18px;color:#555555;border:1px solid #cccccc;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.uneditable-textarea{width:auto;height:auto;}
+label input,label textarea,label select{display:block;}
+input[type="image"],input[type="checkbox"],input[type="radio"]{width:auto;height:auto;padding:0;margin:3px 0;*margin-top:0;line-height:normal;cursor:pointer;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;border:0 \9;}
+input[type="image"]{border:0;}
+input[type="file"]{width:auto;padding:initial;line-height:initial;border:initial;background-color:#ffffff;background-color:initial;-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+input[type="button"],input[type="reset"],input[type="submit"]{width:auto;height:auto;}
+select,input[type="file"]{height:28px;*margin-top:4px;line-height:28px;}
+input[type="file"]{line-height:18px \9;}
+select{width:220px;background-color:#ffffff;}
+select[multiple],select[size]{height:auto;}
+input[type="image"]{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+textarea{height:auto;}
+input[type="hidden"]{display:none;}
+.radio,.checkbox{padding-left:18px;}
+.radio input[type="radio"],.checkbox input[type="checkbox"]{float:left;margin-left:-18px;}
+.controls>.radio:first-child,.controls>.checkbox:first-child{padding-top:5px;}
+.radio.inline,.checkbox.inline{display:inline-block;padding-top:5px;margin-bottom:0;vertical-align:middle;}
+.radio.inline+.radio.inline,.checkbox.inline+.checkbox.inline{margin-left:10px;}
+input,textarea{-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075);-webkit-transition:border linear 0.2s,box-shadow linear 0.2s;-moz-transition:border linear 0.2s,box-shadow linear 0.2s;-ms-transition:border linear 0.2s,box-shadow linear 0.2s;-o-transition:border linear 0.2s,box-shadow linear 0.2s;transition:border linear 0.2s,box-shadow linear 0.2s;}
+input:focus,textarea:focus{border-color:rgba(82, 168, 236, 0.8);-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.075),0 0 8px rgba(82, 168, 236, 0.6);outline:0;outline:thin dotted \9;}
+input[type="file"]:focus,input[type="radio"]:focus,input[type="checkbox"]:focus,select:focus{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.input-mini{width:60px;}
+.input-small{width:90px;}
+.input-medium{width:150px;}
+.input-large{width:210px;}
+.input-xlarge{width:270px;}
+.input-xxlarge{width:530px;}
+input[class*="span"],select[class*="span"],textarea[class*="span"],.uneditable-input{float:none;margin-left:0;}
+input,textarea,.uneditable-input{margin-left:0;}
+input.span12, textarea.span12, .uneditable-input.span12{width:930px;}
+input.span11, textarea.span11, .uneditable-input.span11{width:850px;}
+input.span10, textarea.span10, .uneditable-input.span10{width:770px;}
+input.span9, textarea.span9, .uneditable-input.span9{width:690px;}
+input.span8, textarea.span8, .uneditable-input.span8{width:610px;}
+input.span7, textarea.span7, .uneditable-input.span7{width:530px;}
+input.span6, textarea.span6, .uneditable-input.span6{width:450px;}
+input.span5, textarea.span5, .uneditable-input.span5{width:370px;}
+input.span4, textarea.span4, .uneditable-input.span4{width:290px;}
+input.span3, textarea.span3, .uneditable-input.span3{width:210px;}
+input.span2, textarea.span2, .uneditable-input.span2{width:130px;}
+input.span1, textarea.span1, .uneditable-input.span1{width:50px;}
+input[disabled],select[disabled],textarea[disabled],input[readonly],select[readonly],textarea[readonly]{background-color:#eeeeee;border-color:#ddd;cursor:not-allowed;}
+.control-group.warning>label,.control-group.warning .help-block,.control-group.warning .help-inline{color:#c09853;}
+.control-group.warning input,.control-group.warning select,.control-group.warning textarea{color:#c09853;border-color:#c09853;}.control-group.warning input:focus,.control-group.warning select:focus,.control-group.warning textarea:focus{border-color:#a47e3c;-webkit-box-shadow:0 0 6px #dbc59e;-moz-box-shadow:0 0 6px #dbc59e;box-shadow:0 0 6px #dbc59e;}
+.control-group.warning .input-prepend .add-on,.control-group.warning .input-append .add-on{color:#c09853;background-color:#fcf8e3;border-color:#c09853;}
+.control-group.error>label,.control-group.error .help-block,.control-group.error .help-inline{color:#b94a48;}
+.control-group.error input,.control-group.error select,.control-group.error textarea{color:#b94a48;border-color:#b94a48;}.control-group.error input:focus,.control-group.error select:focus,.control-group.error textarea:focus{border-color:#953b39;-webkit-box-shadow:0 0 6px #d59392;-moz-box-shadow:0 0 6px #d59392;box-shadow:0 0 6px #d59392;}
+.control-group.error .input-prepend .add-on,.control-group.error .input-append .add-on{color:#b94a48;background-color:#f2dede;border-color:#b94a48;}
+.control-group.success>label,.control-group.success .help-block,.control-group.success .help-inline{color:#468847;}
+.control-group.success input,.control-group.success select,.control-group.success textarea{color:#468847;border-color:#468847;}.control-group.success input:focus,.control-group.success select:focus,.control-group.success textarea:focus{border-color:#356635;-webkit-box-shadow:0 0 6px #7aba7b;-moz-box-shadow:0 0 6px #7aba7b;box-shadow:0 0 6px #7aba7b;}
+.control-group.success .input-prepend .add-on,.control-group.success .input-append .add-on{color:#468847;background-color:#dff0d8;border-color:#468847;}
+input:focus:required:invalid,textarea:focus:required:invalid,select:focus:required:invalid{color:#b94a48;border-color:#ee5f5b;}input:focus:required:invalid:focus,textarea:focus:required:invalid:focus,select:focus:required:invalid:focus{border-color:#e9322d;-webkit-box-shadow:0 0 6px #f8b9b7;-moz-box-shadow:0 0 6px #f8b9b7;box-shadow:0 0 6px #f8b9b7;}
+.form-actions{padding:17px 20px 18px;margin-top:18px;margin-bottom:18px;background-color:#eeeeee;border-top:1px solid #ddd;*zoom:1;}.form-actions:before,.form-actions:after{display:table;content:"";}
+.form-actions:after{clear:both;}
+.uneditable-input{display:block;background-color:#ffffff;border-color:#eee;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.025);cursor:not-allowed;}
+:-moz-placeholder{color:#999999;}
+::-webkit-input-placeholder{color:#999999;}
+.help-block,.help-inline{color:#555555;}
+.help-block{display:block;margin-bottom:9px;}
+.help-inline{display:inline-block;*display:inline;*zoom:1;vertical-align:middle;padding-left:5px;}
+.input-prepend,.input-append{margin-bottom:5px;}.input-prepend input,.input-append input,.input-prepend select,.input-append select,.input-prepend .uneditable-input,.input-append .uneditable-input{*margin-left:0;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}.input-prepend input:focus,.input-append input:focus,.input-prepend select:focus,.input-append select:focus,.input-prepend .uneditable-input:focus,.input-append .uneditable-input:focus{position:relative;z-index:2;}
+.input-prepend .uneditable-input,.input-append .uneditable-input{border-left-color:#ccc;}
+.input-prepend .add-on,.input-append .add-on{display:inline-block;width:auto;min-width:16px;height:18px;padding:4px 5px;font-weight:normal;line-height:18px;text-align:center;text-shadow:0 1px 0 #ffffff;vertical-align:middle;background-color:#eeeeee;border:1px solid #ccc;}
+.input-prepend .add-on,.input-append .add-on,.input-prepend .btn,.input-append .btn{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-prepend .active,.input-append .active{background-color:#a9dba9;border-color:#46a546;}
+.input-prepend .add-on,.input-prepend .btn{margin-right:-1px;}
+.input-append input,.input-append select .uneditable-input{-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-append .uneditable-input{border-left-color:#eee;border-right-color:#ccc;}
+.input-append .add-on,.input-append .btn{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.input-prepend.input-append input,.input-prepend.input-append select,.input-prepend.input-append .uneditable-input{-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.input-prepend.input-append .add-on:first-child,.input-prepend.input-append .btn:first-child{margin-right:-1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.input-prepend.input-append .add-on:last-child,.input-prepend.input-append .btn:last-child{margin-left:-1px;-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.search-query{padding-left:14px;padding-right:14px;margin-bottom:0;-webkit-border-radius:14px;-moz-border-radius:14px;border-radius:14px;}
+.form-search input,.form-inline input,.form-horizontal input,.form-search textarea,.form-inline textarea,.form-horizontal textarea,.form-search select,.form-inline select,.form-horizontal select,.form-search .help-inline,.form-inline .help-inline,.form-horizontal .help-inline,.form-search .uneditable-input,.form-inline .uneditable-input,.form-horizontal .uneditable-input,.form-search .input-prepend,.form-inline .input-prepend,.form-horizontal .input-prepend,.form-search .input-append,.form-inline .input-append,.form-horizontal .input-append{display:inline-block;margin-bottom:0;}
+.form-search .hide,.form-inline .hide,.form-horizontal .hide{display:none;}
+.form-search label,.form-inline label{display:inline-block;}
+.form-search .input-append,.form-inline .input-append,.form-search .input-prepend,.form-inline .input-prepend{margin-bottom:0;}
+.form-search .radio,.form-search .checkbox,.form-inline .radio,.form-inline .checkbox{padding-left:0;margin-bottom:0;vertical-align:middle;}
+.form-search .radio input[type="radio"],.form-search .checkbox input[type="checkbox"],.form-inline .radio input[type="radio"],.form-inline .checkbox input[type="checkbox"]{float:left;margin-left:0;margin-right:3px;}
+.control-group{margin-bottom:9px;}
+legend+.control-group{margin-top:18px;-webkit-margin-top-collapse:separate;}
+.form-horizontal .control-group{margin-bottom:18px;*zoom:1;}.form-horizontal .control-group:before,.form-horizontal .control-group:after{display:table;content:"";}
+.form-horizontal .control-group:after{clear:both;}
+.form-horizontal .control-label{float:left;width:140px;padding-top:5px;text-align:right;}
+.form-horizontal .controls{margin-left:160px;*display:inline-block;*margin-left:0;*padding-left:20px;}
+.form-horizontal .help-block{margin-top:9px;margin-bottom:0;}
+.form-horizontal .form-actions{padding-left:160px;}
+table{max-width:100%;border-collapse:collapse;border-spacing:0;background-color:transparent;}
+.table{width:100%;margin-bottom:18px;}.table th,.table td{padding:8px;line-height:18px;text-align:left;vertical-align:top;border-top:1px solid #dddddd;}
+.table th{font-weight:bold;}
+.table thead th{vertical-align:bottom;}
+.table colgroup+thead tr:first-child th,.table colgroup+thead tr:first-child td,.table thead:first-child tr:first-child th,.table thead:first-child tr:first-child td{border-top:0;}
+.table tbody+tbody{border-top:2px solid #dddddd;}
+.table-condensed th,.table-condensed td{padding:4px 5px;}
+.table-bordered{border:1px solid #dddddd;border-left:0;border-collapse:separate;*border-collapse:collapsed;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.table-bordered th,.table-bordered td{border-left:1px solid #dddddd;}
+.table-bordered thead:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child th,.table-bordered tbody:first-child tr:first-child td{border-top:0;}
+.table-bordered thead:first-child tr:first-child th:first-child,.table-bordered tbody:first-child tr:first-child td:first-child{-webkit-border-radius:4px 0 0 0;-moz-border-radius:4px 0 0 0;border-radius:4px 0 0 0;}
+.table-bordered thead:first-child tr:first-child th:last-child,.table-bordered tbody:first-child tr:first-child td:last-child{-webkit-border-radius:0 4px 0 0;-moz-border-radius:0 4px 0 0;border-radius:0 4px 0 0;}
+.table-bordered thead:last-child tr:last-child th:first-child,.table-bordered tbody:last-child tr:last-child td:first-child{-webkit-border-radius:0 0 0 4px;-moz-border-radius:0 0 0 4px;border-radius:0 0 0 4px;}
+.table-bordered thead:last-child tr:last-child th:last-child,.table-bordered tbody:last-child tr:last-child td:last-child{-webkit-border-radius:0 0 4px 0;-moz-border-radius:0 0 4px 0;border-radius:0 0 4px 0;}
+.table-striped tbody tr:nth-child(odd) td,.table-striped tbody tr:nth-child(odd) th{background-color:#f9f9f9;}
+.table tbody tr:hover td,.table tbody tr:hover th{background-color:#f5f5f5;}
+table .span1{float:none;width:44px;margin-left:0;}
+table .span2{float:none;width:124px;margin-left:0;}
+table .span3{float:none;width:204px;margin-left:0;}
+table .span4{float:none;width:284px;margin-left:0;}
+table .span5{float:none;width:364px;margin-left:0;}
+table .span6{float:none;width:444px;margin-left:0;}
+table .span7{float:none;width:524px;margin-left:0;}
+table .span8{float:none;width:604px;margin-left:0;}
+table .span9{float:none;width:684px;margin-left:0;}
+table .span10{float:none;width:764px;margin-left:0;}
+table .span11{float:none;width:844px;margin-left:0;}
+table .span12{float:none;width:924px;margin-left:0;}
+table .span13{float:none;width:1004px;margin-left:0;}
+table .span14{float:none;width:1084px;margin-left:0;}
+table .span15{float:none;width:1164px;margin-left:0;}
+table .span16{float:none;width:1244px;margin-left:0;}
+table .span17{float:none;width:1324px;margin-left:0;}
+table .span18{float:none;width:1404px;margin-left:0;}
+table .span19{float:none;width:1484px;margin-left:0;}
+table .span20{float:none;width:1564px;margin-left:0;}
+table .span21{float:none;width:1644px;margin-left:0;}
+table .span22{float:none;width:1724px;margin-left:0;}
+table .span23{float:none;width:1804px;margin-left:0;}
+table .span24{float:none;width:1884px;margin-left:0;}
+[class^="icon-"],[class*=" icon-"]{display:inline-block;width:14px;height:14px;line-height:14px;vertical-align:text-top;background-image:url("../img/glyphicons-halflings.png");background-position:14px 14px;background-repeat:no-repeat;*margin-right:.3em;}[class^="icon-"]:last-child,[class*=" icon-"]:last-child{*margin-left:0;}
+.icon-white{background-image:url("../img/glyphicons-halflings-white.png");}
+.icon-glass{background-position:0 0;}
+.icon-music{background-position:-24px 0;}
+.icon-search{background-position:-48px 0;}
+.icon-envelope{background-position:-72px 0;}
+.icon-heart{background-position:-96px 0;}
+.icon-star{background-position:-120px 0;}
+.icon-star-empty{background-position:-144px 0;}
+.icon-user{background-position:-168px 0;}
+.icon-film{background-position:-192px 0;}
+.icon-th-large{background-position:-216px 0;}
+.icon-th{background-position:-240px 0;}
+.icon-th-list{background-position:-264px 0;}
+.icon-ok{background-position:-288px 0;}
+.icon-remove{background-position:-312px 0;}
+.icon-zoom-in{background-position:-336px 0;}
+.icon-zoom-out{background-position:-360px 0;}
+.icon-off{background-position:-384px 0;}
+.icon-signal{background-position:-408px 0;}
+.icon-cog{background-position:-432px 0;}
+.icon-trash{background-position:-456px 0;}
+.icon-home{background-position:0 -24px;}
+.icon-file{background-position:-24px -24px;}
+.icon-time{background-position:-48px -24px;}
+.icon-road{background-position:-72px -24px;}
+.icon-download-alt{background-position:-96px -24px;}
+.icon-download{background-position:-120px -24px;}
+.icon-upload{background-position:-144px -24px;}
+.icon-inbox{background-position:-168px -24px;}
+.icon-play-circle{background-position:-192px -24px;}
+.icon-repeat{background-position:-216px -24px;}
+.icon-refresh{background-position:-240px -24px;}
+.icon-list-alt{background-position:-264px -24px;}
+.icon-lock{background-position:-287px -24px;}
+.icon-flag{background-position:-312px -24px;}
+.icon-headphones{background-position:-336px -24px;}
+.icon-volume-off{background-position:-360px -24px;}
+.icon-volume-down{background-position:-384px -24px;}
+.icon-volume-up{background-position:-408px -24px;}
+.icon-qrcode{background-position:-432px -24px;}
+.icon-barcode{background-position:-456px -24px;}
+.icon-tag{background-position:0 -48px;}
+.icon-tags{background-position:-25px -48px;}
+.icon-book{background-position:-48px -48px;}
+.icon-bookmark{background-position:-72px -48px;}
+.icon-print{background-position:-96px -48px;}
+.icon-camera{background-position:-120px -48px;}
+.icon-font{background-position:-144px -48px;}
+.icon-bold{background-position:-167px -48px;}
+.icon-italic{background-position:-192px -48px;}
+.icon-text-height{background-position:-216px -48px;}
+.icon-text-width{background-position:-240px -48px;}
+.icon-align-left{background-position:-264px -48px;}
+.icon-align-center{background-position:-288px -48px;}
+.icon-align-right{background-position:-312px -48px;}
+.icon-align-justify{background-position:-336px -48px;}
+.icon-list{background-position:-360px -48px;}
+.icon-indent-left{background-position:-384px -48px;}
+.icon-indent-right{background-position:-408px -48px;}
+.icon-facetime-video{background-position:-432px -48px;}
+.icon-picture{background-position:-456px -48px;}
+.icon-pencil{background-position:0 -72px;}
+.icon-map-marker{background-position:-24px -72px;}
+.icon-adjust{background-position:-48px -72px;}
+.icon-tint{background-position:-72px -72px;}
+.icon-edit{background-position:-96px -72px;}
+.icon-share{background-position:-120px -72px;}
+.icon-check{background-position:-144px -72px;}
+.icon-move{background-position:-168px -72px;}
+.icon-step-backward{background-position:-192px -72px;}
+.icon-fast-backward{background-position:-216px -72px;}
+.icon-backward{background-position:-240px -72px;}
+.icon-play{background-position:-264px -72px;}
+.icon-pause{background-position:-288px -72px;}
+.icon-stop{background-position:-312px -72px;}
+.icon-forward{background-position:-336px -72px;}
+.icon-fast-forward{background-position:-360px -72px;}
+.icon-step-forward{background-position:-384px -72px;}
+.icon-eject{background-position:-408px -72px;}
+.icon-chevron-left{background-position:-432px -72px;}
+.icon-chevron-right{background-position:-456px -72px;}
+.icon-plus-sign{background-position:0 -96px;}
+.icon-minus-sign{background-position:-24px -96px;}
+.icon-remove-sign{background-position:-48px -96px;}
+.icon-ok-sign{background-position:-72px -96px;}
+.icon-question-sign{background-position:-96px -96px;}
+.icon-info-sign{background-position:-120px -96px;}
+.icon-screenshot{background-position:-144px -96px;}
+.icon-remove-circle{background-position:-168px -96px;}
+.icon-ok-circle{background-position:-192px -96px;}
+.icon-ban-circle{background-position:-216px -96px;}
+.icon-arrow-left{background-position:-240px -96px;}
+.icon-arrow-right{background-position:-264px -96px;}
+.icon-arrow-up{background-position:-289px -96px;}
+.icon-arrow-down{background-position:-312px -96px;}
+.icon-share-alt{background-position:-336px -96px;}
+.icon-resize-full{background-position:-360px -96px;}
+.icon-resize-small{background-position:-384px -96px;}
+.icon-plus{background-position:-408px -96px;}
+.icon-minus{background-position:-433px -96px;}
+.icon-asterisk{background-position:-456px -96px;}
+.icon-exclamation-sign{background-position:0 -120px;}
+.icon-gift{background-position:-24px -120px;}
+.icon-leaf{background-position:-48px -120px;}
+.icon-fire{background-position:-72px -120px;}
+.icon-eye-open{background-position:-96px -120px;}
+.icon-eye-close{background-position:-120px -120px;}
+.icon-warning-sign{background-position:-144px -120px;}
+.icon-plane{background-position:-168px -120px;}
+.icon-calendar{background-position:-192px -120px;}
+.icon-random{background-position:-216px -120px;}
+.icon-comment{background-position:-240px -120px;}
+.icon-magnet{background-position:-264px -120px;}
+.icon-chevron-up{background-position:-288px -120px;}
+.icon-chevron-down{background-position:-313px -119px;}
+.icon-retweet{background-position:-336px -120px;}
+.icon-shopping-cart{background-position:-360px -120px;}
+.icon-folder-close{background-position:-384px -120px;}
+.icon-folder-open{background-position:-408px -120px;}
+.icon-resize-vertical{background-position:-432px -119px;}
+.icon-resize-horizontal{background-position:-456px -118px;}
+.dropdown{position:relative;}
+.dropdown-toggle{*margin-bottom:-3px;}
+.dropdown-toggle:active,.open .dropdown-toggle{outline:0;}
+.caret{display:inline-block;width:0;height:0;vertical-align:top;border-left:4px solid transparent;border-right:4px solid transparent;border-top:4px solid #000000;opacity:0.3;filter:alpha(opacity=30);content:"";}
+.dropdown .caret{margin-top:8px;margin-left:2px;}
+.dropdown:hover .caret,.open.dropdown .caret{opacity:1;filter:alpha(opacity=100);}
+.dropdown-menu{position:absolute;top:100%;left:0;z-index:1000;float:left;display:none;min-width:160px;padding:4px 0;margin:0;list-style:none;background-color:#ffffff;border-color:#ccc;border-color:rgba(0, 0, 0, 0.2);border-style:solid;border-width:1px;-webkit-border-radius:0 0 5px 5px;-moz-border-radius:0 0 5px 5px;border-radius:0 0 5px 5px;-webkit-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-moz-box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);box-shadow:0 5px 10px rgba(0, 0, 0, 0.2);-webkit-background-clip:padding-box;-moz-background-clip:padding;background-clip:padding-box;*border-right-width:2px;*border-bottom-width:2px;}.dropdown-menu.pull-right{right:0;left:auto;}
+.dropdown-menu .divider{height:1px;margin:8px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;}
+.dropdown-menu a{display:block;padding:3px 15px;clear:both;font-weight:normal;line-height:18px;color:#333333;white-space:nowrap;}
+.dropdown-menu li>a:hover,.dropdown-menu .active>a,.dropdown-menu .active>a:hover{color:#ffffff;text-decoration:none;background-color:#0088cc;}
+.dropdown.open{*z-index:1000;}.dropdown.open .dropdown-toggle{color:#ffffff;background:#ccc;background:rgba(0, 0, 0, 0.3);}
+.dropdown.open .dropdown-menu{display:block;}
+.pull-right .dropdown-menu{left:auto;right:0;}
+.dropup .caret,.navbar-fixed-bottom .dropdown .caret{border-top:0;border-bottom:4px solid #000000;content:"\2191";}
+.dropup .dropdown-menu,.navbar-fixed-bottom .dropdown .dropdown-menu{top:auto;bottom:100%;margin-bottom:1px;}
+.typeahead{margin-top:2px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.well{min-height:20px;padding:19px;margin-bottom:20px;background-color:#f5f5f5;border:1px solid #eee;border:1px solid rgba(0, 0, 0, 0.05);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 1px rgba(0, 0, 0, 0.05);}.well blockquote{border-color:#ddd;border-color:rgba(0, 0, 0, 0.15);}
+.well-large{padding:24px;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}
+.well-small{padding:9px;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.fade{-webkit-transition:opacity 0.15s linear;-moz-transition:opacity 0.15s linear;-ms-transition:opacity 0.15s linear;-o-transition:opacity 0.15s linear;transition:opacity 0.15s linear;opacity:0;}.fade.in{opacity:1;}
+.collapse{-webkit-transition:height 0.35s ease;-moz-transition:height 0.35s ease;-ms-transition:height 0.35s ease;-o-transition:height 0.35s ease;transition:height 0.35s ease;position:relative;overflow:hidden;height:0;}.collapse.in{height:auto;}
+.close{float:right;font-size:20px;font-weight:bold;line-height:18px;color:#000000;text-shadow:0 1px 0 #ffffff;opacity:0.2;filter:alpha(opacity=20);}.close:hover{color:#000000;text-decoration:none;opacity:0.4;filter:alpha(opacity=40);cursor:pointer;}
+.btn{display:inline-block;*display:inline;*zoom:1;padding:4px 10px 4px;margin-bottom:0;font-size:13px;line-height:18px;color:#333333;text-align:center;text-shadow:0 1px 1px rgba(255, 255, 255, 0.75);vertical-align:middle;background-color:#f5f5f5;background-image:-moz-linear-gradient(top, #ffffff, #e6e6e6);background-image:-ms-linear-gradient(top, #ffffff, #e6e6e6);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#e6e6e6));background-image:-webkit-linear-gradient(top, #ffffff, #e6e6e6);background-image:-o-linear-gradient(top, #ffffff, #e6e6e6);background-image:linear-gradient(top, #ffffff, #e6e6e6);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#e6e6e6', GradientType=0);border-color:#e6e6e6 #e6e6e6 #bfbfbf;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);border:1px solid #cccccc;border-bottom-color:#b3b3b3;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);cursor:pointer;*margin-left:.3em;}.btn:hover,.btn:active,.btn.active,.btn.disabled,.btn[disabled]{background-color:#e6e6e6;}
+.btn:active,.btn.active{background-color:#cccccc \9;}
+.btn:first-child{*margin-left:0;}
+.btn:hover{color:#333333;text-decoration:none;background-color:#e6e6e6;background-position:0 -15px;-webkit-transition:background-position 0.1s linear;-moz-transition:background-position 0.1s linear;-ms-transition:background-position 0.1s linear;-o-transition:background-position 0.1s linear;transition:background-position 0.1s linear;}
+.btn:focus{outline:thin dotted #333;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px;}
+.btn.active,.btn:active{background-image:none;-webkit-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);background-color:#e6e6e6;background-color:#d9d9d9 \9;outline:0;}
+.btn.disabled,.btn[disabled]{cursor:default;background-image:none;background-color:#e6e6e6;opacity:0.65;filter:alpha(opacity=65);-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;}
+.btn-large{padding:9px 14px;font-size:15px;line-height:normal;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn-large [class^="icon-"]{margin-top:1px;}
+.btn-small{padding:5px 9px;font-size:11px;line-height:16px;}
+.btn-small [class^="icon-"]{margin-top:-1px;}
+.btn-mini{padding:2px 6px;font-size:11px;line-height:14px;}
+.btn-primary,.btn-primary:hover,.btn-warning,.btn-warning:hover,.btn-danger,.btn-danger:hover,.btn-success,.btn-success:hover,.btn-info,.btn-info:hover,.btn-inverse,.btn-inverse:hover{text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);color:#ffffff;}
+.btn-primary.active,.btn-warning.active,.btn-danger.active,.btn-success.active,.btn-info.active,.btn-inverse.active{color:rgba(255, 255, 255, 0.75);}
+.btn-primary{background-color:#0074cc;background-image:-moz-linear-gradient(top, #0088cc, #0055cc);background-image:-ms-linear-gradient(top, #0088cc, #0055cc);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0055cc));background-image:-webkit-linear-gradient(top, #0088cc, #0055cc);background-image:-o-linear-gradient(top, #0088cc, #0055cc);background-image:linear-gradient(top, #0088cc, #0055cc);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0055cc', GradientType=0);border-color:#0055cc #0055cc #003580;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-primary:hover,.btn-primary:active,.btn-primary.active,.btn-primary.disabled,.btn-primary[disabled]{background-color:#0055cc;}
+.btn-primary:active,.btn-primary.active{background-color:#004099 \9;}
+.btn-warning{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);border-color:#f89406 #f89406 #ad6704;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-warning:hover,.btn-warning:active,.btn-warning.active,.btn-warning.disabled,.btn-warning[disabled]{background-color:#f89406;}
+.btn-warning:active,.btn-warning.active{background-color:#c67605 \9;}
+.btn-danger{background-color:#da4f49;background-image:-moz-linear-gradient(top, #ee5f5b, #bd362f);background-image:-ms-linear-gradient(top, #ee5f5b, #bd362f);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#bd362f));background-image:-webkit-linear-gradient(top, #ee5f5b, #bd362f);background-image:-o-linear-gradient(top, #ee5f5b, #bd362f);background-image:linear-gradient(top, #ee5f5b, #bd362f);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#bd362f', GradientType=0);border-color:#bd362f #bd362f #802420;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-danger:hover,.btn-danger:active,.btn-danger.active,.btn-danger.disabled,.btn-danger[disabled]{background-color:#bd362f;}
+.btn-danger:active,.btn-danger.active{background-color:#942a25 \9;}
+.btn-success{background-color:#5bb75b;background-image:-moz-linear-gradient(top, #62c462, #51a351);background-image:-ms-linear-gradient(top, #62c462, #51a351);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#51a351));background-image:-webkit-linear-gradient(top, #62c462, #51a351);background-image:-o-linear-gradient(top, #62c462, #51a351);background-image:linear-gradient(top, #62c462, #51a351);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#51a351', GradientType=0);border-color:#51a351 #51a351 #387038;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-success:hover,.btn-success:active,.btn-success.active,.btn-success.disabled,.btn-success[disabled]{background-color:#51a351;}
+.btn-success:active,.btn-success.active{background-color:#408140 \9;}
+.btn-info{background-color:#49afcd;background-image:-moz-linear-gradient(top, #5bc0de, #2f96b4);background-image:-ms-linear-gradient(top, #5bc0de, #2f96b4);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#2f96b4));background-image:-webkit-linear-gradient(top, #5bc0de, #2f96b4);background-image:-o-linear-gradient(top, #5bc0de, #2f96b4);background-image:linear-gradient(top, #5bc0de, #2f96b4);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#2f96b4', GradientType=0);border-color:#2f96b4 #2f96b4 #1f6377;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-info:hover,.btn-info:active,.btn-info.active,.btn-info.disabled,.btn-info[disabled]{background-color:#2f96b4;}
+.btn-info:active,.btn-info.active{background-color:#24748c \9;}
+.btn-inverse{background-color:#414141;background-image:-moz-linear-gradient(top, #555555, #222222);background-image:-ms-linear-gradient(top, #555555, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#555555), to(#222222));background-image:-webkit-linear-gradient(top, #555555, #222222);background-image:-o-linear-gradient(top, #555555, #222222);background-image:linear-gradient(top, #555555, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#555555', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);}.btn-inverse:hover,.btn-inverse:active,.btn-inverse.active,.btn-inverse.disabled,.btn-inverse[disabled]{background-color:#222222;}
+.btn-inverse:active,.btn-inverse.active{background-color:#080808 \9;}
+button.btn,input[type="submit"].btn{*padding-top:2px;*padding-bottom:2px;}button.btn::-moz-focus-inner,input[type="submit"].btn::-moz-focus-inner{padding:0;border:0;}
+button.btn.btn-large,input[type="submit"].btn.btn-large{*padding-top:7px;*padding-bottom:7px;}
+button.btn.btn-small,input[type="submit"].btn.btn-small{*padding-top:3px;*padding-bottom:3px;}
+button.btn.btn-mini,input[type="submit"].btn.btn-mini{*padding-top:1px;*padding-bottom:1px;}
+.btn-group{position:relative;*zoom:1;*margin-left:.3em;}.btn-group:before,.btn-group:after{display:table;content:"";}
+.btn-group:after{clear:both;}
+.btn-group:first-child{*margin-left:0;}
+.btn-group+.btn-group{margin-left:5px;}
+.btn-toolbar{margin-top:9px;margin-bottom:9px;}.btn-toolbar .btn-group{display:inline-block;*display:inline;*zoom:1;}
+.btn-group .btn{position:relative;float:left;margin-left:-1px;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.btn-group .btn:first-child{margin-left:0;-webkit-border-top-left-radius:4px;-moz-border-radius-topleft:4px;border-top-left-radius:4px;-webkit-border-bottom-left-radius:4px;-moz-border-radius-bottomleft:4px;border-bottom-left-radius:4px;}
+.btn-group .btn:last-child,.btn-group .dropdown-toggle{-webkit-border-top-right-radius:4px;-moz-border-radius-topright:4px;border-top-right-radius:4px;-webkit-border-bottom-right-radius:4px;-moz-border-radius-bottomright:4px;border-bottom-right-radius:4px;}
+.btn-group .btn.large:first-child{margin-left:0;-webkit-border-top-left-radius:6px;-moz-border-radius-topleft:6px;border-top-left-radius:6px;-webkit-border-bottom-left-radius:6px;-moz-border-radius-bottomleft:6px;border-bottom-left-radius:6px;}
+.btn-group .btn.large:last-child,.btn-group .large.dropdown-toggle{-webkit-border-top-right-radius:6px;-moz-border-radius-topright:6px;border-top-right-radius:6px;-webkit-border-bottom-right-radius:6px;-moz-border-radius-bottomright:6px;border-bottom-right-radius:6px;}
+.btn-group .btn:hover,.btn-group .btn:focus,.btn-group .btn:active,.btn-group .btn.active{z-index:2;}
+.btn-group .dropdown-toggle:active,.btn-group.open .dropdown-toggle{outline:0;}
+.btn-group .dropdown-toggle{padding-left:8px;padding-right:8px;-webkit-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 1px 0 0 rgba(255, 255, 255, 0.125),inset 0 1px 0 rgba(255, 255, 255, 0.2),0 1px 2px rgba(0, 0, 0, 0.05);*padding-top:3px;*padding-bottom:3px;}
+.btn-group .btn-mini.dropdown-toggle{padding-left:5px;padding-right:5px;*padding-top:1px;*padding-bottom:1px;}
+.btn-group .btn-small.dropdown-toggle{*padding-top:4px;*padding-bottom:4px;}
+.btn-group .btn-large.dropdown-toggle{padding-left:12px;padding-right:12px;}
+.btn-group.open{*z-index:1000;}.btn-group.open .dropdown-menu{display:block;margin-top:1px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.btn-group.open .dropdown-toggle{background-image:none;-webkit-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:inset 0 1px 6px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);}
+.btn .caret{margin-top:7px;margin-left:0;}
+.btn:hover .caret,.open.btn-group .caret{opacity:1;filter:alpha(opacity=100);}
+.btn-mini .caret{margin-top:5px;}
+.btn-small .caret{margin-top:6px;}
+.btn-large .caret{margin-top:6px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.btn-primary .caret,.btn-warning .caret,.btn-danger .caret,.btn-info .caret,.btn-success .caret,.btn-inverse .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:0.75;filter:alpha(opacity=75);}
+.alert{padding:8px 35px 8px 14px;margin-bottom:18px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);background-color:#fcf8e3;border:1px solid #fbeed5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;color:#c09853;}
+.alert-heading{color:inherit;}
+.alert .close{position:relative;top:-2px;right:-21px;line-height:18px;}
+.alert-success{background-color:#dff0d8;border-color:#d6e9c6;color:#468847;}
+.alert-danger,.alert-error{background-color:#f2dede;border-color:#eed3d7;color:#b94a48;}
+.alert-info{background-color:#d9edf7;border-color:#bce8f1;color:#3a87ad;}
+.alert-block{padding-top:14px;padding-bottom:14px;}
+.alert-block>p,.alert-block>ul{margin-bottom:0;}
+.alert-block p+p{margin-top:5px;}
+.nav{margin-left:0;margin-bottom:18px;list-style:none;}
+.nav>li>a{display:block;}
+.nav>li>a:hover{text-decoration:none;background-color:#eeeeee;}
+.nav .nav-header{display:block;padding:3px 15px;font-size:11px;font-weight:bold;line-height:18px;color:#999999;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);text-transform:uppercase;}
+.nav li+.nav-header{margin-top:9px;}
+.nav-list{padding-left:15px;padding-right:15px;margin-bottom:0;}
+.nav-list>li>a,.nav-list .nav-header{margin-left:-15px;margin-right:-15px;text-shadow:0 1px 0 rgba(255, 255, 255, 0.5);}
+.nav-list>li>a{padding:3px 15px;}
+.nav-list>.active>a,.nav-list>.active>a:hover{color:#ffffff;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.2);background-color:#0088cc;}
+.nav-list [class^="icon-"]{margin-right:2px;}
+.nav-list .divider{height:1px;margin:8px 1px;overflow:hidden;background-color:#e5e5e5;border-bottom:1px solid #ffffff;*width:100%;*margin:-5px 0 5px;}
+.nav-tabs,.nav-pills{*zoom:1;}.nav-tabs:before,.nav-pills:before,.nav-tabs:after,.nav-pills:after{display:table;content:"";}
+.nav-tabs:after,.nav-pills:after{clear:both;}
+.nav-tabs>li,.nav-pills>li{float:left;}
+.nav-tabs>li>a,.nav-pills>li>a{padding-right:12px;padding-left:12px;margin-right:2px;line-height:14px;}
+.nav-tabs{border-bottom:1px solid #ddd;}
+.nav-tabs>li{margin-bottom:-1px;}
+.nav-tabs>li>a{padding-top:8px;padding-bottom:8px;line-height:18px;border:1px solid transparent;-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}.nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #dddddd;}
+.nav-tabs>.active>a,.nav-tabs>.active>a:hover{color:#555555;background-color:#ffffff;border:1px solid #ddd;border-bottom-color:transparent;cursor:default;}
+.nav-pills>li>a{padding-top:8px;padding-bottom:8px;margin-top:2px;margin-bottom:2px;-webkit-border-radius:5px;-moz-border-radius:5px;border-radius:5px;}
+.nav-pills>.active>a,.nav-pills>.active>a:hover{color:#ffffff;background-color:#0088cc;}
+.nav-stacked>li{float:none;}
+.nav-stacked>li>a{margin-right:0;}
+.nav-tabs.nav-stacked{border-bottom:0;}
+.nav-tabs.nav-stacked>li>a{border:1px solid #ddd;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.nav-tabs.nav-stacked>li:first-child>a{-webkit-border-radius:4px 4px 0 0;-moz-border-radius:4px 4px 0 0;border-radius:4px 4px 0 0;}
+.nav-tabs.nav-stacked>li:last-child>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}
+.nav-tabs.nav-stacked>li>a:hover{border-color:#ddd;z-index:2;}
+.nav-pills.nav-stacked>li>a{margin-bottom:3px;}
+.nav-pills.nav-stacked>li:last-child>a{margin-bottom:1px;}
+.nav-tabs .dropdown-menu,.nav-pills .dropdown-menu{margin-top:1px;border-width:1px;}
+.nav-pills .dropdown-menu{-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.nav-tabs .dropdown-toggle .caret,.nav-pills .dropdown-toggle .caret{border-top-color:#0088cc;border-bottom-color:#0088cc;margin-top:6px;}
+.nav-tabs .dropdown-toggle:hover .caret,.nav-pills .dropdown-toggle:hover .caret{border-top-color:#005580;border-bottom-color:#005580;}
+.nav-tabs .active .dropdown-toggle .caret,.nav-pills .active .dropdown-toggle .caret{border-top-color:#333333;border-bottom-color:#333333;}
+.nav>.dropdown.active>a:hover{color:#000000;cursor:pointer;}
+.nav-tabs .open .dropdown-toggle,.nav-pills .open .dropdown-toggle,.nav>.open.active>a:hover{color:#ffffff;background-color:#999999;border-color:#999999;}
+.nav .open .caret,.nav .open.active .caret,.nav .open a:hover .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;opacity:1;filter:alpha(opacity=100);}
+.tabs-stacked .open>a:hover{border-color:#999999;}
+.tabbable{*zoom:1;}.tabbable:before,.tabbable:after{display:table;content:"";}
+.tabbable:after{clear:both;}
+.tab-content{display:table;width:100%;}
+.tabs-below .nav-tabs,.tabs-right .nav-tabs,.tabs-left .nav-tabs{border-bottom:0;}
+.tab-content>.tab-pane,.pill-content>.pill-pane{display:none;}
+.tab-content>.active,.pill-content>.active{display:block;}
+.tabs-below .nav-tabs{border-top:1px solid #ddd;}
+.tabs-below .nav-tabs>li{margin-top:-1px;margin-bottom:0;}
+.tabs-below .nav-tabs>li>a{-webkit-border-radius:0 0 4px 4px;-moz-border-radius:0 0 4px 4px;border-radius:0 0 4px 4px;}.tabs-below .nav-tabs>li>a:hover{border-bottom-color:transparent;border-top-color:#ddd;}
+.tabs-below .nav-tabs .active>a,.tabs-below .nav-tabs .active>a:hover{border-color:transparent #ddd #ddd #ddd;}
+.tabs-left .nav-tabs>li,.tabs-right .nav-tabs>li{float:none;}
+.tabs-left .nav-tabs>li>a,.tabs-right .nav-tabs>li>a{min-width:74px;margin-right:0;margin-bottom:3px;}
+.tabs-left .nav-tabs{float:left;margin-right:19px;border-right:1px solid #ddd;}
+.tabs-left .nav-tabs>li>a{margin-right:-1px;-webkit-border-radius:4px 0 0 4px;-moz-border-radius:4px 0 0 4px;border-radius:4px 0 0 4px;}
+.tabs-left .nav-tabs>li>a:hover{border-color:#eeeeee #dddddd #eeeeee #eeeeee;}
+.tabs-left .nav-tabs .active>a,.tabs-left .nav-tabs .active>a:hover{border-color:#ddd transparent #ddd #ddd;*border-right-color:#ffffff;}
+.tabs-right .nav-tabs{float:right;margin-left:19px;border-left:1px solid #ddd;}
+.tabs-right .nav-tabs>li>a{margin-left:-1px;-webkit-border-radius:0 4px 4px 0;-moz-border-radius:0 4px 4px 0;border-radius:0 4px 4px 0;}
+.tabs-right .nav-tabs>li>a:hover{border-color:#eeeeee #eeeeee #eeeeee #dddddd;}
+.tabs-right .nav-tabs .active>a,.tabs-right .nav-tabs .active>a:hover{border-color:#ddd #ddd #ddd transparent;*border-left-color:#ffffff;}
+.navbar{*position:relative;*z-index:2;overflow:visible;margin-bottom:18px;}
+.navbar-inner{padding-left:20px;padding-right:20px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);-moz-box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);box-shadow:0 1px 3px rgba(0, 0, 0, 0.25),inset 0 -1px 0 rgba(0, 0, 0, 0.1);}
+.navbar .container{width:auto;}
+.btn-navbar{display:none;float:right;padding:7px 10px;margin-left:5px;margin-right:5px;background-color:#2c2c2c;background-image:-moz-linear-gradient(top, #333333, #222222);background-image:-ms-linear-gradient(top, #333333, #222222);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#333333), to(#222222));background-image:-webkit-linear-gradient(top, #333333, #222222);background-image:-o-linear-gradient(top, #333333, #222222);background-image:linear-gradient(top, #333333, #222222);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#333333', endColorstr='#222222', GradientType=0);border-color:#222222 #222222 #000000;border-color:rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);filter:progid:dximagetransform.microsoft.gradient(enabled=false);-webkit-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);-moz-box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);box-shadow:inset 0 1px 0 rgba(255, 255, 255, 0.1),0 1px 0 rgba(255, 255, 255, 0.075);}.btn-navbar:hover,.btn-navbar:active,.btn-navbar.active,.btn-navbar.disabled,.btn-navbar[disabled]{background-color:#222222;}
+.btn-navbar:active,.btn-navbar.active{background-color:#080808 \9;}
+.btn-navbar .icon-bar{display:block;width:18px;height:2px;background-color:#f5f5f5;-webkit-border-radius:1px;-moz-border-radius:1px;border-radius:1px;-webkit-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);-moz-box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);box-shadow:0 1px 0 rgba(0, 0, 0, 0.25);}
+.btn-navbar .icon-bar+.icon-bar{margin-top:3px;}
+.nav-collapse.collapse{height:auto;}
+.navbar{color:#999999;}.navbar .brand:hover{text-decoration:none;}
+.navbar .brand{float:left;display:block;padding:8px 20px 12px;margin-left:-20px;font-size:20px;font-weight:200;line-height:1;color:#ffffff;}
+.navbar .navbar-text{margin-bottom:0;line-height:40px;}
+.navbar .btn,.navbar .btn-group{margin-top:5px;}
+.navbar .btn-group .btn{margin-top:0;}
+.navbar-form{margin-bottom:0;*zoom:1;}.navbar-form:before,.navbar-form:after{display:table;content:"";}
+.navbar-form:after{clear:both;}
+.navbar-form input,.navbar-form select,.navbar-form .radio,.navbar-form .checkbox{margin-top:5px;}
+.navbar-form input,.navbar-form select{display:inline-block;margin-bottom:0;}
+.navbar-form input[type="image"],.navbar-form input[type="checkbox"],.navbar-form input[type="radio"]{margin-top:3px;}
+.navbar-form .input-append,.navbar-form .input-prepend{margin-top:6px;white-space:nowrap;}.navbar-form .input-append input,.navbar-form .input-prepend input{margin-top:0;}
+.navbar-search{position:relative;float:left;margin-top:6px;margin-bottom:0;}.navbar-search .search-query{padding:4px 9px;font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:13px;font-weight:normal;line-height:1;color:#ffffff;background-color:#626262;border:1px solid #151515;-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1),0 1px 0px rgba(255, 255, 255, 0.15);-webkit-transition:none;-moz-transition:none;-ms-transition:none;-o-transition:none;transition:none;}.navbar-search .search-query:-moz-placeholder{color:#cccccc;}
+.navbar-search .search-query::-webkit-input-placeholder{color:#cccccc;}
+.navbar-search .search-query:focus,.navbar-search .search-query.focused{padding:5px 10px;color:#333333;text-shadow:0 1px 0 #ffffff;background-color:#ffffff;border:0;-webkit-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);-moz-box-shadow:0 0 3px rgba(0, 0, 0, 0.15);box-shadow:0 0 3px rgba(0, 0, 0, 0.15);outline:0;}
+.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030;margin-bottom:0;}
+.navbar-fixed-top .navbar-inner,.navbar-fixed-bottom .navbar-inner{padding-left:0;padding-right:0;-webkit-border-radius:0;-moz-border-radius:0;border-radius:0;}
+.navbar-fixed-top .container,.navbar-fixed-bottom .container{width:940px;}
+.navbar-fixed-top{top:0;}
+.navbar-fixed-bottom{bottom:0;}
+.navbar .nav{position:relative;left:0;display:block;float:left;margin:0 10px 0 0;}
+.navbar .nav.pull-right{float:right;}
+.navbar .nav>li{display:block;float:left;}
+.navbar .nav>li>a{float:none;padding:10px 10px 11px;line-height:19px;color:#999999;text-decoration:none;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);}
+.navbar .nav>li>a:hover{background-color:transparent;color:#ffffff;text-decoration:none;}
+.navbar .nav .active>a,.navbar .nav .active>a:hover{color:#ffffff;text-decoration:none;background-color:#222222;}
+.navbar .divider-vertical{height:40px;width:1px;margin:0 9px;overflow:hidden;background-color:#222222;border-right:1px solid #333333;}
+.navbar .nav.pull-right{margin-left:10px;margin-right:0;}
+.navbar .dropdown-menu{margin-top:1px;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}.navbar .dropdown-menu:before{content:'';display:inline-block;border-left:7px solid transparent;border-right:7px solid transparent;border-bottom:7px solid #ccc;border-bottom-color:rgba(0, 0, 0, 0.2);position:absolute;top:-7px;left:9px;}
+.navbar .dropdown-menu:after{content:'';display:inline-block;border-left:6px solid transparent;border-right:6px solid transparent;border-bottom:6px solid #ffffff;position:absolute;top:-6px;left:10px;}
+.navbar-fixed-bottom .dropdown-menu:before{border-top:7px solid #ccc;border-top-color:rgba(0, 0, 0, 0.2);border-bottom:0;bottom:-7px;top:auto;}
+.navbar-fixed-bottom .dropdown-menu:after{border-top:6px solid #ffffff;border-bottom:0;bottom:-6px;top:auto;}
+.navbar .nav .dropdown-toggle .caret,.navbar .nav .open.dropdown .caret{border-top-color:#ffffff;border-bottom-color:#ffffff;}
+.navbar .nav .active .caret{opacity:1;filter:alpha(opacity=100);}
+.navbar .nav .open>.dropdown-toggle,.navbar .nav .active>.dropdown-toggle,.navbar .nav .open.active>.dropdown-toggle{background-color:transparent;}
+.navbar .nav .active>.dropdown-toggle:hover{color:#ffffff;}
+.navbar .nav.pull-right .dropdown-menu,.navbar .nav .dropdown-menu.pull-right{left:auto;right:0;}.navbar .nav.pull-right .dropdown-menu:before,.navbar .nav .dropdown-menu.pull-right:before{left:auto;right:12px;}
+.navbar .nav.pull-right .dropdown-menu:after,.navbar .nav .dropdown-menu.pull-right:after{left:auto;right:13px;}
+.breadcrumb{padding:7px 14px;margin:0 0 18px;list-style:none;background-color:#fbfbfb;background-image:-moz-linear-gradient(top, #ffffff, #f5f5f5);background-image:-ms-linear-gradient(top, #ffffff, #f5f5f5);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ffffff), to(#f5f5f5));background-image:-webkit-linear-gradient(top, #ffffff, #f5f5f5);background-image:-o-linear-gradient(top, #ffffff, #f5f5f5);background-image:linear-gradient(top, #ffffff, #f5f5f5);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ffffff', endColorstr='#f5f5f5', GradientType=0);border:1px solid #ddd;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;}.breadcrumb li{display:inline-block;*display:inline;*zoom:1;text-shadow:0 1px 0 #ffffff;}
+.breadcrumb .divider{padding:0 5px;color:#999999;}
+.breadcrumb .active a{color:#333333;}
+.pagination{height:36px;margin:18px 0;}
+.pagination ul{display:inline-block;*display:inline;*zoom:1;margin-left:0;margin-bottom:0;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;-webkit-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);-moz-box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);box-shadow:0 1px 2px rgba(0, 0, 0, 0.05);}
+.pagination li{display:inline;}
+.pagination a{float:left;padding:0 14px;line-height:34px;text-decoration:none;border:1px solid #ddd;border-left-width:0;}
+.pagination a:hover,.pagination .active a{background-color:#f5f5f5;}
+.pagination .active a{color:#999999;cursor:default;}
+.pagination .disabled span,.pagination .disabled a,.pagination .disabled a:hover{color:#999999;background-color:transparent;cursor:default;}
+.pagination li:first-child a{border-left-width:1px;-webkit-border-radius:3px 0 0 3px;-moz-border-radius:3px 0 0 3px;border-radius:3px 0 0 3px;}
+.pagination li:last-child a{-webkit-border-radius:0 3px 3px 0;-moz-border-radius:0 3px 3px 0;border-radius:0 3px 3px 0;}
+.pagination-centered{text-align:center;}
+.pagination-right{text-align:right;}
+.pager{margin-left:0;margin-bottom:18px;list-style:none;text-align:center;*zoom:1;}.pager:before,.pager:after{display:table;content:"";}
+.pager:after{clear:both;}
+.pager li{display:inline;}
+.pager a{display:inline-block;padding:5px 14px;background-color:#fff;border:1px solid #ddd;-webkit-border-radius:15px;-moz-border-radius:15px;border-radius:15px;}
+.pager a:hover{text-decoration:none;background-color:#f5f5f5;}
+.pager .next a{float:right;}
+.pager .previous a{float:left;}
+.pager .disabled a,.pager .disabled a:hover{color:#999999;background-color:#fff;cursor:default;}
+.modal-open .dropdown-menu{z-index:2050;}
+.modal-open .dropdown.open{*z-index:2050;}
+.modal-open .popover{z-index:2060;}
+.modal-open .tooltip{z-index:2070;}
+.modal-backdrop{position:fixed;top:0;right:0;bottom:0;left:0;z-index:1040;background-color:#000000;}.modal-backdrop.fade{opacity:0;}
+.modal-backdrop,.modal-backdrop.fade.in{opacity:0.8;filter:alpha(opacity=80);}
+.modal{position:fixed;top:50%;left:50%;z-index:1050;overflow:auto;width:560px;margin:-250px 0 0 -280px;background-color:#ffffff;border:1px solid #999;border:1px solid rgba(0, 0, 0, 0.3);*border:1px solid #999;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.modal.fade{-webkit-transition:opacity .3s linear, top .3s ease-out;-moz-transition:opacity .3s linear, top .3s ease-out;-ms-transition:opacity .3s linear, top .3s ease-out;-o-transition:opacity .3s linear, top .3s ease-out;transition:opacity .3s linear, top .3s ease-out;top:-25%;}
+.modal.fade.in{top:50%;}
+.modal-header{padding:9px 15px;border-bottom:1px solid #eee;}.modal-header .close{margin-top:2px;}
+.modal-body{overflow-y:auto;max-height:400px;padding:15px;}
+.modal-form{margin-bottom:0;}
+.modal-footer{padding:14px 15px 15px;margin-bottom:0;text-align:right;background-color:#f5f5f5;border-top:1px solid #ddd;-webkit-border-radius:0 0 6px 6px;-moz-border-radius:0 0 6px 6px;border-radius:0 0 6px 6px;-webkit-box-shadow:inset 0 1px 0 #ffffff;-moz-box-shadow:inset 0 1px 0 #ffffff;box-shadow:inset 0 1px 0 #ffffff;*zoom:1;}.modal-footer:before,.modal-footer:after{display:table;content:"";}
+.modal-footer:after{clear:both;}
+.modal-footer .btn+.btn{margin-left:5px;margin-bottom:0;}
+.modal-footer .btn-group .btn+.btn{margin-left:-1px;}
+.tooltip{position:absolute;z-index:1020;display:block;visibility:visible;padding:5px;font-size:11px;opacity:0;filter:alpha(opacity=0);}.tooltip.in{opacity:0.8;filter:alpha(opacity=80);}
+.tooltip.top{margin-top:-2px;}
+.tooltip.right{margin-left:2px;}
+.tooltip.bottom{margin-top:2px;}
+.tooltip.left{margin-left:-2px;}
+.tooltip.top .tooltip-arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.tooltip.left .tooltip-arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.tooltip.bottom .tooltip-arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.tooltip.right .tooltip-arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.tooltip-inner{max-width:200px;padding:3px 8px;color:#ffffff;text-align:center;text-decoration:none;background-color:#000000;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.tooltip-arrow{position:absolute;width:0;height:0;}
+.popover{position:absolute;top:0;left:0;z-index:1010;display:none;padding:5px;}.popover.top{margin-top:-5px;}
+.popover.right{margin-left:5px;}
+.popover.bottom{margin-top:5px;}
+.popover.left{margin-left:-5px;}
+.popover.top .arrow{bottom:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-top:5px solid #000000;}
+.popover.right .arrow{top:50%;left:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-right:5px solid #000000;}
+.popover.bottom .arrow{top:0;left:50%;margin-left:-5px;border-left:5px solid transparent;border-right:5px solid transparent;border-bottom:5px solid #000000;}
+.popover.left .arrow{top:50%;right:0;margin-top:-5px;border-top:5px solid transparent;border-bottom:5px solid transparent;border-left:5px solid #000000;}
+.popover .arrow{position:absolute;width:0;height:0;}
+.popover-inner{padding:3px;width:280px;overflow:hidden;background:#000000;background:rgba(0, 0, 0, 0.8);-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;-webkit-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);-moz-box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);box-shadow:0 3px 7px rgba(0, 0, 0, 0.3);}
+.popover-title{padding:9px 15px;line-height:1;background-color:#f5f5f5;border-bottom:1px solid #eee;-webkit-border-radius:3px 3px 0 0;-moz-border-radius:3px 3px 0 0;border-radius:3px 3px 0 0;}
+.popover-content{padding:14px;background-color:#ffffff;-webkit-border-radius:0 0 3px 3px;-moz-border-radius:0 0 3px 3px;border-radius:0 0 3px 3px;-webkit-background-clip:padding-box;-moz-background-clip:padding-box;background-clip:padding-box;}.popover-content p,.popover-content ul,.popover-content ol{margin-bottom:0;}
+.thumbnails{margin-left:-20px;list-style:none;*zoom:1;}.thumbnails:before,.thumbnails:after{display:table;content:"";}
+.thumbnails:after{clear:both;}
+.thumbnails>li{float:left;margin:0 0 18px 20px;}
+.thumbnail{display:block;padding:4px;line-height:1;border:1px solid #ddd;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;-webkit-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);-moz-box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);box-shadow:0 1px 1px rgba(0, 0, 0, 0.075);}
+a.thumbnail:hover{border-color:#0088cc;-webkit-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);-moz-box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);box-shadow:0 1px 4px rgba(0, 105, 214, 0.25);}
+.thumbnail>img{display:block;max-width:100%;margin-left:auto;margin-right:auto;}
+.thumbnail .caption{padding:9px;}
+.label{padding:1px 4px 2px;font-size:10.998px;font-weight:bold;line-height:13px;color:#ffffff;vertical-align:middle;white-space:nowrap;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#999999;-webkit-border-radius:3px;-moz-border-radius:3px;border-radius:3px;}
+.label:hover{color:#ffffff;text-decoration:none;}
+.label-important{background-color:#b94a48;}
+.label-important:hover{background-color:#953b39;}
+.label-warning{background-color:#f89406;}
+.label-warning:hover{background-color:#c67605;}
+.label-success{background-color:#468847;}
+.label-success:hover{background-color:#356635;}
+.label-info{background-color:#3a87ad;}
+.label-info:hover{background-color:#2d6987;}
+.label-inverse{background-color:#333333;}
+.label-inverse:hover{background-color:#1a1a1a;}
+.badge{padding:1px 9px 2px;font-size:12.025px;font-weight:bold;white-space:nowrap;color:#ffffff;background-color:#999999;-webkit-border-radius:9px;-moz-border-radius:9px;border-radius:9px;}
+.badge:hover{color:#ffffff;text-decoration:none;cursor:pointer;}
+.badge-error{background-color:#b94a48;}
+.badge-error:hover{background-color:#953b39;}
+.badge-warning{background-color:#f89406;}
+.badge-warning:hover{background-color:#c67605;}
+.badge-success{background-color:#468847;}
+.badge-success:hover{background-color:#356635;}
+.badge-info{background-color:#3a87ad;}
+.badge-info:hover{background-color:#2d6987;}
+.badge-inverse{background-color:#333333;}
+.badge-inverse:hover{background-color:#1a1a1a;}
+@-webkit-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-moz-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@-ms-keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}@keyframes progress-bar-stripes{from{background-position:0 0;} to{background-position:40px 0;}}.progress{overflow:hidden;height:18px;margin-bottom:18px;background-color:#f7f7f7;background-image:-moz-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-ms-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#f5f5f5), to(#f9f9f9));background-image:-webkit-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:-o-linear-gradient(top, #f5f5f5, #f9f9f9);background-image:linear-gradient(top, #f5f5f5, #f9f9f9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#f5f5f5', endColorstr='#f9f9f9', GradientType=0);-webkit-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-moz-box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);box-shadow:inset 0 1px 2px rgba(0, 0, 0, 0.1);-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.progress .bar{width:0%;height:18px;color:#ffffff;font-size:12px;text-align:center;text-shadow:0 -1px 0 rgba(0, 0, 0, 0.25);background-color:#0e90d2;background-image:-moz-linear-gradient(top, #149bdf, #0480be);background-image:-ms-linear-gradient(top, #149bdf, #0480be);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));background-image:-webkit-linear-gradient(top, #149bdf, #0480be);background-image:-o-linear-gradient(top, #149bdf, #0480be);background-image:linear-gradient(top, #149bdf, #0480be);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#149bdf', endColorstr='#0480be', GradientType=0);-webkit-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-moz-box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);box-shadow:inset 0 -1px 0 rgba(0, 0, 0, 0.15);-webkit-box-sizing:border-box;-moz-box-sizing:border-box;-ms-box-sizing:border-box;box-sizing:border-box;-webkit-transition:width 0.6s ease;-moz-transition:width 0.6s ease;-ms-transition:width 0.6s ease;-o-transition:width 0.6s ease;transition:width 0.6s ease;}
+.progress-striped .bar{background-color:#149bdf;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);-webkit-background-size:40px 40px;-moz-background-size:40px 40px;-o-background-size:40px 40px;background-size:40px 40px;}
+.progress.active .bar{-webkit-animation:progress-bar-stripes 2s linear infinite;-moz-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite;}
+.progress-danger .bar{background-color:#dd514c;background-image:-moz-linear-gradient(top, #ee5f5b, #c43c35);background-image:-ms-linear-gradient(top, #ee5f5b, #c43c35);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#ee5f5b), to(#c43c35));background-image:-webkit-linear-gradient(top, #ee5f5b, #c43c35);background-image:-o-linear-gradient(top, #ee5f5b, #c43c35);background-image:linear-gradient(top, #ee5f5b, #c43c35);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#ee5f5b', endColorstr='#c43c35', GradientType=0);}
+.progress-danger.progress-striped .bar{background-color:#ee5f5b;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-success .bar{background-color:#5eb95e;background-image:-moz-linear-gradient(top, #62c462, #57a957);background-image:-ms-linear-gradient(top, #62c462, #57a957);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#62c462), to(#57a957));background-image:-webkit-linear-gradient(top, #62c462, #57a957);background-image:-o-linear-gradient(top, #62c462, #57a957);background-image:linear-gradient(top, #62c462, #57a957);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#62c462', endColorstr='#57a957', GradientType=0);}
+.progress-success.progress-striped .bar{background-color:#62c462;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-info .bar{background-color:#4bb1cf;background-image:-moz-linear-gradient(top, #5bc0de, #339bb9);background-image:-ms-linear-gradient(top, #5bc0de, #339bb9);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#5bc0de), to(#339bb9));background-image:-webkit-linear-gradient(top, #5bc0de, #339bb9);background-image:-o-linear-gradient(top, #5bc0de, #339bb9);background-image:linear-gradient(top, #5bc0de, #339bb9);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#5bc0de', endColorstr='#339bb9', GradientType=0);}
+.progress-info.progress-striped .bar{background-color:#5bc0de;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.progress-warning .bar{background-color:#faa732;background-image:-moz-linear-gradient(top, #fbb450, #f89406);background-image:-ms-linear-gradient(top, #fbb450, #f89406);background-image:-webkit-gradient(linear, 0 0, 0 100%, from(#fbb450), to(#f89406));background-image:-webkit-linear-gradient(top, #fbb450, #f89406);background-image:-o-linear-gradient(top, #fbb450, #f89406);background-image:linear-gradient(top, #fbb450, #f89406);background-repeat:repeat-x;filter:progid:DXImageTransform.Microsoft.gradient(startColorstr='#fbb450', endColorstr='#f89406', GradientType=0);}
+.progress-warning.progress-striped .bar{background-color:#fbb450;background-image:-webkit-gradient(linear, 0 100%, 100% 0, color-stop(0.25, rgba(255, 255, 255, 0.15)), color-stop(0.25, transparent), color-stop(0.5, transparent), color-stop(0.5, rgba(255, 255, 255, 0.15)), color-stop(0.75, rgba(255, 255, 255, 0.15)), color-stop(0.75, transparent), to(transparent));background-image:-webkit-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-moz-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-ms-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:-o-linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(-45deg, rgba(255, 255, 255, 0.15) 25%, transparent 25%, transparent 50%, rgba(255, 255, 255, 0.15) 50%, rgba(255, 255, 255, 0.15) 75%, transparent 75%, transparent);}
+.accordion{margin-bottom:18px;}
+.accordion-group{margin-bottom:2px;border:1px solid #e5e5e5;-webkit-border-radius:4px;-moz-border-radius:4px;border-radius:4px;}
+.accordion-heading{border-bottom:0;}
+.accordion-heading .accordion-toggle{display:block;padding:8px 15px;}
+.accordion-inner{padding:9px 15px;border-top:1px solid #e5e5e5;}
+.carousel{position:relative;margin-bottom:18px;line-height:1;}
+.carousel-inner{overflow:hidden;width:100%;position:relative;}
+.carousel .item{display:none;position:relative;-webkit-transition:0.6s ease-in-out left;-moz-transition:0.6s ease-in-out left;-ms-transition:0.6s ease-in-out left;-o-transition:0.6s ease-in-out left;transition:0.6s ease-in-out left;}
+.carousel .item>img{display:block;line-height:1;}
+.carousel .active,.carousel .next,.carousel .prev{display:block;}
+.carousel .active{left:0;}
+.carousel .next,.carousel .prev{position:absolute;top:0;width:100%;}
+.carousel .next{left:100%;}
+.carousel .prev{left:-100%;}
+.carousel .next.left,.carousel .prev.right{left:0;}
+.carousel .active.left{left:-100%;}
+.carousel .active.right{left:100%;}
+.carousel-control{position:absolute;top:40%;left:15px;width:40px;height:40px;margin-top:-20px;font-size:60px;font-weight:100;line-height:30px;color:#ffffff;text-align:center;background:#222222;border:3px solid #ffffff;-webkit-border-radius:23px;-moz-border-radius:23px;border-radius:23px;opacity:0.5;filter:alpha(opacity=50);}.carousel-control.right{left:auto;right:15px;}
+.carousel-control:hover{color:#ffffff;text-decoration:none;opacity:0.9;filter:alpha(opacity=90);}
+.carousel-caption{position:absolute;left:0;right:0;bottom:0;padding:10px 15px 5px;background:#333333;background:rgba(0, 0, 0, 0.75);}
+.carousel-caption h4,.carousel-caption p{color:#ffffff;}
+.hero-unit{padding:60px;margin-bottom:30px;background-color:#eeeeee;-webkit-border-radius:6px;-moz-border-radius:6px;border-radius:6px;}.hero-unit h1{margin-bottom:0;font-size:60px;line-height:1;color:inherit;letter-spacing:-1px;}
+.hero-unit p{font-size:18px;font-weight:200;line-height:27px;color:inherit;}
+.pull-right{float:right;}
+.pull-left{float:left;}
+.hide{display:none;}
+.show{display:block;}
+.invisible{visibility:hidden;}
diff --git a/doc/resources/ace/skeleton/csses/prettify.css b/doc/resources/ace/skeleton/csses/prettify.css
new file mode 100644
index 00000000..2cd13649
--- /dev/null
+++ b/doc/resources/ace/skeleton/csses/prettify.css
@@ -0,0 +1,52 @@
+/* Pretty printing styles. Used with prettify.js. */
+
+/* SPAN elements with the classes below are added by prettyprint. */
+.pln { color: #000 } /* plain text */
+
+@media screen {
+ .str { color: #2e6a40 } /* string content */
+ .kwd { color: #214afc } /* a keyword */
+ .com { color: #4c886b } /* a comment */
+ .typ { color: #1130ad } /* a type name */
+ .lit { color: #1130ad } /* a literal value */
+ /* punctuation, lisp open bracket, lisp close bracket */
+ .pun, .opn, .clo { color: #2d0603 }
+ .tag { color: #008 } /* a markup tag name */
+ .atn { color: #606 } /* a markup attribute name */
+ .atv { color: #080 } /* a markup attribute value */
+ .dec, .var { color: #606 } /* a declaration; a variable name */
+ .fun { color: #1130ad } /* a function name */
+}
+
+/* Use higher contrast and text-weight for printable form. */
+@media print, projection {
+ .str { color: #060 }
+ .kwd { color: #006; font-weight: bold }
+ .com { color: #600; font-style: italic }
+ .typ { color: #404; font-weight: bold }
+ .lit { color: #044 }
+ .pun, .opn, .clo { color: #440 }
+ .tag { color: #006; font-weight: bold }
+ .atn { color: #404 }
+ .atv { color: #060 }
+}
+
+/* Put a border around prettyprinted code snippets. */
+/*pre.prettyprint { padding: 2px; }*/
+
+/* Specify class=linenums on a pre to get line numbering */
+ol.linenums { margin-top: 0; margin-bottom: 0 } /* IE indents via margin-left */`
+li.L0,
+li.L1,
+li.L2,
+li.L3,
+li.L5,
+li.L6,
+li.L7,
+li.L8 { list-style-type: none }
+/* Alternate shading for lines */
+li.L1,
+li.L3,
+li.L5,
+li.L7,
+li.L9 { background: #eee }
diff --git a/doc/resources/ace/skeleton/images/Ace_ERD.svg b/doc/resources/ace/skeleton/images/Ace_ERD.svg
new file mode 100644
index 00000000..ba386287
--- /dev/null
+++ b/doc/resources/ace/skeleton/images/Ace_ERD.svg
@@ -0,0 +1,4 @@
+
+
+0){c!=="border"&&f.each(e,function(){c||(d-=parseFloat(f.css(a,"padding"+this))||0),c==="margin"?d+=parseFloat(f.css(a,c+this))||0:d-=parseFloat(f.css(a,"border"+this+"Width"))||0});return d+"px"}d=bB(a,b,b);if(d<0||d==null)d=a.style[b]||0;d=parseFloat(d)||0,c&&f.each(e,function(){d+=parseFloat(f.css(a,"padding"+this))||0,c!=="padding"&&(d+=parseFloat(f.css(a,"border"+this+"Width"))||0),c==="margin"&&(d+=parseFloat(f.css(a,c+this))||0)});return d+"px"}function br(a,b){b.src?f.ajax({url:b.src,async:!1,dataType:"script"}):f.globalEval((b.text||b.textContent||b.innerHTML||"").replace(bi,"/*$0*/")),b.parentNode&&b.parentNode.removeChild(b)}function bq(a){var b=(a.nodeName||"").toLowerCase();b==="input"?bp(a):b!=="script"&&typeof a.getElementsByTagName!="undefined"&&f.grep(a.getElementsByTagName("input"),bp)}function bp(a){if(a.type==="checkbox"||a.type==="radio")a.defaultChecked=a.checked}function bo(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bn(a,b){var c;if(b.nodeType===1){b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase();if(c==="object")b.outerHTML=a.outerHTML;else if(c!=="input"||a.type!=="checkbox"&&a.type!=="radio"){if(c==="option")b.selected=a.defaultSelected;else if(c==="input"||c==="textarea")b.defaultValue=a.defaultValue}else a.checked&&(b.defaultChecked=b.checked=a.checked),b.value!==a.value&&(b.value=a.value);b.removeAttribute(f.expando)}}function bm(a,b){if(b.nodeType===1&&!!f.hasData(a)){var c,d,e,g=f._data(a),h=f._data(b,g),i=g.events;if(i){delete h.handle,h.events={};for(c in i)for(d=0,e=i[c].length;d=0===c})}function V(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function N(){return!0}function M(){return!1}function n(a,b,c){var d=b+"defer",e=b+"queue",g=b+"mark",h=f._data(a,d);h&&(c==="queue"||!f._data(a,e))&&(c==="mark"||!f._data(a,g))&&setTimeout(function(){!f._data(a,e)&&!f._data(a,g)&&(f.removeData(a,d,!0),h.fire())},0)}function m(a){for(var b in a){if(b==="data"&&f.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function l(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(k,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:f.isNumeric(d)?parseFloat(d):j.test(d)?f.parseJSON(d):d}catch(g){}f.data(a,c,d)}else d=b}return d}function h(a){var b=g[a]={},c,d;a=a.split(/\s+/);for(c=0,d=a.length;c)[^>]*$|#([\w\-]*)$)/,j=/\S/,k=/^\s+/,l=/\s+$/,m=/\d/,n=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,o=/^[\],:{}\s]*$/,p=/\\(?:["\\\/bfnrt]|u[0-9a-fA-F]{4})/g,q=/"[^"\\\n\r]*"|true|false|null|-?\d+(?:\.\d*)?(?:[eE][+\-]?\d+)?/g,r=/(?:^|:|,)(?:\s*\[)+/g,s=/(webkit)[ \/]([\w.]+)/,t=/(opera)(?:.*version)?[ \/]([\w.]+)/,u=/(msie) ([\w.]+)/,v=/(mozilla)(?:.*? rv:([\w.]+))?/,w=/-([a-z]|[0-9])/ig,x=/^-ms-/,y=function(a,b){return(b+"").toUpperCase()},z=d.userAgent,A,B,C,D=Object.prototype.toString,E=Object.prototype.hasOwnProperty,F=Array.prototype.push,G=Array.prototype.slice,H=String.prototype.trim,I=Array.prototype.indexOf,J={};e.fn=e.prototype={constructor:e,init:function(a,d,f){var g,h,j,k;if(!a)return this;if(a.nodeType){this.context=this[0]=a,this.length=1;return this}if(a==="body"&&!d&&c.body){this.context=c,this[0]=c.body,this.selector=a,this.length=1;return this}if(typeof a=="string"){a.charAt(0)!=="<"||a.charAt(a.length-1)!==">"||a.length<3?g=i.exec(a):g=[null,a,null];if(g&&(g[1]||!d)){if(g[1]){d=d instanceof e?d[0]:d,k=d?d.ownerDocument||d:c,j=n.exec(a),j?e.isPlainObject(d)?(a=[c.createElement(j[1])],e.fn.attr.call(a,d,!0)):a=[k.createElement(j[1])]:(j=e.buildFragment([g[1]],[k]),a=(j.cacheable?e.clone(j.fragment):j.fragment).childNodes);return e.merge(this,a)}h=c.getElementById(g[2]);if(h&&h.parentNode){if(h.id!==g[2])return f.find(a);this.length=1,this[0]=h}this.context=c,this.selector=a;return this}return!d||d.jquery?(d||f).find(a):this.constructor(d).find(a)}if(e.isFunction(a))return f.ready(a);a.selector!==b&&(this.selector=a.selector,this.context=a.context);return e.makeArray(a,this)},selector:"",jquery:"1.7",length:0,size:function(){return this.length},toArray:function(){return G.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=this.constructor();e.isArray(a)?F.apply(d,a):e.merge(d,a),d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")");return d},each:function(a,b){return e.each(this,a,b)},ready:function(a){e.bindReady(),B.add(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(G.apply(this,arguments),"slice",G.call(arguments).join(","))},map:function(a){return this.pushStack(e.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:F,sort:[].sort,splice:[].splice},e.fn.init.prototype=e.fn,e.extend=e.fn.extend=function(){var a,c,d,f,g,h,i=arguments[0]||{},j=1,k=arguments.length,l=!1;typeof i=="boolean"&&(l=i,i=arguments[1]||{},j=2),typeof i!="object"&&!e.isFunction(i)&&(i={}),k===j&&(i=this,--j);for(;j0)return;B.fireWith(c,[e]),e.fn.trigger&&e(c).trigger("ready").unbind("ready")}},bindReady:function(){if(!B){B=e.Callbacks("once memory");if(c.readyState==="complete")return setTimeout(e.ready,1);if(c.addEventListener)c.addEventListener("DOMContentLoaded",C,!1),a.addEventListener("load",e.ready,!1);else if(c.attachEvent){c.attachEvent("onreadystatechange",C),a.attachEvent("onload",e.ready);var b=!1;try{b=a.frameElement==null}catch(d){}c.documentElement.doScroll&&b&&K()}}},isFunction:function(a){return e.type(a)==="function"},isArray:Array.isArray||function(a){return e.type(a)==="array"},isWindow:function(a){return a&&typeof a=="object"&&"setInterval"in a},isNumeric:function(a){return a!=null&&m.test(a)&&!isNaN(a)},type:function(a){return a==null?String(a):J[D.call(a)]||"object"},isPlainObject:function(a){if(!a||e.type(a)!=="object"||a.nodeType||e.isWindow(a))return!1;try{if(a.constructor&&!E.call(a,"constructor")&&!E.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||E.call(a,d)},isEmptyObject:function(a){for(var b in a)return!1;return!0},error:function(a){throw a},parseJSON:function(b){if(typeof b!="string"||!b)return null;b=e.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(o.test(b.replace(p,"@").replace(q,"]").replace(r,"")))return(new Function("return "+b))();e.error("Invalid JSON: "+b)},parseXML:function(c){var d,f;try{a.DOMParser?(f=new DOMParser,d=f.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(g){d=b}(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&e.error("Invalid XML: "+c);return d},noop:function(){},globalEval:function(b){b&&j.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(x,"ms-").replace(w,y)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toUpperCase()===b.toUpperCase()},each:function(a,c,d){var f,g=0,h=a.length,i=h===b||e.isFunction(a);if(d){if(i){for(f in a)if(c.apply(a[f],d)===!1)break}else for(;g0&&a[0]&&a[j-1]||j===0||e.isArray(a));if(k)for(;i1?i.call(arguments,0):b,j.notifyWith(k,e)}}function l(a){return function(c){b[a]=arguments.length>1?i.call(arguments,0):c,--g||j.resolveWith(j,b)}}var b=i.call(arguments,0),c=0,d=b.length,e=Array(d),g=d,h=d,j=d<=1&&a&&f.isFunction(a.promise)?a:f.Deferred(),k=j.promise();if(d>1){for(;ca
",k.shrinkWrapBlocks=a.offsetWidth!==2),a.innerHTML="",q=a.getElementsByTagName("td"),u=q[0].offsetHeight===0,q[0].style.display="",q[1].style.display="none",k.reliableHiddenOffsets=u&&q[0].offsetHeight===0,a.innerHTML="",c.defaultView&&c.defaultView.getComputedStyle&&(j=c.createElement("div"),j.style.width="0",j.style.marginRight="0",a.appendChild(j),k.reliableMarginRight=(parseInt((c.defaultView.getComputedStyle(j,null)||{marginRight:0}).marginRight,10)||0)===0);if(a.attachEvent)for(t in{submit:1,change:1,focusin:1})s="on"+t,u=s in a,u||(a.setAttribute(s,"return;"),u=typeof a[s]=="function"),k[t+"Bubbles"]=u;f(function(){var a,b,d,e,g,h,i=1,j="position:absolute;top:0;left:0;width:1px;height:1px;margin:0;",l="visibility:hidden;border:0;",n="style='"+j+"border:5px solid #000;padding:0;'",p=""+"";m=c.getElementsByTagName("body")[0];!m||(a=c.createElement("div"),a.style.cssText=l+"width:0;height:0;position:static;top:0;margin-top:"+i+"px",m.insertBefore(a,m.firstChild),o=c.createElement("div"),o.style.cssText=j+l,o.innerHTML=p,a.appendChild(o),b=o.firstChild,d=b.firstChild,g=b.nextSibling.firstChild.firstChild,h={doesNotAddBorder:d.offsetTop!==5,doesAddBorderForTableAndCells:g.offsetTop===5},d.style.position="fixed",d.style.top="20px",h.fixedPosition=d.offsetTop===20||d.offsetTop===15,d.style.position=d.style.top="",b.style.overflow="hidden",b.style.position="relative",h.subtractsBorderForOverflowNotVisible=d.offsetTop===-5,h.doesNotIncludeMarginInBodyOffset=m.offsetTop!==i,m.removeChild(a),o=a=null,f.extend(k,h))}),o.innerHTML="",n.removeChild(o),o=l=g=h=m=j=a=i=null;return k}(),f.boxModel=f.support.boxModel;var j=/^(?:\{.*\}|\[.*\])$/,k=/([A-Z])/g;f.extend({cache:{},uuid:0,expando:"jQuery"+(f.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){a=a.nodeType?f.cache[a[f.expando]]:a[f.expando];return!!a&&!m(a)},data:function(a,c,d,e){if(!!f.acceptData(a)){var g,h,i,j=f.expando,k=typeof c=="string",l=a.nodeType,m=l?f.cache:a,n=l?a[f.expando]:a[f.expando]&&f.expando,o=c==="events";if((!n||!m[n]||!o&&!e&&!m[n].data)&&k&&d===b)return;n||(l?a[f.expando]=n=++f.uuid:n=f.expando),m[n]||(m[n]={},l||(m[n].toJSON=f.noop));if(typeof c=="object"||typeof c=="function")e?m[n]=f.extend(m[n],c):m[n].data=f.extend(m[n].data,c);g=h=m[n],e||(h.data||(h.data={}),h=h.data),d!==b&&(h[f.camelCase(c)]=d);if(o&&!h[c])return g.events;k?(i=h[c],i==null&&(i=h[f.camelCase(c)])):i=h;return i}},removeData:function(a,b,c){if(!!f.acceptData(a)){var d,e,g,h=f.expando,i=a.nodeType,j=i?f.cache:a,k=i?a[f.expando]:f.expando;if(!j[k])return;if(b){d=c?j[k]:j[k].data;if(d){f.isArray(b)?b=b:b in d?b=[b]:(b=f.camelCase(b),b in d?b=[b]:b=b.split(" "));for(e=0,g=b.length;e-1)return!0;return!1},val:function(a){var c,d,e,g=this[0];if(!arguments.length){if(g){c=f.valHooks[g.nodeName.toLowerCase()]||f.valHooks[g.type];if(c&&"get"in c&&(d=c.get(g,"value"))!==b)return d;d=g.value;return typeof d=="string"?d.replace(q,""):d==null?"":d}return b}e=f.isFunction(a);return this.each(function(d){var g=f(this),h;if(this.nodeType===1){e?h=a.call(this,d,g.val()):h=a,h==null?h="":typeof h=="number"?h+="":f.isArray(h)&&(h=f.map(h,function(a){return a==null?"":a+""})),c=f.valHooks[this.nodeName.toLowerCase()]||f.valHooks[this.type];if(!c||!("set"in c)||c.set(this,h,"value")===b)this.value=h}})}}),f.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,g=a.selectedIndex,h=[],i=a.options,j=a.type==="select-one";if(g<0)return null;c=j?g:0,d=j?g+1:i.length;for(;c=0}),c.length||(a.selectedIndex=-1);return c}}},attrFn:{val:!0,css:!0,html:!0,text:!0,data:!0,width:!0,height:!0,offset:!0},attr:function(a,c,d,e){var g,h,i,j=a.nodeType;if(!a||j===3||j===8||j===2)return b;if(e&&c in f.attrFn)return f(a)[c](d);if(!("getAttribute"in a))return f.prop(a,c,d);i=j!==1||!f.isXMLDoc(a),i&&(c=c.toLowerCase(),h=f.attrHooks[c]||(u.test(c)?x:w));if(d!==b){if(d===null){f.removeAttr(a,c);return b}if(h&&"set"in h&&i&&(g=h.set(a,d,c))!==b)return g;a.setAttribute(c,""+d);return d}if(h&&"get"in h&&i&&(g=h.get(a,c))!==null)return g;g=a.getAttribute(c);return g===null?b:g},removeAttr:function(a,b){var c,d,e,g,h=0;if(a.nodeType===1){d=(b||"").split(p),g=d.length;for(;h=0}})});var z=/\.(.*)$/,A=/^(?:textarea|input|select)$/i,B=/\./g,C=/ /g,D=/[^\w\s.|`]/g,E=/^([^\.]*)?(?:\.(.+))?$/,F=/\bhover(\.\S+)?/,G=/^key/,H=/^(?:mouse|contextmenu)|click/,I=/^(\w*)(?:#([\w\-]+))?(?:\.([\w\-]+))?$/,J=function(a){var b=I.exec(a);b&&
+(b[1]=(b[1]||"").toLowerCase(),b[3]=b[3]&&new RegExp("(?:^|\\s)"+b[3]+"(?:\\s|$)"));return b},K=function(a,b){return(!b[1]||a.nodeName.toLowerCase()===b[1])&&(!b[2]||a.id===b[2])&&(!b[3]||b[3].test(a.className))},L=function(a){return f.event.special.hover?a:a.replace(F,"mouseenter$1 mouseleave$1")};f.event={add:function(a,c,d,e,g){var h,i,j,k,l,m,n,o,p,q,r,s;if(!(a.nodeType===3||a.nodeType===8||!c||!d||!(h=f._data(a)))){d.handler&&(p=d,d=p.handler),d.guid||(d.guid=f.guid++),j=h.events,j||(h.events=j={}),i=h.handle,i||(h.handle=i=function(a){return typeof f!="undefined"&&(!a||f.event.triggered!==a.type)?f.event.dispatch.apply(i.elem,arguments):b},i.elem=a),c=L(c).split(" ");for(k=0;k=0&&(h=h.slice(0,-1),k=!0),h.indexOf(".")>=0&&(i=h.split("."),h=i.shift(),i.sort());if((!e||f.event.customEvent[h])&&!f.event.global[h])return;c=typeof c=="object"?c[f.expando]?c:new f.Event(h,c):new f.Event(h),c.type=h,c.isTrigger=!0,c.exclusive=k,c.namespace=i.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+i.join("\\.(?:.*\\.)?")+"(\\.|$)"):null,o=h.indexOf(":")<0?"on"+h:"",(g||!e)&&c.preventDefault();if(!e){j=f.cache;for(l in j)j[l].events&&j[l].events[h]&&f.event.trigger(c,d,j[l].handle.elem,!0);return}c.result=b,c.target||(c.target=e),d=d!=null?f.makeArray(d):[],d.unshift(c),p=f.event.special[h]||{};if(p.trigger&&p.trigger.apply(e,d)===!1)return;r=[[e,p.bindType||h]];if(!g&&!p.noBubble&&!f.isWindow(e)){s=p.delegateType||h,n=null;for(m=e.parentNode;m;m=m.parentNode)r.push([m,s]),n=m;n&&n===e.ownerDocument&&r.push([n.defaultView||n.parentWindow||a,s])}for(l=0;l=0:t===b&&(t=o[s]=r.quick?K(m,r.quick):f(m).is(s)),t&&q.push(r);q.length&&j.push({elem:m,matches:q})}d.length>e&&j.push({elem:this,matches:d.slice(e)});for(k=0;k0?this.bind(b,a,c):this.trigger(b)},f.attrFn&&(f.attrFn[b]=!0),G.test(b)&&(f.event.fixHooks[b]=f.event.keyHooks),H.test(b)&&(f.event.fixHooks[b]=f.event.mouseHooks)}),function(){function x(a,b,c,e,f,g){for(var h=0,i=e.length;h0){k=j;break}}j=j[a]}e[h]=k}}}function w(a,b,c,e,f,g){for(var h=0,i=e.length;h+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g,d="sizcache"+(Math.random()+"").replace(".",""),e=0,g=Object.prototype.toString,h=!1,i=!0,j=/\\/g,k=/\r\n/g,l=/\W/;[0,0].sort(function(){i=!1;return 0});var m=function(b,d,e,f){e=e||[],d=d||c;var h=d;if(d.nodeType!==1&&d.nodeType!==9)return[];if(!b||typeof b!="string")return e;var i,j,k,l,n,q,r,t,u=!0,v=m.isXML(d),w=[],x=b;do{a.exec(""),i=a.exec(x);if(i){x=i[3],w.push(i[1]);if(i[2]){l=i[3];break}}}while(i);if(w.length>1&&p.exec(b))if(w.length===2&&o.relative[w[0]])j=y(w[0]+w[1],d,f);else{j=o.relative[w[0]]?[d]:m(w.shift(),d);while(w.length)b=w.shift(),o.relative[b]&&(b+=w.shift()),j=y(b,j,f)}else{!f&&w.length>1&&d.nodeType===9&&!v&&o.match.ID.test(w[0])&&!o.match.ID.test(w[w.length-1])&&(n=m.find(w.shift(),d,v),d=n.expr?m.filter(n.expr,n.set)[0]:n.set[0]);if(d){n=f?{expr:w.pop(),set:s(f)}:m.find(w.pop(),w.length===1&&(w[0]==="~"||w[0]==="+")&&d.parentNode?d.parentNode:d,v),j=n.expr?m.filter(n.expr,n.set):n.set,w.length>0?k=s(j):u=!1;while(w.length)q=w.pop(),r=q,o.relative[q]?r=w.pop():q="",r==null&&(r=d),o.relative[q](k,r,v)}else k=w=[]}k||(k=j),k||m.error(q||b);if(g.call(k)==="[object Array]")if(!u)e.push.apply(e,k);else if(d&&d.nodeType===1)for(t=0;k[t]!=null;t++)k[t]&&(k[t]===!0||k[t].nodeType===1&&m.contains(d,k[t]))&&e.push(j[t]);else for(t=0;k[t]!=null;t++)k[t]&&k[t].nodeType===1&&e.push(j[t]);else s(k,e);l&&(m(l,h,e,f),m.uniqueSort(e));return e};m.uniqueSort=function(a){if(u){h=i,a.sort(u);if(h)for(var b=1;b0},m.find=function(a,b,c){var d,e,f,g,h,i;if(!a)return[];for(e=0,f=o.order.length;e":function(a,b){var c,d=typeof b=="string",e=0,f=a.length;if(d&&!l.test(b)){b=b.toLowerCase();for(;e=0)?c||d.push(h):c&&(b[g]=!1));return!1},ID:function(a){return a[1].replace(j,"")},TAG:function(a,b){return a[1].replace(j,"").toLowerCase()},CHILD:function(a){if(a[1]==="nth"){a[2]||m.error(a[0]),a[2]=a[2].replace(/^\+|\s*/g,"");var b=/(-?)(\d*)(?:n([+\-]?\d*))?/.exec(a[2]==="even"&&"2n"||a[2]==="odd"&&"2n+1"||!/\D/.test(a[2])&&"0n+"+a[2]||a[2]);a[2]=b[1]+(b[2]||1)-0,a[3]=b[3]-0}else a[2]&&m.error(a[0]);a[0]=e++;return a},ATTR:function(a,b,c,d,e,f){var g=a[1]=a[1].replace(j,"");!f&&o.attrMap[g]&&(a[1]=o.attrMap[g]),a[4]=(a[4]||a[5]||"").replace(j,""),a[2]==="~="&&(a[4]=" "+a[4]+" ");return a},PSEUDO:function(b,c,d,e,f){if(b[1]==="not")if((a.exec(b[3])||"").length>1||/^\w/.test(b[3]))b[3]=m(b[3],null,null,c);else{var g=m.filter(b[3],c,d,!0^f);d||e.push.apply(e,g);return!1}else if(o.match.POS.test(b[0])||o.match.CHILD.test(b[0]))return!0;return b},POS:function(a){a.unshift(!0);return a}},filters:{enabled:function(a){return a.disabled===!1&&a.type!=="hidden"},disabled:function(a){return a.disabled===!0},checked:function(a){return a.checked===!0},selected:function(a){a.parentNode&&a.parentNode.selectedIndex;return a.selected===!0},parent:function(a){return!!a.firstChild},empty:function(a){return!a.firstChild},has:function(a,b,c){return!!m(c[3],a).length},header:function(a){return/h\d/i.test(a.nodeName)},text:function(a){var b=a.getAttribute("type"),c=a.type;return a.nodeName.toLowerCase()==="input"&&"text"===c&&(b===c||b===null)},radio:function(a){return a.nodeName.toLowerCase()==="input"&&"radio"===a.type},checkbox:function(a){return a.nodeName.toLowerCase()==="input"&&"checkbox"===a.type},file:function(a){return a.nodeName.toLowerCase()==="input"&&"file"===a.type},password:function(a){return a.nodeName.toLowerCase()==="input"&&"password"===a.type},submit:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"submit"===a.type},image:function(a){return a.nodeName.toLowerCase()==="input"&&"image"===a.type},reset:function(a){var b=a.nodeName.toLowerCase();return(b==="input"||b==="button")&&"reset"===a.type},button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&"button"===a.type||b==="button"},input:function(a){return/input|select|textarea|button/i.test(a.nodeName)},focus:function(a){return a===a.ownerDocument.activeElement}},setFilters:{first:function(a,b){return b===0},last:function(a,b,c,d){return b===d.length-1},even:function(a,b){return b%2===0},odd:function(a,b){return b%2===1},lt:function(a,b,c){return bc[3]-0},nth:function(a,b,c){return c[3]-0===b},eq:function(a,b,c){return c[3]-0===b}},filter:{PSEUDO:function(a,b,c,d){var e=b[1],f=o.filters[e];if(f)return f(a,c,b,d);if(e==="contains")return(a.textContent||a.innerText||n([a])||"").indexOf(b[3])>=0;if(e==="not"){var g=b[3];for(var h=0,i=g.length;h=0}},ID:function(a,b){return a.nodeType===1&&a.getAttribute("id")===b},TAG:function(a,b){return b==="*"&&a.nodeType===1||!!a.nodeName&&a.nodeName.toLowerCase()===b},CLASS:function(a,b){return(" "+(a.className||a.getAttribute("class"))+" ").indexOf(b)>-1},ATTR:function(a,b){var c=b[1],d=m.attr?m.attr(a,c):o.attrHandle[c]?o.attrHandle[c](a):a[c]!=null?a[c]:a.getAttribute(c),e=d+"",f=b[2],g=b[4];return d==null?f==="!=":!f&&m.attr?d!=null:f==="="?e===g:f==="*="?e.indexOf(g)>=0:f==="~="?(" "+e+" ").indexOf(g)>=0:g?f==="!="?e!==g:f==="^="?e.indexOf(g)===0:f==="$="?e.substr(e.length-g.length)===g:f==="|="?e===g||e.substr(0,g.length+1)===g+"-":!1:e&&d!==!1},POS:function(a,b,c,d){var e=b[2],f=o.setFilters[e];if(f)return f(a,c,b,d)}}},p=o.match.POS,q=function(a,b){return"\\"+(b-0+1)};for(var r in o.match)o.match[r]=new RegExp(o.match[r].source+/(?![^\[]*\])(?![^\(]*\))/.source),o.leftMatch[r]=new RegExp(/(^(?:.|\r|\n)*?)/.source+o.match[r].source.replace(/\\(\d+)/g,q));var s=function(a,b){a=Array.prototype.slice.call(a,0);if(b){b.push.apply(b,a);return b}return a};try{Array.prototype.slice.call(c.documentElement.childNodes,0)[0].nodeType}catch(t){s=function(a,b){var c=0,d=b||[];if(g.call(a)==="[object Array]")Array.prototype.push.apply(d,a);else if(typeof a.length=="number")for(var e=a.length;c
";if(!b.querySelectorAll||b.querySelectorAll(".TEST").length!==0){m=function(b,e,f,g){e=e||c;if(!g&&!m.isXML(e)){var h=/^(\w+$)|^\.([\w\-]+$)|^#([\w\-]+$)/.exec(b);if(h&&(e.nodeType===1||e.nodeType===9)){if(h[1])return s(e.getElementsByTagName(b),f);if(h[2]&&o.find.CLASS&&e.getElementsByClassName)return s(e.getElementsByClassName(h[2]),f)}if(e.nodeType===9){if(b==="body"&&e.body)return s([e.body],f);if(h&&h[3]){var i=e.getElementById(h[3]);if(!i||!i.parentNode)return s([],f);if(i.id===h[3])return s([i],f)}try{return s(e.querySelectorAll(b),f)}catch(j){}}else if(e.nodeType===1&&e.nodeName.toLowerCase()!=="object"){var k=e,l=e.getAttribute("id"),n=l||d,p=e.parentNode,q=/^\s*[+~]/.test(b);l?n=n.replace(/'/g,"\\$&"):e.setAttribute("id",n),q&&p&&(e=e.parentNode);try{if(!q||p)return s(e.querySelectorAll("[id='"+n+"'] "+b),f)}catch(r){}finally{l||k.removeAttribute("id")}}}return a(b,e,f,g)};for(var e in a)m[e]=a[e];b=null}}(),function(){var a=c.documentElement,b=a.matchesSelector||a.mozMatchesSelector||a.webkitMatchesSelector||a.msMatchesSelector;if(b){var d=!b.call(c.createElement("div"),"div"),e=!1;try{b.call(c.documentElement,"[test!='']:sizzle")}catch(f){e=!0}m.matchesSelector=function(a,c){c=c.replace(/\=\s*([^'"\]]*)\s*\]/g,"='$1']");if(!m.isXML(a))try{if(e||!o.match.PSEUDO.test(c)&&!/!=/.test(c)){var f=b.call(a,c);if(f||!d||a.document&&a.document.nodeType!==11)return f}}catch(g){}return m(c,null,null,[a]).length>0}}}(),function(){var a=c.createElement("div");a.innerHTML="
";if(!!a.getElementsByClassName&&a.getElementsByClassName("e").length!==0){a.lastChild.className="e";if(a.getElementsByClassName("e").length===1)return;o.order.splice(1,0,"CLASS"),o.find.CLASS=function(a,b,c){if(typeof b.getElementsByClassName!="undefined"&&!c)return b.getElementsByClassName(a[1])},a=null}}(),c.documentElement.contains?m.contains=function(a,b){return a!==b&&(a.contains?a.contains(b):!0)}:c.documentElement.compareDocumentPosition?m.contains=function(a,b){return!!(a.compareDocumentPosition(b)&16)}:m.contains=function(){return!1},m.isXML=function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":!1};var y=function(a,b,c){var d,e=[],f="",g=b.nodeType?[b]:b;while(d=o.match.PSEUDO.exec(a))f+=d[0],a=a.replace(o.match.PSEUDO,"");a=o.relative[a]?a+"*":a;for(var h=0,i=g.length;h0)for(h=g;h=0:f.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c=[],d,e,g=this[0];if(f.isArray(a)){var h=1;while(g&&g.ownerDocument&&g!==b){for(d=0;d-1:f.find.matchesSelector(g,a)){c.push(g);break}g=g.parentNode;if(!g||!g.ownerDocument||g===b||g.nodeType===11)break}}c=c.length>1?f.unique(c):c;return this.pushStack(c,"closest",a)},index:function(a){if(!a)return this[0]&&this[0].parentNode?this.prevAll().length:-1;if(typeof a=="string")return f.inArray(this[0],f(a));return f.inArray(a.jquery?a[0]:a,this)},add:function(a,b){var c=typeof a=="string"?f(a,b):f.makeArray(a&&a.nodeType?[a]:a),d=f.merge(this.get(),c);return this.pushStack(V(c[0])||V(d[0])?d:f.unique(d))},andSelf:function(){return this.add(this.prevObject)}}),f.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return f.dir(a,"parentNode")},parentsUntil:function(a,b,c){return f.dir(a,"parentNode",c)},next:function(a){return f.nth(a,2,"nextSibling")},prev:function(a){return f.nth(a,2,"previousSibling")},nextAll:function(a){return f.dir(a,"nextSibling")},prevAll:function(a){return f.dir(a,"previousSibling")},nextUntil:function(a,b,c){return f.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return f.dir(a,"previousSibling",c)},siblings:function(a){return f.sibling(a.parentNode.firstChild,a)},children:function(a){return f.sibling(a.firstChild)},contents:function(a){return f.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:f.makeArray(a.childNodes)}},function(a,b){f.fn[a]=function(c,d){var e=f.map(this,b,c),g=S.call(arguments);O.test(a)||(d=c),d&&typeof d=="string"&&(e=f.filter(d,e)),e=this.length>1&&!U[a]?f.unique(e):e,(this.length>1||Q.test(d))&&P.test(a)&&(e=e.reverse());return this.pushStack(e,a,g.join(","))}}),f.extend({filter:function(a,b,c){c&&(a=":not("+a+")");return b.length===1?f.find.matchesSelector(b[0],a)?[b[0]]:[]:f.find.matches(a,b)},dir:function(a,c,d){var e=[],g=a[c];while(g&&g.nodeType!==9&&(d===b||g.nodeType!==1||!f(g).is(d)))g.nodeType===1&&e.push(g),g=g[c];return e},nth:function(a,b,c,d){b=b||1;var e=0;for(;a;a=a[c])if(a.nodeType===1&&++e===b)break;return a},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var Y="abbr article aside audio canvas datalist details figcaption figure footer header hgroup mark meter nav output progress section summary time video",Z=/ jQuery\d+="(?:\d+|null)"/g,$=/^\s+/,_=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/ig,ba=/<([\w:]+)/,bb=/",""],legend:[1,""," "],thead:[1,""],tr:[2,""],td:[3,""],col:[2,""],area:[1,""," "],_default:[0,"",""]},bk=X(c);bj.optgroup=bj.option,bj.tbody=bj.tfoot=bj.colgroup=bj.caption=bj.thead,bj.th=bj.td,f.support.htmlSerialize||(bj._default=[1,"div","
"]),f.fn.extend({text:function(a){if(f.isFunction(a))return this.each(function(b){var c=f(this);c.text(a.call(this,b,c.text()))});if(typeof a!="object"&&a!==b)return this.empty().append((this[0]&&this[0].ownerDocument||c).createTextNode(a));return f.text(this)},wrapAll:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapAll(a.call(this,b))});if(this[0]){var b=f(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){if(f.isFunction(a))return this.each(function(b){f(this).wrapInner(a.call(this,b))});return this.each(function(){var b=f(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){f(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){f.nodeName(this,"body")||f(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=f(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=this.pushStack(this,"after"
+,arguments);a.push.apply(a,f(arguments[0]).toArray());return a}},remove:function(a,b){for(var c=0,d;(d=this[c])!=null;c++)if(!a||f.filter(a,[d]).length)!b&&d.nodeType===1&&(f.cleanData(d.getElementsByTagName("*")),f.cleanData([d])),d.parentNode&&d.parentNode.removeChild(d);return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++){b.nodeType===1&&f.cleanData(b.getElementsByTagName("*"));while(b.firstChild)b.removeChild(b.firstChild)}return this},clone:function(a,b){a=a==null?!1:a,b=b==null?a:b;return this.map(function(){return f.clone(this,a,b)})},html:function(a){if(a===b)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Z,""):null;if(typeof a=="string"&&!bd.test(a)&&(f.support.leadingWhitespace||!$.test(a))&&!bj[(ba.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(_,"<$1>");try{for(var c=0,d=this.length;c1&&l0?this.clone(!0):this).get();f(e[h])[b](j),d=d.concat(j)}return this.pushStack(d,a,e.selector)}}),f.extend({clone:function(a,b,c){var d=a.cloneNode(!0),e,g,h;if((!f.support.noCloneEvent||!f.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!f.isXMLDoc(a)){bn(a,d),e=bo(a),g=bo(d);for(h=0;e[h];++h)g[h]&&bn(e[h],g[h])}if(b){bm(a,d);if(c){e=bo(a),g=bo(d);for(h=0;e[h];++h)bm(e[h],g[h])}}e=g=null;return d},clean:function(a,b,d,e){var g;b=b||c,typeof b.createElement=="undefined"&&(b=b.ownerDocument||b[0]&&b[0].ownerDocument||c);var h=[],i;for(var j=0,k;(k=a[j])!=null;j++){typeof k=="number"&&(k+="");if(!k)continue;if(typeof k=="string")if(!bc.test(k))k=b.createTextNode(k);else{k=k.replace(_,"<$1>");var l=(ba.exec(k)||["",""])[1].toLowerCase(),m=bj[l]||bj._default,n=m[0],o=b.createElement("div");b===c?bk.appendChild(o):X(b).appendChild(o),o.innerHTML=m[1]+k+m[2];while(n--)o=o.lastChild;if(!f.support.tbody){var p=bb.test(k),q=l==="table"&&!p?o.firstChild&&o.firstChild.childNodes:m[1]===""&&!p?o.childNodes:[];for(i=q.length-1;i>=0;--i)f.nodeName(q[i],"tbody")&&!q[i].childNodes.length&&q[i].parentNode.removeChild(q[i])}!f.support.leadingWhitespace&&$.test(k)&&o.insertBefore(b.createTextNode($.exec(k)[0]),o.firstChild),k=o.childNodes}var r;if(!f.support.appendChecked)if(k[0]&&typeof (r=k.length)=="number")for(i=0;i=0)return b+"px"}}}),f.support.opacity||(f.cssHooks.opacity={get:function(a,b){return bt.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?parseFloat(RegExp.$1)/100+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=f.isNumeric(b)?"alpha(opacity="+b*100+")":"",g=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&f.trim(g.replace(bs,""))===""){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bs.test(g)?g.replace(bs,e):g+" "+e}}),f(function(){f.support.reliableMarginRight||(f.cssHooks.marginRight={get:function(a,b){var c;f.swap(a,{display:"inline-block"},function(){b?c=bB(a,"margin-right","marginRight"):c=a.style.marginRight});return c}})}),c.defaultView&&c.defaultView.getComputedStyle&&(bC=function(a,c){var d,e,g;c=c.replace(bu,"-$1").toLowerCase();if(!(e=a.ownerDocument.defaultView))return b;if(g=e.getComputedStyle(a,null))d=g.getPropertyValue(c),d===""&&!f.contains(a.ownerDocument.documentElement,a)&&(d=f.style(a,c));return d}),c.documentElement.currentStyle&&(bD=function(a,b){var c,d,e,f=a.currentStyle&&a.currentStyle[b],g=a.style;f===null&&g&&(e=g[b])&&(f=e),!bv.test(f)&&bw.test(f)&&(c=g.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),g.left=b==="fontSize"?"1em":f||0,f=g.pixelLeft+"px",g.left=c,d&&(a.runtimeStyle.left=d));return f===""?"auto":f}),bB=bC||bD,f.expr&&f.expr.filters&&(f.expr.filters.hidden=function(a){var b=a.offsetWidth,c=a.offsetHeight;return b===0&&c===0||!f.support.reliableHiddenOffsets&&(a.style&&a.style.display||f.css(a,"display"))==="none"},f.expr.filters.visible=function(a){return!f.expr.filters.hidden(a)});var bF=/%20/g,bG=/\[\]$/,bH=/\r?\n/g,bI=/#.*$/,bJ=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,bK=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,bL=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,bM=/^(?:GET|HEAD)$/,bN=/^\/\//,bO=/\?/,bP=/)<[^<]*)*<\/script>/gi,bQ=/^(?:select|textarea)/i,bR=/\s+/,bS=/([?&])_=[^&]*/,bT=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+))?)?/,bU=f.fn.load,bV={},bW={},bX,bY,bZ=["*/"]+["*"];try{bX=e.href}catch(b$){bX=c.createElement("a"),bX.href="",bX=bX.href}bY=bT.exec(bX.toLowerCase())||[],f.fn.extend({load:function(a,c,d){if(typeof a!="string"&&bU)return bU.apply(this,arguments);if(!this.length)return this;var e=a.indexOf(" ");if(e>=0){var g=a.slice(e,a.length);a=a.slice(0,e)}var h="GET";c&&(f.isFunction(c)?(d=c,c=b):typeof c=="object"&&(c=f.param(c,f.ajaxSettings.traditional),h="POST"));var i=this;f.ajax({url:a,type:h,dataType:"html",data:c,complete:function(a,b,c){c=a.responseText,a.isResolved()&&(a.done(function(a){c=a}),i.html(g?f("").append(c.replace(bP,"")).find(g):c)),d&&i.each(d,[c,b,a])}});return this},serialize:function(){return f.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?f.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||bQ.test(this.nodeName)||bK.test(this.type))}).map(function(a,b){var c=f(this).val();return c==null?null:f.isArray(c)?f.map(c,function(a,c){return{name:b.name,value:a.replace(bH,"\r\n")}}):{name:b.name,value:c.replace(bH,"\r\n")}}).get()}}),f.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){f.fn[b]=function(a){return this.bind(b,a)}}),f.each(["get","post"],function(a,c){f[c]=function(a,d,e,g){f.isFunction(d)&&(g=g||e,e=d,d=b);return f.ajax({type:c,url:a,data:d,success:e,dataType:g})}}),f.extend({getScript:function(a,c){return f.get(a,b,c,"script")},getJSON:function(a,b,c){return f.get(a,b,c,"json")},ajaxSetup:function(a,b){b?cb(a,f.ajaxSettings):(b=a,a=f.ajaxSettings),cb(a,b);return a},ajaxSettings:{url:bX,isLocal:bL.test(bY[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":bZ},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":f.parseJSON,"text xml":f.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:b_(bV),ajaxTransport:b_(bW),ajax:function(a,c){function w(a,c,l,m){if(s!==2){s=2,q&&clearTimeout(q),p=b,n=m||"",v.readyState=a>0?4:0;var o,r,u,w=c,x=l?cd(d,v,l):b,y,z;if(a>=200&&a<300||a===304){if(d.ifModified){if(y=v.getResponseHeader("Last-Modified"))f.lastModified[k]=y;if(z=v.getResponseHeader("Etag"))f.etag[k]=z}if(a===304)w="notmodified",o=!0;else try{r=ce(d,x),w="success",o=!0}catch(A){w="parsererror",u=A}}else{u=w;if(!w||a)w="error",a<0&&(a=0)}v.status=a,v.statusText=""+(c||w),o?h.resolveWith(e,[r,w,v]):h.rejectWith(e,[v,w,u]),v.statusCode(j),j=b,t&&g.trigger("ajax"+(o?"Success":"Error"),[v,d,o?r:u]),i.fireWith(e,[v,w]),t&&(g.trigger("ajaxComplete",[v,d]),--f.active||f.event.trigger("ajaxStop"))}}typeof a=="object"&&(c=a,a=b),c=c||{};var d=f.ajaxSetup({},c),e=d.context||d,g=e!==d&&(e.nodeType||e instanceof f)?f(e):f.event,h=f.Deferred(),i=f.Callbacks("once memory"),j=d.statusCode||{},k,l={},m={},n,o,p,q,r,s=0,t,u,v={readyState:0,setRequestHeader:function(a,b){if(!s){var c=a.toLowerCase();a=m[c]=m[c]||a,l[a]=b}return this},getAllResponseHeaders:function(){return s===2?n:null},getResponseHeader:function(a){var c;if(s===2){if(!o){o={};while(c=bJ.exec(n))o[c[1].toLowerCase()]=c[2]}c=o[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){s||(d.mimeType=a);return this},abort:function(a){a=a||"abort",p&&p.abort(a),w(0,a);return this}};h.promise(v),v.success=v.done,v.error=v.fail,v.complete=i.add,v.statusCode=function(a){if(a){var b;if(s<2)for(b in a)j[b]=[j[b],a[b]];else b=a[v.status],v.then(b,b)}return this},d.url=((a||d.url)+"").replace(bI,"").replace(bN,bY[1]+"//"),d.dataTypes=f.trim(d.dataType||"*").toLowerCase().split(bR),d.crossDomain==null&&(r=bT.exec(d.url.toLowerCase()),d.crossDomain=!(!r||r[1]==bY[1]&&r[2]==bY[2]&&(r[3]||(r[1]==="http:"?80:443))==(bY[3]||(bY[1]==="http:"?80:443)))),d.data&&d.processData&&typeof d.data!="string"&&(d.data=f.param(d.data,d.traditional)),ca(bV,d,c,v);if(s===2)return!1;t=d.global,d.type=d.type.toUpperCase(),d.hasContent=!bM.test(d.type),t&&f.active++===0&&f.event.trigger("ajaxStart");if(!d.hasContent){d.data&&(d.url+=(bO.test(d.url)?"&":"?")+d.data,delete d.data),k=d.url;if(d.cache===!1){var x=f.now(),y=d.url.replace(bS,"$1_="+x);d.url=y+(y===d.url?(bO.test(d.url)?"&":"?")+"_="+x:"")}}(d.data&&d.hasContent&&d.contentType!==!1||c.contentType)&&v.setRequestHeader("Content-Type",d.contentType),d.ifModified&&(k=k||d.url,f.lastModified[k]&&v.setRequestHeader("If-Modified-Since",f.lastModified[k]),f.etag[k]&&v.setRequestHeader("If-None-Match",f.etag[k])),v.setRequestHeader("Accept",d.dataTypes[0]&&d.accepts[d.dataTypes[0]]?d.accepts[d.dataTypes[0]]+(d.dataTypes[0]!=="*"?", "+bZ+"; q=0.01":""):d.accepts["*"]);for(u in d.headers)v.setRequestHeader(u,d.headers[u]);if(d.beforeSend&&(d.beforeSend.call(e,v,d)===!1||s===2)){v.abort();return!1}for(u in{success:1,error:1,complete:1})v[u](d[u]);p=ca(bW,d,c,v);if(!p)w(-1,"No Transport");else{v.readyState=1,t&&g.trigger("ajaxSend",[v,d]),d.async&&d.timeout>0&&(q=setTimeout(function(){v.abort("timeout")},d.timeout));try{s=1,p.send(l,w)}catch(z){s<2?w(-1,z):f.error(z)}}return v},param:function(a,c){var d=[],e=function(a,b){b=f.isFunction(b)?b():b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=f.ajaxSettings.traditional);if(f.isArray(a)||a.jquery&&!f.isPlainObject(a))f.each(a,function(){e(this.name,this.value)});else for(var g in a)cc(g,a[g],c,e);return d.join("&").replace(bF,"+")}}),f.extend({active:0,lastModified:{},etag:{}});var cf=f.now(),cg=/(\=)\?(&|$)|\?\?/i;f.ajaxSetup({jsonp:"callback",jsonpCallback:function(){return f.expando+"_"+cf++}}),f.ajaxPrefilter("json jsonp",function(b,c,d){var e=b.contentType==="application/x-www-form-urlencoded"&&typeof b.data=="string";if(b.dataTypes[0]==="jsonp"||b.jsonp!==!1&&(cg.test(b.url)||e&&cg.test(b.data))){var g,h=b.jsonpCallback=f.isFunction(b.jsonpCallback)?b.jsonpCallback():b.jsonpCallback,i=a[h],j=b.url,k=b.data,l="$1"+h+"$2";b.jsonp!==!1&&(j=j.replace(cg,l),b.url===j&&(e&&(k=k.replace(cg,l)),b.data===k&&(j+=(/\?/.test(j)?"&":"?")+b.jsonp+"="+h))),b.url=j,b.data=k,a[h]=function(a){g=[a]},d.always(function(){a[h]=i,g&&f.isFunction(i)&&a[h](g[0])}),b.converters["script json"]=function(){g||f.error(h+" was not called");return g[0]},b.dataTypes[0]="json";return"script"}}),f.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){f.globalEval(a);return a}}}),f.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),f.ajaxTransport("script",function(a){if(a.crossDomain){var d,e=c.head||c.getElementsByTagName("head")[0]||c.documentElement;return{send:function(f,g){d=c.createElement("script"),d.async="async",a.scriptCharset&&(d.charset=a.scriptCharset),d.src=a.url,d.onload=d.onreadystatechange=function(a,c){if(c||!d.readyState||/loaded|complete/.test(d.readyState))d.onload=d.onreadystatechange=null,e&&d.parentNode&&e.removeChild(d),d=b,c||g(200,"success")},e.insertBefore(d,e.firstChild)},abort:function(){d&&d.onload(0,1)}}}});var ch=a.ActiveXObject?function(){for(var a in cj)cj[a](0,1)}:!1,ci=0,cj;f.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&ck()||cl()}:ck,function(a){f.extend(f.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(f.ajaxSettings.xhr()),f.support.ajax&&f.ajaxTransport(function(c){if(!c.crossDomain||f.support.cors){var d;return{send:function(e,g){var h=c.xhr(),i,j;c.username?h.open(c.type,c.url,c.async,c.username,c.password):h.open(c.type,c.url,c.async);if(c.xhrFields)for(j in c.xhrFields)h[j]=c.xhrFields[j];c.mimeType&&h.overrideMimeType&&h.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(j in e)h.setRequestHeader(j,e[j])}catch(k){}h.send(c.hasContent&&c.data||null),d=function(a,e){var j,k,l,m,n;try{if(d&&(e||h.readyState===4)){d=b,i&&(h.onreadystatechange=f.noop,ch&&delete cj[i]);if(e)h.readyState!==4&&h.abort();else{j=h.status,l=h.getAllResponseHeaders(),m={},n=h.responseXML,n&&n.documentElement&&(m.xml=n),m.text=h.responseText;try{k=h.statusText}catch(o){k=""}!j&&c.isLocal&&!c.crossDomain?j=m.text?200:404:j===1223&&(j=204)}}}catch(p){e||g(-1,p)}m&&g(j,k,m,l)},!c.async||h.readyState===4?d():(i=++ci,ch&&(cj||(cj={},f(a).unload(ch)),cj[i]=d),h.onreadystatechange=d)},abort:function(){d&&d(0,1)}}}});var cm={},cn,co,cp=/^(?:toggle|show|hide)$/,cq=/^([+\-]=)?([\d+.\-]+)([a-z%]*)$/i,cr,cs=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]],ct;f.fn.extend({show:function(a,b,c){var d,e;if(a||a===0)return this.animate(cw("show",3),a,b,c);for(var g=0,h=this.length;g
=i.duration+this.startTime){this.now=this.end,this.pos=this.state=1,this.update(),i.animatedProperties[this.prop]=!0;for(b in i.animatedProperties)i.animatedProperties[b]!==!0&&(g=!1);if(g){i.overflow!=null&&!f.support.shrinkWrapBlocks&&f.each(["","X","Y"],function(a,b){h.style["overflow"+b]=i.overflow[a]}),i.hide&&f(h).hide();if(i.hide||i.show)for(b in i.animatedProperties)f.style(h,b,i.orig[b]),f.removeData(h,"fxshow"+b,!0),f.removeData(h,"toggle"+b,!0);d=i.complete,d&&(i.complete=!1,d.call(h))}return!1}i.duration==Infinity?this.now=e:(c=e-this.startTime,this.state=c/i.duration,this.pos=f.easing[i.animatedProperties[this.prop]](this.state,c,0,1,i.duration),this.now=this.start+(this.end-this.start)*this.pos),this.update();return!0}},f.extend(f.fx,{tick:function(){var a,b=f.timers,c=0;for(;c-1,k={},l={},m,n;j?(l=e.position(),m=l.top,n=l.left):(m=parseFloat(h)||0,n=parseFloat(i)||0),f.isFunction(b)&&(b=b.call(a,c,g)),b.top!=null&&(k.top=b.top-g.top+m),b.left!=null&&(k.left=b.left-g.left+n),"using"in b?b.using.call(a,k):e.css(k)}},f.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),c=this.offset(),d=cz.test(b[0].nodeName)?{top:0,left:0}:b.offset();c.top-=parseFloat(f.css(a,"marginTop"))||0,c.left-=parseFloat(f.css(a,"marginLeft"))||0,d.top+=parseFloat(f.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(f.css(b[0],"borderLeftWidth"))||0;return{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||c.body;while(a&&!cz.test(a.nodeName)&&f.css(a,"position")==="static")a=a.offsetParent;return a})}}),f.each(["Left","Top"],function(a,c){var d="scroll"+c;f.fn[d]=function(c){var e,g;if(c===b){e=this[0];if(!e)return null;g=cA(e);return g?"pageXOffset"in g?g[a?"pageYOffset":"pageXOffset"]:f.support.boxModel&&g.document.documentElement[d]||g.document.body[d]:e[d]}return this.each(function(){g=cA(this),g?g.scrollTo(a?f(g).scrollLeft():c,a?c:f(g).scrollTop()):this[d]=c})}}),f.each(["Height","Width"],function(a,c){var d=c.toLowerCase();f.fn["inner"+c]=function(){var a=this[0];return a?a.style?parseFloat(f.css(a,d,"padding")):this[d]():null},f.fn["outer"+c]=function(a){var b=this[0];return b?b.style?parseFloat(f.css(b,d,a?"margin":"border")):this[d]():null},f.fn[d]=function(a){var e=this[0];if(!e)return a==null?null:this;if(f.isFunction(a))return this.each(function(b){var c=f(this);c[d](a.call(this,b,c[d]()))});if(f.isWindow(e)){var g=e.document.documentElement["client"+c],h=e.document.body;return e.document.compatMode==="CSS1Compat"&&g||h&&h["client"+c]||g}if(e.nodeType===9)return Math.max(e.documentElement["client"+c],e.body["scroll"+c],e.documentElement["scroll"+c],e.body["offset"+c],e.documentElement["offset"+c]);if(a===b){var i=f.css(e,d),j=parseFloat(i);return f.isNumeric(j)?j:i}return this.css(d,typeof a=="string"?a:a+"px")}}),a.jQuery=a.$=f})(window);
\ No newline at end of file
diff --git a/doc/template/resources/javascripts/plugins.js b/doc/resources/ace/skeleton/javascripts/plugins.js
similarity index 100%
rename from doc/template/resources/javascripts/plugins.js
rename to doc/resources/ace/skeleton/javascripts/plugins.js
diff --git a/doc/template/resources/javascripts/prettify-extension.js b/doc/resources/ace/skeleton/javascripts/prettify-extension.js
similarity index 100%
rename from doc/template/resources/javascripts/prettify-extension.js
rename to doc/resources/ace/skeleton/javascripts/prettify-extension.js
diff --git a/doc/template/resources/javascripts/prettify.js b/doc/resources/ace/skeleton/javascripts/prettify.js
similarity index 100%
rename from doc/template/resources/javascripts/prettify.js
rename to doc/resources/ace/skeleton/javascripts/prettify.js
diff --git a/doc/resources/ace/skeleton/javascripts/ux.js b/doc/resources/ace/skeleton/javascripts/ux.js
new file mode 100644
index 00000000..1d03e091
--- /dev/null
+++ b/doc/resources/ace/skeleton/javascripts/ux.js
@@ -0,0 +1,207 @@
+$(function () {
+ 'use strict';
+
+ var baseTitle = document.title,
+ // base (general) part of title
+ pathName = window.location.pathname,
+ fileName = pathName.substring(window.location.pathname.lastIndexOf("/") + 1);
+
+ if (window.addEventListener) window.addEventListener('load', loadCallback, true);
+ else window.attachEvent('load', loadCallback, true);
+
+ function loadCallback(evt) {
+ var form = document.getElementById("searchbox");
+ var input = form.query;
+ form.onsubmit = function (evt) {
+ var query = input.value;
+ if (query) {
+ input.value = "";
+ input.blur();
+ var currentVersion = $('#currentVersion').text();
+ var url = "https://www.google.com/search?q=" + encodeURIComponent("site:ace.ajax.org/api" + " " + query);
+ window.open(url);
+ }
+ return false;
+ };
+ }
+
+ var fileNameRE = new RegExp("^" + fileName, "i");
+
+ $('a.menuLink').each(function (index) {
+ if ($(this).attr("href").match(fileNameRE)) {
+ $(this).addClass("currentItem");
+ return false;
+ }
+ });
+
+ // init search
+ $('#search')
+ // prevent from form submit
+ .on('submit', function () {
+ return false;
+ }).find('input');
+
+ // init prettyprint
+ $('pre > code').addClass('prettyprint');
+ prettyPrint();
+});
+
+$(document).ready(function () {
+ var d = 'a.menu, .dropdown-toggle'
+
+ function clearMenus() {
+ $(d).parent('li').each(function () {
+ $(this).removeClass('open')
+ });
+ }
+
+ var s, sx;
+
+ // scrolling offset calculation via www.quirksmode.org
+ if (window.pageYOffset || window.pageXOffset) {
+ s = window.pageYOffset;
+ sx = window.pageXOffset;
+ }
+ else if (document.documentElement && (document.documentElement.scrollTop || document.documentElement.scrollLeft)) {
+ s = document.documentElement.scrollTop;
+ sx = document.documentElement.scrollLeft;
+ }
+ else if (document.body) {
+ s = document.body.scrollTop;
+ sx = document.body.scrollLeft;
+ }
+
+ if (document.documentElement.offsetWidth < 1010) {
+ if (sx <= 0) sx = 0;
+ else if (sx + document.documentElement.offsetWidth > 1010) sx = 1010 - document.documentElement.offsetWidth;
+ }
+ else sx = 0;
+
+ $('.members').each(function (i) {
+ var position = $(this).position();
+ var $classContent = $(this).closest('.classContent');
+
+ $(this).scrollspy({
+ min: $classContent.position().top - 35,
+ max: $classContent.position().top + $classContent.height(),
+ onEnter: function (element, position) {
+ var $pagination = $(element);
+ var $paginationContent = $('.membersContent pos' + i);
+ var $tabs = $('.tabs pos' + i);
+
+ $paginationContent.css('left', -1 * sx);
+ $paginationContent.css('top', 0);
+
+ $pagination.addClass('shadow').stop().css({
+ height: 31,
+ 'top': 33
+ }).closest('.classContent').addClass('srolled');
+
+ $tabs.addClass('tabsSansBorder');
+ },
+ onLeave: function (element, position) {
+ var $pagination = $(element);
+ var $paginationContent = $('.membersContent pos' + i);
+ var $tabs = $('.tabs pos' + i);
+
+ $paginationContent.stop().css({
+ top: 11
+ });
+ $pagination.css({
+ 'position': 'absolute',
+ 'top': 193
+ });
+ $pagination.stop().removeClass('shadow').css({
+ height: 42
+ });
+
+ $paginationContent.css('left', 0);
+ // setTimeout(function () {
+ $paginationContent.css({
+ 'top': ''
+ });
+ $pagination.css({
+ 'position': '',
+ 'top': ''
+ });
+ $paginationContent.css('left', 0);
+ $pagination.closest('.classContent').removeClass('srolled')
+ $tabs.removeClass('tabsSansBorder');
+ // }, 300);
+ }
+ });
+ });
+
+ $('span.methodClicker, article.article, h3.methodClicker').each(function () {
+ var a = $(this);
+ var constructorPos = a.attr("id").indexOf("new ");
+
+ var objName = a.attr("id");
+ if (constructorPos >= 0) {
+ objName = objName.substring(constructorPos + 4);
+ objName += ".new";
+ }
+
+ a.attr("id", objName);
+ });
+
+ $('.brand').parent('.dropdown').hover(
+
+ function () {
+ $(this).addClass('open');
+ }, function () {
+ clearMenus();
+ });
+
+ $('.versions').hover(
+
+ function () {
+ $(this).addClass('open');
+ }, function () {
+ clearMenus();
+ });
+
+ function showMethodContent() {
+ if (!location.hash) return;
+
+ var $clickerEl = $('span#' + location.hash.replace(/^#/, '').replace(/\./g, '\\.'));
+ if ($clickerEl.length > 0 && $clickerEl.hasClass('methodClicker')) {
+ var p = $clickerEl.parent();
+ p[0].force = true;
+ p.trigger('click');
+ p[0].force = false;
+ }
+ }
+
+ if (location.hash) {
+ showMethodContent();
+ var data = location.hash;
+ scrollTo(null, data.substr(1));
+ }
+
+ window.onhashchange = function () {
+ showMethodContent();
+ }
+});
+
+function scrollTo(el, data) {
+ if (!data) {
+ data = el.getAttribute("data-id");
+ location.hash = data;
+ }
+ var el = $("span#" + data.replace(/\./g, "\\."))[0];
+ if (!el) return;
+
+ var article = $(el).closest('.article')[0];
+
+ var top = article.offsetTop - 100;
+
+ if (document.body.scrollTop > top || document.body.scrollTop != top && document.body.scrollTop + (window.innerHeight || document.documentElement.offsetHeight) < top + article.offsetHeight) {
+ $('body').animate({
+ scrollTop: top
+ }, {
+ duration: 200,
+ easing: "swing"
+ });
+ }
+}
\ No newline at end of file
diff --git a/doc/resources/ace/templates/ace_menu.jade b/doc/resources/ace/templates/ace_menu.jade
new file mode 100755
index 00000000..d325887c
--- /dev/null
+++ b/doc/resources/ace/templates/ace_menu.jade
@@ -0,0 +1,61 @@
+div#well
+
+ h3 Ace Reference
+
+ div.swirl_divider
+
+ ul.menu
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="ace.html") Ace
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="anchor.html") Anchor
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="background_tokenizer.html") BackgroundTokenizer
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="document.html") Document
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="edit_session.html") EditSession
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="editor.html") Editor
+
+ //- probably not needing doc a(class="menuLink namespace", href="multi_select.html") MultiSelect
+
+ //- not actually doc'ed yet a(class="menuLink namespace", href="placeholder.html") PlaceHolder
+
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="range.html") Range
+
+ //- not actually doc'ed yet a(class="menuLink namespace", href="renderloop.html") RenderLoop
+
+
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="scrollbar.html") Scrollbar
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="search.html") Search
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="selection.html") Selection
+
+ //- not actually doc'ed yet a(class="menuLink namespace", href="split.html") Split
+
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="token_iterator.html") TokenIterator
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="tokenizer.html") Tokenizer
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="undomanager.html") UndoManager
+ li
+ div.menu-item
+ a(class="menuLink namespace", href="virtual_renderer.html") VirtualRenderer
\ No newline at end of file
diff --git a/doc/resources/ace/templates/layout.jade b/doc/resources/ace/templates/layout.jade
new file mode 100644
index 00000000..88847947
--- /dev/null
+++ b/doc/resources/ace/templates/layout.jade
@@ -0,0 +1,30 @@
+include ../../common_layout
+include lib
+
+mixin doctype
+
+html(xmlns="http://www.w3.org/1999/xhtml")
+ head
+ mixin head
+
+ body
+ mixin navBar
+ #nonFooter
+ #wrapper
+ .content
+ .row.centerpiece
+ .span3#sidebarContainer
+ #sidebar
+ include ace_menu.jade
+ .span9#mainContent
+ #documentation
+ -if (isIndex)
+ != content
+ -else
+ mixin api()
+
+ div(id="disqus_thread")
+ .push
+ mixin footer
+
+ mixin endingScripts
\ No newline at end of file
diff --git a/doc/resources/ace/templates/lib.jade b/doc/resources/ace/templates/lib.jade
new file mode 100644
index 00000000..d8437979
--- /dev/null
+++ b/doc/resources/ace/templates/lib.jade
@@ -0,0 +1,256 @@
+- var methodSection = constructorSection = propertySection = eventSection = false;
+
+-function renameMemberTitle(title, count)
+ if title.indexOf("ethods") >= 0
+ span Functions (#{count})
+ else if title.indexOf("ropert") >= 0
+ span Properties (#{count})
+ else
+ span #{title} (#{count})
+
+mixin article(obj, parents)
+ if typeof obj === 'string'
+ obj = list[obj]
+
+ title = obj.id + (obj.type ? ' (' + obj.type + ')' : '')
+ article.article(id=obj.path, data-title=title)
+
+ if obj.type === 'section' || obj.type === 'namespace' || obj.type === 'class' || obj.type === 'mixin'
+
+ if obj.description
+ .section.description
+ .memberContent
+ mixin markdown(obj.description)
+
+ collection = obj.children.filter(function(x){return x.type === 'namespace'});
+ if collection.length
+ .section.namespaces
+ //
+ h3 Namespaces
+ .memberContent
+ mixin short_description_list(collection)
+
+ collection = obj.children.filter(function(x){return x.type === 'mixin'});
+ if collection.length
+ .section.mixins
+ //
+ h3 Mixins
+ .memberContent
+ mixin short_description_list(collection)
+
+ if obj.type === 'class'
+
+ if obj.superclass
+ .section.superclass
+ // h3
+ Superclass
+ .memberContent
+ mixin link(obj.superclass)
+
+ if obj.subclasses.length
+ .section.subclasses
+ // h3
+ Subclasses
+ .memberContent
+ mixin links(obj.subclasses)
+
+ if obj.included_mixins
+ .section.mixins
+ // h3
+ Includes
+ .memberContent
+ mixin links(obj.included_mixins)
+
+ collection = obj.children.filter(function(x){return x.type === 'utility'})
+ if collection.length
+ .section.utilities
+ // h3
+ Utilities
+ .memberContent
+ mixin links(collection)
+
+ else
+
+ .section.method
+ .memberContent
+ if obj.signatures
+ div.title
+ ul.signatures
+ -var loops = 0;
+ for sig in obj.signatures
+ li.signature
+ ul
+ li.signature-call!= signature(obj, sig, ["methodClicker"])
+ if sig.returns
+ li.signature-returns
+ ul.argument-types
+ for ret in sig.returns
+ li.argument-type!= returnLink(obj, ret, [])
+ -if (loops == 0)
+ -loops = 1 // ensure that we only print ONE meta info UL per signature (some methods have multiple signatures)
+ ul.metaInfo
+ if obj.readonly
+ li
+ span.label.read-only Read-Only
+ if obj.chainable
+ li
+ span.label.chainable Chainable
+ if obj.internal
+ li
+ span.label.internal Internal
+ if obj.deprecated
+ li
+ span.label.deprecated
+ | Deprecated
+ if obj.deprecated.from
+ | (since #{obj.deprecated.from})
+ if obj.deprecated.off
+ | and will be removed on #{obj.deprecated.off}
+ if obj.alias_of
+ li
+ span.label.alias.single
+ | Aliased as:
+ != link(obj.alias_of)
+ else if obj.aliases.length
+ li
+ span.label.alias.multiple
+ | Aliased as:
+ ul.alias
+ for alias in obj.aliases
+ li
+ mixin link(alias)
+
+ if obj.related_to
+ li
+ span.label.related-to
+ | Related to
+ mixin link(obj.related_to)
+
+ div.sideToggler
+
+ div(id='ellipsis_#{obj.id}', class='ellipsis_description')
+ mixin markdown(obj.short_description)
+
+ h3(id='#{obj.id}', class='methodToggle methodClicker inactive')
+
+ div.description
+
+ mixin markdown(obj.description)
+
+ if obj.bound && ~obj.bound.indexOf('#')
+ p.note.methodized
+ | This method can be called either as an
+ != link(obj.bound, ['link-short'], 'instance method')
+ | or as a generic method. If calling as generic, pass the instance in as the first argument.
+ else if obj.bound && !~obj.bound.indexOf('#')
+ p.note.functionalized
+ | This method can be called either as an instance method or as a
+ != link(obj.bound, ['link-short'], 'generic method')
+ |. If calling as generic, pass the instance in as the first argument.
+
+ if obj.arguments
+ h4 Arguments
+ != argumentTable(obj.arguments, ["argument-list", "table", "table-striped", "table-bordered"])
+
+ if obj.retDesc
+ h4 Returns
+ != returnTable(obj.retDesc, ["return-list", "table", "table-striped", "table-bordered"])
+
+ //- children
+ for child in obj.children.filter(function(x){return x.type === 'section'})
+ mixin article(child, parents.concat(obj))
+ for child in obj.children.filter(function(x){return x.type === 'utility'})
+ mixin article(child, parents.concat(obj))
+
+ for child in obj.children.filter(function(x){return x.type === 'constructor'})
+ - if (!constructorSection)
+ - constructorSection = true
+ h3.sectionHeader Constructors
+ mixin article(child, parents.concat(obj))
+
+ for child in obj.children.filter(function(x){return x.type === 'namespace' || x.type === 'class' || x.type === 'mixin'})
+ mixin article(child, parents.concat(obj))
+
+ for child in obj.children.filter(function(x){return x.type === 'event'})
+ - if (!eventSection)
+ - eventSection = true
+ h3.sectionHeader Events
+ mixin article(child, parents.concat(obj), 'event')
+
+ for child in obj.children.filter(function(x){return x.type === 'class method'})
+ - if (!methodSection)
+ - methodSection = true
+ h3.sectionHeader Methods
+ mixin article(child, parents.concat(obj))
+
+ for child in obj.children.filter(function(x){return x.type === 'class property'})
+ - if (!propertySection)
+ - propertySection = true
+ h3.sectionHeader Properties
+ mixin article(child, parents.concat(obj))
+
+ for child in obj.children.filter(function(x){return x.type === 'instance method'})
+ mixin article(child, parents.concat(obj))
+ for child in obj.children.filter(function(x){return x.type === 'instance property'})
+ mixin article(child, parents.concat(obj))
+ for child in obj.children.filter(function(x){return x.type === 'constant'})
+ mixin article(child, parents.concat(obj))
+
+
+
+mixin api()
+ -pos = 0
+ for obj in tree.children
+ .classContent
+ .membersBackground
+ div(class=' members pos#{pos}')
+ div(class=' membersContent pos#{pos}')
+ h1.memberHeader
+ -var heading = obj.path
+ span.name #{heading}
+ span.editInC9
+ mixin formatGHHref(obj.href, 'nodejs_ref_guide')
+
+ -if (true || obj.filename.indexOf("index") < 0)
+ ul(class='nav tabs pos#{pos}', data-tabs='tabs')
+ for selector, title in {'Events': ['event', 'events'], 'Constructors': ['constructor', 'constructors'], 'Class methods': ['class method', 'class_methods'], 'Class properties': ['class property', 'class_properties'], 'Instance methods': ['instance method', 'instance_methods'], 'Instance properties': ['instance property', 'instance_properties'], 'Constants': ['constant', 'constants']}
+ members = obj.children.filter(function(x){return x.type === selector[0]})
+ li(class="dropdown", data-dropdown="dropdown")
+ if members.length
+ a(href="\#", class="dropdown-toggle", data-toggle="dropdown")
+ != renameMemberTitle(title, members.length)
+ b.caret
+ ul.dropdown-menu
+ for m in members
+ li(data-id='#{m.id}', class='memberLink')
+ mixin link(m, [], true)
+ -pos++
+ mixin article(obj, [])
+
+
+mixin short_description_list(collection)
+ ul.method-details-list
+ for obj in collection
+ if typeof obj === 'string'
+ obj = list[obj]
+ li.method-description
+ h4
+ mixin link(obj)
+ if obj.short_description
+ mixin markdown(obj.short_description)
+
+mixin link(obj, classes, short)
+ l = link(obj, classes, short)
+ != l
+
+mixin links(collection)
+ ul.method-list
+ for obj in collection
+ li
+ mixin link(obj)
+
+mixin formatGHHref(url, type)
+ url = url.substring(url.indexOf("ace/lib"))
+
+ -url = url.replace(/\/{2,}/g, "/").replace(/\//g,"%2F")
+ [edit]
\ No newline at end of file
diff --git a/doc/resources/common_layout.jade b/doc/resources/common_layout.jade
new file mode 100644
index 00000000..fb19e158
--- /dev/null
+++ b/doc/resources/common_layout.jade
@@ -0,0 +1,86 @@
+-var dirPrefix = "./";
+-var landingPage = 'false'
+-var versions = []
+
+mixin doctype
+ !!! 5
+
+
+
+
+
+
+mixin head
+ meta(charset="utf-8")
+ //- N.B. http://blog.yjl.im/2011/01/bad-value-x-ua-compatible-for-attribute.html
+ meta(http-equiv="X-UA-Compatible", content="IE=edge,chrome=1")
+
+ -if (isIndex)
+ title #{title}
+ -else
+ title #{classId} - #{title}
+
+ meta(name="generator", content="c9-doc-build")
+ meta(name="description", content="Ace API documentation for the online code editor.")
+ meta(name="author", content="Garen J. Torikian")
+
+ meta(name="viewport", content="width=device-width,initial-scale=1")
+
+ link(rel="stylesheet", href="#{dirPrefix}resources/csses/bootstrap.min.css")
+ link(rel="stylesheet", href="#{dirPrefix}resources/csses/prettify.css")
+ link(rel="stylesheet", href="#{dirPrefix}resources/csses/ace_api.css")
+
+ link(href="#{dirPrefix}resources/images/favicon.ico", rel="icon", type="image/x-icon")
+
+ script(src="#{dirPrefix}resources/javascripts/jquery.js")
+ script(src="#{dirPrefix}resources/javascripts/clicker.js")
+ script(src="#{dirPrefix}resources/javascripts/jquery.collapse.js")
+ script(src="#{dirPrefix}resources/javascripts/jquery.cookie.js")
+ script(src="#{dirPrefix}resources/javascripts/bootstrap-dropdown.js")
+ script(src="#{dirPrefix}resources/javascripts/jquery-scrollspy.js")
+ script(script src="#{dirPrefix}resources/javascripts/prettify-extension.js")
+
+mixin navBar
+ div.navbar.navbar-fixed-top
+ div.navbar-inner
+ div#topSection.container
+ span.brand
+
+ ul.nav.topLinks
+ li#ace_site
+ a(href='../index.html') Ace
+ li#ace_api.active
+ a(href='index.html') Ace API Reference
+ form(id='searchbox', action='', class='navbar-search pull-right')
+ input(class='search-query span3', name='query', type='text', placeholder="Search the API", title="Search across all the documentation")
+
+mixin footer
+ div#footer
+ .footerInner
+ .footer-text.pull-right
+ p
+ About Cloud9 | Ace & Cloud9 IDE are © Ajax.org 2012
+
+mixin endingScripts
+ // scripts concatenated and minified via ant build script
+
+
+
+
+
+
+ //-
+ // end scripts
+
+ //if lt IE 7
+ script(src="//ajax.googleapis.com/ajax/libs/chrome-frame/1.0.3/CFInstall.min.js")
+ script
+ window.attachEvent('onload',function(){CFInstall.check({mode:'overlay'})})
+
+
+mixin identifyBuild(tree, type)
+ landingPage = 'true'
+ -dirPrefix = './'
+
+mixin markdown(text, inline)
+ != markdown(text, inline)
\ No newline at end of file
diff --git a/doc/site/images/ac-logo.png b/doc/site/images/ac-logo.png
deleted file mode 100644
index 6ca069a3..00000000
Binary files a/doc/site/images/ac-logo.png and /dev/null differ
diff --git a/doc/site/images/ace-logo.png b/doc/site/images/ace-logo.png
deleted file mode 100644
index 886a8df31..00000000
Binary files a/doc/site/images/ace-logo.png and /dev/null differ
diff --git a/doc/site/images/ace-tab.png b/doc/site/images/ace-tab.png
deleted file mode 100644
index 50298c10..00000000
Binary files a/doc/site/images/ace-tab.png and /dev/null differ
diff --git a/doc/site/images/cloud9-logo.png b/doc/site/images/cloud9-logo.png
deleted file mode 100644
index 5466cf7e..00000000
Binary files a/doc/site/images/cloud9-logo.png and /dev/null differ
diff --git a/doc/site/images/codecademy-logo.png b/doc/site/images/codecademy-logo.png
deleted file mode 100644
index e27947ae..00000000
Binary files a/doc/site/images/codecademy-logo.png and /dev/null differ
diff --git a/doc/site/images/codiad.png b/doc/site/images/codiad.png
deleted file mode 100644
index c77a446c..00000000
Binary files a/doc/site/images/codiad.png and /dev/null differ
diff --git a/doc/site/images/crunchapp-logo.png b/doc/site/images/crunchapp-logo.png
deleted file mode 100644
index 1ed8d2f7..00000000
Binary files a/doc/site/images/crunchapp-logo.png and /dev/null differ
diff --git a/doc/site/images/empty-logo.png b/doc/site/images/empty-logo.png
deleted file mode 100644
index c0bbbbe3..00000000
Binary files a/doc/site/images/empty-logo.png and /dev/null differ
diff --git a/doc/site/images/firefox-logo.png b/doc/site/images/firefox-logo.png
deleted file mode 100644
index 711fad62..00000000
Binary files a/doc/site/images/firefox-logo.png and /dev/null differ
diff --git a/doc/site/images/github-logo.png b/doc/site/images/github-logo.png
deleted file mode 100644
index 9456846a..00000000
Binary files a/doc/site/images/github-logo.png and /dev/null differ
diff --git a/doc/site/images/habitat-logo.svg b/doc/site/images/habitat-logo.svg
deleted file mode 100644
index 986c3687..00000000
--- a/doc/site/images/habitat-logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-Slice 1
-
-
-
- image/svg+xml
-
-
-
-
-
-
-
-
diff --git a/doc/site/images/repl.it-logo.png b/doc/site/images/repl.it-logo.png
deleted file mode 100644
index bf383a62..00000000
Binary files a/doc/site/images/repl.it-logo.png and /dev/null differ
diff --git a/doc/site/images/rstudio_logo_64.png b/doc/site/images/rstudio_logo_64.png
deleted file mode 100644
index 3d402a21..00000000
Binary files a/doc/site/images/rstudio_logo_64.png and /dev/null differ
diff --git a/doc/site/images/sassmeister-logo.png b/doc/site/images/sassmeister-logo.png
deleted file mode 100644
index 7ecc8939..00000000
Binary files a/doc/site/images/sassmeister-logo.png and /dev/null differ
diff --git a/doc/site/images/shiftedit-logo.png b/doc/site/images/shiftedit-logo.png
deleted file mode 100644
index b505f9df..00000000
Binary files a/doc/site/images/shiftedit-logo.png and /dev/null differ
diff --git a/doc/site/images/spandexio-logo.png b/doc/site/images/spandexio-logo.png
deleted file mode 100644
index e2fdb79d..00000000
Binary files a/doc/site/images/spandexio-logo.png and /dev/null differ
diff --git a/doc/site/images/stypi-logo.png b/doc/site/images/stypi-logo.png
deleted file mode 100644
index ef1af148..00000000
Binary files a/doc/site/images/stypi-logo.png and /dev/null differ
diff --git a/doc/site/images/sx-logo.png b/doc/site/images/sx-logo.png
deleted file mode 100644
index 0604d279..00000000
Binary files a/doc/site/images/sx-logo.png and /dev/null differ
diff --git a/doc/site/images/textimage.png b/doc/site/images/textimage.png
deleted file mode 100644
index 6f7d3130..00000000
Binary files a/doc/site/images/textimage.png and /dev/null differ
diff --git a/doc/site/images/weecod-logo.png b/doc/site/images/weecod-logo.png
deleted file mode 100644
index c4970727..00000000
Binary files a/doc/site/images/weecod-logo.png and /dev/null differ
diff --git a/doc/site/images/wolf_3d_logo_trans.png b/doc/site/images/wolf_3d_logo_trans.png
deleted file mode 100644
index fe61b9b4..00000000
Binary files a/doc/site/images/wolf_3d_logo_trans.png and /dev/null differ
diff --git a/doc/site/images/zorba-logo.png b/doc/site/images/zorba-logo.png
deleted file mode 100644
index ad2c22f6..00000000
Binary files a/doc/site/images/zorba-logo.png and /dev/null differ
diff --git a/doc/site/iphone.css b/doc/site/iphone.css
index dd90db03..f1c2ba03 100644
--- a/doc/site/iphone.css
+++ b/doc/site/iphone.css
@@ -22,4 +22,4 @@ UL.menu-footer LI {
PRE{
font-size:22px;
-}
\ No newline at end of file
+}
diff --git a/doc/site/js/main.js b/doc/site/js/main.js
deleted file mode 100644
index 39dc202d..00000000
--- a/doc/site/js/main.js
+++ /dev/null
@@ -1,187 +0,0 @@
-var editor;
-var embedded_editor;
-$(function() {
- if (typeof ace !== "undefined") {
- ace.config.set("workerPath", "build/src-min");
- editor = ace.edit("ace_editor_demo");
- editor.container.style.opacity = "";
- embedded_editor = ace.edit("embedded_ace_code");
- embedded_editor.container.style.opacity = "";
- embedded_editor.session.setMode("ace/mode/html");
- embedded_editor.setAutoScrollEditorIntoView(true);
- embedded_editor.setOption("maxLines", 40);
-
- editor.setOptions({
- maxLines: 30,
- mode: "ace/mode/javascript",
- autoScrollEditorIntoView: true
- });
-
- ace.config.loadModule("ace/ext/emmet", function() {
- ace.require("ace/lib/net").loadScript("http://cloud9ide.github.io/emmet-core/emmet.js", function() {
- embedded_editor.setOption("enableEmmet", true);
- editor.setOption("enableEmmet", true);
- });
- });
-
- ace.config.loadModule("ace/ext/language_tools", function() {
- embedded_editor.setOptions({
- enableSnippets: true,
- enableBasicAutocompletion: true
- });
- editor.setOptions({
- enableSnippets: true,
- enableBasicAutocompletion: true
- });
- });
- } else {
- document.body.insertAdjacentHTML("afterbegin", '\
-
\
- \xd7 \
- Oh No! Couldn\'t load build/src/ace.js.node Makefile.dryice.jsgit submodule update --init --recursive
\
-
either as an
- != link(obj.bound, ['link-short'], 'instance method')
- | or as a generic method. If calling as generic, pass the instance in as the first argument.
- else if obj.bound && !~obj.bound.indexOf('#')
- p.note.functionalized
- | This method can be called either as an instance method or as a
- != link(obj.bound, ['link-short'], 'generic method')
- |. If calling as generic, pass the instance in as the first argument.
-
- if obj.arguments && obj.arguments.length
- h4 Arguments
- != argumentTable(obj.arguments, ["argument-list", "table", "table-striped", "table-bordered"])
-
- if obj.returns && obj.returns.length
- h4 Returns
- != returnTable(obj.returns, ["return-list", "table", "table-striped", "table-bordered"])
-
- //- children
- for child in obj.children.filter(function(x){return x.type === 'section'})
- mixin article(child, parents.concat(obj))
- for child in obj.children.filter(function(x){return x.type === 'utility'})
- mixin article(child, parents.concat(obj))
-
- for child in obj.children.filter(function(x){return x.type === 'constructor'})
- - if (!constructorSection)
- - constructorSection = true
- h3.sectionHeader Constructors
- mixin article(child, parents.concat(obj))
-
- for child in obj.children.filter(function(x){return x.type === 'event'})
- - if (!eventSection)
- - eventSection = true
- h3.sectionHeader Events
- mixin article(child, parents.concat(obj), 'event')
-
- for child in obj.children.filter(function(x){return x.type === 'class method'})
- - if (!methodSection)
- - methodSection = true
- h3.sectionHeader Methods
- mixin article(child, parents.concat(obj))
-
- for child in obj.children.filter(function(x){return x.type === 'class property'})
- - if (!propertySection)
- - propertySection = true
- h3.sectionHeader Properties
- mixin article(child, parents.concat(obj))
-
- for child in obj.children.filter(function(x){return x.type === 'instance method'})
- mixin article(child, parents.concat(obj))
- for child in obj.children.filter(function(x){return x.type === 'instance property'})
- mixin article(child, parents.concat(obj))
- for child in obj.children.filter(function(x){return x.type === 'constant'})
- mixin article(child, parents.concat(obj))
-
-
-
-mixin api()
- -pos = 0
- for obj in tree.children
- -if (obj.subclasses.length == 0)
- mixin render_starting_tabs(obj, pos)
- -else
- mixin render_starting_tabs(obj, pos)
- for child in obj.children.filter(function(x){return x.type === 'namespace' || x.type === 'class' || x.type === 'mixin'})
- -pos++
- mixin render_starting_tabs(child, pos)
-
-
-mixin render_starting_tabs(obj, pos)
- .classContent
- .membersBackground
-
- div(class=' members pos#{pos}')
- div(class=' membersContent pos#{pos}')
- h1.memberHeader
- -var heading = obj.path
- span.name #{heading}
-
- -if (true || obj.filename.indexOf("index") < 0)
- ul(class='nav tabs pos#{pos}', data-tabs='tabs')
- for selector, title in {'Events': ['event', 'events'], 'Constructors': ['constructor', 'constructors'], 'Class methods': ['class method', 'class_methods'], 'Class properties': ['class property', 'class_properties'], 'Instance methods': ['instance method', 'instance_methods'], 'Instance properties': ['instance property', 'instance_properties'], 'Constants': ['constant', 'constants']}
- members = obj.children.filter(function(x){return x.type === selector[0]})
- li(class="dropdown", data-dropdown="dropdown")
- if members.length
- a(href="\#", class="dropdown-toggle", data-toggle="dropdown")
- != renameMemberTitle(title, members.length)
- b.caret
- ul.dropdown-menu
- for m in members
- if (m.private !== true && m.name.charAt(0) !== "$")
- li(id='dropdown_#{m.path}', data-id='#{m.path}', class='memberLink')
- mixin link(m, [], true)
- -methodSection = constructorSection = propertySection = eventSection = false;
- mixin article(obj, [])
-
-mixin short_description_list(collection)
- ul.method-details-list
- for obj in collection
- if typeof obj === 'string'
- obj = list[obj]
- li.method-description
- h4
- mixin link(obj)
- if obj.short_description
- mixin markdown(obj.short_description)
-
-mixin link(obj, classes, short)
- l = link(obj, classes, short)
- != l
-
-mixin links(collection)
- ul.method-list
- for obj in collection
- li
- mixin link(obj)
\ No newline at end of file
diff --git a/doc/template/resources/font/fontawesome-webfont.eot b/doc/template/resources/font/fontawesome-webfont.eot
deleted file mode 100644
index 89070c1e..00000000
Binary files a/doc/template/resources/font/fontawesome-webfont.eot and /dev/null differ
diff --git a/doc/template/resources/font/fontawesome-webfont.svg b/doc/template/resources/font/fontawesome-webfont.svg
deleted file mode 100644
index 1245f92c..00000000
--- a/doc/template/resources/font/fontawesome-webfont.svg
+++ /dev/null
@@ -1,255 +0,0 @@
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/doc/template/resources/font/fontawesome-webfont.ttf b/doc/template/resources/font/fontawesome-webfont.ttf
deleted file mode 100644
index c17e9f8d..00000000
Binary files a/doc/template/resources/font/fontawesome-webfont.ttf and /dev/null differ
diff --git a/doc/template/resources/font/fontawesome-webfont.woff b/doc/template/resources/font/fontawesome-webfont.woff
deleted file mode 100644
index 09f2469a..00000000
Binary files a/doc/template/resources/font/fontawesome-webfont.woff and /dev/null differ
diff --git a/doc/template/resources/images/Ace_ERD.png b/doc/template/resources/images/Ace_ERD.png
deleted file mode 100644
index 78fb8dab..00000000
Binary files a/doc/template/resources/images/Ace_ERD.png and /dev/null differ
diff --git a/doc/template/resources/javascripts/bbq.js b/doc/template/resources/javascripts/bbq.js
deleted file mode 100644
index bcbf2483..00000000
--- a/doc/template/resources/javascripts/bbq.js
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * jQuery BBQ: Back Button & Query Library - v1.2.1 - 2/17/2010
- * http://benalman.com/projects/jquery-bbq-plugin/
- *
- * Copyright (c) 2010 "Cowboy" Ben Alman
- * Dual licensed under the MIT and GPL licenses.
- * http://benalman.com/about/license/
- */
-(function($,p){var i,m=Array.prototype.slice,r=decodeURIComponent,a=$.param,c,l,v,b=$.bbq=$.bbq||{},q,u,j,e=$.event.special,d="hashchange",A="querystring",D="fragment",y="elemUrlAttr",g="location",k="href",t="src",x=/^.*\?|#.*$/g,w=/^.*\#/,h,C={};function E(F){return typeof F==="string"}function B(G){var F=m.call(arguments,1);return function(){return G.apply(this,F.concat(m.call(arguments)))}}function n(F){return F.replace(/^[^#]*#?(.*)$/,"$1")}function o(F){return F.replace(/(?:^[^?#]*\?([^#]*).*$)?.*/,"$1")}function f(H,M,F,I,G){var O,L,K,N,J;if(I!==i){K=F.match(H?/^([^#]*)\#?(.*)$/:/^([^#?]*)\??([^#]*)(#?.*)/);J=K[3]||"";if(G===2&&E(I)){L=I.replace(H?w:x,"")}else{N=l(K[2]);I=E(I)?l[H?D:A](I):I;L=G===2?I:G===1?$.extend({},I,N):$.extend({},N,I);L=a(L);if(H){L=L.replace(h,r)}}O=K[1]+(H?"#":L||!K[1]?"?":"")+L+J}else{O=M(F!==i?F:p[g][k])}return O}a[A]=B(f,0,o);a[D]=c=B(f,1,n);c.noEscape=function(G){G=G||"";var F=$.map(G.split(""),encodeURIComponent);h=new RegExp(F.join("|"),"g")};c.noEscape(",/");$.deparam=l=function(I,F){var H={},G={"true":!0,"false":!1,"null":null};$.each(I.replace(/\+/g," ").split("&"),function(L,Q){var K=Q.split("="),P=r(K[0]),J,O=H,M=0,R=P.split("]["),N=R.length-1;if(/\[/.test(R[0])&&/\]$/.test(R[N])){R[N]=R[N].replace(/\]$/,"");R=R.shift().split("[").concat(R);N=R.length-1}else{N=0}if(K.length===2){J=r(K[1]);if(F){J=J&&!isNaN(J)?+J:J==="undefined"?i:G[J]!==i?G[J]:J}if(N){for(;M<=N;M++){P=R[M]===""?O.length:R[M];O=O[P]=MToggle editor
-
-
-
-
-
\ No newline at end of file
diff --git a/index.html b/index.html
index e2440eb1..5031e00f 100644
--- a/index.html
+++ b/index.html
@@ -1,1345 +1,145 @@
-
-
- Ace - The High Performance Code Editor for the Web
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
Built for Code
-
Ace is an embeddable code editor written in JavaScript.
- It matches the features and performance of native
- editors such as Sublime, Vim and TextMate. It can be easily embedded
- in any web page and JavaScript application. Ace is maintained as the
- primary editor for Cloud9 IDE
- and is the successor of the Mozilla Skywriter (Bespin) project.
-
-
-
/**
- * In fact, you're looking at ACE right now. Go ahead and play with it!
- *
- * We are currently showing off the JavaScript mode. ACE has support for 45
- * language modes and 24 color themes!
- */
-
-function add(x, y) {
- var resultString = "Hello, ACE! The result of your math is: ";
- var result = x + y;
- return resultString + result;
-}
-
-var addResult = add(3, 2);
-console.log(addResult);
-
-
Learn how to embed this in your own site
-
Looking for a more full-featured demo? Check out the
- kitchen sink .
-
-
Features
-
- Syntax highlighting for over 110 languages (TextMate/Sublime Text.tmlanguage files can be imported)Over 20 themes (TextMate/Sublime Text .tmtheme files can be imported)
- Automatic indent and outdent
- An optional command line
- Handles huge documents (four million lines seems to be the limit!)
- Fully customizable key bindings including vim and Emacs modes
- Search and replace with regular expressions
- Highlight matching parentheses
- Toggle between soft tabs and real tabs
- Displays hidden characters
- Drag and drop text using the mouse
- Line wrapping
- Code folding
- Multiple cursors and selections
- Live syntax checker (currently JavaScript/CoffeeScript/CSS/XQuery)
- Cut, copy, and paste functionality
-
-
Get the Open-Source Code
-
Ace is a community project. We actively encourage and support
- contributions! The Ace source code is hosted on GitHub
- and released under the BSD license ‐
- very simple and friendly to all kinds of projects, whether open-source
- or not. Take charge of your editor and add your favorite language
- highlighting and keybindings!
-
-
git clone git://github.com/ajaxorg/ace.git
-
History
-
Skywriter/Bespin and Ace started
- as two independent projects both aiming to build a no compromise
- code editor component for the web. Bespin started as part of
- Mozilla Labs and was based on the <canvas> tag, while Ace is
- the editor component of Cloud9 IDE
- and uses the DOM for rendering. After the release of Ace at
- JSConf.eu 2010
- in Berlin the Skywriter team decided to merge Ace with a simplified
- version of Skywriter's plugin system and some of Skywriter's
- extensibility points. All these changes have been merged back to Ace
- now, which supersedes Skywriter. Both Cloud9 IDE
- and Mozilla are actively developing and
- maintaining Ace.
-
-
Related Projects
-
-
-
-
Embedding Ace in Your Site
-
Ace can be easily embedded into a web page. Get prebuilt version of ace from
- ace-builds repository and use the code below:
-
<!DOCTYPE html>
-<html lang="en">
-<head>
-<title>ACE in Action</title>
-<style type="text/css" media="screen">
- #editor {
- position: absolute;
- top: 0;
- right: 0;
- bottom: 0;
- left: 0;
- }
-</style>
-</head>
-<body>
-
-<div id="editor">function foo(items) {
- var x = "All this is syntax highlighted";
- return x;
-}</div>
-
-<script src="/ace-builds/src-noconflict/ace.js" type="text/javascript" charset="utf-8"></script>
-<script>
- var editor = ace.edit("editor");
- editor.setTheme("ace/theme/monokai");
- editor.getSession().setMode("ace/mode/javascript");
-</script>
-</body>
-</html>
-
Now check out the How-To Guide for instructions on
- common operations, such as setting a different language mode or
- getting the contents from the editor.
-
-
Loading Ace from a Local URL
-
If you want to clone and host Ace locally you can
- use one of the pre-packaged versions . Just copy
- one of src* subdirectories somewhere into your project, or use RequireJS to load the
- contents of lib/ace folder as ace:
-
-
The packaged version can also be loaded from CDN's such as jsDelivr or cdnjs .
-
-
-
-
Working with Ace
-
In all of these examples Ace has been invoked
- as shown in the embedding guide .
-
-
Setting Themes
-
Themes are loaded on demand; all you have to do is pass the string name:
-
editor.setTheme("ace/theme/twilight");
-
> See all themes
-
Setting the Programming Language Mode
-
By default, the editor supports plain text mode. All other language modes are available as separate modules, loaded on demand like this:
-
editor.getSession().setMode("ace/mode/javascript");
-
-
Common Operations
-
Set and get content:
-
editor.setValue("the new text here"); // or session.setValue
-editor.getValue(); // or session.getValue
-
Get selected text:
-
editor.session.getTextRange(editor.getSelectionRange());
-
Insert at cursor:
-
editor.insert("Something cool");
-
Get the current cursor line and column:
-
editor.selection.getCursor();
-
Go to a line:
-
editor.gotoLine(lineNumber);
-
Get total number of lines:
-
editor.session.getLength();
-
Set the default tab size:
-
editor.getSession().setTabSize(4);
-
Use soft tabs:
-
editor.getSession().setUseSoftTabs(true);
-
Set the font size:
-
document.getElementById('editor').style.fontSize='12px';
-
Toggle word wrapping:
-
editor.getSession().setUseWrapMode(true);
-
Set line highlighting:
-
editor.setHighlightActiveLine(false);
-
Set the print margin visibility:
-
editor.setShowPrintMargin(false);
-
Set the editor to read-only:
-
editor.setReadOnly(true); // false to make it editable
-
Triggering Resizes
-
Ace only resizes itself on window events. If you resize the editor div in another manner, and need Ace to resize, use the following:
-
editor.resize()
-
Searching
-
editor.find('needle',{
- backwards: false,
- wrap: false,
- caseSensitive: false,
- wholeWord: false,
- regExp: false
-});
-editor.findNext();
-editor.findPrevious();
-
The following options are available to you for your search parameters:
-
-
- needle: The string or regular expression you're looking for
-
-
- backwards: Whether to search backwards from where cursor currently is. Defaults to false.
-
-
- wrap: Whether to wrap the search back to the beginning when it hits the end. Defaults to false.
-
-
- caseSensitive: Whether the search ought to be case-sensitive. Defaults to false.
-
-
- wholeWord: Whether the search matches only on whole words. Defaults to false.
-
-
- range: The Range to search within. Set this to null for the whole document
-
-
- regExp: Whether the search is a regular expression or not. Defaults to false.
-
-
- start: The starting Range or cursor position to begin the search
-
-
- skipCurrent: Whether or not to include the current line in the search. Default to false.
-
-
-
Here's how you can perform a replace:
-
editor.find('foo');
-editor.replace('bar');
-
And here's a replace all:
-
editor.replaceAll('bar');
-
(editor.replaceAll uses the needle set earlier by editor.find('needle', ...)
-
Listening to Events
-
To listen for an onchange:
-
editor.getSession().on('change', function(e) {
- // e.type, etc
-});
-
To listen for an selection change:
-
editor.getSession().selection.on('changeSelection', function(e) {
-});
-
To listen for a cursor change:
-
editor.getSession().selection.on('changeCursor', function(e) {
-});
-
Adding New Commands and Keybindings
-
To assign key bindings to a custom function:
-
editor.commands.addCommand({
- name: 'myCommand',
- bindKey: {win: 'Ctrl-M', mac: 'Command-M'},
- exec: function(editor) {
- //...
- },
- readOnly: true // false if this command should not apply in readOnly mode
-});
-
-
-
Creating a Syntax Highlighter for Ace
-
Creating a new syntax highlighter for Ace is extremly simple. You'll need to define two pieces of code: a new mode, and a new set of highlighting rules.
-
-
We recommend using the the Ace Mode Creator when defining your highlighter. This allows you to inspect your code's tokens, as well as providing a live preview of the syntax highlighter in action.
-
-
Every language needs a mode. A mode contains the paths to a language's syntax highlighting rules, indentation rules, and code folding rules. Without defining a mode, Ace won't know anything about the finer aspects of your language.
-
Here is the starter template we'll use to create a new mode:
-
define(function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-// defines the parent mode
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-
-// defines the language specific highlighters and folding rules
-var MyNewHighlightRules = require("./mynew_highlight_rules").MyNewHighlightRules;
-var MyNewFoldMode = require("./folding/mynew").MyNewFoldMode;
-
-var Mode = function() {
- // set everything up
- this.HighlightRules = MyNewHighlightRules;
- this.$outdent = new MatchingBraceOutdent();
- this.foldingRules = new MyNewFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
- // configure comment start/end characters
- this.lineCommentStart = "//";
- this.blockComment = {start: "/*", end: "*/"};
-
- // special logic for indent/outdent.
- // By default ace keeps indentation of previous line
- this.getNextLineIndent = function(state, line, tab) {
- var indent = this.$getIndent(line);
- return indent;
- };
-
- this.checkOutdent = function(state, line, input) {
- return this.$outdent.checkOutdent(line, input);
- };
-
- this.autoOutdent = function(state, doc, row) {
- this.$outdent.autoOutdent(doc, row);
- };
-
- // create worker for live syntax checking
- this.createWorker = function(session) {
- var worker = new WorkerClient(["ace"], "ace/mode/mynew_worker", "NewWorker");
- worker.attachToDocument(session.getDocument());
- worker.on("errors", function(e) {
- session.setAnnotations(e.data);
- });
- return worker;
- };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-
What's going on here? First, you're defining the path to TextMode (more on this later). Then you're pointing the mode to your definitions for the highlighting rules, as well as your rules for code folding. Finally, you're setting everything up to find those rules, and exporting the Mode so that it can be consumed. That's it!
-
Regarding TextMode, you'll notice that it's only being used once: oop.inherits(Mode, TextMode);. If your new language depends on the rules of another language, you can choose to inherit the same rules, while expanding on it with your language's own requirements. For example, PHP inherits from HTML, since it can be embedded directly inside .html pages. You can either inherit from TextMode, or any other existing mode, if it already relates to your language.
-
All Ace modes can be found in the lib/ace/mode folder.
-
-
The Ace highlighter can be considered to be a state machine. Regular expressions define the tokens for the current state, as well as the transitions into another state. Let's define mynew_highlight_rules.js , which our mode above uses.
-
All syntax highlighters start off looking something like this:
-
define(function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var MyNewHighlightRules = function() {
-
- // regexp must not have capturing parentheses. Use (?:) instead.
- // regexps are ordered -> the first match is used
- this.$rules = {
- "start" : [
- {
- token: <token>, // String, Array, or Function: the CSS token to apply
- regex: <regex>, // String or RegExp: the regexp to match
- next: <next> // [Optional] String: next state to enter
- }
- ]
- };
-};
-
-oop.inherits(MyNewHighlightRules, TextHighlightRules);
-
-exports.MyNewHighlightRules = MyNewHighlightRules;
-
-});
-
The token state machine operates on whatever is defined in this.$rules. The highlighter always begins at the start state, and progresses down the list, looking for a matching regex. When one is found, the resulting text is wrapped within a <span class="ace_<token>"> tag, where <token> is defined as the token property. Note that all tokens are preceded by the ace_ prefix when they're rendered on the page.
-
Once again, we're inheriting from TextHighlightRules here. We could choose to make this any other language set we want, if our new language requires previously defined syntaxes. For more information on extending languages, see "extending Highlighters " below.
-
-
The Ace highlighting system is heavily inspired by the TextMate language grammar . Most tokens will follow the conventions of TextMate when naming grammars. A thorough (albeit incomplete) list of tokens can be found on the Ace Wiki .
-
For the complete list of tokens, see tool/tmtheme.js
-
Multiple tokens can be applied to the same text by adding dots in the token, e.g. token: support.function wraps the text in a <span class="ace_support ace_function"> tag.
-
-
Regular expressions can either be a RegExp or String definition
-
If you're using a regular expression, remember to start and end the line with the / character, like this:
-
{
- token : "constant.language.escape",
- regex : /\$[\w\d]+/
-}
-
A caveat of using stringed regular expressions is that any \ character must be escaped. That means that even an innocuous regular expression like this:
-
regex: "function\s*\(\w+\)"
-
Must actually be written like this:
-
regex: "function\\s*\(\\w+\)"
-
-
You can also include flat regexps--(var)--or have matching groups--((a+)(b+)). There is a strict requirement whereby matching groups must cover the entire matched string; thus, (hel)lo is invalid. If you want to create a non-matching group, simply start the group with the ?: predicate; thus, (hel)(?:lo) is okay. You can, of course, create longer non-matching groups. For example:
-
{
- token : "constant.language.boolean",
- regex : /(?:true|false)\b/
-},
-
For flat regular expression matches, token can be a String, or a Function that takes a single argument (the match) and returns a string token. For example, using a function might look like this:
-
var colors = lang.arrayToMap(
- ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
- "purple|red|silver|teal|white|yellow").split("|")
-);
-
-var fonts = lang.arrayToMap(
- ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
- "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
- "serif|monospace").split("|")
-);
-
-...
-
-{
- token: function(value) {
- if (colors.hasOwnProperty(value.toLowerCase())) {
- return "support.constant.color";
- }
- else if (fonts.hasOwnProperty(value.toLowerCase())) {
- return "support.constant.fonts";
- }
- else {
- return "text";
- }
- },
- regex: "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-}
-
If token is a function,it should take the same number of arguments as there are groups, and return an array of tokens.
-
For grouped regular expressions, token can be a String, in which case all matched groups are given that same token, like this:
-
{
- token: "identifier",
- regex: "(\\w+\\s*:)(\\w*)"
-}
-
More commonly, though, token is an Array (of the same length as the number of groups), whereby matches are given the token of the same alignment as in the match. For a complicated regular expression, like defining a function, that might look something like this:
-
{
- token : ["storage.type", "text", "entity.name.function"],
- regex : "(function)(\\s+)([a-zA-Z_][a-zA-Z0-9_]*\\b)"
-}
-
-
The syntax highlighting state machine stays in the start state, until you define a next state for it to advance to. At that point, the tokenizer stays in that new state, until it advances to another state. Afterwards, you should return to the original start state.
-
Here's an example:
-
this.$rules = {
- "start" : [ {
- token : "text",
- regex : "<\\!\\[CDATA\\[",
- next : "cdata"
- },
-
- "cdata" : [ {
- token : "text",
- regex : "\\]\\]>",
- next : "start"
- }, {
- defaultToken : "text"
- } ]
-};
-
In this extremly short sample, we're defining some highlighting rules for when Ace detectes a <![CDATA tag. When one is encountered, the tokenizer moves from start into the cdata state. It remains there, applying the text token to any string it encounters. Finally, when it hits a closing ]> symbol, it returns to the start state and continues to tokenize anything else.
-
Using the TMLanguage Tool
-
There is a tool that
- will take an existing tmlanguage file and do its best to convert it into Javascript for Ace to consume. Here's what you need to get started:
-
-
- In the Ace repository, navigate to the tools
- Run npm install to install required dependencies.
- Run node tmlanguage.js <path_to_tmlanguage_file>; for example, node <path_to_tmlanguage_file> /Users/Elrond/elven.tmLanguage
-
-
Two files are created and placed in lib/ace/mode : one for the language mode, and one for the set of highlight rules. You will still need to add the code into ace/ext/modelist.js , and add a sample file for testing.
-
-
Your .tmlanguage file will then be converted to the best of the converter’s ability. It is an understatement to say that the tool is imperfect. Probably, language mode creation will never be able to be fully autogenerated. There's a list of non-determinable items; for example:
-
- The use of regular expression lookbehinds
- Deciding which state to transition tostate_2, state_10, e.t.c.
- Extending modesinclude source.c, to mean, “add all the rules in C highlighting.” That syntax does not make sense to Ace or this tool (though of course you can extending existing highlighters ).
- Rule preference order
- Gathering keywordscreateKeywordMapper()
-
-
However, the tool is an excellent way to get a quick start, if you already possess a tmlanguage file for you language.
-
Extending Highlighters
-
Suppose you're working on a LuaPage, PHP embedded in HTML, or a Django template. You'll need to create a syntax highlighter that takes all the rules from the original language (Lua, PHP, or Python) and extends it with some additional identifiers (<?lua, <?php, {%, for example). Ace allows you to easily extend a highlighter using a few helper functions.
-
-
To get the existing syntax highlighting rules for a particular language, use the getRules() function. For example:
-
var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
-
-this.$rules = new HtmlHighlightRules().getRules();
-
-/*
- this.$rules == Same this.$rules as HTML highlighting
-*/
-
-
The addRules method does one thing, and it does one thing well: it adds new rules to an existing rule set, and prefixes any state with a given tag. For example, let's say you've got two sets of rules, defined like this:
-
this.$rules = {
- "start": [ /* ... */ ]
-};
-
-var newRules = {
- "start": [ /* ... */ ]
-}
-
If you want to incorporate newRules into this.$rules, you'd do something like this:
-
this.addRules(newRules, "new-");
-
-/*
- this.$rules = {
- "start": [ ... ],
- "new-start": [ ... ]
- };
-*/
-
-
The last function available to you combines both of these concepts, and it's called embedRules. It takes three parameters:
-
- An existing rule set to embed with
- A prefix to apply for each state in the existing rule set
- A set of new states to add
-
-
Like addRules, embedRules adds on to the existing this.$rules object.
-
To explain this visually, let's take a look at the syntax highlighter for Lua pages, which combines all of these concepts:
-
var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
-var LuaHighlightRules = require("./lua_highlight_rules").LuaHighlightRules;
-
-var LuaPageHighlightRules = function() {
- this.$rules = new HtmlHighlightRules().getRules();
-
- for (var i in this.$rules) {
- this.$rules[i].unshift({
- token: "keyword",
- regex: "<\\%\\=?",
- next: "lua-start"
- }, {
- token: "keyword",
- regex: "<\\?lua\\=?",
- next: "lua-start"
- });
- }
- this.embedRules(LuaHighlightRules, "lua-", [
- {
- token: "keyword",
- regex: "\\%>",
- next: "start"
- },
- {
- token: "keyword",
- regex: "\\?>",
- next: "start"
- }
- ]);
-};
-
Here, this.$rules starts off as a set of HTML highlighting rules. To this set, we add two new checks for <%= and <?lua=. We also delegate that if one of these rules are matched, we should move onto the lua-start state. Next, embedRules takes the already existing set of LuaHighlightRules and applies the lua- prefix to each state there. Finally, it adds two new checks for %> and ?>, allowing the state machine to return to start.
-
Code Folding
-
Adding new folding rules to your mode can be a little tricky. First, insert the following lines of code into your mode definition:
-
var MyFoldMode = require("./folding/newrules").FoldMode;
-
-...
-var MyMode = function() {
-
- ...
-
- this.foldingRules = new MyFoldMode();
-};
-
You'll be defining your code folding rules into the lib/ace/mode/folding folder. Here's a template that you can use to get started:
-
define(function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
- // regular expressions that identify starting and stopping points
- this.foldingStartMarker;
- this.foldingStopMarker;
-
- this.getFoldWidgetRange = function(session, foldStyle, row) {
- var line = session.getLine(row);
-
- // test each line, and return a range of segments to collapse
- };
-
-}).call(FoldMode.prototype);
-
-});
-
Just like with TextMode for syntax highlighting, BaseFoldMode contains the starting point for code folding logic. foldingStartMarker defines your opening folding point, while foldingStopMarker defines the stopping point. For example, for a C-style folding system, these values might look like this:
-
this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-
These regular expressions identify various symbols--{, [, //--to pay attention to. getFoldWidgetRange matches on these regular expressions, and when found, returns the range of relevant folding points. For more information on the Range object, see the Ace API documentation .
-
Again, for a C-style folding mechanism, a range to return for the starting fold might look like this:
-
var line = session.getLine(row);
-var match = line.match(this.foldingStartMarker);
-if (match) {
- var i = match.index;
-
- if (match[1])
- return this.openingBracketBlock(session, match[1], row, i);
-
- var range = session.getCommentFoldRange(row, i + match[0].length);
- range.end.column -= 2;
- return range;
-}
-
Let's say we stumble across the code block hello_world() {. Our range object here becomes:
-
{
- startRow: 0,
- endRow: 0,
- startColumn: 0,
- endColumn: 13
-}
-
Testing Your Highlighter
-
The best way to test your tokenizer is to see it live, right? To do that, you'll want to modify the live Ace demo to preview your changes. You can find this file in the root Ace directory with the name kitchen-sink.html .
-
-
- add an entry to supportedModes in ace/ext/modelist.js
-
- add a sample file to demo/kitchen-sink/docs/ with same name as the mode file
-
-
-
Once you set this up, you should be able to witness a live demonstration of your new highlighter.
-
-
Adding automated tests for a highlighter is trivial so you are not required to do it, but it can help during development.
-
In lib/ace/mode/_test create a file named text_<modeName> .txt demo/docs both looks good and covers various edge cases in your language syntax).
-
-
Run node highlight_rules_test.js -gen tokens_<modeName> .json
-
-
After this running highlight_rules_test.js optionalLanguageName
-
Any files ending with the _test.js suffix are automatically run by Ace's Travis CI server.
-
-
-
-
-
-
-
Ace API Reference
-
Welcome to the Ace API Reference!
-
On the left, you'll find a list of all of our currently documented classes.
- These is not a complete set of classes, but rather, the "core" set. For more
- information on how to work with Ace, check out the embedding guide .
-
-
Below is an ERD diagram describing some fundamentals about how the internals of Ace works:
-
-
-
-
-
-
-
Projects Using Ace
-
Ace is used all over the web in all kinds of production applications. Here is
- just a small sampling:
-
-
-
-
Support and User Resources
-
Aside from our GitHub page, here's a list of places you can find help for Ace:
-
-
-
-
+
+
+
+
ACE - Ajax.org Cloud9 Editor
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
Ace is a standalone code editor written in JavaScript. Our goal is to create a web based code editor that matches and extends the features, usability and performance of existing native editors such as TextMate, Vim or Eclipse. It can be easily embedded in any web page and JavaScript application. Ace is developed as the primary editor for Cloud9 IDE and the successor of the Mozilla Skywriter (Bespin) Project.
+
+
Features
+
+
+
+ Syntax highlighting Auto indentation and outdent
+ An optional command line Work with huge documents (100,000 lines and more are no problem)
+ Fully customizable key bindings including VI and Emacs modes
+ Themes (TextMate themes can be imported)
+ Search and replace with regular expressions
+ Highlight matching parentheses
+ Toggle between soft tabs and real tabs
+ Displays hidden characters
+ Highlight selected word
+
+
+
Take Ace for a spin!
+
+
Check out the Ace live demo or get a Cloud9 IDE account to experience Ace while editing one of your own GitHub projects.
+
+
History
+
+
Previously known as “Bespin” or lately “Skywriter” it’s now known as Ace (Ajax.org Cloud9 Editor)! Bespin and Ace started as two independent projects both aiming to build a no compromise code editor component for the web. Bespin started as part of Mozilla Labs and was based on the <canvas> tag, while Ace is the Editor component of the Cloud9 IDE and is using the DOM for rendering. After the release of Ace at JSConf.eu 2010 in Berlin the Skywriter team decided to merge Ace with a simplified version of Skywriter's plugin system and some of Skywriter's extensibility points. All these changes have been merged back to Ace now, which supersedes Skywriter. Both Ajax.org and Mozilla are actively developing and maintaining Ace.
+
+
+
Getting the code
+
+
Ace is a community project. We actively encourage and support contributions. The Ace source code is hosted on GitHub . It is released under the Mozilla tri-license (MPL/GPL/LGPL). This is the same license used by Firefox. This license is friendly to all kinds of projects, whether open source or not. Take charge of your editor and add your favorite language highlighting and keybindings!
+
git clone git://github.com/ajaxorg/ace.git
+
+
+
+
+
+
+
+
diff --git a/install.js b/install.js
new file mode 100644
index 00000000..4789e48f
--- /dev/null
+++ b/install.js
@@ -0,0 +1,53 @@
+#!/usr/bin/env node
+/* ***** 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
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ * Julian Viereck
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
+ *
+ * ***** END LICENSE BLOCK ***** */
+
+var buildAce = require("./Makefile.dryice").buildAce;
+
+try {
+ buildAce({
+ compress: false,
+ noconflict: false,
+ suffix: "",
+ name: "ace"
+ });
+} catch (e) {
+ console.log("--- Ace Build error ---");
+ console.log(e);
+ process.exit(0);
+}
diff --git a/kitchen-sink.html b/kitchen-sink.html
index a8e1fb7b..825a6194 100644
--- a/kitchen-sink.html
+++ b/kitchen-sink.html
@@ -1,4 +1,5 @@
-
+
@@ -6,24 +7,25 @@
Ace Kitchen Sink
-
-
-
-
-
+
+
@@ -57,7 +59,36 @@
Theme
-
+
+ Chrome
+ Clouds
+ Crimson Editor
+ Dawn
+ Dreamweaver
+ Eclipse
+ GitHub
+ Solarized Light
+ TextMate
+ Tomorrow
+
+
+ Clouds Midnight
+ Cobalt
+ idleFingers
+ krTheme
+ Merbivore
+ Merbivore Soft
+ Mono Industrial
+ Monokai
+ Pastel on dark
+ Solarized Dark
+ Twilight
+ Tomorrow Night
+ Tomorrow Night Blue
+ Tomorrow Night Bright
+ Tomorrow Night 80s
+ Vibrant Ink
+
@@ -69,10 +100,8 @@
10px
11px
12px
- 13px
14px
16px
- 18px
20px
24px
@@ -113,7 +142,7 @@
-
+
-
-
-
-
-
-
+
@@ -283,7 +255,7 @@
-
+
diff --git a/lib/ace/ace.js b/lib/ace/ace.js
index 6c8a6126..5573abdb 100644
--- a/lib/ace/ace.js
+++ b/lib/ace/ace.js
@@ -1,37 +1,46 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Mozilla Skywriter.
+ *
+ * The Initial Developer of the Original Code is
+ * Mozilla.
+ * Portions created by the Initial Developer are Copyright (C) 2009
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Kevin Dangoor (kdangoor@mozilla.com)
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
/**
+ * class Ace
+ *
* The main class required to set up an Ace instance in the browser.
*
- * @class Ace
+ *
**/
define(function(require, exports, module) {
@@ -39,91 +48,56 @@ define(function(require, exports, module) {
require("./lib/fixoldbrowsers");
-var dom = require("./lib/dom");
-var event = require("./lib/event");
+var Dom = require("./lib/dom");
+var Event = require("./lib/event");
var Editor = require("./editor").Editor;
var EditSession = require("./edit_session").EditSession;
var UndoManager = require("./undomanager").UndoManager;
var Renderer = require("./virtual_renderer").VirtualRenderer;
+var MultiSelect = require("./multi_select").MultiSelect;
// The following require()s are for inclusion in the built ace file
require("./worker/worker_client");
require("./keyboard/hash_handler");
+require("./keyboard/state_handler");
require("./placeholder");
-require("./multi_select");
-require("./mode/folding/fold_mode");
-require("./theme/textmate");
-require("./ext/error_marker");
-
exports.config = require("./config");
-
-/**
- * Provides access to require in packed noconflict mode
- * @param {String} moduleName
- * @returns {Object}
- *
- **/
-exports.require = require;
-
-/**
- * Embeds the Ace editor into the DOM, at the element provided by `el`.
- * @param {String | DOMElement} el Either the id of an element, or the element itself
- *
- **/
+ /**
+ * Ace.edit(el) -> Editor
+ * - el (String | DOMElement): Either the id of an element, or the element itself
+ *
+ * This method embeds the Ace editor into the DOM, at the element provided by `el`.
+ *
+ **/
exports.edit = function(el) {
if (typeof(el) == "string") {
- var _id = el;
- el = document.getElementById(_id);
- if (!el)
- throw new Error("ace.edit can't find div #" + _id);
+ el = document.getElementById(el);
}
- if (el && el.env && el.env.editor instanceof Editor)
+ if (el.env && el.env.editor instanceof Editor)
return el.env.editor;
- var value = "";
- if (el && /input|textarea/i.test(el.tagName)) {
- var oldNode = el;
- value = oldNode.value;
- el = dom.createElement("pre");
- oldNode.parentNode.replaceChild(el, oldNode);
- } else {
- value = dom.getInnerText(el);
- el.innerHTML = '';
- }
+ var doc = new EditSession(Dom.getInnerText(el));
+ doc.setUndoManager(new UndoManager());
+ el.innerHTML = '';
- var doc = exports.createEditSession(value);
-
- var editor = new Editor(new Renderer(el));
+ var editor = new Editor(new Renderer(el, require("./theme/textmate")));
+ new MultiSelect(editor);
editor.setSession(doc);
- var env = {
- document: doc,
- editor: editor,
- onResize: editor.resize.bind(editor, null)
- };
- if (oldNode) env.textarea = oldNode;
- event.addListener(window, "resize", env.onResize);
- editor.on("destroy", function() {
- event.removeListener(window, "resize", env.onResize);
- env.editor.container.env = null; // prevent memory leak on old ie
+ var env = {};
+ env.document = doc;
+ env.editor = editor;
+ editor.resize();
+ Event.addListener(window, "resize", function() {
+ editor.resize();
});
- editor.container.env = editor.env = env;
+ el.env = env;
+ // Store env on editor such that it can be accessed later on from
+ // the returned object.
+ editor.env = env;
return editor;
};
-/**
- * Creates a new [[EditSession]], and returns the associated [[Document]].
- * @param {Document | String} text {:textParam}
- * @param {TextMode} mode {:modeParam}
- *
- **/
-exports.createEditSession = function(text, mode) {
- var doc = new EditSession(text, mode);
- doc.setUndoManager(new UndoManager());
- return doc;
-}
-exports.EditSession = EditSession;
-exports.UndoManager = UndoManager;
});
diff --git a/lib/ace/anchor.js b/lib/ace/anchor.js
index 39b78e0f..11809bc0 100644
--- a/lib/ace/anchor.js
+++ b/lib/ace/anchor.js
@@ -1,30 +1,37 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -35,126 +42,143 @@ var oop = require("./lib/oop");
var EventEmitter = require("./lib/event_emitter").EventEmitter;
/**
+ * class Anchor
*
- * Defines a floating pointer in the document. Whenever text is inserted or deleted before the cursor, the position of the anchor is updated.
+ * Defines the floating pointer in the document. Whenever text is inserted or deleted before the cursor, the position of the cursor is updated
*
- * @class Anchor
**/
/**
+ * new Anchor(doc, row, column)
+ * - doc (Document): The document to associate with the anchor
+ * - row (Number): The starting row position
+ * - column (Number): The starting column position
+ *
* Creates a new `Anchor` and associates it with a document.
*
- * @param {Document} doc The document to associate with the anchor
- * @param {Number} row The starting row position
- * @param {Number} column The starting column position
- *
- * @constructor
**/
var Anchor = exports.Anchor = function(doc, row, column) {
- this.$onChange = this.onChange.bind(this);
- this.attach(doc);
+ this.document = doc;
if (typeof column == "undefined")
this.setPosition(row.row, row.column);
else
this.setPosition(row, column);
+
+ this.$onChange = this.onChange.bind(this);
+ doc.on("change", this.$onChange);
};
(function() {
oop.implement(this, EventEmitter);
-
+
/**
+ * Anchor.getPosition() -> Object
+ *
* Returns an object identifying the `row` and `column` position of the current anchor.
- * @returns {Object}
+ *
**/
+
this.getPosition = function() {
return this.$clipPositionToDocument(this.row, this.column);
};
-
- /**
+
+ /**
+ * Anchor.getDocument() -> Document
*
* Returns the current document.
- * @returns {Document}
+ *
**/
+
this.getDocument = function() {
return this.document;
};
-
- /**
- * experimental: allows anchor to stick to the next on the left
- */
- this.$insertRight = false;
- /**
- * Fires whenever the anchor position changes.
- *
- * Both of these objects have a `row` and `column` property corresponding to the position.
- *
- * Events that can trigger this function include [[Anchor.setPosition `setPosition()`]].
- *
- * @event change
- * @param {Object} e An object containing information about the anchor position. It has two properties:
- * - `old`: An object describing the old Anchor position
- * - `value`: An object describing the new Anchor position
- *
- **/
- this.onChange = function(delta) {
- if (delta.start.row == delta.end.row && delta.start.row != this.row)
- return;
-
- if (delta.start.row > this.row)
- return;
-
- var point = $getTransformedPoint(delta, {row: this.row, column: this.column}, this.$insertRight);
- this.setPosition(point.row, point.column, true);
- };
- function $pointsInOrder(point1, point2, equalPointsInOrder) {
- var bColIsAfter = equalPointsInOrder ? point1.column <= point2.column : point1.column < point2.column;
- return (point1.row < point2.row) || (point1.row == point2.row && bColIsAfter);
- }
-
- function $getTransformedPoint(delta, point, moveIfEqual) {
- // Get delta info.
- var deltaIsInsert = delta.action == "insert";
- var deltaRowShift = (deltaIsInsert ? 1 : -1) * (delta.end.row - delta.start.row);
- var deltaColShift = (deltaIsInsert ? 1 : -1) * (delta.end.column - delta.start.column);
- var deltaStart = delta.start;
- var deltaEnd = deltaIsInsert ? deltaStart : delta.end; // Collapse insert range.
-
- // DELTA AFTER POINT: No change needed.
- if ($pointsInOrder(point, deltaStart, moveIfEqual)) {
- return {
- row: point.row,
- column: point.column
- };
- }
-
- // DELTA BEFORE POINT: Move point by delta shift.
- if ($pointsInOrder(deltaEnd, point, !moveIfEqual)) {
- return {
- row: point.row + deltaRowShift,
- column: point.column + (point.row == deltaEnd.row ? deltaColShift : 0)
- };
- }
-
- // DELTA ENVELOPS POINT (delete only): Move point to delta start.
- // TODO warn if delta.action != "remove" ?
-
- return {
- row: deltaStart.row,
- column: deltaStart.column
- };
- }
-
- /**
- * Sets the anchor position to the specified row and column. If `noClip` is `true`, the position is not clipped.
- * @param {Number} row The row index to move the anchor to
- * @param {Number} column The column index to move the anchor to
- * @param {Boolean} noClip Identifies if you want the position to be clipped
+ /**
+ * Anchor@change(e)
+ * - e (Event): Contains data about the event
+ *
+ * Fires whenever the anchor position changes. Events that can trigger this function include `'insertText'`, `'insertLines'`, `'removeText'`, and `'removeLines'`.
*
**/
+
+ this.onChange = function(e) {
+ var delta = e.data;
+ var range = delta.range;
+
+ if (range.start.row == range.end.row && range.start.row != this.row)
+ return;
+
+ if (range.start.row > this.row)
+ return;
+
+ if (range.start.row == this.row && range.start.column > this.column)
+ return;
+
+ var row = this.row;
+ var column = this.column;
+
+ if (delta.action === "insertText") {
+ if (range.start.row === row && range.start.column <= column) {
+ if (range.start.row === range.end.row) {
+ column += range.end.column - range.start.column;
+ }
+ else {
+ column -= range.start.column;
+ row += range.end.row - range.start.row;
+ }
+ }
+ else if (range.start.row !== range.end.row && range.start.row < row) {
+ row += range.end.row - range.start.row;
+ }
+ } else if (delta.action === "insertLines") {
+ if (range.start.row <= row) {
+ row += range.end.row - range.start.row;
+ }
+ }
+ else if (delta.action == "removeText") {
+ if (range.start.row == row && range.start.column < column) {
+ if (range.end.column >= column)
+ column = range.start.column;
+ else
+ column = Math.max(0, column - (range.end.column - range.start.column));
+
+ } else if (range.start.row !== range.end.row && range.start.row < row) {
+ if (range.end.row == row) {
+ column = Math.max(0, column - range.end.column) + range.start.column;
+ }
+ row -= (range.end.row - range.start.row);
+ }
+ else if (range.end.row == row) {
+ row -= range.end.row - range.start.row;
+ column = Math.max(0, column - range.end.column) + range.start.column;
+ }
+ } else if (delta.action == "removeLines") {
+ if (range.start.row <= row) {
+ if (range.end.row <= row)
+ row -= range.end.row - range.start.row;
+ else {
+ row = range.start.row;
+ column = 0;
+ }
+ }
+ }
+
+ this.setPosition(row, column, true);
+ };
+
+ /**
+ * Anchor.setPosition(row, column, noClip)
+ * - row (Number): The row index to move the anchor to
+ * - column (Number): The column index to move the anchor to
+ * - noClip (Boolean): Identifies if you want the position to be clipped
+ *
+ * Sets the anchor position to the specified row and column. If `noClip` is `true`, the position is not clipped.
+ *
+ **/
+
this.setPosition = function(row, column, noClip) {
var pos;
if (noClip) {
@@ -162,47 +186,50 @@ var Anchor = exports.Anchor = function(doc, row, column) {
row: row,
column: column
};
- } else {
+ }
+ else {
pos = this.$clipPositionToDocument(row, column);
}
-
+
if (this.row == pos.row && this.column == pos.column)
return;
-
+
var old = {
row: this.row,
column: this.column
};
-
+
this.row = pos.row;
this.column = pos.column;
- this._signal("change", {
+ this._emit("change", {
old: old,
value: pos
});
};
-
+
/**
- * When called, the `"change"` event listener is removed.
+ * Anchor.detach()
+ *
+ * When called, the `'change'` event listener is removed.
*
**/
+
this.detach = function() {
this.document.removeEventListener("change", this.$onChange);
};
- this.attach = function(doc) {
- this.document = doc || this.document;
- this.document.on("change", this.$onChange);
- };
-
- /**
+
+ /** internal, hide
+ * Anchor.clipPositionToDocument(row, column)
+ * - row (Number): The row index to clip the anchor to
+ * - column (Number): The column index to clip the anchor to
+ *
* Clips the anchor position to the specified row and column.
- * @param {Number} row The row index to clip the anchor to
- * @param {Number} column The column index to clip the anchor to
*
**/
+
this.$clipPositionToDocument = function(row, column) {
var pos = {};
-
+
if (row >= this.document.getLength()) {
pos.row = Math.max(0, this.document.getLength() - 1);
pos.column = this.document.getLine(pos.row).length;
@@ -215,13 +242,13 @@ var Anchor = exports.Anchor = function(doc, row, column) {
pos.row = row;
pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
}
-
+
if (column < 0)
pos.column = 0;
-
+
return pos;
};
-
+
}).call(Anchor.prototype);
});
diff --git a/lib/ace/anchor_test.js b/lib/ace/anchor_test.js
index c0b97273..62511c70 100644
--- a/lib/ace/anchor_test.js
+++ b/lib/ace/anchor_test.js
@@ -1,30 +1,37 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -57,55 +64,20 @@ module.exports = {
doc.insert({row: 1, column: 1}, "123");
assert.position(anchor.getPosition(), 1, 7);
},
-
- "test insert text at anchor should not move anchor when insertRight is true": function() {
- var doc = new Document("juhu\nkinners");
- var anchor = new Anchor(doc, 1, 4);
- anchor.$insertRight = true;
-
- doc.insert({row: 1, column: 4}, "123");
- assert.position(anchor.getPosition(), 1, 4);
- },
"test insert lines before cursor should move anchor row": function() {
var doc = new Document("juhu\nkinners");
var anchor = new Anchor(doc, 1, 4);
- doc.insertFullLines(1, ["123", "456"]);
+ doc.insertLines(1, ["123", "456"]);
assert.position(anchor.getPosition(), 3, 4);
},
-
- "test insert lines at anchor position should move anchor down": function() {
- var doc = new Document("juhu\nkinners");
- var anchor = new Anchor(doc, 1, 0);
-
- doc.insertLines(1, ["line"]);
- assert.position(anchor.getPosition(), 2, 0);
- },
-
- "test insert lines at anchor position should not move anchor down when insertRight is true and column is 0": function() {
- var doc = new Document("juhu\nkinners");
- var anchor = new Anchor(doc, 1, 0);
- anchor.$insertRight = true;
-
- doc.insertLines(1, ["line"]);
- assert.position(anchor.getPosition(), 1, 0);
- },
-
- "test insert lines at anchor row should move anchor down when column > 0": function() {
- var doc = new Document("juhu\nkinners");
- var anchor = new Anchor(doc, 1, 2);
- anchor.$insertRight = true;
-
- doc.insertLines(1, ["line"]);
- assert.position(anchor.getPosition(), 2, 2);
- },
"test insert new line before cursor should move anchor column": function() {
var doc = new Document("juhu\nkinners");
var anchor = new Anchor(doc, 1, 4);
- doc.insertMergedLines({row: 0, column: 0}, ['', '']);
+ doc.insertNewLine({row: 0, column: 0});
assert.position(anchor.getPosition(), 2, 4);
},
@@ -113,7 +85,7 @@ module.exports = {
var doc = new Document("juhu\nkinners");
var anchor = new Anchor(doc, 1, 4);
- doc.insertMergedLines({row: 1, column: 2}, ['', '']);
+ doc.insertNewLine({row: 1, column: 2});
assert.position(anchor.getPosition(), 2, 2);
},
@@ -145,7 +117,7 @@ module.exports = {
var doc = new Document("juhu\n1\n2\nkinners");
var anchor = new Anchor(doc, 3, 4);
- doc.removeFullLines(1, 2);
+ doc.removeLines(1, 2);
assert.position(anchor.getPosition(), 1, 4);
},
@@ -169,7 +141,7 @@ module.exports = {
var doc = new Document("juhu\nkinners\n123");
var anchor = new Anchor(doc, 1, 5);
- doc.removeFullLines(1, 1);
+ doc.removeLines(1, 1);
assert.position(anchor.getPosition(), 1, 0);
},
@@ -202,17 +174,6 @@ module.exports = {
});
doc.remove(new Range(2, 0, 2, 1));
- },
-
- "test insert/remove lines at the end of the document": function() {
- var doc = new Document("juhu\nkinners\n123");
- var anchor = new Anchor(doc, 2, 4);
-
- doc.removeFullLines(0, 3);
- assert.position(anchor.getPosition(), 0, 0);
- doc.insertFullLines(0, ["a", "b", "c"]);
- assert.position(anchor.getPosition(), 3, 0);
- assert.equal(doc.getValue(), "a\nb\nc\n");
}
};
diff --git a/lib/ace/apply_delta.js b/lib/ace/apply_delta.js
deleted file mode 100644
index 98bfe148..00000000
--- a/lib/ace/apply_delta.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-"use strict";
-
-function throwDeltaError(delta, errorText){
- console.log("Invalid Delta:", delta);
- throw "Invalid Delta: " + errorText;
-}
-
-function positionInDocument(docLines, position) {
- return position.row >= 0 && position.row < docLines.length &&
- position.column >= 0 && position.column <= docLines[position.row].length;
-}
-
-function validateDelta(docLines, delta) {
- // Validate action string.
- if (delta.action != "insert" && delta.action != "remove")
- throwDeltaError(delta, "delta.action must be 'insert' or 'remove'");
-
- // Validate lines type.
- if (!(delta.lines instanceof Array))
- throwDeltaError(delta, "delta.lines must be an Array");
-
- // Validate range type.
- if (!delta.start || !delta.end)
- throwDeltaError(delta, "delta.start/end must be an present");
-
- // Validate that the start point is contained in the document.
- var start = delta.start;
- if (!positionInDocument(docLines, delta.start))
- throwDeltaError(delta, "delta.start must be contained in document");
-
- // Validate that the end point is contained in the document (remove deltas only).
- var end = delta.end;
- if (delta.action == "remove" && !positionInDocument(docLines, end))
- throwDeltaError(delta, "delta.end must contained in document for 'remove' actions");
-
- // Validate that the .range size matches the .lines size.
- var numRangeRows = end.row - start.row;
- var numRangeLastLineChars = (end.column - (numRangeRows == 0 ? start.column : 0));
- if (numRangeRows != delta.lines.length - 1 || delta.lines[numRangeRows].length != numRangeLastLineChars)
- throwDeltaError(delta, "delta.range must match delta lines");
-}
-
-exports.applyDelta = function(docLines, delta, doNotValidate) {
- // disabled validation since it breaks autocompletion popup
- // if (!doNotValidate)
- // validateDelta(docLines, delta);
-
- var row = delta.start.row;
- var startColumn = delta.start.column;
- var line = docLines[row] || "";
- switch (delta.action) {
- case "insert":
- var lines = delta.lines;
- if (lines.length === 1) {
- docLines[row] = line.substring(0, startColumn) + delta.lines[0] + line.substring(startColumn);
- } else {
- var args = [row, 1].concat(delta.lines);
- docLines.splice.apply(docLines, args);
- docLines[row] = line.substring(0, startColumn) + docLines[row];
- docLines[row + delta.lines.length - 1] += line.substring(startColumn);
- }
- break;
- case "remove":
- var endColumn = delta.end.column;
- var endRow = delta.end.row;
- if (row === endRow) {
- docLines[row] = line.substring(0, startColumn) + line.substring(endColumn);
- } else {
- docLines.splice(
- row, endRow - row + 1,
- line.substring(0, startColumn) + docLines[endRow].substring(endColumn)
- );
- }
- break;
- }
-}
-});
diff --git a/lib/ace/autocomplete.js b/lib/ace/autocomplete.js
deleted file mode 100644
index 8e121f35..00000000
--- a/lib/ace/autocomplete.js
+++ /dev/null
@@ -1,497 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2012, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-"use strict";
-
-var HashHandler = require("./keyboard/hash_handler").HashHandler;
-var AcePopup = require("./autocomplete/popup").AcePopup;
-var util = require("./autocomplete/util");
-var event = require("./lib/event");
-var lang = require("./lib/lang");
-var dom = require("./lib/dom");
-var snippetManager = require("./snippets").snippetManager;
-
-var Autocomplete = function() {
- this.autoInsert = false;
- this.autoSelect = true;
- this.exactMatch = false;
- this.gatherCompletionsId = 0;
- this.keyboardHandler = new HashHandler();
- this.keyboardHandler.bindKeys(this.commands);
-
- this.blurListener = this.blurListener.bind(this);
- this.changeListener = this.changeListener.bind(this);
- this.mousedownListener = this.mousedownListener.bind(this);
- this.mousewheelListener = this.mousewheelListener.bind(this);
-
- this.changeTimer = lang.delayedCall(function() {
- this.updateCompletions(true);
- }.bind(this));
-
- this.tooltipTimer = lang.delayedCall(this.updateDocTooltip.bind(this), 50);
-};
-
-(function() {
-
- this.$init = function() {
- this.popup = new AcePopup(document.body || document.documentElement);
- this.popup.on("click", function(e) {
- this.insertMatch();
- e.stop();
- }.bind(this));
- this.popup.focus = this.editor.focus.bind(this.editor);
- this.popup.on("show", this.tooltipTimer.bind(null, null));
- this.popup.on("select", this.tooltipTimer.bind(null, null));
- this.popup.on("changeHoverMarker", this.tooltipTimer.bind(null, null));
- return this.popup;
- };
-
- this.getPopup = function() {
- return this.popup || this.$init();
- };
-
- this.openPopup = function(editor, prefix, keepPopupPosition) {
- if (!this.popup)
- this.$init();
-
- this.popup.setData(this.completions.filtered);
-
- editor.keyBinding.addKeyboardHandler(this.keyboardHandler);
-
- var renderer = editor.renderer;
- this.popup.setRow(this.autoSelect ? 0 : -1);
- if (!keepPopupPosition) {
- this.popup.setTheme(editor.getTheme());
- this.popup.setFontSize(editor.getFontSize());
-
- var lineHeight = renderer.layerConfig.lineHeight;
-
- var pos = renderer.$cursorLayer.getPixelPosition(this.base, true);
- pos.left -= this.popup.getTextLeftOffset();
-
- var rect = editor.container.getBoundingClientRect();
- pos.top += rect.top - renderer.layerConfig.offset;
- pos.left += rect.left - editor.renderer.scrollLeft;
- pos.left += renderer.gutterWidth;
-
- this.popup.show(pos, lineHeight);
- } else if (keepPopupPosition && !prefix) {
- this.detach();
- }
- };
-
- this.detach = function() {
- this.editor.keyBinding.removeKeyboardHandler(this.keyboardHandler);
- this.editor.off("changeSelection", this.changeListener);
- this.editor.off("blur", this.blurListener);
- this.editor.off("mousedown", this.mousedownListener);
- this.editor.off("mousewheel", this.mousewheelListener);
- this.changeTimer.cancel();
- this.hideDocTooltip();
-
- this.gatherCompletionsId += 1;
- if (this.popup && this.popup.isOpen)
- this.popup.hide();
-
- if (this.base)
- this.base.detach();
- this.activated = false;
- this.completions = this.base = null;
- };
-
- this.changeListener = function(e) {
- var cursor = this.editor.selection.lead;
- if (cursor.row != this.base.row || cursor.column < this.base.column) {
- this.detach();
- }
- if (this.activated)
- this.changeTimer.schedule();
- else
- this.detach();
- };
-
- this.blurListener = function(e) {
- // we have to check if activeElement is a child of popup because
- // on IE preventDefault doesn't stop scrollbar from being focussed
- var el = document.activeElement;
- var text = this.editor.textInput.getElement();
- var fromTooltip = e.relatedTarget && e.relatedTarget == this.tooltipNode;
- var container = this.popup && this.popup.container;
- if (el != text && el.parentNode != container && !fromTooltip
- && el != this.tooltipNode && e.relatedTarget != text
- ) {
- this.detach();
- }
- };
-
- this.mousedownListener = function(e) {
- this.detach();
- };
-
- this.mousewheelListener = function(e) {
- this.detach();
- };
-
- this.goTo = function(where) {
- var row = this.popup.getRow();
- var max = this.popup.session.getLength() - 1;
-
- switch(where) {
- case "up": row = row <= 0 ? max : row - 1; break;
- case "down": row = row >= max ? -1 : row + 1; break;
- case "start": row = 0; break;
- case "end": row = max; break;
- }
-
- this.popup.setRow(row);
- };
-
- this.insertMatch = function(data) {
- if (!data)
- data = this.popup.getData(this.popup.getRow());
- if (!data)
- return false;
-
- if (data.completer && data.completer.insertMatch) {
- data.completer.insertMatch(this.editor, data);
- } else {
- if (this.completions.filterText) {
- var ranges = this.editor.selection.getAllRanges();
- for (var i = 0, range; range = ranges[i]; i++) {
- range.start.column -= this.completions.filterText.length;
- this.editor.session.remove(range);
- }
- }
- if (data.snippet)
- snippetManager.insertSnippet(this.editor, data.snippet);
- else
- this.editor.execCommand("insertstring", data.value || data);
- }
- this.detach();
- };
-
-
- this.commands = {
- "Up": function(editor) { editor.completer.goTo("up"); },
- "Down": function(editor) { editor.completer.goTo("down"); },
- "Ctrl-Up|Ctrl-Home": function(editor) { editor.completer.goTo("start"); },
- "Ctrl-Down|Ctrl-End": function(editor) { editor.completer.goTo("end"); },
-
- "Esc": function(editor) { editor.completer.detach(); },
- "Return": function(editor) { return editor.completer.insertMatch(); },
- "Shift-Return": function(editor) { editor.completer.insertMatch(true); },
- "Tab": function(editor) {
- var result = editor.completer.insertMatch();
- if (!result && !editor.tabstopManager)
- editor.completer.goTo("down");
- else
- return result;
- },
-
- "PageUp": function(editor) { editor.completer.popup.gotoPageUp(); },
- "PageDown": function(editor) { editor.completer.popup.gotoPageDown(); }
- };
-
- this.gatherCompletions = function(editor, callback) {
- var session = editor.getSession();
- var pos = editor.getCursorPosition();
-
- var line = session.getLine(pos.row);
- var prefix = util.retrievePrecedingIdentifier(line, pos.column);
-
- this.base = session.doc.createAnchor(pos.row, pos.column - prefix.length);
- this.base.$insertRight = true;
-
- var matches = [];
- var total = editor.completers.length;
- editor.completers.forEach(function(completer, i) {
- completer.getCompletions(editor, session, pos, prefix, function(err, results) {
- if (!err)
- matches = matches.concat(results);
- // Fetch prefix again, because they may have changed by now
- var pos = editor.getCursorPosition();
- var line = session.getLine(pos.row);
- callback(null, {
- prefix: util.retrievePrecedingIdentifier(line, pos.column, results[0] && results[0].identifierRegex),
- matches: matches,
- finished: (--total === 0)
- });
- });
- });
- return true;
- };
-
- this.showPopup = function(editor) {
- if (this.editor)
- this.detach();
-
- this.activated = true;
-
- this.editor = editor;
- if (editor.completer != this) {
- if (editor.completer)
- editor.completer.detach();
- editor.completer = this;
- }
-
- editor.on("changeSelection", this.changeListener);
- editor.on("blur", this.blurListener);
- editor.on("mousedown", this.mousedownListener);
- editor.on("mousewheel", this.mousewheelListener);
-
- this.updateCompletions();
- };
-
- this.updateCompletions = function(keepPopupPosition) {
- if (keepPopupPosition && this.base && this.completions) {
- var pos = this.editor.getCursorPosition();
- var prefix = this.editor.session.getTextRange({start: this.base, end: pos});
- if (prefix == this.completions.filterText)
- return;
- this.completions.setFilter(prefix);
- if (!this.completions.filtered.length)
- return this.detach();
- if (this.completions.filtered.length == 1
- && this.completions.filtered[0].value == prefix
- && !this.completions.filtered[0].snippet)
- return this.detach();
- this.openPopup(this.editor, prefix, keepPopupPosition);
- return;
- }
-
- // Save current gatherCompletions session, session is close when a match is insert
- var _id = this.gatherCompletionsId;
- this.gatherCompletions(this.editor, function(err, results) {
- // Only detach if result gathering is finished
- var detachIfFinished = function() {
- if (!results.finished) return;
- return this.detach();
- }.bind(this);
-
- var prefix = results.prefix;
- var matches = results && results.matches;
-
- if (!matches || !matches.length)
- return detachIfFinished();
-
- // Wrong prefix or wrong session -> ignore
- if (prefix.indexOf(results.prefix) !== 0 || _id != this.gatherCompletionsId)
- return;
-
- this.completions = new FilteredList(matches);
-
- if (this.exactMatch)
- this.completions.exactMatch = true;
-
- this.completions.setFilter(prefix);
- var filtered = this.completions.filtered;
-
- // No results
- if (!filtered.length)
- return detachIfFinished();
-
- // One result equals to the prefix
- if (filtered.length == 1 && filtered[0].value == prefix && !filtered[0].snippet)
- return detachIfFinished();
-
- // Autoinsert if one result
- if (this.autoInsert && filtered.length == 1 && results.finished)
- return this.insertMatch(filtered[0]);
-
- this.openPopup(this.editor, prefix, keepPopupPosition);
- }.bind(this));
- };
-
- this.cancelContextMenu = function() {
- this.editor.$mouseHandler.cancelContextMenu();
- };
-
- this.updateDocTooltip = function() {
- var popup = this.popup;
- var all = popup.data;
- var selected = all && (all[popup.getHoveredRow()] || all[popup.getRow()]);
- var doc = null;
- if (!selected || !this.editor || !this.popup.isOpen)
- return this.hideDocTooltip();
- this.editor.completers.some(function(completer) {
- if (completer.getDocTooltip)
- doc = completer.getDocTooltip(selected);
- return doc;
- });
- if (!doc)
- doc = selected;
-
- if (typeof doc == "string")
- doc = {docText: doc};
- if (!doc || !(doc.docHTML || doc.docText))
- return this.hideDocTooltip();
- this.showDocTooltip(doc);
- };
-
- this.showDocTooltip = function(item) {
- if (!this.tooltipNode) {
- this.tooltipNode = dom.createElement("div");
- this.tooltipNode.className = "ace_tooltip ace_doc-tooltip";
- this.tooltipNode.style.margin = 0;
- this.tooltipNode.style.pointerEvents = "auto";
- this.tooltipNode.tabIndex = -1;
- this.tooltipNode.onblur = this.blurListener.bind(this);
- }
-
- var tooltipNode = this.tooltipNode;
- if (item.docHTML) {
- tooltipNode.innerHTML = item.docHTML;
- } else if (item.docText) {
- tooltipNode.textContent = item.docText;
- }
-
- if (!tooltipNode.parentNode)
- document.body.appendChild(tooltipNode);
- var popup = this.popup;
- var rect = popup.container.getBoundingClientRect();
- tooltipNode.style.top = popup.container.style.top;
- tooltipNode.style.bottom = popup.container.style.bottom;
-
- if (window.innerWidth - rect.right < 320) {
- tooltipNode.style.right = window.innerWidth - rect.left + "px";
- tooltipNode.style.left = "";
- } else {
- tooltipNode.style.left = (rect.right + 1) + "px";
- tooltipNode.style.right = "";
- }
- tooltipNode.style.display = "block";
- };
-
- this.hideDocTooltip = function() {
- this.tooltipTimer.cancel();
- if (!this.tooltipNode) return;
- var el = this.tooltipNode;
- if (!this.editor.isFocused() && document.activeElement == el)
- this.editor.focus();
- this.tooltipNode = null;
- if (el.parentNode)
- el.parentNode.removeChild(el);
- };
-
-}).call(Autocomplete.prototype);
-
-Autocomplete.startCommand = {
- name: "startAutocomplete",
- exec: function(editor) {
- if (!editor.completer)
- editor.completer = new Autocomplete();
- editor.completer.autoInsert = false;
- editor.completer.autoSelect = true;
- editor.completer.showPopup(editor);
- // prevent ctrl-space opening context menu on firefox on mac
- editor.completer.cancelContextMenu();
- },
- bindKey: "Ctrl-Space|Ctrl-Shift-Space|Alt-Space"
-};
-
-var FilteredList = function(array, filterText) {
- this.all = array;
- this.filtered = array;
- this.filterText = filterText || "";
- this.exactMatch = false;
-};
-(function(){
- this.setFilter = function(str) {
- if (str.length > this.filterText && str.lastIndexOf(this.filterText, 0) === 0)
- var matches = this.filtered;
- else
- var matches = this.all;
-
- this.filterText = str;
- matches = this.filterCompletions(matches, this.filterText);
- matches = matches.sort(function(a, b) {
- return b.exactMatch - a.exactMatch || b.score - a.score;
- });
-
- // make unique
- var prev = null;
- matches = matches.filter(function(item){
- var caption = item.snippet || item.caption || item.value;
- if (caption === prev) return false;
- prev = caption;
- return true;
- });
-
- this.filtered = matches;
- };
- this.filterCompletions = function(items, needle) {
- var results = [];
- var upper = needle.toUpperCase();
- var lower = needle.toLowerCase();
- loop: for (var i = 0, item; item = items[i]; i++) {
- var caption = item.value || item.caption || item.snippet;
- if (!caption) continue;
- var lastIndex = -1;
- var matchMask = 0;
- var penalty = 0;
- var index, distance;
-
- if (this.exactMatch) {
- if (needle !== caption.substr(0, needle.length))
- continue loop;
- }else{
- // caption char iteration is faster in Chrome but slower in Firefox, so lets use indexOf
- for (var j = 0; j < needle.length; j++) {
- // TODO add penalty on case mismatch
- var i1 = caption.indexOf(lower[j], lastIndex + 1);
- var i2 = caption.indexOf(upper[j], lastIndex + 1);
- index = (i1 >= 0) ? ((i2 < 0 || i1 < i2) ? i1 : i2) : i2;
- if (index < 0)
- continue loop;
- distance = index - lastIndex - 1;
- if (distance > 0) {
- // first char mismatch should be more sensitive
- if (lastIndex === -1)
- penalty += 10;
- penalty += distance;
- }
- matchMask = matchMask | (1 << index);
- lastIndex = index;
- }
- }
- item.matchMask = matchMask;
- item.exactMatch = penalty ? 0 : 1;
- item.score = (item.score || 0) - penalty;
- results.push(item);
- }
- return results;
- };
-}).call(FilteredList.prototype);
-
-exports.Autocomplete = Autocomplete;
-exports.FilteredList = FilteredList;
-
-});
diff --git a/lib/ace/autocomplete/popup.js b/lib/ace/autocomplete/popup.js
deleted file mode 100644
index 6c480b38..00000000
--- a/lib/ace/autocomplete/popup.js
+++ /dev/null
@@ -1,344 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2012, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-"use strict";
-
-var Renderer = require("../virtual_renderer").VirtualRenderer;
-var Editor = require("../editor").Editor;
-var Range = require("../range").Range;
-var event = require("../lib/event");
-var lang = require("../lib/lang");
-var dom = require("../lib/dom");
-
-var $singleLineEditor = function(el) {
- var renderer = new Renderer(el);
-
- renderer.$maxLines = 4;
-
- var editor = new Editor(renderer);
-
- editor.setHighlightActiveLine(false);
- editor.setShowPrintMargin(false);
- editor.renderer.setShowGutter(false);
- editor.renderer.setHighlightGutterLine(false);
-
- editor.$mouseHandler.$focusWaitTimout = 0;
- editor.$highlightTagPending = true;
-
- return editor;
-};
-
-var AcePopup = function(parentNode) {
- var el = dom.createElement("div");
- var popup = new $singleLineEditor(el);
-
- if (parentNode)
- parentNode.appendChild(el);
- el.style.display = "none";
- popup.renderer.content.style.cursor = "default";
- popup.renderer.setStyle("ace_autocomplete");
-
- popup.setOption("displayIndentGuides", false);
- popup.setOption("dragDelay", 150);
-
- var noop = function(){};
-
- popup.focus = noop;
- popup.$isFocused = true;
-
- popup.renderer.$cursorLayer.restartTimer = noop;
- popup.renderer.$cursorLayer.element.style.opacity = 0;
-
- popup.renderer.$maxLines = 8;
- popup.renderer.$keepTextAreaAtCursor = false;
-
- popup.setHighlightActiveLine(false);
- // set default highlight color
- popup.session.highlight("");
- popup.session.$searchHighlight.clazz = "ace_highlight-marker";
-
- popup.on("mousedown", function(e) {
- var pos = e.getDocumentPosition();
- popup.selection.moveToPosition(pos);
- selectionMarker.start.row = selectionMarker.end.row = pos.row;
- e.stop();
- });
-
- var lastMouseEvent;
- var hoverMarker = new Range(-1,0,-1,Infinity);
- var selectionMarker = new Range(-1,0,-1,Infinity);
- selectionMarker.id = popup.session.addMarker(selectionMarker, "ace_active-line", "fullLine");
- popup.setSelectOnHover = function(val) {
- if (!val) {
- hoverMarker.id = popup.session.addMarker(hoverMarker, "ace_line-hover", "fullLine");
- } else if (hoverMarker.id) {
- popup.session.removeMarker(hoverMarker.id);
- hoverMarker.id = null;
- }
- };
- popup.setSelectOnHover(false);
- popup.on("mousemove", function(e) {
- if (!lastMouseEvent) {
- lastMouseEvent = e;
- return;
- }
- if (lastMouseEvent.x == e.x && lastMouseEvent.y == e.y) {
- return;
- }
- lastMouseEvent = e;
- lastMouseEvent.scrollTop = popup.renderer.scrollTop;
- var row = lastMouseEvent.getDocumentPosition().row;
- if (hoverMarker.start.row != row) {
- if (!hoverMarker.id)
- popup.setRow(row);
- setHoverMarker(row);
- }
- });
- popup.renderer.on("beforeRender", function() {
- if (lastMouseEvent && hoverMarker.start.row != -1) {
- lastMouseEvent.$pos = null;
- var row = lastMouseEvent.getDocumentPosition().row;
- if (!hoverMarker.id)
- popup.setRow(row);
- setHoverMarker(row, true);
- }
- });
- popup.renderer.on("afterRender", function() {
- var row = popup.getRow();
- var t = popup.renderer.$textLayer;
- var selected = t.element.childNodes[row - t.config.firstRow];
- if (selected == t.selectedNode)
- return;
- if (t.selectedNode)
- dom.removeCssClass(t.selectedNode, "ace_selected");
- t.selectedNode = selected;
- if (selected)
- dom.addCssClass(selected, "ace_selected");
- });
- var hideHoverMarker = function() { setHoverMarker(-1) };
- var setHoverMarker = function(row, suppressRedraw) {
- if (row !== hoverMarker.start.row) {
- hoverMarker.start.row = hoverMarker.end.row = row;
- if (!suppressRedraw)
- popup.session._emit("changeBackMarker");
- popup._emit("changeHoverMarker");
- }
- };
- popup.getHoveredRow = function() {
- return hoverMarker.start.row;
- };
-
- event.addListener(popup.container, "mouseout", hideHoverMarker);
- popup.on("hide", hideHoverMarker);
- popup.on("changeSelection", hideHoverMarker);
-
- popup.session.doc.getLength = function() {
- return popup.data.length;
- };
- popup.session.doc.getLine = function(i) {
- var data = popup.data[i];
- if (typeof data == "string")
- return data;
- return (data && data.value) || "";
- };
-
- var bgTokenizer = popup.session.bgTokenizer;
- bgTokenizer.$tokenizeRow = function(row) {
- var data = popup.data[row];
- var tokens = [];
- if (!data)
- return tokens;
- if (typeof data == "string")
- data = {value: data};
- if (!data.caption)
- data.caption = data.value || data.name;
-
- var last = -1;
- var flag, c;
- for (var i = 0; i < data.caption.length; i++) {
- c = data.caption[i];
- flag = data.matchMask & (1 << i) ? 1 : 0;
- if (last !== flag) {
- tokens.push({type: data.className || "" + ( flag ? "completion-highlight" : ""), value: c});
- last = flag;
- } else {
- tokens[tokens.length - 1].value += c;
- }
- }
-
- if (data.meta) {
- var maxW = popup.renderer.$size.scrollerWidth / popup.renderer.layerConfig.characterWidth;
- var metaData = data.meta;
- if (metaData.length + data.caption.length > maxW - 2) {
- // trim meta to fit this popup and add ellipsis
- metaData = metaData.substr(0, maxW - data.caption.length - 3) + "\u2026"
- }
- tokens.push({type: "rightAlignedText", value: metaData});
- }
- return tokens;
- };
- bgTokenizer.$updateOnChange = noop;
- bgTokenizer.start = noop;
-
- popup.session.$computeWidth = function() {
- return this.screenWidth = 0;
- };
-
- popup.$blockScrolling = Infinity;
-
- // public
- popup.isOpen = false;
- popup.isTopdown = false;
-
- popup.data = [];
- popup.setData = function(list) {
- popup.setValue(lang.stringRepeat("\n", list.length), -1);
- popup.data = list || [];
- popup.setRow(0);
- };
- popup.getData = function(row) {
- return popup.data[row];
- };
-
- popup.getRow = function() {
- return selectionMarker.start.row;
- };
- popup.setRow = function(line) {
- line = Math.max(-1, Math.min(this.data.length, line));
- if (selectionMarker.start.row != line) {
- popup.selection.clearSelection();
- selectionMarker.start.row = selectionMarker.end.row = line || 0;
- popup.session._emit("changeBackMarker");
- popup.moveCursorTo(line || 0, 0);
- if (popup.isOpen)
- popup._signal("select");
- }
- };
-
- popup.on("changeSelection", function() {
- if (popup.isOpen)
- popup.setRow(popup.selection.lead.row);
- popup.renderer.scrollCursorIntoView();
- });
-
- popup.hide = function() {
- this.container.style.display = "none";
- this._signal("hide");
- popup.isOpen = false;
- };
- popup.show = function(pos, lineHeight, topdownOnly) {
- var el = this.container;
- var screenHeight = window.innerHeight;
- var screenWidth = window.innerWidth;
- var renderer = this.renderer;
- // var maxLines = Math.min(renderer.$maxLines, this.session.getLength());
- var maxH = renderer.$maxLines * lineHeight * 1.4;
- var top = pos.top + this.$borderSize;
- if (top + maxH > screenHeight - lineHeight && !topdownOnly) {
- el.style.top = "";
- el.style.bottom = screenHeight - top + "px";
- popup.isTopdown = false;
- } else {
- top += lineHeight;
- el.style.top = top + "px";
- el.style.bottom = "";
- popup.isTopdown = true;
- }
-
- el.style.display = "";
- this.renderer.$textLayer.checkForSizeChanges();
-
- var left = pos.left;
- if (left + el.offsetWidth > screenWidth)
- left = screenWidth - el.offsetWidth;
-
- el.style.left = left + "px";
-
- this._signal("show");
- lastMouseEvent = null;
- popup.isOpen = true;
- };
-
- popup.getTextLeftOffset = function() {
- return this.$borderSize + this.renderer.$padding + this.$imageSize;
- };
-
- popup.$imageSize = 0;
- popup.$borderSize = 1;
-
- return popup;
-};
-
-dom.importCssString("\
-.ace_editor.ace_autocomplete .ace_marker-layer .ace_active-line {\
- background-color: #CAD6FA;\
- z-index: 1;\
-}\
-.ace_editor.ace_autocomplete .ace_line-hover {\
- border: 1px solid #abbffe;\
- margin-top: -1px;\
- background: rgba(233,233,253,0.4);\
-}\
-.ace_editor.ace_autocomplete .ace_line-hover {\
- position: absolute;\
- z-index: 2;\
-}\
-.ace_editor.ace_autocomplete .ace_scroller {\
- background: none;\
- border: none;\
- box-shadow: none;\
-}\
-.ace_rightAlignedText {\
- color: gray;\
- display: inline-block;\
- position: absolute;\
- right: 4px;\
- text-align: right;\
- z-index: -1;\
-}\
-.ace_editor.ace_autocomplete .ace_completion-highlight{\
- color: #000;\
- text-shadow: 0 0 0.01em;\
-}\
-.ace_editor.ace_autocomplete {\
- width: 280px;\
- z-index: 200000;\
- background: #fbfbfb;\
- color: #444;\
- border: 1px lightgray solid;\
- position: fixed;\
- box-shadow: 2px 3px 5px rgba(0,0,0,.2);\
- line-height: 1.4;\
-}");
-
-exports.AcePopup = AcePopup;
-
-});
diff --git a/lib/ace/autocomplete/text_completer.js b/lib/ace/autocomplete/text_completer.js
deleted file mode 100644
index 17a4bdad..00000000
--- a/lib/ace/autocomplete/text_completer.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2012, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
- var Range = require("../range").Range;
-
- var splitRegex = /[^a-zA-Z_0-9\$\-\u00C0-\u1FFF\u2C00-\uD7FF\w]+/;
-
- function getWordIndex(doc, pos) {
- var textBefore = doc.getTextRange(Range.fromPoints({row: 0, column:0}, pos));
- return textBefore.split(splitRegex).length - 1;
- }
-
- /**
- * Does a distance analysis of the word `prefix` at position `pos` in `doc`.
- * @return Map
- */
- function wordDistance(doc, pos) {
- var prefixPos = getWordIndex(doc, pos);
- var words = doc.getValue().split(splitRegex);
- var wordScores = Object.create(null);
-
- var currentWord = words[prefixPos];
-
- words.forEach(function(word, idx) {
- if (!word || word === currentWord) return;
-
- var distance = Math.abs(prefixPos - idx);
- var score = words.length - distance;
- if (wordScores[word]) {
- wordScores[word] = Math.max(score, wordScores[word]);
- } else {
- wordScores[word] = score;
- }
- });
- return wordScores;
- }
-
- exports.getCompletions = function(editor, session, pos, prefix, callback) {
- var wordScore = wordDistance(session, pos, prefix);
- var wordList = Object.keys(wordScore);
- callback(null, wordList.map(function(word) {
- return {
- caption: word,
- value: word,
- score: wordScore[word],
- meta: "local"
- };
- }));
- };
-});
diff --git a/lib/ace/autocomplete/util.js b/lib/ace/autocomplete/util.js
deleted file mode 100644
index 767b983e..00000000
--- a/lib/ace/autocomplete/util.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2012, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-"use strict";
-
-exports.parForEach = function(array, fn, callback) {
- var completed = 0;
- var arLength = array.length;
- if (arLength === 0)
- callback();
- for (var i = 0; i < arLength; i++) {
- fn(array[i], function(result, err) {
- completed++;
- if (completed === arLength)
- callback(result, err);
- });
- }
-};
-
-var ID_REGEX = /[a-zA-Z_0-9\$\-\u00A2-\uFFFF]/;
-
-exports.retrievePrecedingIdentifier = function(text, pos, regex) {
- regex = regex || ID_REGEX;
- var buf = [];
- for (var i = pos-1; i >= 0; i--) {
- if (regex.test(text[i]))
- buf.push(text[i]);
- else
- break;
- }
- return buf.reverse().join("");
-};
-
-exports.retrieveFollowingIdentifier = function(text, pos, regex) {
- regex = regex || ID_REGEX;
- var buf = [];
- for (var i = pos; i < text.length; i++) {
- if (regex.test(text[i]))
- buf.push(text[i]);
- else
- break;
- }
- return buf;
-};
-
-});
diff --git a/lib/ace/background_tokenizer.js b/lib/ace/background_tokenizer.js
index ea4ddd0f..7422d36d 100644
--- a/lib/ace/background_tokenizer.js
+++ b/lib/ace/background_tokenizer.js
@@ -1,30 +1,37 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -34,21 +41,24 @@ define(function(require, exports, module) {
var oop = require("./lib/oop");
var EventEmitter = require("./lib/event_emitter").EventEmitter;
+// tokenizing lines longer than this makes editor very slow
+var MAX_LINE_LENGTH = 5000;
/**
- * Tokenizes the current [[Document `Document`]] in the background, and caches the tokenized rows for future use.
- *
- * If a certain row is changed, everything below that row is re-tokenized.
+ * class BackgroundTokenizer
+ *
+ * Tokenizes the current [[Document `Document`]] in the background, and caches the tokenized rows for future use. If a certain row is changed, everything below that row is re-tokenized.
*
- * @class BackgroundTokenizer
**/
/**
- * Creates a new `BackgroundTokenizer` object.
- * @param {Tokenizer} tokenizer The tokenizer to use
- * @param {Editor} editor The editor to associate with
+ * new BackgroundTokenizer(tokenizer, editor)
+ * - tokenizer (Tokenizer): The tokenizer to use
+ * - editor (Editor): The editor to associate with
+ *
+ * Creates a new `BackgroundTokenizer` object.
+ *
*
- * @constructor
**/
var BackgroundTokenizer = function(tokenizer, editor) {
@@ -64,35 +74,29 @@ var BackgroundTokenizer = function(tokenizer, editor) {
if (!self.running) { return; }
var workerStart = new Date();
- var currentLine = self.currentLine;
- var endLine = -1;
+ var startLine = self.currentLine;
var doc = self.doc;
- var startLine = currentLine;
- while (self.lines[currentLine])
- currentLine++;
-
- var len = doc.getLength();
var processedLines = 0;
- self.running = false;
- while (currentLine < len) {
- self.$tokenizeRow(currentLine);
- endLine = currentLine;
- do {
- currentLine++;
- } while (self.lines[currentLine]);
+
+ var len = doc.getLength();
+ while (self.currentLine < len) {
+ self.$tokenizeRow(self.currentLine);
+ while (self.lines[self.currentLine])
+ self.currentLine++;
// only check every 5 lines
processedLines ++;
- if ((processedLines % 5 === 0) && (new Date() - workerStart) > 20) {
+ if ((processedLines % 5 == 0) && (new Date() - workerStart) > 20) {
+ self.fireUpdateEvent(startLine, self.currentLine-1);
self.running = setTimeout(self.$worker, 20);
- break;
+ return;
}
}
- self.currentLine = currentLine;
-
- if (startLine <= endLine)
- self.fireUpdateEvent(startLine, endLine);
+
+ self.running = false;
+
+ self.fireUpdateEvent(startLine, len - 1);
};
};
@@ -101,9 +105,10 @@ var BackgroundTokenizer = function(tokenizer, editor) {
oop.implement(this, EventEmitter);
/**
- * Sets a new tokenizer for this object.
+ * BackgroundTokenizer.setTokenizer(tokenizer)
+ * - tokenizer (Tokenizer): The new tokenizer to use
*
- * @param {Tokenizer} tokenizer The new tokenizer to use
+ * Sets a new tokenizer for this object.
*
**/
this.setTokenizer = function(tokenizer) {
@@ -115,8 +120,11 @@ var BackgroundTokenizer = function(tokenizer, editor) {
};
/**
+ * BackgroundTokenizer.setDocument(doc)
+ * - doc (Document): The new document to associate with
+ *
* Sets a new document to associate with this object.
- * @param {Document} doc The new document to associate with
+ *
**/
this.setDocument = function(doc) {
this.doc = doc;
@@ -126,17 +134,12 @@ var BackgroundTokenizer = function(tokenizer, editor) {
this.stop();
};
- /**
- * Fires whenever the background tokeniziers between a range of rows are going to be updated.
- *
- * @event update
- * @param {Object} e An object containing two properties, `first` and `last`, which indicate the rows of the region being updated.
- *
- **/
/**
+ * BackgroundTokenizer.fireUpdateEvent(firstRow, lastRow)
+ * - firstRow (Number): The starting row region
+ * - lastRow (Number): The final row region
+ *
* Emits the `'update'` event. `firstRow` and `lastRow` are used to define the boundaries of the region to be updated.
- * @param {Number} firstRow The starting row region
- * @param {Number} lastRow The final row region
*
**/
this.fireUpdateEvent = function(firstRow, lastRow) {
@@ -144,13 +147,14 @@ var BackgroundTokenizer = function(tokenizer, editor) {
first: firstRow,
last: lastRow
};
- this._signal("update", {data: data});
+ this._emit("update", {data: data});
};
/**
- * Starts tokenizing at the row indicated.
+ * BackgroundTokenizer.start(startRow)
+ * - startRow (Number): The row to start at
*
- * @param {Number} startRow The row to start at
+ * Starts tokenizing at the row indicated.
*
**/
this.start = function(startRow) {
@@ -164,19 +168,15 @@ var BackgroundTokenizer = function(tokenizer, editor) {
// pretty long delay to prevent the tokenizer from interfering with the user
this.running = setTimeout(this.$worker, 700);
};
-
- this.scheduleStart = function() {
- if (!this.running)
- this.running = setTimeout(this.$worker, 700);
- }
this.$updateOnChange = function(delta) {
- var startRow = delta.start.row;
- var len = delta.end.row - startRow;
+ var range = delta.range;
+ var startRow = range.start.row;
+ var len = range.end.row - startRow;
if (len === 0) {
this.lines[startRow] = null;
- } else if (delta.action == "remove") {
+ } else if (delta.action == "removeText" || delta.action == "removeLines") {
this.lines.splice(startRow, len + 1, null);
this.states.splice(startRow, len + 1, null);
} else {
@@ -189,9 +189,13 @@ var BackgroundTokenizer = function(tokenizer, editor) {
this.currentLine = Math.min(startRow, this.currentLine, this.doc.getLength());
this.stop();
+ // pretty long delay to prevent the tokenizer from interfering with the user
+ this.running = setTimeout(this.$worker, 700);
};
/**
+ * BackgroundTokenizer.stop()
+ *
* Stops tokenizing.
*
**/
@@ -202,11 +206,10 @@ var BackgroundTokenizer = function(tokenizer, editor) {
};
/**
- * Gives list of tokens of the row. (tokens are cached)
- *
- * @param {Number} row The row to get tokens at
+ * BackgroundTokenizer.getTokens(row) -> [Object]
+ * - row (Number): The row to get tokens at
*
- *
+ * Gives list of tokens of the row. (tokens are cached)
*
**/
this.getTokens = function(row) {
@@ -214,9 +217,10 @@ var BackgroundTokenizer = function(tokenizer, editor) {
};
/**
- * [Returns the state of tokenization at the end of a row.]{: #BackgroundTokenizer.getState}
+ * BackgroundTokenizer.getState(row) -> String
+ * - row (Number): The row to get state at
*
- * @param {Number} row The row to get state at
+ * [Returns the state of tokenization at the end of a row.]{: #BackgroundTokenizer.getState}
**/
this.getState = function(row) {
if (this.currentLine == row)
@@ -228,9 +232,17 @@ var BackgroundTokenizer = function(tokenizer, editor) {
var line = this.doc.getLine(row);
var state = this.states[row - 1];
- var data = this.tokenizer.getLineTokens(line, state, row);
+ if (line.length > MAX_LINE_LENGTH) {
+ var overflow = {value: line.substr(MAX_LINE_LENGTH), type: "text"};
+ line = line.slice(0, MAX_LINE_LENGTH);
+ }
+ var data = this.tokenizer.getLineTokens(line, state);
+ if (overflow) {
+ data.tokens.push(overflow);
+ data.state = "start";
+ }
- if (this.states[row] + "" !== data.state + "") {
+ if (this.states[row] !== data.state) {
this.states[row] = data.state;
this.lines[row + 1] = null;
if (this.currentLine > row + 1)
diff --git a/lib/ace/background_tokenizer_test.js b/lib/ace/background_tokenizer_test.js
index fd738d06..5b93a371 100644
--- a/lib/ace/background_tokenizer_test.js
+++ b/lib/ace/background_tokenizer_test.js
@@ -1,30 +1,37 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Harutyun Amirjanyan
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -62,62 +69,19 @@ module.exports = {
doc.setMode("./mode/javascript")
forceTokenize(doc)
- testStates(doc, ["comment_regex_allowed", "start", "no_regex"])
+ testStates(doc, ["comment", "start", "start"])
doc.remove(new Range(0,2,1,2))
- testStates(doc, [null, "no_regex"])
+ testStates(doc, [null, "start"])
forceTokenize(doc)
- testStates(doc, ["comment_regex_allowed", "comment_regex_allowed"])
+ testStates(doc, ["comment", "comment"])
doc.insert({row:0, column:2}, "\n*/")
- testStates(doc, [undefined, undefined, "comment_regex_allowed"])
+ testStates(doc, [undefined, undefined, "comment"])
forceTokenize(doc)
- testStates(doc, ["comment_regex_allowed", "start", "no_regex"])
- },
- "test background tokenizer sends update event" : function() {
- var doc = new EditSession([
- "/*",
- "var",
- "juhu",
- "*/"
- ]);
- doc.setMode("./mode/javascript");
-
- var updateEvent = null;
- doc.bgTokenizer.on("update", function(e) {
- updateEvent = e.data;
- });
- function checkEvent(first, last) {
- assert.ok(!updateEvent, "unneccessary update event");
- doc.bgTokenizer.running = 1;
- doc.bgTokenizer.$worker();
- assert.ok(updateEvent);
- assert.equal([first, last] + "",
- [updateEvent.first, updateEvent.last] + "")
- updateEvent = null;
- }
-
- forceTokenize(doc);
- var comment = "comment_regex_allowed";
- testStates(doc, [comment, comment, comment, "start"]);
-
- doc.remove(new Range(0,0,0,2));
- testStates(doc, [comment, comment, comment, "start"]);
-
- checkEvent(0, 3);
- testStates(doc, ["start", "no_regex", "no_regex", "regex"]);
-
- // insert /* and and press down several times quickly
- doc.insert({row:0, column:0}, "/*");
- doc.getTokens(0);
- doc.getTokens(1);
- doc.getTokens(2);
- checkEvent(0, 3);
-
- forceTokenize(doc);
- testStates(doc, [comment, comment, comment, "start"]);
+ testStates(doc, ["comment", "start", "start"])
}
};
diff --git a/lib/ace/commands/command_manager.js b/lib/ace/commands/command_manager.js
index df30ef9b..ee7c8561 100644
--- a/lib/ace/commands/command_manager.js
+++ b/lib/ace/commands/command_manager.js
@@ -2,44 +2,47 @@ define(function(require, exports, module) {
"use strict";
var oop = require("../lib/oop");
-var MultiHashHandler = require("../keyboard/hash_handler").MultiHashHandler;
+var HashHandler = require("../keyboard/hash_handler").HashHandler;
var EventEmitter = require("../lib/event_emitter").EventEmitter;
/**
- * @class CommandManager
+ * class CommandManager
+ *
+ *
+ *
*
**/
/**
* new CommandManager(platform, commands)
- * @param {String} platform Identifier for the platform; must be either `"mac"` or `"win"`
- * @param {Array} commands A list of commands
+ * - platform (String): Identifier for the platform; must be either `'mac'` or `'win'`
+ * - commands (Array): A list of commands
+ *
+ * TODO
+ *
*
**/
var CommandManager = function(platform, commands) {
- MultiHashHandler.call(this, commands, platform);
- this.byName = this.commands;
+ this.platform = platform;
+ this.commands = {};
+ this.commmandKeyBinding = {};
+
+ this.addCommands(commands);
+
this.setDefaultHandler("exec", function(e) {
return e.command.exec(e.editor, e.args || {});
});
};
-oop.inherits(CommandManager, MultiHashHandler);
+oop.inherits(CommandManager, HashHandler);
(function() {
oop.implement(this, EventEmitter);
this.exec = function(command, editor, args) {
- if (Array.isArray(command)) {
- for (var i = command.length; i--; ) {
- if (this.exec(command[i], editor, args)) return true;
- }
- return false;
- }
-
- if (typeof command === "string")
+ if (typeof command === 'string')
command = this.commands[command];
if (!command)
@@ -48,11 +51,13 @@ oop.inherits(CommandManager, MultiHashHandler);
if (editor && editor.$readOnly && !command.readOnly)
return false;
- var e = {editor: editor, command: command, args: args};
- e.returnValue = this._emit("exec", e);
- this._signal("afterExec", e);
+ var retvalue = this._emit("exec", {
+ editor: editor,
+ command: command,
+ args: args
+ });
- return e.returnValue === false ? false : true;
+ return retvalue === false ? false : true;
};
this.toggleRecording = function(editor) {
diff --git a/lib/ace/commands/command_manager_test.js b/lib/ace/commands/command_manager_test.js
index 902600be..71a37117 100644
--- a/lib/ace/commands/command_manager_test.js
+++ b/lib/ace/commands/command_manager_test.js
@@ -1,30 +1,37 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -61,20 +68,20 @@ module.exports = {
},
"test: mac hotkeys": function() {
- var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "l");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "L");
assert.equal(command, this.command);
- var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "l");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "L");
assert.equal(command, undefined);
},
"test: win hotkeys": function() {
var cm = new CommandManager("win", [this.command]);
- var command = cm.findKeyCommand(keys.KEY_MODS.command, "l");
+ var command = cm.findKeyCommand(keys.KEY_MODS.command, "L");
assert.equal(command, undefined);
- var command = cm.findKeyCommand(keys.KEY_MODS.ctrl, "l");
+ var command = cm.findKeyCommand(keys.KEY_MODS.ctrl, "L");
assert.equal(command, this.command);
},
@@ -84,7 +91,7 @@ module.exports = {
this.cm.exec("gotoline");
assert.ok(!this.command.called);
- var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "l");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "L");
assert.equal(command, null);
},
@@ -94,7 +101,7 @@ module.exports = {
this.cm.exec("gotoline");
assert.ok(!this.command.called);
- var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "l");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "L");
assert.equal(command, null);
},
@@ -114,7 +121,7 @@ module.exports = {
assert.ok(command.called);
assert.ok(!this.command.called);
- assert.equal(this.cm.findKeyCommand(keys.KEY_MODS.command, "l"), command);
+ assert.equal(this.cm.findKeyCommand(keys.KEY_MODS.command, "L"), command);
},
"test: adding commands and recording a macro": function() {
@@ -154,41 +161,33 @@ module.exports = {
},
"test: bindkeys": function() {
+ var called = "";
+ this.cm.addCommands({
+ cm1: function(editor, arg) {
+ called += "1" + (arg || "");
+ },
+ cm2: function(editor) {
+ called += "2";
+ }
+ });
+
this.cm.bindKeys({
"Ctrl-L|Command-C": "cm1",
"Ctrl-R": "cm2"
});
- var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "c");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.command, "C");
assert.equal(command, "cm1");
- var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "r");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "R");
assert.equal(command, "cm2");
this.cm.bindKeys({
"Ctrl-R": null
});
- var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "r");
+ var command = this.cm.findKeyCommand(keys.KEY_MODS.ctrl, "R");
assert.equal(command, null);
- },
-
- "test: binding keys without modifiers": function() {
- this.cm.bindKeys({
- "R": "cm1",
- "Shift-r": "cm2",
- "Return": "cm4",
- "Enter": "cm3"
- });
-
- var command = this.cm.findKeyCommand(-1, "r");
- assert.equal(command, "cm1");
-
- var command = this.cm.findKeyCommand(-1, "R");
- assert.equal(command, "cm2");
-
- var command = this.cm.findKeyCommand(0, "return");
- assert.equal(command + "", ["cm4", "cm3"] + "");
}
};
diff --git a/lib/ace/commands/default_commands.js b/lib/ace/commands/default_commands.js
index de14df85..1811c34c 100644
--- a/lib/ace/commands/default_commands.js
+++ b/lib/ace/commands/default_commands.js
@@ -1,30 +1,40 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -32,48 +42,15 @@ define(function(require, exports, module) {
"use strict";
var lang = require("../lib/lang");
-var config = require("../config");
-var Range = require("../range").Range;
function bindKey(win, mac) {
- return {win: win, mac: mac};
+ return {
+ win: win,
+ mac: mac
+ };
}
-/*
- multiSelectAction: "forEach"|"forEachLine"|function|undefined,
- scrollIntoView: true|"cursor"|"center"|"selectionPart"
-*/
exports.commands = [{
- name: "showSettingsMenu",
- bindKey: bindKey("Ctrl-,", "Command-,"),
- exec: function(editor) {
- config.loadModule("ace/ext/settings_menu", function(module) {
- module.init(editor);
- editor.showSettingsMenu();
- });
- },
- readOnly: true
-}, {
- name: "goToNextError",
- bindKey: bindKey("Alt-E", "Ctrl-E"),
- exec: function(editor) {
- config.loadModule("ace/ext/error_marker", function(module) {
- module.showErrorMarker(editor, 1);
- });
- },
- scrollIntoView: "animate",
- readOnly: true
-}, {
- name: "goToPreviousError",
- bindKey: bindKey("Alt-Shift-E", "Ctrl-Shift-E"),
- exec: function(editor) {
- config.loadModule("ace/ext/error_marker", function(module) {
- module.showErrorMarker(editor, -1);
- });
- },
- scrollIntoView: "animate",
- readOnly: true
-}, {
name: "selectall",
bindKey: bindKey("Ctrl-A", "Command-A"),
exec: function(editor) { editor.selectAll(); },
@@ -97,90 +74,38 @@ exports.commands = [{
name: "fold",
bindKey: bindKey("Alt-L|Ctrl-F1", "Command-Alt-L|Command-F1"),
exec: function(editor) { editor.session.toggleFold(false); },
- multiSelectAction: "forEach",
- scrollIntoView: "center",
readOnly: true
}, {
name: "unfold",
bindKey: bindKey("Alt-Shift-L|Ctrl-Shift-F1", "Command-Alt-Shift-L|Command-Shift-F1"),
exec: function(editor) { editor.session.toggleFold(true); },
- multiSelectAction: "forEach",
- scrollIntoView: "center",
- readOnly: true
-}, {
- name: "toggleFoldWidget",
- bindKey: bindKey("F2", "F2"),
- exec: function(editor) { editor.session.toggleFoldWidget(); },
- multiSelectAction: "forEach",
- scrollIntoView: "center",
- readOnly: true
-}, {
- name: "toggleParentFoldWidget",
- bindKey: bindKey("Alt-F2", "Alt-F2"),
- exec: function(editor) { editor.session.toggleFoldWidget(true); },
- multiSelectAction: "forEach",
- scrollIntoView: "center",
readOnly: true
}, {
name: "foldall",
- bindKey: bindKey(null, "Ctrl-Command-Option-0"),
- exec: function(editor) { editor.session.foldAll(); },
- scrollIntoView: "center",
- readOnly: true
-}, {
- name: "foldOther",
bindKey: bindKey("Alt-0", "Command-Option-0"),
- exec: function(editor) {
- editor.session.foldAll();
- editor.session.unfold(editor.selection.getAllRanges());
- },
- scrollIntoView: "center",
+ exec: function(editor) { editor.session.foldAll(); },
readOnly: true
}, {
name: "unfoldall",
bindKey: bindKey("Alt-Shift-0", "Command-Option-Shift-0"),
exec: function(editor) { editor.session.unfold(); },
- scrollIntoView: "center",
readOnly: true
}, {
name: "findnext",
bindKey: bindKey("Ctrl-K", "Command-G"),
exec: function(editor) { editor.findNext(); },
- multiSelectAction: "forEach",
- scrollIntoView: "center",
readOnly: true
}, {
name: "findprevious",
bindKey: bindKey("Ctrl-Shift-K", "Command-Shift-G"),
exec: function(editor) { editor.findPrevious(); },
- multiSelectAction: "forEach",
- scrollIntoView: "center",
- readOnly: true
-}, {
- name: "selectOrFindNext",
- bindKey: bindKey("Alt-K", "Ctrl-G"),
- exec: function(editor) {
- if (editor.selection.isEmpty())
- editor.selection.selectWord();
- else
- editor.findNext();
- },
- readOnly: true
-}, {
- name: "selectOrFindPrevious",
- bindKey: bindKey("Alt-Shift-K", "Ctrl-Shift-G"),
- exec: function(editor) {
- if (editor.selection.isEmpty())
- editor.selection.selectWord();
- else
- editor.findPrevious();
- },
readOnly: true
}, {
name: "find",
bindKey: bindKey("Ctrl-F", "Command-F"),
exec: function(editor) {
- config.loadModule("ace/ext/searchbox", function(e) {e.Search(editor)});
+ var needle = prompt("Find:", editor.getCopyText());
+ editor.find(needle);
},
readOnly: true
}, {
@@ -193,144 +118,120 @@ exports.commands = [{
bindKey: bindKey("Ctrl-Shift-Home", "Command-Shift-Up"),
exec: function(editor) { editor.getSelection().selectFileStart(); },
multiSelectAction: "forEach",
- readOnly: true,
- scrollIntoView: "animate",
- aceCommandGroup: "fileJump"
+ readOnly: true
}, {
name: "gotostart",
bindKey: bindKey("Ctrl-Home", "Command-Home|Command-Up"),
exec: function(editor) { editor.navigateFileStart(); },
multiSelectAction: "forEach",
- readOnly: true,
- scrollIntoView: "animate",
- aceCommandGroup: "fileJump"
+ readOnly: true
}, {
name: "selectup",
bindKey: bindKey("Shift-Up", "Shift-Up"),
exec: function(editor) { editor.getSelection().selectUp(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "golineup",
bindKey: bindKey("Up", "Up|Ctrl-P"),
exec: function(editor, args) { editor.navigateUp(args.times); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "selecttoend",
bindKey: bindKey("Ctrl-Shift-End", "Command-Shift-Down"),
exec: function(editor) { editor.getSelection().selectFileEnd(); },
multiSelectAction: "forEach",
- readOnly: true,
- scrollIntoView: "animate",
- aceCommandGroup: "fileJump"
+ readOnly: true
}, {
name: "gotoend",
bindKey: bindKey("Ctrl-End", "Command-End|Command-Down"),
exec: function(editor) { editor.navigateFileEnd(); },
multiSelectAction: "forEach",
- readOnly: true,
- scrollIntoView: "animate",
- aceCommandGroup: "fileJump"
+ readOnly: true
}, {
name: "selectdown",
bindKey: bindKey("Shift-Down", "Shift-Down"),
exec: function(editor) { editor.getSelection().selectDown(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "golinedown",
bindKey: bindKey("Down", "Down|Ctrl-N"),
exec: function(editor, args) { editor.navigateDown(args.times); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "selectwordleft",
bindKey: bindKey("Ctrl-Shift-Left", "Option-Shift-Left"),
exec: function(editor) { editor.getSelection().selectWordLeft(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "gotowordleft",
bindKey: bindKey("Ctrl-Left", "Option-Left"),
exec: function(editor) { editor.navigateWordLeft(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "selecttolinestart",
bindKey: bindKey("Alt-Shift-Left", "Command-Shift-Left"),
exec: function(editor) { editor.getSelection().selectLineStart(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "gotolinestart",
bindKey: bindKey("Alt-Left|Home", "Command-Left|Home|Ctrl-A"),
exec: function(editor) { editor.navigateLineStart(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "selectleft",
bindKey: bindKey("Shift-Left", "Shift-Left"),
exec: function(editor) { editor.getSelection().selectLeft(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "gotoleft",
bindKey: bindKey("Left", "Left|Ctrl-B"),
exec: function(editor, args) { editor.navigateLeft(args.times); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "selectwordright",
bindKey: bindKey("Ctrl-Shift-Right", "Option-Shift-Right"),
exec: function(editor) { editor.getSelection().selectWordRight(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "gotowordright",
bindKey: bindKey("Ctrl-Right", "Option-Right"),
exec: function(editor) { editor.navigateWordRight(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "selecttolineend",
bindKey: bindKey("Alt-Shift-Right", "Command-Shift-Right"),
exec: function(editor) { editor.getSelection().selectLineEnd(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "gotolineend",
bindKey: bindKey("Alt-Right|End", "Command-Right|End|Ctrl-E"),
exec: function(editor) { editor.navigateLineEnd(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "selectright",
bindKey: bindKey("Shift-Right", "Shift-Right"),
exec: function(editor) { editor.getSelection().selectRight(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "gotoright",
bindKey: bindKey("Right", "Right|Ctrl-F"),
exec: function(editor, args) { editor.navigateRight(args.times); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "selectpagedown",
@@ -377,14 +278,12 @@ exports.commands = [{
bindKey: "Shift-Home",
exec: function(editor) { editor.getSelection().selectLineStart(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "selectlineend",
bindKey: "Shift-End",
exec: function(editor) { editor.getSelection().selectLineEnd(); },
multiSelectAction: "forEach",
- scrollIntoView: "cursor",
readOnly: true
}, {
name: "togglerecording",
@@ -398,38 +297,16 @@ exports.commands = [{
readOnly: true
}, {
name: "jumptomatching",
- bindKey: bindKey("Ctrl-P", "Ctrl-P"),
+ bindKey: bindKey("Ctrl-P", "Ctrl-Shift-P"),
exec: function(editor) { editor.jumpToMatching(); },
multiSelectAction: "forEach",
- scrollIntoView: "animate",
readOnly: true
}, {
name: "selecttomatching",
- bindKey: bindKey("Ctrl-Shift-P", "Ctrl-Shift-P"),
+ bindKey: bindKey("Ctrl-Shift-P", null),
exec: function(editor) { editor.jumpToMatching(true); },
- multiSelectAction: "forEach",
- scrollIntoView: "animate",
readOnly: true
-}, {
- name: "expandToMatching",
- bindKey: bindKey("Ctrl-Shift-M", "Ctrl-Shift-M"),
- exec: function(editor) { editor.jumpToMatching(true, true); },
- multiSelectAction: "forEach",
- scrollIntoView: "animate",
- readOnly: true
-}, {
- name: "passKeysToBrowser",
- bindKey: bindKey(null, null),
- exec: function() {},
- passEvent: true,
- readOnly: true
-}, {
- name: "copy",
- exec: function(editor) {
- // placeholder for replay macro
- },
- readOnly: true
-},
+},
// commands disabled in readOnly mode
{
@@ -443,61 +320,45 @@ exports.commands = [{
editor.clearSelection();
}
},
- scrollIntoView: "cursor",
multiSelectAction: "forEach"
-}, {
- name: "paste",
- exec: function(editor, args) {
- editor.$handlePaste(args);
- },
- scrollIntoView: "cursor"
}, {
name: "removeline",
bindKey: bindKey("Ctrl-D", "Command-D"),
exec: function(editor) { editor.removeLines(); },
- scrollIntoView: "cursor",
- multiSelectAction: "forEachLine"
+ multiSelectAction: "forEach"
}, {
name: "duplicateSelection",
bindKey: bindKey("Ctrl-Shift-D", "Command-Shift-D"),
exec: function(editor) { editor.duplicateSelection(); },
- scrollIntoView: "cursor",
multiSelectAction: "forEach"
-}, {
- name: "sortlines",
- bindKey: bindKey("Ctrl-Alt-S", "Command-Alt-S"),
- exec: function(editor) { editor.sortLines(); },
- scrollIntoView: "selection",
- multiSelectAction: "forEachLine"
}, {
name: "togglecomment",
bindKey: bindKey("Ctrl-/", "Command-/"),
exec: function(editor) { editor.toggleCommentLines(); },
- multiSelectAction: "forEachLine",
- scrollIntoView: "selectionPart"
-}, {
- name: "toggleBlockComment",
- bindKey: bindKey("Ctrl-Shift-/", "Command-Shift-/"),
- exec: function(editor) { editor.toggleBlockComment(); },
- multiSelectAction: "forEach",
- scrollIntoView: "selectionPart"
-}, {
- name: "modifyNumberUp",
- bindKey: bindKey("Ctrl-Shift-Up", "Alt-Shift-Up"),
- exec: function(editor) { editor.modifyNumber(1); },
- scrollIntoView: "cursor",
- multiSelectAction: "forEach"
-}, {
- name: "modifyNumberDown",
- bindKey: bindKey("Ctrl-Shift-Down", "Alt-Shift-Down"),
- exec: function(editor) { editor.modifyNumber(-1); },
- scrollIntoView: "cursor",
multiSelectAction: "forEach"
}, {
name: "replace",
- bindKey: bindKey("Ctrl-H", "Command-Option-F"),
+ bindKey: bindKey("Ctrl-R", "Command-Option-F"),
exec: function(editor) {
- config.loadModule("ace/ext/searchbox", function(e) {e.Search(editor, true)});
+ var needle = prompt("Find:", editor.getCopyText());
+ if (!needle)
+ return;
+ var replacement = prompt("Replacement:");
+ if (!replacement)
+ return;
+ editor.replace(replacement, {needle: needle});
+ }
+}, {
+ name: "replaceall",
+ bindKey: bindKey("Ctrl-Shift-R", "Command-Shift-Option-F"),
+ exec: function(editor) {
+ var needle = prompt("Find:");
+ if (!needle)
+ return;
+ var replacement = prompt("Replacement:");
+ if (!replacement)
+ return;
+ editor.replaceAll(replacement, {needle: needle});
}
}, {
name: "undo",
@@ -510,228 +371,92 @@ exports.commands = [{
}, {
name: "copylinesup",
bindKey: bindKey("Alt-Shift-Up", "Command-Option-Up"),
- exec: function(editor) { editor.copyLinesUp(); },
- scrollIntoView: "cursor"
+ exec: function(editor) { editor.copyLinesUp(); }
}, {
name: "movelinesup",
bindKey: bindKey("Alt-Up", "Option-Up"),
- exec: function(editor) { editor.moveLinesUp(); },
- scrollIntoView: "cursor"
+ exec: function(editor) { editor.moveLinesUp(); }
}, {
name: "copylinesdown",
bindKey: bindKey("Alt-Shift-Down", "Command-Option-Down"),
- exec: function(editor) { editor.copyLinesDown(); },
- scrollIntoView: "cursor"
+ exec: function(editor) { editor.copyLinesDown(); }
}, {
name: "movelinesdown",
bindKey: bindKey("Alt-Down", "Option-Down"),
- exec: function(editor) { editor.moveLinesDown(); },
- scrollIntoView: "cursor"
+ exec: function(editor) { editor.moveLinesDown(); }
}, {
name: "del",
- bindKey: bindKey("Delete", "Delete|Ctrl-D|Shift-Delete"),
+ bindKey: bindKey("Delete", "Delete|Ctrl-D"),
exec: function(editor) { editor.remove("right"); },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
+ multiSelectAction: "forEach"
}, {
name: "backspace",
bindKey: bindKey(
- "Shift-Backspace|Backspace",
- "Ctrl-Backspace|Shift-Backspace|Backspace|Ctrl-H"
+ "Command-Backspace|Option-Backspace|Shift-Backspace|Backspace",
+ "Ctrl-Backspace|Command-Backspace|Shift-Backspace|Backspace|Ctrl-H"
),
exec: function(editor) { editor.remove("left"); },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
-}, {
- name: "cut_or_delete",
- bindKey: bindKey("Shift-Delete", null),
- exec: function(editor) {
- if (editor.selection.isEmpty()) {
- editor.remove("left");
- } else {
- return false;
- }
- },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
+ multiSelectAction: "forEach"
}, {
name: "removetolinestart",
bindKey: bindKey("Alt-Backspace", "Command-Backspace"),
exec: function(editor) { editor.removeToLineStart(); },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
+ multiSelectAction: "forEach"
}, {
name: "removetolineend",
bindKey: bindKey("Alt-Delete", "Ctrl-K"),
exec: function(editor) { editor.removeToLineEnd(); },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
+ multiSelectAction: "forEach"
}, {
name: "removewordleft",
bindKey: bindKey("Ctrl-Backspace", "Alt-Backspace|Ctrl-Alt-Backspace"),
exec: function(editor) { editor.removeWordLeft(); },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
+ multiSelectAction: "forEach"
}, {
name: "removewordright",
bindKey: bindKey("Ctrl-Delete", "Alt-Delete"),
exec: function(editor) { editor.removeWordRight(); },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
+ multiSelectAction: "forEach"
}, {
name: "outdent",
bindKey: bindKey("Shift-Tab", "Shift-Tab"),
exec: function(editor) { editor.blockOutdent(); },
- multiSelectAction: "forEach",
- scrollIntoView: "selectionPart"
+ multiSelectAction: "forEach"
}, {
name: "indent",
bindKey: bindKey("Tab", "Tab"),
exec: function(editor) { editor.indent(); },
- multiSelectAction: "forEach",
- scrollIntoView: "selectionPart"
-}, {
- name: "blockoutdent",
- bindKey: bindKey("Ctrl-[", "Ctrl-["),
- exec: function(editor) { editor.blockOutdent(); },
- multiSelectAction: "forEachLine",
- scrollIntoView: "selectionPart"
-}, {
- name: "blockindent",
- bindKey: bindKey("Ctrl-]", "Ctrl-]"),
- exec: function(editor) { editor.blockIndent(); },
- multiSelectAction: "forEachLine",
- scrollIntoView: "selectionPart"
+ multiSelectAction: "forEach"
}, {
name: "insertstring",
exec: function(editor, str) { editor.insert(str); },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
+ multiSelectAction: "forEach"
}, {
name: "inserttext",
exec: function(editor, args) {
editor.insert(lang.stringRepeat(args.text || "", args.times || 1));
},
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
+ multiSelectAction: "forEach"
}, {
name: "splitline",
bindKey: bindKey(null, "Ctrl-O"),
exec: function(editor) { editor.splitLine(); },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
+ multiSelectAction: "forEach"
}, {
name: "transposeletters",
bindKey: bindKey("Ctrl-T", "Ctrl-T"),
exec: function(editor) { editor.transposeLetters(); },
- multiSelectAction: function(editor) {editor.transposeSelections(1); },
- scrollIntoView: "cursor"
+ multiSelectAction: function(editor) {editor.transposeSelections(1); }
}, {
name: "touppercase",
bindKey: bindKey("Ctrl-U", "Ctrl-U"),
exec: function(editor) { editor.toUpperCase(); },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
+ multiSelectAction: "forEach"
}, {
name: "tolowercase",
bindKey: bindKey("Ctrl-Shift-U", "Ctrl-Shift-U"),
exec: function(editor) { editor.toLowerCase(); },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor"
-}, {
- name: "expandtoline",
- bindKey: bindKey("Ctrl-Shift-L", "Command-Shift-L"),
- exec: function(editor) {
- var range = editor.selection.getRange();
-
- range.start.column = range.end.column = 0;
- range.end.row++;
- editor.selection.setRange(range, false);
- },
- multiSelectAction: "forEach",
- scrollIntoView: "cursor",
- readOnly: true
-}, {
- name: "joinlines",
- bindKey: bindKey(null, null),
- exec: function(editor) {
- var isBackwards = editor.selection.isBackwards();
- var selectionStart = isBackwards ? editor.selection.getSelectionLead() : editor.selection.getSelectionAnchor();
- var selectionEnd = isBackwards ? editor.selection.getSelectionAnchor() : editor.selection.getSelectionLead();
- var firstLineEndCol = editor.session.doc.getLine(selectionStart.row).length;
- var selectedText = editor.session.doc.getTextRange(editor.selection.getRange());
- var selectedCount = selectedText.replace(/\n\s*/, " ").length;
- var insertLine = editor.session.doc.getLine(selectionStart.row);
-
- for (var i = selectionStart.row + 1; i <= selectionEnd.row + 1; i++) {
- var curLine = lang.stringTrimLeft(lang.stringTrimRight(editor.session.doc.getLine(i)));
- if (curLine.length !== 0) {
- curLine = " " + curLine;
- }
- insertLine += curLine;
- }
-
- if (selectionEnd.row + 1 < (editor.session.doc.getLength() - 1)) {
- // Don't insert a newline at the end of the document
- insertLine += editor.session.doc.getNewLineCharacter();
- }
-
- editor.clearSelection();
- editor.session.doc.replace(new Range(selectionStart.row, 0, selectionEnd.row + 2, 0), insertLine);
-
- if (selectedCount > 0) {
- // Select the text that was previously selected
- editor.selection.moveCursorTo(selectionStart.row, selectionStart.column);
- editor.selection.selectTo(selectionStart.row, selectionStart.column + selectedCount);
- } else {
- // If the joined line had something in it, start the cursor at that something
- firstLineEndCol = editor.session.doc.getLine(selectionStart.row).length > firstLineEndCol ? (firstLineEndCol + 1) : firstLineEndCol;
- editor.selection.moveCursorTo(selectionStart.row, firstLineEndCol);
- }
- },
- multiSelectAction: "forEach",
- readOnly: true
-}, {
- name: "invertSelection",
- bindKey: bindKey(null, null),
- exec: function(editor) {
- var endRow = editor.session.doc.getLength() - 1;
- var endCol = editor.session.doc.getLine(endRow).length;
- var ranges = editor.selection.rangeList.ranges;
- var newRanges = [];
-
- // If multiple selections don't exist, rangeList will return 0 so replace with single range
- if (ranges.length < 1) {
- ranges = [editor.selection.getRange()];
- }
-
- for (var i = 0; i < ranges.length; i++) {
- if (i == (ranges.length - 1)) {
- // The last selection must connect to the end of the document, unless it already does
- if (!(ranges[i].end.row === endRow && ranges[i].end.column === endCol)) {
- newRanges.push(new Range(ranges[i].end.row, ranges[i].end.column, endRow, endCol));
- }
- }
-
- if (i === 0) {
- // The first selection must connect to the start of the document, unless it already does
- if (!(ranges[i].start.row === 0 && ranges[i].start.column === 0)) {
- newRanges.push(new Range(0, 0, ranges[i].start.row, ranges[i].start.column));
- }
- } else {
- newRanges.push(new Range(ranges[i-1].end.row, ranges[i-1].end.column, ranges[i].start.row, ranges[i].start.column));
- }
- }
-
- editor.exitMultiSelectMode();
- editor.clearSelection();
-
- for(var i = 0; i < newRanges.length; i++) {
- editor.selection.addRange(newRanges[i], false);
- }
- },
- readOnly: true,
- scrollIntoView: "none"
+ multiSelectAction: "forEach"
}];
});
diff --git a/lib/ace/commands/incremental_search_commands.js b/lib/ace/commands/incremental_search_commands.js
deleted file mode 100644
index 59083a85..00000000
--- a/lib/ace/commands/incremental_search_commands.js
+++ /dev/null
@@ -1,213 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-
-var config = require("../config");
-var oop = require("../lib/oop");
-var HashHandler = require("../keyboard/hash_handler").HashHandler;
-var occurStartCommand = require("./occur_commands").occurStartCommand;
-
-// These commands can be installed in a normal key handler to start iSearch:
-exports.iSearchStartCommands = [{
- name: "iSearch",
- bindKey: {win: "Ctrl-F", mac: "Command-F"},
- exec: function(editor, options) {
- config.loadModule(["core", "ace/incremental_search"], function(e) {
- var iSearch = e.iSearch = e.iSearch || new e.IncrementalSearch();
- iSearch.activate(editor, options.backwards);
- if (options.jumpToFirstMatch) iSearch.next(options);
- });
- },
- readOnly: true
-}, {
- name: "iSearchBackwards",
- exec: function(editor, jumpToNext) { editor.execCommand('iSearch', {backwards: true}); },
- readOnly: true
-}, {
- name: "iSearchAndGo",
- bindKey: {win: "Ctrl-K", mac: "Command-G"},
- exec: function(editor, jumpToNext) { editor.execCommand('iSearch', {jumpToFirstMatch: true, useCurrentOrPrevSearch: true}); },
- readOnly: true
-}, {
- name: "iSearchBackwardsAndGo",
- bindKey: {win: "Ctrl-Shift-K", mac: "Command-Shift-G"},
- exec: function(editor) { editor.execCommand('iSearch', {jumpToFirstMatch: true, backwards: true, useCurrentOrPrevSearch: true}); },
- readOnly: true
-}];
-
-// These commands are only available when incremental search mode is active:
-exports.iSearchCommands = [{
- name: "restartSearch",
- bindKey: {win: "Ctrl-F", mac: "Command-F"},
- exec: function(iSearch) {
- iSearch.cancelSearch(true);
- }
-}, {
- name: "searchForward",
- bindKey: {win: "Ctrl-S|Ctrl-K", mac: "Ctrl-S|Command-G"},
- exec: function(iSearch, options) {
- options.useCurrentOrPrevSearch = true;
- iSearch.next(options);
- }
-}, {
- name: "searchBackward",
- bindKey: {win: "Ctrl-R|Ctrl-Shift-K", mac: "Ctrl-R|Command-Shift-G"},
- exec: function(iSearch, options) {
- options.useCurrentOrPrevSearch = true;
- options.backwards = true;
- iSearch.next(options);
- }
-}, {
- name: "extendSearchTerm",
- exec: function(iSearch, string) {
- iSearch.addString(string);
- }
-}, {
- name: "extendSearchTermSpace",
- bindKey: "space",
- exec: function(iSearch) { iSearch.addString(' '); }
-}, {
- name: "shrinkSearchTerm",
- bindKey: "backspace",
- exec: function(iSearch) {
- iSearch.removeChar();
- }
-}, {
- name: 'confirmSearch',
- bindKey: 'return',
- exec: function(iSearch) { iSearch.deactivate(); }
-}, {
- name: 'cancelSearch',
- bindKey: 'esc|Ctrl-G',
- exec: function(iSearch) { iSearch.deactivate(true); }
-}, {
- name: 'occurisearch',
- bindKey: 'Ctrl-O',
- exec: function(iSearch) {
- var options = oop.mixin({}, iSearch.$options);
- iSearch.deactivate();
- occurStartCommand.exec(iSearch.$editor, options);
- }
-}, {
- name: "yankNextWord",
- bindKey: "Ctrl-w",
- exec: function(iSearch) {
- var ed = iSearch.$editor,
- range = ed.selection.getRangeOfMovements(function(sel) { sel.moveCursorWordRight(); }),
- string = ed.session.getTextRange(range);
- iSearch.addString(string);
- }
-}, {
- name: "yankNextChar",
- bindKey: "Ctrl-Alt-y",
- exec: function(iSearch) {
- var ed = iSearch.$editor,
- range = ed.selection.getRangeOfMovements(function(sel) { sel.moveCursorRight(); }),
- string = ed.session.getTextRange(range);
- iSearch.addString(string);
- }
-}, {
- name: 'recenterTopBottom',
- bindKey: 'Ctrl-l',
- exec: function(iSearch) { iSearch.$editor.execCommand('recenterTopBottom'); }
-}, {
- name: 'selectAllMatches',
- bindKey: 'Ctrl-space',
- exec: function(iSearch) {
- var ed = iSearch.$editor,
- hl = ed.session.$isearchHighlight,
- ranges = hl && hl.cache ? hl.cache
- .reduce(function(ranges, ea) {
- return ranges.concat(ea ? ea : []); }, []) : [];
- iSearch.deactivate(false);
- ranges.forEach(ed.selection.addRange.bind(ed.selection));
- }
-}, {
- name: 'searchAsRegExp',
- bindKey: 'Alt-r',
- exec: function(iSearch) {
- iSearch.convertNeedleToRegExp();
- }
-}].map(function(cmd) {
- cmd.readOnly = true;
- cmd.isIncrementalSearchCommand = true;
- cmd.scrollIntoView = "animate-cursor";
- return cmd;
-});
-
-function IncrementalSearchKeyboardHandler(iSearch) {
- this.$iSearch = iSearch;
-}
-
-oop.inherits(IncrementalSearchKeyboardHandler, HashHandler);
-
-(function() {
-
- this.attach = function(editor) {
- var iSearch = this.$iSearch;
- HashHandler.call(this, exports.iSearchCommands, editor.commands.platform);
- this.$commandExecHandler = editor.commands.addEventListener('exec', function(e) {
- if (!e.command.isIncrementalSearchCommand) return undefined;
- e.stopPropagation();
- e.preventDefault();
- var scrollTop = editor.session.getScrollTop();
- var result = e.command.exec(iSearch, e.args || {});
- editor.renderer.scrollCursorIntoView(null, 0.5);
- editor.renderer.animateScrolling(scrollTop);
- return result;
- });
- };
-
- this.detach = function(editor) {
- if (!this.$commandExecHandler) return;
- editor.commands.removeEventListener('exec', this.$commandExecHandler);
- delete this.$commandExecHandler;
- };
-
- var handleKeyboard$super = this.handleKeyboard;
- this.handleKeyboard = function(data, hashId, key, keyCode) {
- if (((hashId === 1/*ctrl*/ || hashId === 8/*command*/) && key === 'v')
- || (hashId === 1/*ctrl*/ && key === 'y')) return null;
- var cmd = handleKeyboard$super.call(this, data, hashId, key, keyCode);
- if (cmd.command) { return cmd; }
- if (hashId == -1) {
- var extendCmd = this.commands.extendSearchTerm;
- if (extendCmd) { return {command: extendCmd, args: key}; }
- }
- return {command: "null", passEvent: hashId == 0 || hashId == 4};
- };
-
-}).call(IncrementalSearchKeyboardHandler.prototype);
-
-
-exports.IncrementalSearchKeyboardHandler = IncrementalSearchKeyboardHandler;
-
-});
diff --git a/lib/ace/commands/multi_select_commands.js b/lib/ace/commands/multi_select_commands.js
index ba6392bc..ebac5cc7 100644
--- a/lib/ace/commands/multi_select_commands.js
+++ b/lib/ace/commands/multi_select_commands.js
@@ -1,30 +1,38 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Harutyun Amirjanyan
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -35,74 +43,54 @@ exports.defaultCommands = [{
name: "addCursorAbove",
exec: function(editor) { editor.selectMoreLines(-1); },
bindKey: {win: "Ctrl-Alt-Up", mac: "Ctrl-Alt-Up"},
- scrollIntoView: "cursor",
readonly: true
}, {
name: "addCursorBelow",
exec: function(editor) { editor.selectMoreLines(1); },
bindKey: {win: "Ctrl-Alt-Down", mac: "Ctrl-Alt-Down"},
- scrollIntoView: "cursor",
readonly: true
}, {
name: "addCursorAboveSkipCurrent",
exec: function(editor) { editor.selectMoreLines(-1, true); },
bindKey: {win: "Ctrl-Alt-Shift-Up", mac: "Ctrl-Alt-Shift-Up"},
- scrollIntoView: "cursor",
readonly: true
}, {
name: "addCursorBelowSkipCurrent",
exec: function(editor) { editor.selectMoreLines(1, true); },
bindKey: {win: "Ctrl-Alt-Shift-Down", mac: "Ctrl-Alt-Shift-Down"},
- scrollIntoView: "cursor",
readonly: true
}, {
name: "selectMoreBefore",
exec: function(editor) { editor.selectMore(-1); },
bindKey: {win: "Ctrl-Alt-Left", mac: "Ctrl-Alt-Left"},
- scrollIntoView: "cursor",
readonly: true
}, {
name: "selectMoreAfter",
exec: function(editor) { editor.selectMore(1); },
bindKey: {win: "Ctrl-Alt-Right", mac: "Ctrl-Alt-Right"},
- scrollIntoView: "cursor",
readonly: true
}, {
name: "selectNextBefore",
exec: function(editor) { editor.selectMore(-1, true); },
bindKey: {win: "Ctrl-Alt-Shift-Left", mac: "Ctrl-Alt-Shift-Left"},
- scrollIntoView: "cursor",
readonly: true
}, {
name: "selectNextAfter",
exec: function(editor) { editor.selectMore(1, true); },
bindKey: {win: "Ctrl-Alt-Shift-Right", mac: "Ctrl-Alt-Shift-Right"},
- scrollIntoView: "cursor",
readonly: true
}, {
name: "splitIntoLines",
exec: function(editor) { editor.multiSelect.splitIntoLines(); },
- bindKey: {win: "Ctrl-Alt-L", mac: "Ctrl-Alt-L"},
- readonly: true
-}, {
- name: "alignCursors",
- exec: function(editor) { editor.alignCursors(); },
- bindKey: {win: "Ctrl-Alt-A", mac: "Ctrl-Alt-A"},
- scrollIntoView: "cursor"
-}, {
- name: "findAll",
- exec: function(editor) { editor.findAll(); },
- bindKey: {win: "Ctrl-Alt-K", mac: "Ctrl-Alt-G"},
- scrollIntoView: "cursor",
+ bindKey: {win: "Ctrl-Shift-L", mac: "Ctrl-Shift-L"},
readonly: true
}];
-// commands active only in multiselect mode
+// commands active in multiselect mode
exports.multiSelectCommands = [{
name: "singleSelection",
bindKey: "esc",
exec: function(editor) { editor.exitMultiSelectMode(); },
- scrollIntoView: "cursor",
readonly: true,
isAvailable: function(editor) {return editor && editor.inMultiSelectMode}
}];
diff --git a/lib/ace/commands/occur_commands.js b/lib/ace/commands/occur_commands.js
deleted file mode 100644
index b45fbf61..00000000
--- a/lib/ace/commands/occur_commands.js
+++ /dev/null
@@ -1,110 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-
-var config = require("../config"),
- Occur = require("../occur").Occur;
-
-// These commands can be installed in a normal command handler to start occur:
-var occurStartCommand = {
- name: "occur",
- exec: function(editor, options) {
- var alreadyInOccur = !!editor.session.$occur;
- var occurSessionActive = new Occur().enter(editor, options);
- if (occurSessionActive && !alreadyInOccur)
- OccurKeyboardHandler.installIn(editor);
- },
- readOnly: true
-};
-
-var occurCommands = [{
- name: "occurexit",
- bindKey: 'esc|Ctrl-G',
- exec: function(editor) {
- var occur = editor.session.$occur;
- if (!occur) return;
- occur.exit(editor, {});
- if (!editor.session.$occur) OccurKeyboardHandler.uninstallFrom(editor);
- },
- readOnly: true
-}, {
- name: "occuraccept",
- bindKey: 'enter',
- exec: function(editor) {
- var occur = editor.session.$occur;
- if (!occur) return;
- occur.exit(editor, {translatePosition: true});
- if (!editor.session.$occur) OccurKeyboardHandler.uninstallFrom(editor);
- },
- readOnly: true
-}];
-
-var HashHandler = require("../keyboard/hash_handler").HashHandler;
-var oop = require("../lib/oop");
-
-
-function OccurKeyboardHandler() {}
-
-oop.inherits(OccurKeyboardHandler, HashHandler);
-
-;(function() {
-
- this.isOccurHandler = true;
-
- this.attach = function(editor) {
- HashHandler.call(this, occurCommands, editor.commands.platform);
- this.$editor = editor;
- }
-
- var handleKeyboard$super = this.handleKeyboard;
- this.handleKeyboard = function(data, hashId, key, keyCode) {
- var cmd = handleKeyboard$super.call(this, data, hashId, key, keyCode);
- return (cmd && cmd.command) ? cmd : undefined;
- }
-
-}).call(OccurKeyboardHandler.prototype);
-
-OccurKeyboardHandler.installIn = function(editor) {
- var handler = new this();
- editor.keyBinding.addKeyboardHandler(handler);
- editor.commands.addCommands(occurCommands);
-}
-
-OccurKeyboardHandler.uninstallFrom = function(editor) {
- editor.commands.removeCommands(occurCommands);
- var handler = editor.getKeyboardHandler();
- if (handler.isOccurHandler)
- editor.keyBinding.removeKeyboardHandler(handler);
-}
-
-exports.occurStartCommand = occurStartCommand;
-
-});
diff --git a/lib/ace/config.js b/lib/ace/config.js
index fe9312fd..dccbb484 100644
--- a/lib/ace/config.js
+++ b/lib/ace/config.js
@@ -1,30 +1,38 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -32,22 +40,16 @@ define(function(require, exports, module) {
"no use strict";
var lang = require("./lib/lang");
-var oop = require("./lib/oop");
-var net = require("./lib/net");
-var AppConfig = require("./lib/app_config").AppConfig;
-
-module.exports = exports = new AppConfig();
var global = (function() {
- return this || typeof window != "undefined" && window;
+ return this;
})();
var options = {
packaged: false,
- workerPath: null,
- modePath: null,
- themePath: null,
- basePath: "",
+ workerPath: "",
+ modePath: "",
+ themePath: "",
suffix: ".js",
$moduleUrls: {}
};
@@ -70,81 +72,25 @@ exports.all = function() {
return lang.copyObject(options);
};
-// module loading
exports.moduleUrl = function(name, component) {
if (options.$moduleUrls[name])
return options.$moduleUrls[name];
var parts = name.split("/");
component = component || parts[parts.length - 2] || "";
-
- // todo make this configurable or get rid of '-'
- var sep = component == "snippets" ? "/" : "-";
- var base = parts[parts.length - 1];
- if (component == "worker" && sep == "-") {
- var re = new RegExp("^" + component + "[\\-_]|[\\-_]" + component + "$", "g");
- base = base.replace(re, "");
- }
+ var base = parts[parts.length - 1].replace(component, "").replace(/(^[\-_])|([\-_]$)/, "");
- if ((!base || base == component) && parts.length > 1)
+ if (!base && parts.length > 1)
base = parts[parts.length - 2];
- var path = options[component + "Path"];
- if (path == null) {
- path = options.basePath;
- } else if (sep == "/") {
- component = sep = "";
- }
- if (path && path.slice(-1) != "/")
- path += "/";
- return path + component + sep + base + this.get("suffix");
+ return this.get(component + "Path") + "/" + component + "-" + base + this.get("suffix");
};
exports.setModuleUrl = function(name, subst) {
return options.$moduleUrls[name] = subst;
};
-exports.$loading = {};
-exports.loadModule = function(moduleName, onLoad) {
- var module, moduleType;
- if (Array.isArray(moduleName)) {
- moduleType = moduleName[0];
- moduleName = moduleName[1];
- }
-
- try {
- module = require(moduleName);
- } catch (e) {}
- // require(moduleName) can return empty object if called after require([moduleName], callback)
- if (module && !exports.$loading[moduleName])
- return onLoad && onLoad(module);
-
- if (!exports.$loading[moduleName])
- exports.$loading[moduleName] = [];
-
- exports.$loading[moduleName].push(onLoad);
-
- if (exports.$loading[moduleName].length > 1)
- return;
-
- var afterLoad = function() {
- require([moduleName], function(module) {
- exports._emit("load.module", {name: moduleName, module: module});
- var listeners = exports.$loading[moduleName];
- exports.$loading[moduleName] = null;
- listeners.forEach(function(onLoad) {
- onLoad && onLoad(module);
- });
- });
- };
-
- if (!exports.get("packaged"))
- return afterLoad();
- net.loadScript(exports.moduleUrl(moduleName, moduleType), afterLoad);
-};
-
-// initialization
-function init(packaged) {
- options.packaged = packaged || require.packaged || module.packaged || (global.define && define.packaged);
+exports.init = function() {
+ options.packaged = require.packaged || module.packaged || (global.define && define.packaged);
if (!global.document)
return "";
@@ -152,17 +98,14 @@ function init(packaged) {
var scriptOptions = {};
var scriptUrl = "";
- // Use currentScript.ownerDocument in case this file was loaded from imported document. (HTML Imports)
- var currentScript = (document.currentScript || document._currentScript ); // native or polyfill
- var currentDocument = currentScript && currentScript.ownerDocument || document;
-
- var scripts = currentDocument.getElementsByTagName("script");
+ var scripts = document.getElementsByTagName("script");
for (var i=0; i .ace_gutter-cell {
@@ -315,46 +256,46 @@
}
.ace_fold-widget {
+ box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
- box-sizing: border-box;
margin: 0 -12px 0 1px;
- display: none;
+ display: inline-block;
+ height: 100%;
width: 11px;
- vertical-align: top;
+ vertical-align: bottom;
- background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42mWKsQ0AMAzC8ixLlrzQjzmBiEjp0A6WwBCSPgKAXoLkqSot7nN3yMwR7pZ32NzpKkVoDBUxKAAAAABJRU5ErkJggg==");
+ background-image: url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAe%8A%B1%0D%000%0C%C2%F2%2CK%96%BC%D0%8F9%81%88H%E9%D0%0E%96%C0%10%92%3E%02%80%5E%82%E4%A9*-%EEsw%C8%CC%11%EE%96w%D8%DC%E9*Eh%0C%151(%00%00%00%00IEND%AEB%60%82");
background-repeat: no-repeat;
background-position: center;
border-radius: 3px;
border: 1px solid transparent;
- cursor: pointer;
}
-.ace_folding-enabled .ace_fold-widget {
- display: inline-block;
+.ace_fold-widget.end {
+ background-image: url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%05%00%00%00%05%08%06%00%00%00%8Do%26%E5%00%00%004IDATx%DAm%C7%C1%09%000%08C%D1%8C%ECE%C8E(%8E%EC%02)%1EZJ%F1%C1'%04%07I%E1%E5%EE%CAL%F5%A2%99%99%22%E2%D6%1FU%B5%FE0%D9x%A7%26Wz5%0E%D5%00%00%00%00IEND%AEB%60%82");
}
-.ace_fold-widget.ace_end {
- background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAANElEQVR42m3HwQkAMAhD0YzsRchFKI7sAikeWkrxwScEB0nh5e7KTPWimZki4tYfVbX+MNl4pyZXejUO1QAAAABJRU5ErkJggg==");
-}
-
-.ace_fold-widget.ace_closed {
- background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAGCAYAAAAG5SQMAAAAOUlEQVR42jXKwQkAMAgDwKwqKD4EwQ26sSOkVWjgIIHAzPiCgaqiqnJHZnKICBERHN194O5b9vbLuAVRL+l0YWnZAAAAAElFTkSuQmCCXA==");
+.ace_fold-widget.closed {
+ background-image: url("data:image/png,%89PNG%0D%0A%1A%0A%00%00%00%0DIHDR%00%00%00%03%00%00%00%06%08%06%00%00%00%06%E5%24%0C%00%00%009IDATx%DA5%CA%C1%09%000%08%03%C0%AC*(%3E%04%C1%0D%BA%B1%23%A4Uh%E0%20%81%C0%CC%F8%82%81%AA%A2%AArGfr%88%08%11%11%1C%DD%7D%E0%EE%5B%F6%F6%CB%B8%05Q%2F%E9tai%D9%00%00%00%00IEND%AEB%60%82");
}
.ace_fold-widget:hover {
border: 1px solid rgba(0, 0, 0, 0.3);
background-color: rgba(255, 255, 255, 0.2);
+ -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);
+ -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);
box-shadow: 0 1px 1px rgba(255, 255, 255, 0.7);
}
.ace_fold-widget:active {
border: 1px solid rgba(0, 0, 0, 0.4);
background-color: rgba(0, 0, 0, 0.05);
+ -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);
+ -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);
box-shadow: 0 1px 1px rgba(255, 255, 255, 0.8);
}
/**
@@ -363,10 +304,10 @@
.ace_dark .ace_fold-widget {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAHklEQVQIW2P4//8/AzoGEQ7oGCaLLAhWiSwB146BAQCSTPYocqT0AAAAAElFTkSuQmCC");
}
-.ace_dark .ace_fold-widget.ace_end {
+.ace_dark .ace_fold-widget.end {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAUAAAAFCAYAAACNbyblAAAAH0lEQVQIW2P4//8/AxQ7wNjIAjDMgC4AxjCVKBirIAAF0kz2rlhxpAAAAABJRU5ErkJggg==");
}
-.ace_dark .ace_fold-widget.ace_closed {
+.ace_dark .ace_fold-widget.closed {
background-image: url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAMAAAAFCAYAAACAcVaiAAAAHElEQVQIW2P4//+/AxAzgDADlOOAznHAKgPWAwARji8UIDTfQQAAAABJRU5ErkJggg==");
}
.ace_dark .ace_fold-widget:hover {
@@ -374,78 +315,32 @@
background-color: rgba(255, 255, 255, 0.1);
}
.ace_dark .ace_fold-widget:active {
+ -moz-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);
+ -webkit-box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);
box-shadow: 0 1px 1px rgba(255, 255, 255, 0.2);
}
-
-.ace_fold-widget.ace_invalid {
+
+
+
+.ace_fold-widget.invalid {
background-color: #FFB4B4;
border-color: #DE5555;
}
.ace_fade-fold-widgets .ace_fold-widget {
+ -moz-transition: opacity 0.4s ease 0.05s;
-webkit-transition: opacity 0.4s ease 0.05s;
+ -o-transition: opacity 0.4s ease 0.05s;
+ -ms-transition: opacity 0.4s ease 0.05s;
transition: opacity 0.4s ease 0.05s;
opacity: 0;
}
.ace_fade-fold-widgets:hover .ace_fold-widget {
+ -moz-transition: opacity 0.05s ease 0.05s;
-webkit-transition: opacity 0.05s ease 0.05s;
+ -o-transition: opacity 0.05s ease 0.05s;
+ -ms-transition: opacity 0.05s ease 0.05s;
transition: opacity 0.05s ease 0.05s;
opacity:1;
}
-
-.ace_underline {
- text-decoration: underline;
-}
-
-.ace_bold {
- font-weight: bold;
-}
-
-.ace_nobold .ace_bold {
- font-weight: normal;
-}
-
-.ace_italic {
- font-style: italic;
-}
-
-
-.ace_error-marker {
- background-color: rgba(255, 0, 0,0.2);
- position: absolute;
- z-index: 9;
-}
-
-.ace_highlight-marker {
- background-color: rgba(255, 255, 0,0.2);
- position: absolute;
- z-index: 8;
-}
-
-/*
-styles = []
-for (var i = 1; i < 16; i++) {
- styles.push(".ace_br" + i + "{" + (
- ["top-left", "top-right", "bottom-right", "bottom-left"]
- ).map(function(x, j) {
- return i & (1<
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -32,36 +39,36 @@ define(function(require, exports, module) {
"use strict";
var oop = require("./lib/oop");
-var applyDelta = require("./apply_delta").applyDelta;
var EventEmitter = require("./lib/event_emitter").EventEmitter;
var Range = require("./range").Range;
var Anchor = require("./anchor").Anchor;
/**
- * Contains the text of the document. Document can be attached to several [[EditSession `EditSession`]]s.
- * At its core, `Document`s are just an array of strings, with each row in the document matching up to the array index.
+ * class Document
+ *
+ * Contains the text of the document. Document can be attached to several [[EditSession `EditSession`]]s. At its core, `Document`s are just an array of strings, with each row in the document matching up to the array index.
+ *
*
- * @class Document
**/
-/**
+ /**
+ * new Document([text])
+ * - text (String | Array): The starting text
*
* Creates a new `Document`. If `text` is included, the `Document` contains those strings; otherwise, it's empty.
- * @param {String | Array} text The starting text
- * @constructor
+ *
**/
-
-var Document = function(textOrLines) {
- this.$lines = [""];
+var Document = function(text) {
+ this.$lines = [];
// There has to be one line at least in the document. If you pass an empty
// string to the insert function, nothing will happen. Workaround.
- if (textOrLines.length === 0) {
+ if (text.length == 0) {
this.$lines = [""];
- } else if (Array.isArray(textOrLines)) {
- this.insertMergedLines({row: 0, column: 0}, textOrLines);
+ } else if (Array.isArray(text)) {
+ this.insertLines(0, text);
} else {
- this.insert({row: 0, column:0}, textOrLines);
+ this.insert({row: 0, column:0}, text);
}
};
@@ -70,104 +77,126 @@ var Document = function(textOrLines) {
oop.implement(this, EventEmitter);
/**
- * Replaces all the lines in the current `Document` with the value of `text`.
+ * Document.setValue(text) -> Void
+ * - text (String): The text to use
*
- * @param {String} text The text to use
+ * Replaces all the lines in the current `Document` with the value of `text`.
**/
this.setValue = function(text) {
- var len = this.getLength() - 1;
- this.remove(new Range(0, 0, len, this.getLine(len).length));
- this.insert({row: 0, column: 0}, text);
+ var len = this.getLength();
+ this.remove(new Range(0, 0, len, this.getLine(len-1).length));
+ this.insert({row: 0, column:0}, text);
};
/**
- * Returns all the lines in the document as a single string, joined by the new line character.
+ * Document.getValue() -> String
+ *
+ * Returns all the lines in the document as a single string, split by the new line character.
**/
this.getValue = function() {
return this.getAllLines().join(this.getNewLineCharacter());
};
/**
- * Creates a new `Anchor` to define a floating point in the document.
- * @param {Number} row The row number to use
- * @param {Number} column The column number to use
+ * Document.createAnchor(row, column) -> Anchor
+ * - row (Number): The row number to use
+ * - column (Number): The column number to use
*
+ * Creates a new `Anchor` to define a floating point in the document.
**/
this.createAnchor = function(row, column) {
return new Anchor(this, row, column);
};
- /**
- * Splits a string of text on any newline (`\n`) or carriage-return (`\r`) characters.
+ /** internal, hide
+ * Document.$split(text) -> [String]
+ * - text (String): The text to work with
+ * + ([String]): A String array, with each index containing a piece of the original `text` string.
+ *
+ * Splits a string of text on any newline (`\n`) or carriage-return ('\r') characters.
*
- * @method $split
- * @param {String} text The text to work with
- * @returns {String} A String array, with each index containing a piece of the original `text` string.
*
**/
// check for IE split bug
- if ("aaa".split(/a/).length === 0) {
+ if ("aaa".split(/a/).length == 0)
this.$split = function(text) {
return text.replace(/\r\n|\r/g, "\n").split("\n");
- };
- } else {
+ }
+ else
this.$split = function(text) {
return text.split(/\r\n|\r|\n/);
};
- }
+ /** internal, hide
+ * Document.$detectNewLine(text) -> Void
+ *
+ *
+ **/
this.$detectNewLine = function(text) {
var match = text.match(/^.*?(\r\n|\r|\n)/m);
- this.$autoNewLine = match ? match[1] : "\n";
- this._signal("changeNewLineMode");
- };
-
- /**
- * Returns the newline character that's being used, depending on the value of `newLineMode`.
- * @returns {String} If `newLineMode == windows`, `\r\n` is returned.
- * If `newLineMode == unix`, `\n` is returned.
- * If `newLineMode == auto`, the value of `autoNewLine` is returned.
- *
- **/
- this.getNewLineCharacter = function() {
- switch (this.$newLineMode) {
- case "windows":
- return "\r\n";
- case "unix":
- return "\n";
- default:
- return this.$autoNewLine || "\n";
+ if (match) {
+ this.$autoNewLine = match[1];
+ } else {
+ this.$autoNewLine = "\n";
}
};
- this.$autoNewLine = "";
+ /**
+ * Document.getNewLineCharacter() -> String
+ * + (String): If `newLineMode == windows`, `\r\n` is returned. Void
+ *
+ * Reverts any changes previously applied. These can be either `'includeText'`, `'insertLines'`, `'removeText'`, and `'removeLines'`.
**/
this.revertDeltas = function(deltas) {
for (var i=deltas.length-1; i>=0; i--) {
- this.revertDelta(deltas[i]);
- }
- };
-
- /**
- * Applies `delta` to the document.
- * @param {Object} delta A delta object (can include "insert" and "remove" actions)
- **/
- this.applyDelta = function(delta, doNotValidate) {
- var isInsert = delta.action == "insert";
- // An empty range is a NOOP.
- if (isInsert ? delta.lines.length <= 1 && !delta.lines[0]
- : !Range.comparePoints(delta.start, delta.end)) {
- return;
- }
-
- if (isInsert && delta.lines.length > 20000)
- this.$splitAndapplyLargeDelta(delta, 20000);
-
- // Apply.
- applyDelta(this.$lines, delta, doNotValidate);
- this._signal("change", delta);
- };
-
- this.$splitAndapplyLargeDelta = function(delta, MAX) {
- // Split large insert deltas. This is necessary because:
- // 1. We need to support splicing delta lines into the document via $lines.splice.apply(...)
- // 2. fn.apply() doesn't work for a large number of params. The smallest threshold is on chrome 40 ~42000.
- // we use 20000 to leave some space for actual stack
- //
- // To Do: Ideally we'd be consistent and also split 'delete' deltas. We don't do this now, because delete
- // delta handling is too slow. If we make delete delta handling faster we can split all large deltas
- // as shown in https://gist.github.com/aldendaniels/8367109#file-document-snippet-js
- // If we do this, update validateDelta() to limit the number of lines in a delete delta.
- var lines = delta.lines;
- var l = lines.length;
- var row = delta.start.row;
- var column = delta.start.column;
- var from = 0, to = 0;
- do {
- from = to;
- to += MAX - 1;
- var chunk = lines.slice(from, to);
- if (to > l) {
- // Update remaining delta.
- delta.lines = chunk;
- delta.start.row = row + from;
- delta.start.column = column;
- break;
- }
- chunk.push("");
- this.applyDelta({
- start: this.pos(row + from, column),
- end: this.pos(row + to, column = 0),
- action: delta.action,
- lines: chunk
- }, true);
- } while(true);
- };
-
- /**
- * Reverts `delta` from the document.
- * @param {Object} delta A delta object (can include "insert" and "remove" actions)
- **/
- this.revertDelta = function(delta) {
- this.applyDelta({
- start: this.clonePos(delta.start),
- end: this.clonePos(delta.end),
- action: (delta.action == "insert" ? "remove" : "insert"),
- lines: delta.lines.slice()
- });
- };
-
- /**
- * Converts an index position in a document to a `{row, column}` object.
- *
- * Index refers to the "absolute position" of a character in the document. For example:
- *
- * ```javascript
- * var x = 0; // 10 characters, plus one for newline
- * var y = -1;
- * ```
- *
- * Here, `y` is an index 15: 11 characters for the first row, and 5 characters until `y` in the second.
- *
- * @param {Number} index An index to convert
- * @param {Number} startRow=0 The row from which to start the conversion
- * @returns {Object} A `{row, column}` object of the `index` position
- */
- this.indexToPosition = function(index, startRow) {
- var lines = this.$lines || this.getAllLines();
- var newlineLength = this.getNewLineCharacter().length;
- for (var i = startRow || 0, l = lines.length; i < l; i++) {
- index -= lines[i].length + newlineLength;
- if (index < 0)
- return {row: i, column: index + lines[i].length + newlineLength};
- }
- return {row: l-1, column: lines[l-1].length};
- };
+ var delta = deltas[i];
- /**
- * Converts the `{row, column}` position in a document to the character's index.
- *
- * Index refers to the "absolute position" of a character in the document. For example:
- *
- * ```javascript
- * var x = 0; // 10 characters, plus one for newline
- * var y = -1;
- * ```
- *
- * Here, `y` is an index 15: 11 characters for the first row, and 5 characters until `y` in the second.
- *
- * @param {Object} pos The `{row, column}` to convert
- * @param {Number} startRow=0 The row from which to start the conversion
- * @returns {Number} The index position in the document
- */
- this.positionToIndex = function(pos, startRow) {
- var lines = this.$lines || this.getAllLines();
- var newlineLength = this.getNewLineCharacter().length;
- var index = 0;
- var row = Math.min(pos.row, lines.length);
- for (var i = startRow || 0; i < row; ++i)
- index += lines[i].length + newlineLength;
+ var range = Range.fromPoints(delta.range.start, delta.range.end);
- return index + pos.column;
+ if (delta.action == "insertLines")
+ this.removeLines(range.start.row, range.end.row - 1);
+ else if (delta.action == "insertText")
+ this.remove(range);
+ else if (delta.action == "removeLines")
+ this.insertLines(range.start.row, delta.lines);
+ else if (delta.action == "removeText")
+ this.insert(range.start, delta.text);
+ }
};
}).call(Document.prototype);
diff --git a/lib/ace/document_test.js b/lib/ace/document_test.js
index ada56cd2..f140e3d4 100644
--- a/lib/ace/document_test.js
+++ b/lib/ace/document_test.js
@@ -1,30 +1,38 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ * Julian Viereck
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -46,7 +54,7 @@ module.exports = {
var doc = new Document(["12", "34"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
doc.insert({row: 0, column: 1}, "juhu");
assert.equal(doc.getValue(), ["1juhu2", "34"].join("\n"));
@@ -63,9 +71,9 @@ module.exports = {
var doc = new Document(["12", "34"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
- doc.insertMergedLines({row: 0, column: 1}, ['', '']);
+ doc.insertNewLine({row: 0, column: 1});
assert.equal(doc.getValue(), ["1", "2", "34"].join("\n"));
var d = deltas.concat();
@@ -80,9 +88,9 @@ module.exports = {
var doc = new Document(["12", "34"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
- doc.insertFullLines(0, ["aa", "bb"]);
+ doc.insertLines(0, ["aa", "bb"]);
assert.equal(doc.getValue(), ["aa", "bb", "12", "34"].join("\n"));
var d = deltas.concat();
@@ -97,9 +105,9 @@ module.exports = {
var doc = new Document(["12", "34"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
- doc.insertFullLines(2, ["aa", "bb"]);
+ doc.insertLines(2, ["aa", "bb"]);
assert.equal(doc.getValue(), ["12", "34", "aa", "bb"].join("\n"));
},
@@ -107,9 +115,9 @@ module.exports = {
var doc = new Document(["12", "34"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
- doc.insertFullLines(1, ["aa", "bb"]);
+ doc.insertLines(1, ["aa", "bb"]);
assert.equal(doc.getValue(), ["12", "aa", "bb", "34"].join("\n"));
var d = deltas.concat();
@@ -124,7 +132,7 @@ module.exports = {
var doc = new Document(["12", "34"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
doc.insert({row: 0, column: 0}, "aa\nbb\ncc");
assert.equal(doc.getValue(), ["aa", "bb", "cc12", "34"].join("\n"));
@@ -141,9 +149,9 @@ module.exports = {
var doc = new Document(["12", "34"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
- doc.insert({row: 1, column: 2}, "aa\nbb\ncc");
+ doc.insert({row: 2, column: 0}, "aa\nbb\ncc");
assert.equal(doc.getValue(), ["12", "34aa", "bb", "cc"].join("\n"));
var d = deltas.concat();
@@ -158,7 +166,7 @@ module.exports = {
var doc = new Document(["12", "34"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
doc.insert({row: 0, column: 1}, "aa\nbb\ncc");
assert.equal(doc.getValue(), ["1aa", "bb", "cc2", "34"].join("\n"));
@@ -175,7 +183,7 @@ module.exports = {
var doc = new Document(["1234", "5678"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
doc.remove(new Range(0, 1, 0, 3));
assert.equal(doc.getValue(), ["14", "5678"].join("\n"));
@@ -192,7 +200,7 @@ module.exports = {
var doc = new Document(["1234", "5678"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
doc.remove(new Range(0, 4, 1, 0));
assert.equal(doc.getValue(), ["12345678"].join("\n"));
@@ -209,7 +217,7 @@ module.exports = {
var doc = new Document(["1234", "5678", "abcd"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
doc.remove(new Range(0, 2, 2, 2));
assert.equal(doc.getValue(), ["12cd"].join("\n"));
@@ -226,7 +234,7 @@ module.exports = {
var doc = new Document(["1234", "5678", "abcd"]);
var deltas = [];
- doc.on("change", function(e) { deltas.push(e); });
+ doc.on("change", function(e) { deltas.push(e.data); });
doc.remove(new Range(1, 0, 3, 0));
assert.equal(doc.getValue(), ["1234", ""].join("\n"));
@@ -235,7 +243,7 @@ module.exports = {
"test: remove lines should return the removed lines" : function() {
var doc = new Document(["1234", "5678", "abcd"]);
- var removed = doc.removeFullLines(1, 2);
+ var removed = doc.removeLines(1, 2);
assert.equal(removed.join("\n"), ["5678", "abcd"].join("\n"));
},
@@ -296,35 +304,6 @@ module.exports = {
"test: empty document has to contain one line": function() {
var doc = new Document("");
assert.equal(doc.$lines.length, 1);
- },
-
- "test: ignore empty delta": function() {
- var doc = new Document("");
- doc.on("change", function() {
- throw "should ignore empty delta";
- })
- doc.insert({row: 0, column: 0}, "");
- doc.insert({row: 1, column: 1}, "");
- doc.remove({start: {row: 1, column: 1}, end: {row: 1, column: 1}});
- },
-
- "test: inserting huge delta": function() {
- var doc = new Document("");
- var val = "";
- var MAX = 0xF000;
- for (var i = 0; i < 10 * MAX; i++) {
- val += i + "\n"
- }
- doc.setValue(val);
- assert.equal(doc.getValue(), val);
-
- for (var i = 3 * MAX + 2; i >= 3 * MAX - 2; i--) {
- val = doc.getLines(0, i).join("\n");
- doc.setValue("\nab");
- assert.equal(doc.getValue(), "\nab");
- doc.insert({row: 1, column: 1}, val);
- assert.equal(doc.getValue(), "\na" + val + "b");
- }
}
};
diff --git a/lib/ace/edit_session.js b/lib/ace/edit_session.js
index 2aa9b378..21d908b5 100644
--- a/lib/ace/edit_session.js
+++ b/lib/ace/edit_session.js
@@ -1,39 +1,50 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ * Mihai Sucan
+ * Julian Viereck
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
define(function(require, exports, module) {
"use strict";
+var config = require("./config");
var oop = require("./lib/oop");
var lang = require("./lib/lang");
-var config = require("./config");
+var net = require("./lib/net");
var EventEmitter = require("./lib/event_emitter").EventEmitter;
var Selection = require("./selection").Selection;
var TextMode = require("./mode/text").Mode;
@@ -43,127 +54,79 @@ var BackgroundTokenizer = require("./background_tokenizer").BackgroundTokenizer;
var SearchHighlight = require("./search_highlight").SearchHighlight;
/**
- * Stores all the data about [[Editor `Editor`]] state providing easy way to change editors state.
+ * class EditSession
+ *
+ * Stores all the data about [[Editor `Editor`]] state providing easy way to change editors state. `EditSession` can be attached to only one [[Document `Document`]]. Same `Document` can be attached to several `EditSession`s.
*
- * `EditSession` can be attached to only one [[Document `Document`]]. Same `Document` can be attached to several `EditSession`s.
- * @class EditSession
**/
-//{ events
+// events
/**
+ * EditSession@change(e)
*
* Emitted when the document changes.
- * @event change
- * @param {Object} e An object containing a `delta` of information about the change.
**/
/**
- * Emitted when the tab size changes, via [[EditSession.setTabSize]].
+ * EditSession@tokenizerUpdate(e)
*
- * @event changeTabSize
- **/
-/**
- * Emitted when the ability to overwrite text changes, via [[EditSession.setOverwrite]].
- *
- * @event changeOverwrite
- **/
-/**
- * Emitted when the gutter changes, either by setting or removing breakpoints, or when the gutter decorations change.
- *
- * @event changeBreakpoint
- **/
-/**
- * Emitted when a front marker changes.
- *
- * @event changeFrontMarker
- **/
-/**
- * Emitted when a back marker changes.
- *
- * @event changeBackMarker
- **/
-/**
- * Emitted when an annotation changes, like through [[EditSession.setAnnotations]].
- *
- * @event changeAnnotation
- **/
-/**
- * Emitted when a background tokenizer asynchronously processes new rows.
- * @event tokenizerUpdate
- *
- * @param {Object} e An object containing one property, `"data"`, that contains information about the changing rows
+ * Emitted when a background tokenizer asynchronousely processes new rows.
*
**/
/**
- * Emitted when the current mode changes.
+ * EditSession@changeFold(e)
*
- * @event changeMode
- *
- **/
-/**
- * Emitted when the wrap mode changes.
- *
- * @event changeWrapMode
- *
- **/
-/**
- * Emitted when the wrapping limit changes.
- *
- * @event changeWrapLimit
- *
- **/
-/**
- * Emitted when a code fold is added or removed.
- *
- * @event changeFold
+ * Emitted when a code fold added or removed.
*
**/
/**
+ * EditSession@changeScrollTop()
+ *
* Emitted when the scroll top changes.
- * @event changeScrollTop
- *
- * @param {Number} scrollTop The new scroll top value
**/
/**
+ * EditSession@changeScrollLeft()
+ *
* Emitted when the scroll left changes.
- * @event changeScrollLeft
- *
- * @param {Number} scrollLeft The new scroll left value
**/
-//}
-
+
+
/**
+ * new EditSession(text, mode)
+ * - text (Document | String): If `text` is a `Document`, it associates the `EditSession` with it. Otherwise, a new `Document` is created, with the initial text
+ * - mode (TextMode): The inital language mode to use for the document
*
* Sets up a new `EditSession` and associates it with the given `Document` and `TextMode`.
- * @param {Document | String} text [If `text` is a `Document`, it associates the `EditSession` with it. Otherwise, a new `Document` is created, with the initial text]{: #textParam}
- * @param {TextMode} mode [The inital language mode to use for the document]{: #modeParam}
*
- * @constructor
**/
var EditSession = function(text, mode) {
+ this.$modified = true;
this.$breakpoints = [];
this.$decorations = [];
this.$frontMarkers = {};
this.$backMarkers = {};
this.$markerId = 1;
- this.$undoSelect = true;
-
+ this.$resetRowCache(0);
+ this.$wrapData = [];
this.$foldData = [];
+ this.$rowLengthCache = [];
+ this.$undoSelect = true;
this.$foldData.toString = function() {
- return this.join("\n");
- };
- this.on("changeFold", this.onChangeFold.bind(this));
- this.$onChange = this.onChange.bind(this);
+ var str = "";
+ this.forEach(function(foldLine) {
+ str += "\n" + foldLine.toString();
+ });
+ return str;
+ }
- if (typeof text != "object" || !text.getLine)
- text = new Document(text);
+ if (typeof text == "object" && text.getLine) {
+ this.setDocument(text);
+ } else {
+ this.setDocument(new Document(text));
+ }
- this.setDocument(text);
this.selection = new Selection(this);
-
- config.resetOptions(this);
this.setMode(mode);
- config._signal("session", this);
};
@@ -172,48 +135,55 @@ var EditSession = function(text, mode) {
oop.implement(this, EventEmitter);
/**
- * Sets the `EditSession` to point to a new `Document`. If a `BackgroundTokenizer` exists, it also points to `doc`.
+ * EditSession.setDocument(doc)
+ * - doc (Document): The new `Document` to use
*
- * @param {Document} doc The new `Document` to use
+ * Sets the `EditSession` to point to a new `Document`. If a `BackgroundTokenizer` exists, it also points to `doc`.
*
**/
this.setDocument = function(doc) {
if (this.doc)
- this.doc.removeListener("change", this.$onChange);
+ throw new Error("Document is already set");
this.doc = doc;
- doc.on("change", this.$onChange);
+ doc.on("change", this.onChange.bind(this));
+ this.on("changeFold", this.onChangeFold.bind(this));
- if (this.bgTokenizer)
+ if (this.bgTokenizer) {
this.bgTokenizer.setDocument(this.getDocument());
-
- this.resetCaches();
+ this.bgTokenizer.start(0);
+ }
};
/**
+ * EditSession.getDocument() -> Document
+ *
* Returns the `Document` associated with this session.
- * @return {Document}
+ *
**/
this.getDocument = function() {
return this.doc;
};
- /**
- * @param {Number} row The row to work with
+ /** internal, hide
+ * EditSession.$resetRowCache(row)
+ * - row (Number): The row to work with
+ *
+ *
*
**/
- this.$resetRowCache = function(docRow) {
- if (!docRow) {
+ this.$resetRowCache = function(docRrow) {
+ if (!docRrow) {
this.$docRowCache = [];
this.$screenRowCache = [];
return;
}
+
+ var i = this.$getRowCacheIndex(this.$docRowCache, docRrow) + 1;
var l = this.$docRowCache.length;
- var i = this.$getRowCacheIndex(this.$docRowCache, docRow) + 1;
- if (l > i) {
- this.$docRowCache.splice(i, l);
- this.$screenRowCache.splice(i, l);
- }
+ this.$docRowCache.splice(i, l);
+ this.$screenRowCache.splice(i, l);
+
};
this.$getRowCacheIndex = function(cacheArray, val) {
@@ -232,16 +202,7 @@ var EditSession = function(text, mode) {
return mid;
}
- return low -1;
- };
-
- this.resetCaches = function() {
- this.$modified = true;
- this.$wrapData = [];
- this.$rowLengthCache = [];
- this.$resetRowCache(0);
- if (this.bgTokenizer)
- this.bgTokenizer.start(0);
+ return low && low -1;
};
this.onChangeFold = function(e) {
@@ -249,12 +210,13 @@ var EditSession = function(text, mode) {
this.$resetRowCache(fold.start.row);
};
- this.onChange = function(delta) {
+ this.onChange = function(e) {
+ var delta = e.data;
this.$modified = true;
- this.$resetRowCache(delta.start.row);
+ this.$resetRowCache(delta.range.start.row);
- var removedFolds = this.$updateInternalDataOnChange(delta);
+ var removedFolds = this.$updateInternalDataOnChange(e);
if (!this.$fromUndo && this.$undoManager && !delta.ignore) {
this.$deltasDoc.push(delta);
if (removedFolds && removedFolds.length != 0) {
@@ -267,40 +229,40 @@ var EditSession = function(text, mode) {
this.$informUndoManager.schedule();
}
- this.bgTokenizer && this.bgTokenizer.$updateOnChange(delta);
- this._signal("change", delta);
+ this.bgTokenizer.$updateOnChange(delta);
+ this._emit("change", e);
};
/**
+ * EditSession.setValue(text)
+ * - text (String): The new text to place
+ *
* Sets the session text.
- * @param {String} text The new text to place
*
**/
this.setValue = function(text) {
this.doc.setValue(text);
- this.selection.moveTo(0, 0);
+ this.selection.moveCursorTo(0, 0);
+ this.selection.clearSelection();
this.$resetRowCache(0);
this.$deltas = [];
this.$deltasDoc = [];
this.$deltasFold = [];
- this.setUndoManager(this.$undoManager);
this.getUndoManager().reset();
};
- /**
+ /** alias of: EditSession.toString
+ * EditSession.getValue() -> String
+ *
* Returns the current [[Document `Document`]] as a string.
- * @method toString
- * @returns {String}
- * @alias EditSession.getValue
*
**/
-
- /**
+ /** alias of: EditSession.getValue
+ * EditSession.toString() -> String
+ *
* Returns the current [[Document `Document`]] as a string.
- * @method getValue
- * @returns {String}
- * @alias EditSession.toString
+ *
**/
this.getValue =
this.toString = function() {
@@ -308,27 +270,30 @@ var EditSession = function(text, mode) {
};
/**
+ * EditSession.getSelection() -> String
+ *
* Returns the string of the current selection.
**/
this.getSelection = function() {
return this.selection;
};
- /**
- * {:BackgroundTokenizer.getState}
- * @param {Number} row The row to start at
+ /** related to: BackgroundTokenizer.getState
+ * EditSession.getState(row) -> Array
+ * - row (Number): The row to start at
+ *
+ * {:BackgroundTokenizer.getState}
*
- * @related BackgroundTokenizer.getState
**/
this.getState = function(row) {
return this.bgTokenizer.getState(row);
};
- /**
+ /** related to: BackgroundTokenizer.getTokens
+ * EditSession.getTokens(row) -> Array
+ * - row (Number): The row to start at
+ *
* Starts tokenizing at the row indicated. Returns a list of objects of the tokenized rows.
- * @param {Number} row The row to start at
- *
- *
*
**/
this.getTokens = function(row) {
@@ -336,11 +301,11 @@ var EditSession = function(text, mode) {
};
/**
- * Returns an object indicating the token at the current row. The object has two properties: `index` and `start`.
- * @param {Number} row The row number to retrieve from
- * @param {Number} column The column number to retrieve from
- *
+ * EditSession.getTokenAt(row, column) -> Array
+ * - row (Number): The row number to retrieve from
+ * - column (Number): The column number to retrieve from
*
+ * Returns an array of tokens at the indicated row and column.
**/
this.getTokenAt = function(row, column) {
var tokens = this.bgTokenizer.getTokens(row);
@@ -363,11 +328,18 @@ var EditSession = function(text, mode) {
return token;
};
+ this.highlight = function(re) {
+ if (!this.$searchHighlight) {
+ var highlight = new SearchHighlight(null, "ace_selected_word", "text");
+ this.$searchHighlight = this.addDynamicMarker(highlight);
+ }
+ this.$searchHighlight.setRegexp(re);
+ }
/**
+ * EditSession.setUndoManager(undoManager)
+ * - undoManager (UndoManager): The new undo manager
+ *
* Sets the undo manager.
- * @param {UndoManager} undoManager The new undo manager
- *
- *
**/
this.setUndoManager = function(undoManager) {
this.$undoManager = undoManager;
@@ -380,7 +352,11 @@ var EditSession = function(text, mode) {
if (undoManager) {
var self = this;
-
+ /** internal, hide
+ * EditSession.$syncInformUndoManager()
+ *
+ *
+ **/
this.$syncInformUndoManager = function() {
self.$informUndoManager.cancel();
@@ -403,25 +379,17 @@ var EditSession = function(text, mode) {
if (self.$deltas.length > 0) {
undoManager.execute({
action: "aceupdate",
- args: [self.$deltas, self],
- merge: self.mergeUndoDeltas
+ args: [self.$deltas, self]
});
}
- self.mergeUndoDeltas = false;
+
self.$deltas = [];
- };
- this.$informUndoManager = lang.delayedCall(this.$syncInformUndoManager);
+ }
+ this.$informUndoManager =
+ lang.deferredCall(this.$syncInformUndoManager);
}
};
- /**
- * starts a new group in undo history
- **/
- this.markUndoGroup = function() {
- if (this.$syncInformUndoManager)
- this.$syncInformUndoManager();
- };
-
this.$defaultUndoManager = {
undo: function() {},
redo: function() {},
@@ -429,13 +397,17 @@ var EditSession = function(text, mode) {
};
/**
+ * EditSession.getUndoManager() -> UndoManager
+ *
* Returns the current undo manager.
**/
this.getUndoManager = function() {
return this.$undoManager || this.$defaultUndoManager;
- };
+ },
/**
+ * EditSession.getTabString() -> String
+ *
* Returns the current value for tabs. If the user is using soft tabs, this will be a series of spaces (defined by [[EditSession.getTabSize `getTabSize()`]]); otherwise it's simply `'\t'`.
**/
this.getTabString = function() {
@@ -446,30 +418,49 @@ var EditSession = function(text, mode) {
}
};
+ this.$useSoftTabs = true;
/**
- /**
+ * EditSession.setUseSoftTabs(useSoftTabs)
+ * - useSoftTabs (Boolean): Value indicating whether or not to use soft tabs
+ *
* Pass `true` to enable the use of soft tabs. Soft tabs means you're using spaces instead of the tab character (`'\t'`).
- * @param {Boolean} useSoftTabs Value indicating whether or not to use soft tabs
+ *
**/
- this.setUseSoftTabs = function(val) {
- this.setOption("useSoftTabs", val);
+ this.setUseSoftTabs = function(useSoftTabs) {
+ if (this.$useSoftTabs === useSoftTabs) return;
+
+ this.$useSoftTabs = useSoftTabs;
};
+
/**
+ * EditSession.getUseSoftTabs() -> Boolean
+ *
* Returns `true` if soft tabs are being used, `false` otherwise.
- * @returns {Boolean}
+ *
**/
this.getUseSoftTabs = function() {
- // todo might need more general way for changing settings from mode, but this is ok for now
- return this.$useSoftTabs && !this.$mode.$indentWithTabs;
+ return this.$useSoftTabs;
};
+
+ this.$tabSize = 4;
/**
+ * EditSession.setTabSize(tabSize)
+ * - tabSize (Number): The new tab size
+ *
* Set the number of spaces that define a soft tab; for example, passing in `4` transforms the soft tabs to be equivalent to four spaces. This function also emits the `changeTabSize` event.
- * @param {Number} tabSize The new tab size
**/
this.setTabSize = function(tabSize) {
- this.setOption("tabSize", tabSize);
+ if (isNaN(tabSize) || this.$tabSize === tabSize) return;
+
+ this.$modified = true;
+ this.$rowLengthCache = [];
+ this.$tabSize = tabSize;
+ this._emit("changeTabSize");
};
+
/**
+ * EditSession.getTabSize() -> Number
+ *
* Returns the current tab size.
**/
this.getTabSize = function() {
@@ -477,30 +468,33 @@ var EditSession = function(text, mode) {
};
/**
+ * EditSession.isTabStop(position) -> Boolean
+ * - position (Object): The position to check
+ *
* Returns `true` if the character at the position is a soft tab.
- * @param {Object} position The position to check
- *
- *
**/
this.isTabStop = function(position) {
- return this.$useSoftTabs && (position.column % this.$tabSize === 0);
+ return this.$useSoftTabs && (position.column % this.$tabSize == 0);
};
this.$overwrite = false;
/**
- * Pass in `true` to enable overwrites in your session, or `false` to disable.
- *
- * If overwrites is enabled, any text you enter will type over any text after it. If the value of `overwrite` changes, this function also emites the `changeOverwrite` event.
- *
- * @param {Boolean} overwrite Defines wheter or not to set overwrites
+ * EditSession.setOverwrite(overwrite)
+ * - overwrite (Boolean): Defines wheter or not to set overwrites
*
+ * Pass in `true` to enable overwrites in your session, or `false` to disable. If overwrites is enabled, any text you enter will type over any text after it. If the value of `overwrite` changes, this function also emites the `changeOverwrite` event.
*
**/
this.setOverwrite = function(overwrite) {
- this.setOption("overwrite", overwrite);
+ if (this.$overwrite == overwrite) return;
+
+ this.$overwrite = overwrite;
+ this._emit("changeOverwrite");
};
/**
+ * EditSession.getOverwrite() -> Boolean
+ *
* Returns `true` if overwrites are enabled; `false` otherwise.
**/
this.getOverwrite = function() {
@@ -508,6 +502,8 @@ var EditSession = function(text, mode) {
};
/**
+ * EditSession.toggleOverwrite()
+ *
* Sets the value of overwrite to the opposite of whatever it currently is.
**/
this.toggleOverwrite = function() {
@@ -515,44 +511,45 @@ var EditSession = function(text, mode) {
};
/**
+ * EditSession.addGutterDecoration(row, className) -> Void
+ * - row (Number): The row number
+ * - className (String): The class to add
+ *
* Adds `className` to the `row`, to be used for CSS stylings and whatnot.
- * @param {Number} row The row number
- * @param {String} className The class to add
- *
- *
**/
this.addGutterDecoration = function(row, className) {
if (!this.$decorations[row])
this.$decorations[row] = "";
this.$decorations[row] += " " + className;
- this._signal("changeBreakpoint", {});
+ this._emit("changeBreakpoint", {});
};
/**
+ * EditSession.removeGutterDecoration(row, className)-> Void
+ * - row (Number): The row number
+ * - className (String): The class to add
+ *
* Removes `className` from the `row`.
- * @param {Number} row The row number
- * @param {String} className The class to add
- *
- *
**/
this.removeGutterDecoration = function(row, className) {
this.$decorations[row] = (this.$decorations[row] || "").replace(" " + className, "");
- this._signal("changeBreakpoint", {});
+ this._emit("changeBreakpoint", {});
};
-
+
/**
+ * EditSession.getBreakpoints() -> Array
+ *
* Returns an array of numbers, indicating which rows have breakpoints.
- * @returns {[Number]}
**/
this.getBreakpoints = function() {
return this.$breakpoints;
};
/**
+ * EditSession.setBreakpoints(rows)
+ * - rows (Array): An array of row indicies
+ *
* Sets a breakpoint on every row number given by `rows`. This function also emites the `'changeBreakpoint'` event.
- * @param {Array} rows An array of row indices
- *
- *
*
**/
this.setBreakpoints = function(rows) {
@@ -560,23 +557,25 @@ var EditSession = function(text, mode) {
for (var i=0; i Number
+ * - range (Range): Define the range of the marker
+ * - clazz (String): Set the CSS class for the marker
+ * - type (Function | String): Identify the type of the marker
+ * - inFront (Boolean): Set to `true` to establish a front marker
+ *
* Adds a new marker to the given `Range`. If `inFront` is `true`, a front marker is defined, and the `'changeFrontMarker'` event fires; otherwise, the `'changeBackMarker'` event fires.
- * @param {Range} range Define the range of the marker
- * @param {String} clazz Set the CSS class for the marker
- * @param {Function | String} type Identify the type of the marker
- * @param {Boolean} inFront Set to `true` to establish a front marker
*
- *
- * @return {Number} The new marker id
**/
this.addMarker = function(range, clazz, type, inFront) {
var id = this.$markerId++;
@@ -619,26 +618,25 @@ var EditSession = function(text, mode) {
clazz : clazz,
inFront: !!inFront,
id: id
- };
+ }
if (inFront) {
this.$frontMarkers[id] = marker;
- this._signal("changeFrontMarker");
+ this._emit("changeFrontMarker")
} else {
this.$backMarkers[id] = marker;
- this._signal("changeBackMarker");
+ this._emit("changeBackMarker")
}
return id;
};
/**
+ * EditSession.addDynamicMarker(marker, inFront) -> Object
+ * - marker (Object): object with update method
+ * - inFront (Boolean): Set to `true` to establish a front marker
+ *
* Adds a dynamic marker to the session.
- * @param {Object} marker object with update method
- * @param {Boolean} inFront Set to `true` to establish a front marker
- *
- *
- * @return {Object} The added marker
**/
this.addDynamicMarker = function(marker, inFront) {
if (!marker.update)
@@ -649,20 +647,20 @@ var EditSession = function(text, mode) {
if (inFront) {
this.$frontMarkers[id] = marker;
- this._signal("changeFrontMarker");
+ this._emit("changeFrontMarker")
} else {
this.$backMarkers[id] = marker;
- this._signal("changeBackMarker");
+ this._emit("changeBackMarker")
}
return marker;
};
/**
+ * EditSession.removeMarker(markerId)
+ * - markerId (Number): A number representing a marker
+ *
* Removes the marker with the specified ID. If this marker was in front, the `'changeFrontMarker'` event is emitted. If the marker was in the back, the `'changeBackMarker'` event is emitted.
- * @param {Number} markerId A number representing a marker
- *
- *
*
**/
this.removeMarker = function(markerId) {
@@ -673,42 +671,21 @@ var EditSession = function(text, mode) {
var markers = marker.inFront ? this.$frontMarkers : this.$backMarkers;
if (marker) {
delete (markers[markerId]);
- this._signal(marker.inFront ? "changeFrontMarker" : "changeBackMarker");
+ this._emit(marker.inFront ? "changeFrontMarker" : "changeBackMarker");
}
};
/**
- * Returns an object containing all of the markers, either front or back.
- * @param {Boolean} inFront If `true`, indicates you only want front markers; `false` indicates only back markers
+ * EditSession.getMarkers(inFront) -> Array
+ * - inFront (Boolean): If `true`, indicates you only want front markers; `false` indicates only back markers
+ *
+ * Returns an array containing the IDs of all the markers, either front or back.
*
- * @returns {Object}
**/
this.getMarkers = function(inFront) {
return inFront ? this.$frontMarkers : this.$backMarkers;
};
- this.highlight = function(re) {
- if (!this.$searchHighlight) {
- var highlight = new SearchHighlight(null, "ace_selected-word", "text");
- this.$searchHighlight = this.addDynamicMarker(highlight);
- }
- this.$searchHighlight.setRegexp(re);
- };
-
- // experimental
- this.highlightLines = function(startRow, endRow, clazz, inFront) {
- if (typeof endRow != "number") {
- clazz = endRow;
- endRow = startRow;
- }
- if (!clazz)
- clazz = "ace_step";
-
- var range = new Range(startRow, 0, endRow, Infinity);
- range.id = this.addMarker(range, clazz, "fullLine", inFront);
- return range;
- };
-
/*
* Error:
* {
@@ -719,34 +696,48 @@ var EditSession = function(text, mode) {
* }
*/
/**
- * Sets annotations for the `EditSession`. This functions emits the `'changeAnnotation'` event.
- * @param {Array} annotations A list of annotations
+ * EditSession.setAnnotations(annotations)
+ * - annotations (Array): A list of annotations
*
+ * Sets annotations for the `EditSession`. This functions emits the `'changeAnnotation'` event.
**/
this.setAnnotations = function(annotations) {
- this.$annotations = annotations;
- this._signal("changeAnnotation", {});
+ this.$annotations = {};
+ for (var i=0; i Object
+ *
* Returns the annotations for the `EditSession`.
- * @returns {Array}
**/
this.getAnnotations = function() {
- return this.$annotations || [];
+ return this.$annotations || {};
};
/**
+ * EditSession.clearAnnotations()
+ *
* Clears all the annotations for this session. This function also triggers the `'changeAnnotation'` event.
**/
this.clearAnnotations = function() {
- this.setAnnotations([]);
+ this.$annotations = {};
+ this._emit("changeAnnotation", {});
};
- /**
- * If `text` contains either the newline (`\n`) or carriage-return ('\r') characters, `$autoNewLine` stores that value.
- * @param {String} text A block of text
+ /** internal, hide
+ * EditSession.$detectNewLine(text)
+ * - text (String): A block of text
*
+ * If `text` contains either the newline (`\n`) or carriage-return ('\r') characters, `$autoNewLine` stores that value.
*
**/
this.$detectNewLine = function(text) {
@@ -759,11 +750,12 @@ var EditSession = function(text, mode) {
};
/**
- * Given a starting row and column, this method returns the `Range` of the first word boundary it finds.
- * @param {Number} row The row to start at
- * @param {Number} column The column to start at
+ * EditSession.getWordRange(row, column) -> Range
+ * - row (Number): The row to start at
+ * - column (Number): The column to start at
+ *
+ * Given a starting row and column, this method returns the `Range` of the first word boundary it finds.
*
- * @returns {Range}
**/
this.getWordRange = function(row, column) {
var line = this.getLine(row);
@@ -774,7 +766,7 @@ var EditSession = function(text, mode) {
if (!inToken)
inToken = !!line.charAt(column).match(this.tokenRe);
-
+
if (inToken)
var re = this.tokenRe;
else if (/^\s+$/.test(line.slice(column-1, column+1)))
@@ -800,11 +792,11 @@ var EditSession = function(text, mode) {
};
/**
- * Gets the range of a word, including its right whitespace.
- * @param {Number} row The row number to start from
- * @param {Number} column The column number to start from
+ * EditSession.getAWordRange(row, column) -> Range
+ * - row (Number): The row number to start from
+ * - column (Number): The column number to start from
*
- * @return {Range}
+ * Gets the range of a word, including its right whitespace.
**/
this.getAWordRange = function(row, column) {
var wordRange = this.getWordRange(row, column);
@@ -816,107 +808,160 @@ var EditSession = function(text, mode) {
return wordRange;
};
- /**
+ /** related to: Document.setNewLineMode
+ * EditSession.setNewLineMode(newLineMode)
+ * - newLineMode (String): {:Document.setNewLineMode.param}
+ *
* {:Document.setNewLineMode.desc}
- * @param {String} newLineMode {:Document.setNewLineMode.param}
- *
- *
- * @related Document.setNewLineMode
**/
this.setNewLineMode = function(newLineMode) {
this.doc.setNewLineMode(newLineMode);
};
- /**
+ /** related to: Document.getNewLineMode
+ * EditSession.getNewLineMode() -> String
*
* Returns the current new line mode.
- * @returns {String}
- * @related Document.getNewLineMode
**/
this.getNewLineMode = function() {
return this.doc.getNewLineMode();
};
+ this.$useWorker = true;
+
/**
+ * EditSession.setUseWorker(useWorker)
+ * - useWorker (Boolean): Set to `true` to use a worker
+ *
* Identifies if you want to use a worker for the `EditSession`.
- * @param {Boolean} useWorker Set to `true` to use a worker
*
**/
- this.setUseWorker = function(useWorker) { this.setOption("useWorker", useWorker); };
+ this.setUseWorker = function(useWorker) {
+ if (this.$useWorker == useWorker)
+ return;
+
+ this.$useWorker = useWorker;
+
+ this.$stopWorker();
+ if (useWorker)
+ this.$startWorker();
+ };
/**
+ * EditSession.getUseWorker() -> Boolean
+ *
* Returns `true` if workers are being used.
**/
- this.getUseWorker = function() { return this.$useWorker; };
+ this.getUseWorker = function() {
+ return this.$useWorker;
+ };
/**
+ * EditSession.onReloadTokenizer(e)
+ *
* Reloads all the tokens on the current session. This function calls [[BackgroundTokenizer.start `BackgroundTokenizer.start ()`]] to all the rows; it also emits the `'tokenizerUpdate'` event.
**/
this.onReloadTokenizer = function(e) {
var rows = e.data;
this.bgTokenizer.start(rows.first);
- this._signal("tokenizerUpdate", e);
+ this._emit("tokenizerUpdate", e);
};
this.$modes = {};
+ this._loadMode = function(mode, callback) {
+ if (!this.$modes["null"])
+ this.$modes["null"] = this.$modes["ace/mode/text"] = new TextMode();
+
+ if (this.$modes[mode])
+ return callback(this.$modes[mode]);
+
+ var _self = this;
+ var module;
+ try {
+ module = require(mode);
+ } catch (e) {};
+ // sometimes require returns empty object (this bug is present in requirejs 2 as well)
+ if (module && module.Mode)
+ return done(module);
+
+ // set mode to text until loading is finished
+ if (!this.$mode)
+ this.$setModePlaceholder();
+
+ fetch(mode, function() {
+ require([mode], done);
+ });
+
+ function done(module) {
+ if (_self.$modes[mode])
+ return callback(_self.$modes[mode]);
+
+ _self.$modes[mode] = new module.Mode();
+ _self.$modes[mode].$id = mode;
+ _self._emit("loadmode", {
+ name: mode,
+ mode: _self.$modes[mode]
+ });
+ callback(_self.$modes[mode]);
+ }
+
+ function fetch(name, callback) {
+ if (!config.get("packaged"))
+ return callback();
+
+ net.loadScript(config.moduleUrl(name, "mode"), callback);
+ }
+ };
+
+ this.$setModePlaceholder = function() {
+ this.$mode = this.$modes["null"];
+ var tokenizer = this.$mode.getTokenizer();
+
+ if (!this.bgTokenizer) {
+ this.bgTokenizer = new BackgroundTokenizer(tokenizer);
+ var _self = this;
+ this.bgTokenizer.addEventListener("update", function(e) {
+ _self._emit("tokenizerUpdate", e);
+ });
+ } else {
+ this.bgTokenizer.setTokenizer(tokenizer);
+ }
+ this.bgTokenizer.setDocument(this.getDocument());
+
+ this.tokenRe = this.$mode.tokenRe;
+ this.nonTokenRe = this.$mode.nonTokenRe;
+ };
/**
+ * EditSession.setMode(mode)
+ * - mode (TextMode): Set a new text mode
+ *
* Sets a new text mode for the `EditSession`. This method also emits the `'changeMode'` event. If a [[BackgroundTokenizer `BackgroundTokenizer`]] is set, the `'tokenizerUpdate'` event is also emitted.
- * @param {TextMode} mode Set a new text mode
- * @param {cb} optional callback
*
**/
this.$mode = null;
this.$modeId = null;
- this.setMode = function(mode, cb) {
- if (mode && typeof mode === "object") {
- if (mode.getTokenizer)
- return this.$onChangeMode(mode);
- var options = mode;
- var path = options.path;
- } else {
- path = mode || "ace/mode/text";
- }
-
- // this is needed if ace isn't on require path (e.g tests in node)
- if (!this.$modes["ace/mode/text"])
- this.$modes["ace/mode/text"] = new TextMode();
-
- if (this.$modes[path] && !options) {
- this.$onChangeMode(this.$modes[path]);
- cb && cb();
- return;
- }
+ this.setMode = function(mode) {
+ mode = mode || "null";
// load on demand
- this.$modeId = path;
- config.loadModule(["mode", path], function(m) {
- if (this.$modeId !== path)
- return cb && cb();
- if (this.$modes[path] && !options) {
- this.$onChangeMode(this.$modes[path]);
- } else if (m && m.Mode) {
- m = new m.Mode(options);
- if (!options) {
- this.$modes[path] = m;
- m.$id = path;
- }
- this.$onChangeMode(m);
- }
- cb && cb();
- }.bind(this));
+ if (typeof mode === "string") {
+ if (this.$modeId == mode)
+ return;
- // set mode to text until loading is finished
- if (!this.$mode)
- this.$onChangeMode(this.$modes["ace/mode/text"], true);
- };
+ this.$modeId = mode;
+ var _self = this;
+ this._loadMode(mode, function(module) {
+ if (_self.$modeId !== mode)
+ return;
- this.$onChangeMode = function(mode, $isPlaceholder) {
- if (!$isPlaceholder)
- this.$modeId = mode.$id;
- if (this.$mode === mode)
+ _self.setMode(module);
+ });
return;
+ }
+ if (this.$mode === mode) return;
this.$mode = mode;
+ this.$modeId = mode.$id;
this.$stopWorker();
@@ -934,48 +979,58 @@ var EditSession = function(text, mode) {
this.bgTokenizer = new BackgroundTokenizer(tokenizer);
var _self = this;
this.bgTokenizer.addEventListener("update", function(e) {
- _self._signal("tokenizerUpdate", e);
+ _self._emit("tokenizerUpdate", e);
});
} else {
this.bgTokenizer.setTokenizer(tokenizer);
}
this.bgTokenizer.setDocument(this.getDocument());
+ this.bgTokenizer.start(0);
this.tokenRe = mode.tokenRe;
this.nonTokenRe = mode.nonTokenRe;
-
- if (!$isPlaceholder) {
- // experimental method, used by c9 findiniles
- if (mode.attachToSession)
- mode.attachToSession(this);
- this.$options.wrapMethod.set.call(this, this.$wrapMethod);
- this.$setFolding(mode.foldingRules);
- this.bgTokenizer.start(0);
- this._emit("changeMode");
- }
+ this.$setFolding(mode.foldingRules);
+
+ this._emit("changeMode");
};
+ /** internal, hide
+ * EditSession.stopWorker()
+ *
+ *
+ **/
this.$stopWorker = function() {
- if (this.$worker) {
+ if (this.$worker)
this.$worker.terminate();
- this.$worker = null;
- }
+
+ this.$worker = null;
};
+ /** internal, hide
+ * EditSession.$startWorker()
+ *
+ *
+ **/
this.$startWorker = function() {
- try {
- this.$worker = this.$mode.createWorker(this);
- } catch (e) {
- config.warn("Could not load worker", e);
- this.$worker = null;
+ if (typeof Worker !== "undefined" && !require.noWorker) {
+ try {
+ this.$worker = this.$mode.createWorker(this);
+ } catch (e) {
+ console.log("Could not load worker");
+ console.log(e);
+ this.$worker = null;
+ }
}
+ else
+ this.$worker = null;
};
/**
+ * EditSession.getMode() -> TextMode
+ *
* Returns the current text mode.
- * @returns {TextMode} The current text mode
**/
this.getMode = function() {
return this.$mode;
@@ -983,22 +1038,24 @@ var EditSession = function(text, mode) {
this.$scrollTop = 0;
/**
- * This function sets the scroll top value. It also emits the `'changeScrollTop'` event.
- * @param {Number} scrollTop The new scroll top value
+ * EditSession.setScrollTop(scrollTop)
+ * - scrollTop (Number): The new scroll top value
*
+ * This function sets the scroll top value. It also emits the `'changeScrollTop'` event.
**/
this.setScrollTop = function(scrollTop) {
- // TODO: should we force integer lineheight instead? scrollTop = Math.round(scrollTop);
- if (this.$scrollTop === scrollTop || isNaN(scrollTop))
+ scrollTop = Math.round(Math.max(0, scrollTop));
+ if (this.$scrollTop === scrollTop)
return;
this.$scrollTop = scrollTop;
- this._signal("changeScrollTop", scrollTop);
+ this._emit("changeScrollTop", scrollTop);
};
/**
+ * EditSession.getScrollTop() -> Number
+ *
* [Returns the value of the distance between the top of the editor and the topmost part of the visible content.]{: #EditSession.getScrollTop}
- * @returns {Number}
**/
this.getScrollTop = function() {
return this.$scrollTop;
@@ -1006,45 +1063,37 @@ var EditSession = function(text, mode) {
this.$scrollLeft = 0;
/**
+ * EditSession.setScrollLeft(scrollLeft)
+ *
* [Sets the value of the distance between the left of the editor and the leftmost part of the visible content.]{: #EditSession.setScrollLeft}
**/
this.setScrollLeft = function(scrollLeft) {
- // scrollLeft = Math.round(scrollLeft);
- if (this.$scrollLeft === scrollLeft || isNaN(scrollLeft))
+ scrollLeft = Math.round(Math.max(0, scrollLeft));
+ if (this.$scrollLeft === scrollLeft)
return;
this.$scrollLeft = scrollLeft;
- this._signal("changeScrollLeft", scrollLeft);
+ this._emit("changeScrollLeft", scrollLeft);
};
/**
+ * EditSession.getScrollLeft() -> Number
+ *
* [Returns the value of the distance between the left of the editor and the leftmost part of the visible content.]{: #EditSession.getScrollLeft}
- * @returns {Number}
**/
this.getScrollLeft = function() {
return this.$scrollLeft;
};
/**
+ * EditSession.getScreenWidth() -> Number
+ *
* Returns the width of the screen.
- * @returns {Number}
**/
this.getScreenWidth = function() {
this.$computeWidth();
- if (this.lineWidgets)
- return Math.max(this.getLineWidgetMaxWidth(), this.screenWidth);
return this.screenWidth;
};
-
- this.getLineWidgetMaxWidth = function() {
- if (this.lineWidgetsWidth != null) return this.lineWidgetsWidth;
- var width = 0;
- this.lineWidgets.forEach(function(w) {
- if (w && w.screenWidth > width)
- width = w.screenWidth;
- });
- return this.lineWidgetWidth = width;
- };
this.$computeWidth = function(force) {
if (this.$modified || force) {
@@ -1080,92 +1129,81 @@ var EditSession = function(text, mode) {
}
};
- /**
- * Returns a verbatim copy of the given line as it is in the document
- * @param {Number} row The row to retrieve from
- *
+ /** related to: Document.getLine
+ * EditSession.getLine(row) -> String
+ * - row (Number): The row to retrieve from
*
- * @returns {String}
+ * Returns a verbatim copy of the given line as it is in the document
*
**/
this.getLine = function(row) {
return this.doc.getLine(row);
};
- /**
- * Returns an array of strings of the rows between `firstRow` and `lastRow`. This function is inclusive of `lastRow`.
- * @param {Number} firstRow The first row index to retrieve
- * @param {Number} lastRow The final row index to retrieve
- *
- * @returns {[String]}
- *
- **/
+ /** related to: Document.getLines
+ * EditSession.getLines(firstRow, lastRow) -> Array
+ * - firstRow (Number): The first row index to retrieve
+ * - lastRow (Number): The final row index to retrieve
+ *
+ * Returns an array of strings of the rows between `firstRow` and `lastRow`. This function is inclusive of `lastRow`.
+ *
+ **/
this.getLines = function(firstRow, lastRow) {
return this.doc.getLines(firstRow, lastRow);
};
- /**
- * Returns the number of rows in the document.
- * @returns {Number}
- **/
+ /** related to: Document.getLength
+ * EditSession.getLength()-> Number
+ *
+ * Returns the number of rows in the document.
+ **/
this.getLength = function() {
return this.doc.getLength();
};
- /**
- * {:Document.getTextRange.desc}
- * @param {Range} range The range to work with
- *
- * @returns {String}
- **/
+ /** related to: Document.getTextRange
+ * EditSession.getTextRange(range) -> Array
+ * - range (String): The range to work with
+ *
+ * {:Document.getTextRange.desc}
+ **/
this.getTextRange = function(range) {
return this.doc.getTextRange(range || this.selection.getRange());
};
- /**
- * Inserts a block of `text` and the indicated `position`.
- * @param {Object} position The position {row, column} to start inserting at
- * @param {String} text A chunk of text to insert
- * @returns {Object} The position of the last line of `text`. If the length of `text` is 0, this function simply returns `position`.
- *
- *
- **/
+ /** related to: Document.insert
+ * EditSession.insert(position, text) -> Number
+ * - position (Number): The position to start inserting at
+ * - text (String): A chunk of text to insert
+ * + (Number): The position of the last line of `text`. If the length of `text` is 0, this function simply returns `position`.
+ *
+ * Inserts a block of `text` and the indicated `position`.
+ *
+ *
+ **/
this.insert = function(position, text) {
return this.doc.insert(position, text);
};
- /**
- * Removes the `range` from the document.
- * @param {Range} range A specified Range to remove
- * @returns {Object} The new `start` property of the range, which contains `startRow` and `startColumn`. If `range` is empty, this function returns the unmodified value of `range.start`.
- *
- * @related Document.remove
- *
- **/
+ /** related to: Document.remove
+ * EditSession.remove(range) -> Object
+ * - range (Range): A specified Range to remove
+ * + (Object): The new `start` property of the range, which contains `startRow` and `startColumn`. If `range` is empty, this function returns the unmodified value of `range.start`.
+ *
+ * Removes the `range` from the document.
+ *
+ *
+ **/
this.remove = function(range) {
return this.doc.remove(range);
};
-
- /**
- * Removes a range of full lines. This method also triggers the `'change'` event.
- * @param {Number} firstRow The first row to be removed
- * @param {Number} lastRow The last row to be removed
- * @returns {[String]} Returns all the removed lines.
- *
- * @related Document.removeFullLines
- *
- **/
- this.removeFullLines = function(firstRow, lastRow){
- return this.doc.removeFullLines(firstRow, lastRow);
- };
/**
- * Reverts previous changes to your document.
- * @param {Array} deltas An array of previous changes
- * @param {Boolean} dontSelect [If `true`, doesn't select the range of where the change occured]{: #dontSelect}
+ * EditSession.undoChanges(deltas, dontSelect) -> Range
+ * - deltas (Array): An array of previous changes
+ * - dontSelect (Boolean): [If `true`, doesn't select the range of where the change occured]{: #dontSelect}
*
- *
- * @returns {Range}
+ * Reverts previous changes to your document.
**/
this.undoChanges = function(deltas, dontSelect) {
if (!deltas.length)
@@ -1194,12 +1232,11 @@ var EditSession = function(text, mode) {
};
/**
- * Re-implements a previously undone change to your document.
- * @param {Array} deltas An array of previous changes
- * @param {Boolean} dontSelect {:dontSelect}
- *
+ * EditSession.redoChanges(deltas, dontSelect) -> Range
+ * - deltas (Array): An array of previous changes
+ * - dontSelect (Boolean): {:dontSelect}
*
- * @returns {Range}
+ * Re-implements a previously undone change to your document.
**/
this.redoChanges = function(deltas, dontSelect) {
if (!deltas.length)
@@ -1224,46 +1261,55 @@ var EditSession = function(text, mode) {
};
/**
- * Enables or disables highlighting of the range where an undo occured.
- * @param {Boolean} enable If `true`, selects the range of the reinserted change
+ * EditSession.setUndoSelect(enable)
+ * - enable (Boolean): If `true`, selects the range of the reinserted change
*
+ * ENables or disables highlighting of the range where an undo occured.
**/
this.setUndoSelect = function(enable) {
this.$undoSelect = enable;
};
+ /** internal, hide
+ * EditSession.$getUndoSelection(deltas, isUndo, lastUndoRange) -> Range
+ *
+ *
+ **/
this.$getUndoSelection = function(deltas, isUndo, lastUndoRange) {
function isInsert(delta) {
- return isUndo ? delta.action !== "insert" : delta.action === "insert";
+ var insert =
+ delta.action == "insertText" || delta.action == "insertLines";
+ return isUndo ? !insert : insert;
}
var delta = deltas[0];
var range, point;
var lastDeltaIsInsert = false;
if (isInsert(delta)) {
- range = Range.fromPoints(delta.start, delta.end);
+ range = delta.range.clone();
lastDeltaIsInsert = true;
} else {
- range = Range.fromPoints(delta.start, delta.start);
+ range = Range.fromPoints(delta.range.start, delta.range.start);
lastDeltaIsInsert = false;
}
for (var i = 1; i < deltas.length; i++) {
delta = deltas[i];
if (isInsert(delta)) {
- point = delta.start;
+ point = delta.range.start;
if (range.compare(point.row, point.column) == -1) {
- range.setStart(point);
+ range.setStart(delta.range.start);
}
- point = delta.end;
+ point = delta.range.end;
if (range.compare(point.row, point.column) == 1) {
- range.setEnd(point);
+ range.setEnd(delta.range.end);
}
lastDeltaIsInsert = true;
} else {
- point = delta.start;
+ point = delta.range.start;
if (range.compare(point.row, point.column) == -1) {
- range = Range.fromPoints(delta.start, delta.start);
+ range =
+ Range.fromPoints(delta.range.start, delta.range.start);
}
lastDeltaIsInsert = false;
}
@@ -1272,11 +1318,6 @@ var EditSession = function(text, mode) {
// Check if this range and the last undo range has something in common.
// If true, merge the ranges.
if (lastUndoRange != null) {
- if (Range.comparePoints(lastUndoRange.start, range.start) === 0) {
- lastUndoRange.start.column += range.end.column - range.start.column;
- lastUndoRange.end.column += range.end.column - range.start.column;
- }
-
var cmp = lastUndoRange.compareRange(range);
if (cmp == 1) {
range.setStart(lastUndoRange.start);
@@ -1286,24 +1327,20 @@ var EditSession = function(text, mode) {
}
return range;
- };
+ },
- /**
- * Replaces a range in the document with the new `text`.
- *
- * @param {Range} range A specified Range to replace
- * @param {String} text The new text to use as a replacement
- * @returns {Object} An object containing the final row and column, like this:
- * ```
- * {row: endRow, column: 0}
- * ```
- * If the text and range are empty, this function returns an object containing the current `range.start` value.
+ /** related to: Document.replace
+ * EditSession.replace(range, text) -> Object
+ * - range (Range): A specified Range to replace
+ * - text (String): The new text to use as a replacement
+ * + (Object): Returns an object containing the final row and column, like this:
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -37,10 +45,10 @@ var Range = require("../range").Range;
function BracketMatch() {
- this.findMatchingBracket = function(position, chr) {
+ this.findMatchingBracket = function(position) {
if (position.column == 0) return null;
- var charBeforeCursor = chr || this.getLine(position.row).charAt(position.column-1);
+ var charBeforeCursor = this.getLine(position.row).charAt(position.column-1);
if (charBeforeCursor == "") return null;
var match = charBeforeCursor.match(/([\(\[\{])|([\)\]\}])/);
@@ -117,7 +125,6 @@ function BracketMatch() {
typeRe = new RegExp(
"(\\.?" +
token.type.replace(".", "\\.").replace("rparen", ".paren")
- .replace(/\b(?:end)\b/, "(?:start|begin|end)")
+ ")+"
);
}
@@ -174,7 +181,6 @@ function BracketMatch() {
typeRe = new RegExp(
"(\\.?" +
token.type.replace(".", "\\.").replace("lparen", ".paren")
- .replace(/\b(?:start|begin)\b/, "(?:start|begin|end)")
+ ")+"
);
}
diff --git a/lib/ace/edit_session/fold.js b/lib/ace/edit_session/fold.js
index 232101bd..d1165fb5 100644
--- a/lib/ace/edit_session/fold.js
+++ b/lib/ace/edit_session/fold.js
@@ -1,39 +1,44 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Julian Viereck
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
define(function(require, exports, module) {
"use strict";
-var Range = require("../range").Range;
-var RangeList = require("../range_list").RangeList;
-var oop = require("../lib/oop")
/*
* Simple fold-data struct.
**/
@@ -45,11 +50,9 @@ var Fold = exports.Fold = function(range, placeholder) {
this.end = range.end;
this.sameRow = range.start.row == range.end.row;
- this.subFolds = this.ranges = [];
+ this.subFolds = [];
};
-oop.inherits(Fold, RangeList);
-
(function() {
this.toString = function() {
@@ -69,21 +72,17 @@ oop.inherits(Fold, RangeList);
this.subFolds.forEach(function(subFold) {
fold.subFolds.push(subFold.clone());
});
- fold.collapseChildren = this.collapseChildren;
return fold;
};
this.addSubFold = function(fold) {
if (this.range.isEqual(fold))
- return;
+ return this;
if (!this.range.containsRange(fold))
- throw new Error("A fold can't intersect already existing fold" + fold.range + this.range);
+ throw "A fold can't intersect already existing fold" + fold.range + this.range;
- // transform fold to local coordinates
- consumeRange(fold, this.start);
-
- var row = fold.start.row, column = fold.start.column;
+ var row = fold.range.start.row, column = fold.range.start.column;
for (var i = 0, cmp = -1; i < this.subFolds.length; i++) {
cmp = this.subFolds[i].range.compare(row, column);
if (cmp != 1)
@@ -104,37 +103,14 @@ oop.inherits(Fold, RangeList);
var afterEnd = this.subFolds[j];
if (cmp == 0)
- throw new Error("A fold can't intersect already existing fold" + fold.range + this.range);
+ throw "A fold can't intersect already existing fold" + fold.range + this.range;
var consumedFolds = this.subFolds.splice(i, j - i, fold);
fold.setFoldLine(this.foldLine);
return fold;
};
-
- this.restoreRange = function(range) {
- return restoreRange(range, this.start);
- };
}).call(Fold.prototype);
-function consumePoint(point, anchor) {
- point.row -= anchor.row;
- if (point.row == 0)
- point.column -= anchor.column;
-}
-function consumeRange(range, anchor) {
- consumePoint(range.start, anchor);
- consumePoint(range.end, anchor);
-}
-function restorePoint(point, anchor) {
- if (point.row == 0)
- point.column += anchor.column;
- point.row += anchor.row;
-}
-function restoreRange(range, anchor) {
- restorePoint(range.start, anchor);
- restorePoint(range.end, anchor);
-}
-
});
diff --git a/lib/ace/edit_session/fold_line.js b/lib/ace/edit_session/fold_line.js
index 9d73154d..5206dffc 100644
--- a/lib/ace/edit_session/fold_line.js
+++ b/lib/ace/edit_session/fold_line.js
@@ -1,30 +1,38 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Julian Viereck
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -44,7 +52,7 @@ function FoldLine(foldData, folds) {
folds = this.folds = [ folds ];
}
- var last = folds[folds.length - 1];
+ var last = folds[folds.length - 1]
this.range = new Range(folds[0].start.row, folds[0].start.column,
last.end.row, last.end.column);
this.start = this.range.start;
@@ -66,12 +74,12 @@ function FoldLine(foldData, folds) {
fold.start.row += shift;
fold.end.row += shift;
});
- };
+ }
this.addFold = function(fold) {
if (fold.sameRow) {
if (fold.start.row < this.startRow || fold.endRow > this.endRow) {
- throw new Error("Can't add a fold to this FoldLine as it has no connection");
+ throw "Can't add a fold to this FoldLine as it has no connection";
}
this.folds.push(fold);
this.folds.sort(function(a, b) {
@@ -93,20 +101,20 @@ function FoldLine(foldData, folds) {
this.start.row = fold.start.row;
this.start.column = fold.start.column;
} else {
- throw new Error("Trying to add fold to FoldRow that doesn't have a matching row");
+ throw "Trying to add fold to FoldRow that doesn't have a matching row";
}
fold.foldLine = this;
- };
+ }
this.containsRow = function(row) {
return row >= this.start.row && row <= this.end.row;
- };
+ }
this.walk = function(callback, endRow, endColumn) {
var lastEnd = 0,
folds = this.folds,
fold,
- cmp, stop, isNewRow = true;
+ comp, stop, isNewRow = true;
if (endRow == null) {
endRow = this.end.row;
@@ -116,9 +124,9 @@ function FoldLine(foldData, folds) {
for (var i = 0; i < folds.length; i++) {
fold = folds[i];
- cmp = fold.range.compareStart(endRow, endColumn);
+ comp = fold.range.compareStart(endRow, endColumn);
// This fold is after the endRow/Column.
- if (cmp == -1) {
+ if (comp == -1) {
callback(null, endRow, endColumn, lastEnd, isNewRow);
return;
}
@@ -127,8 +135,8 @@ function FoldLine(foldData, folds) {
stop = !stop && callback(fold.placeholder, fold.start.row, fold.start.column, lastEnd);
// If the user requested to stop the walk or endRow/endColumn is
- // inside of this fold (cmp == 0), then end here.
- if (stop || cmp === 0) {
+ // inside of this fold (comp == 0), then end here.
+ if (stop || comp == 0) {
return;
}
@@ -138,7 +146,7 @@ function FoldLine(foldData, folds) {
lastEnd = fold.end.column;
}
callback(null, endRow, endColumn, lastEnd, isNewRow);
- };
+ }
this.getNextFoldTo = function(row, column) {
var fold, cmp;
@@ -150,15 +158,15 @@ function FoldLine(foldData, folds) {
fold: fold,
kind: "after"
};
- } else if (cmp === 0) {
+ } else if (cmp == 0) {
return {
fold: fold,
kind: "inside"
- };
+ }
}
}
return null;
- };
+ }
this.addRemoveChars = function(row, column, len) {
var ret = this.getNextFoldTo(row, column),
@@ -170,12 +178,12 @@ function FoldLine(foldData, folds) {
&& fold.start.row != row)
{
//throwing here breaks whole editor
- //TODO: properly handle this
+ //@todo properly handle this
window.console && window.console.log(row, column, fold);
} else if (fold.start.row == row) {
folds = this.folds;
var i = folds.indexOf(fold);
- if (i === 0) {
+ if (i == 0) {
this.start.column += len;
}
for (i; i < folds.length; i++) {
@@ -189,18 +197,16 @@ function FoldLine(foldData, folds) {
this.end.column += len;
}
}
- };
+ }
this.split = function(row, column) {
- var pos = this.getNextFoldTo(row, column);
-
- if (!pos || pos.kind == "inside")
- return null;
-
- var fold = pos.fold;
- var folds = this.folds;
+ var fold = this.getNextFoldTo(row, column).fold,
+ folds = this.folds;
var foldData = this.foldData;
-
+
+ if (!fold) {
+ return null;
+ }
var i = folds.indexOf(fold);
var foldBefore = folds[i - 1];
this.end.row = foldBefore.end.row;
@@ -213,7 +219,7 @@ function FoldLine(foldData, folds) {
var newFoldLine = new FoldLine(foldData, folds);
foldData.splice(foldData.indexOf(this) + 1, 0, newFoldLine);
return newFoldLine;
- };
+ }
this.merge = function(foldLineNext) {
var folds = foldLineNext.folds;
@@ -224,7 +230,7 @@ function FoldLine(foldData, folds) {
// it's merged now with foldLineNext.
var foldData = this.foldData;
foldData.splice(foldData.indexOf(foldLineNext), 1);
- };
+ }
this.toString = function() {
var ret = [this.range.toString() + ": [" ];
@@ -232,12 +238,13 @@ function FoldLine(foldData, folds) {
this.folds.forEach(function(fold) {
ret.push(" " + fold.toString());
});
- ret.push("]");
+ ret.push("]")
return ret.join("\n");
- };
+ }
this.idxToPosition = function(idx) {
var lastFoldEndColumn = 0;
+ var fold;
for (var i = 0; i < this.folds.length; i++) {
var fold = this.folds[i];
@@ -262,7 +269,7 @@ function FoldLine(foldData, folds) {
row: this.end.row,
column: this.end.column + idx
};
- };
+ }
}).call(FoldLine.prototype);
exports.FoldLine = FoldLine;
diff --git a/lib/ace/edit_session/folding.js b/lib/ace/edit_session/folding.js
index 77c0f22d..310a9856 100644
--- a/lib/ace/edit_session/folding.js
+++ b/lib/ace/edit_session/folding.js
@@ -1,30 +1,38 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Julian Viereck
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -66,6 +74,7 @@ function Folding() {
*
*/
this.getFoldsInRange = function(range) {
+ range = range.clone();
var start = range.start;
var end = range.end;
var foldLines = this.$foldData;
@@ -103,23 +112,8 @@ function Folding() {
foundFolds.push(fold);
}
}
- start.column -= 1;
- end.column += 1;
-
return foundFolds;
};
-
- this.getFoldsInRangeList = function(ranges) {
- if (Array.isArray(ranges)) {
- var folds = [];
- ranges.forEach(function(range) {
- folds = folds.concat(this.getFoldsInRange(range));
- }, this);
- } else {
- var folds = this.getFoldsInRange(ranges);
- }
- return folds;
- }
/*
* Returns all folds in the document
@@ -128,9 +122,18 @@ function Folding() {
var folds = [];
var foldLines = this.$foldData;
+ function addFold(fold) {
+ folds.push(fold);
+ if (!fold.subFolds)
+ return;
+
+ for (var i = 0; i < fold.subFolds.length; i++)
+ addFold(fold.subFolds[i]);
+ }
+
for (var i = 0; i < foldLines.length; i++)
for (var j = 0; j < foldLines[i].folds.length; j++)
- folds.push(foldLines[i].folds[j]);
+ addFold(foldLines[i].folds[j]);
return folds;
};
@@ -254,7 +257,7 @@ function Folding() {
return foldLine;
};
- /**
+ /*
* Adds a new fold.
*
* @returns
@@ -268,10 +271,9 @@ function Folding() {
if (placeholder instanceof Fold)
fold = placeholder;
- else {
+ else
fold = new Fold(range, placeholder);
- fold.collapseChildren = range.collapseChildren;
- }
+
this.$clipRangeToDocument(fold.range);
var startRow = fold.start.row;
@@ -280,30 +282,31 @@ function Folding() {
var endColumn = fold.end.column;
// --- Some checking ---
- if (!(startRow < endRow ||
- startRow == endRow && startColumn <= endColumn - 2))
- throw new Error("The range has to be at least 2 characters width");
+ if (fold.placeholder.length < 2)
+ throw "Placeholder has to be at least 2 characters";
+
+ if (startRow == endRow && endColumn - startColumn < 2)
+ throw "The range has to be at least 2 characters width";
var startFold = this.getFoldAt(startRow, startColumn, 1);
var endFold = this.getFoldAt(endRow, endColumn, -1);
if (startFold && endFold == startFold)
return startFold.addSubFold(fold);
- if (startFold && !startFold.range.isStart(startRow, startColumn))
- this.removeFold(startFold);
-
- if (endFold && !endFold.range.isEnd(endRow, endColumn))
- this.removeFold(endFold);
-
+ if (
+ (startFold && !startFold.range.isStart(startRow, startColumn))
+ || (endFold && !endFold.range.isEnd(endRow, endColumn))
+ ) {
+ throw "A fold can't intersect already existing fold" + fold.range + startFold.range;
+ }
+
// Check if there are folds in the range we create the new fold for.
var folds = this.getFoldsInRange(fold.range);
if (folds.length > 0) {
// Remove the folds from fold data.
this.removeFolds(folds);
// Add the removed folds as subfolds on the new fold.
- folds.forEach(function(subFold) {
- fold.addSubFold(subFold);
- });
+ fold.subFolds = folds;
}
for (var i = 0; i < foldData.length; i++) {
@@ -312,7 +315,8 @@ function Folding() {
foldLine.addFold(fold);
added = true;
break;
- } else if (startRow == foldLine.end.row) {
+ }
+ else if (startRow == foldLine.end.row) {
foldLine.addFold(fold);
added = true;
if (!fold.sameRow) {
@@ -325,7 +329,8 @@ function Folding() {
}
}
break;
- } else if (endRow <= foldLine.start.row) {
+ }
+ else if (endRow <= foldLine.start.row) {
break;
}
}
@@ -340,7 +345,7 @@ function Folding() {
// Notify that fold data has changed.
this.$modified = true;
- this._emit("changeFold", { data: fold, action: "add" });
+ this._emit("changeFold", { data: fold });
return fold;
};
@@ -392,16 +397,14 @@ function Folding() {
newFoldLine.start.column = folds[0].start.column;
}
- if (!this.$updating) {
- if (this.$useWrapMode)
- this.$updateWrapData(startRow, endRow);
- else
- this.$updateRowLengthCache(startRow, endRow);
- }
-
+ if (this.$useWrapMode)
+ this.$updateWrapData(startRow, endRow);
+ else
+ this.$updateRowLengthCache(startRow, endRow);
+
// Notify that fold data has changed.
this.$modified = true;
- this._emit("changeFold", { data: fold, action: "remove" });
+ this._emit("changeFold", { data: fold });
};
this.removeFolds = function(folds) {
@@ -421,13 +424,9 @@ function Folding() {
this.expandFold = function(fold) {
this.removeFold(fold);
- fold.subFolds.forEach(function(subFold) {
- fold.restoreRange(subFold);
- this.addFold(subFold);
+ fold.subFolds.forEach(function(fold) {
+ this.addFold(fold);
}, this);
- if (fold.collapseChildren > 0) {
- this.foldAll(fold.start.row+1, fold.end.row, fold.collapseChildren-1);
- }
fold.subFolds = [];
};
@@ -439,30 +438,26 @@ function Folding() {
this.unfold = function(location, expandInner) {
var range, folds;
- if (location == null) {
+ if (location == null)
range = new Range(0, 0, this.getLength(), 0);
- expandInner = true;
- } else if (typeof location == "number")
+ else if (typeof location == "number")
range = new Range(location, 0, location, this.getLine(location).length);
else if ("row" in location)
range = Range.fromPoints(location, location);
else
range = location;
-
- folds = this.getFoldsInRangeList(range);
+
+ folds = this.getFoldsInRange(range);
if (expandInner) {
this.removeFolds(folds);
} else {
- var subFolds = folds;
- // TODO: might be better to remove and add folds in one go instead of using
+ // TODO: might need to remove and add folds in one go instead of using
// expandFolds several times.
- while (subFolds.length) {
- this.expandFolds(subFolds);
- subFolds = this.getFoldsInRangeList(range);
+ while (folds.length) {
+ this.expandFolds(folds);
+ folds = this.getFoldsInRange(range);
}
}
- if (folds.length)
- return folds;
};
/*
@@ -478,41 +473,36 @@ function Folding() {
return foldLine ? foldLine.end.row : docRow;
};
- this.getRowFoldStart = function(docRow, startFoldRow) {
- var foldLine = this.getFoldLine(docRow, startFoldRow);
- return foldLine ? foldLine.start.row : docRow;
- };
-
this.getFoldDisplayLine = function(foldLine, endRow, endColumn, startRow, startColumn) {
- if (startRow == null)
+ if (startRow == null) {
startRow = foldLine.start.row;
- if (startColumn == null)
startColumn = 0;
- if (endRow == null)
+ }
+
+ if (endRow == null) {
endRow = foldLine.end.row;
- if (endColumn == null)
endColumn = this.getLine(endRow).length;
-
+ }
// Build the textline using the FoldLine walker.
var doc = this.doc;
var textLine = "";
foldLine.walk(function(placeholder, row, column, lastColumn) {
- if (row < startRow)
+ if (row < startRow) {
return;
- if (row == startRow) {
- if (column < startColumn)
+ } else if (row == startRow) {
+ if (column < startColumn) {
return;
+ }
lastColumn = Math.max(startColumn, lastColumn);
}
-
- if (placeholder != null) {
+ if (placeholder) {
textLine += placeholder;
} else {
textLine += doc.getLine(row).substring(lastColumn, column);
}
- }, endRow, endColumn);
+ }.bind(this), endRow, endColumn);
return textLine;
};
@@ -554,22 +544,26 @@ function Folding() {
if (fold) {
this.expandFold(fold);
return;
- } else if (bracketPos = this.findMatchingBracket(cursor)) {
+ }
+ else if (bracketPos = this.findMatchingBracket(cursor)) {
if (range.comparePoint(bracketPos) == 1) {
range.end = bracketPos;
- } else {
+ }
+ else {
range.start = bracketPos;
range.start.column++;
range.end.column--;
}
- } else if (bracketPos = this.findMatchingBracket({row: cursor.row, column: cursor.column + 1})) {
+ }
+ else if (bracketPos = this.findMatchingBracket({row: cursor.row, column: cursor.column + 1})) {
if (range.comparePoint(bracketPos) == 1)
range.end = bracketPos;
else
range.start = bracketPos;
range.start.column++;
- } else {
+ }
+ else {
range = this.getCommentFoldRange(cursor.row, cursor.column) || range;
}
} else {
@@ -577,7 +571,8 @@ function Folding() {
if (tryToUnfold && folds.length) {
this.expandFolds(folds);
return;
- } else if (folds.length == 1 ) {
+ }
+ else if (folds.length == 1 ) {
fold = folds[0];
}
}
@@ -601,47 +596,38 @@ function Folding() {
this.addFold(placeholder, range);
};
- this.getCommentFoldRange = function(row, column, dir) {
+ this.getCommentFoldRange = function(row, column) {
var iterator = new TokenIterator(this, row, column);
var token = iterator.getCurrentToken();
if (token && /^comment|string/.test(token.type)) {
var range = new Range();
var re = new RegExp(token.type.replace(/\..*/, "\\."));
- if (dir != 1) {
- do {
- token = iterator.stepBackward();
- } while(token && re.test(token.type));
- iterator.stepForward();
- }
-
+ do {
+ token = iterator.stepBackward();
+ } while(token && re.test(token.type));
+
+ iterator.stepForward();
range.start.row = iterator.getCurrentTokenRow();
range.start.column = iterator.getCurrentTokenColumn() + 2;
iterator = new TokenIterator(this, row, column);
+
+ do {
+ token = iterator.stepForward();
+ } while(token && re.test(token.type));
- if (dir != -1) {
- do {
- token = iterator.stepForward();
- } while(token && re.test(token.type));
- token = iterator.stepBackward();
- } else
- token = iterator.getCurrentToken();
+ token = iterator.stepBackward();
range.end.row = iterator.getCurrentTokenRow();
- range.end.column = iterator.getCurrentTokenColumn() + token.value.length - 2;
+ range.end.column = iterator.getCurrentTokenColumn() + token.value.length;
return range;
}
};
- this.foldAll = function(startRow, endRow, depth) {
- if (depth == undefined)
- depth = 100000; // JSON.stringify doesn't hanle Infinity
+ this.foldAll = function(startRow, endRow) {
var foldWidgets = this.foldWidgets;
- if (!foldWidgets)
- return; // mode doesn't support folding
endRow = endRow || this.getLength();
- startRow = startRow || 0;
- for (var row = startRow; row < endRow; row++) {
+ for (var row = startRow || 0; row < endRow; row++) {
if (foldWidgets[row] == null)
foldWidgets[row] = this.getFoldWidget(row);
if (foldWidgets[row] != "start")
@@ -649,23 +635,13 @@ function Folding() {
var range = this.getFoldWidgetRange(row);
// sometimes range can be incompatible with existing fold
- // TODO change addFold to return null istead of throwing
- if (range && range.isMultiLine()
- && range.end.row <= endRow
- && range.start.row >= startRow
- ) {
- row = range.end.row;
- try {
- // addFold can change the range
- var fold = this.addFold("...", range);
- if (fold)
- fold.collapseChildren = depth;
- } catch(e) {}
- }
+ // wouldn't it be better for addFold to return null istead of throwing?
+ if (range && range.end.row < endRow) try {
+ this.addFold("...", range);
+ } catch(e) {}
}
};
- // structured folding
this.$foldStyles = {
"manual": 1,
"markbegin": 1,
@@ -690,14 +666,14 @@ function Folding() {
this.$setFolding(mode);
};
+ // structured folding
this.$setFolding = function(foldMode) {
if (this.$foldMode == foldMode)
return;
this.$foldMode = foldMode;
- this.off('change', this.$updateFoldWidgets);
- this.off('tokenizerUpdate', this.$tokenizerUpdateFoldWidgets);
+ this.removeListener('change', this.$updateFoldWidgets);
this._emit("changeAnnotation");
if (!foldMode || this.$foldStyle == "manual") {
@@ -710,132 +686,62 @@ function Folding() {
this.getFoldWidgetRange = foldMode.getFoldWidgetRange.bind(foldMode, this, this.$foldStyle);
this.$updateFoldWidgets = this.updateFoldWidgets.bind(this);
- this.$tokenizerUpdateFoldWidgets = this.tokenizerUpdateFoldWidgets.bind(this);
this.on('change', this.$updateFoldWidgets);
- this.on('tokenizerUpdate', this.$tokenizerUpdateFoldWidgets);
+
};
- this.getParentFoldRangeData = function (row, ignoreCurrent) {
- var fw = this.foldWidgets;
- if (!fw || (ignoreCurrent && fw[row]))
- return {};
-
- var i = row - 1, firstRange;
- while (i >= 0) {
- var c = fw[i];
- if (c == null)
- c = fw[i] = this.getFoldWidget(i);
-
- if (c == "start") {
- var range = this.getFoldWidgetRange(i);
- if (!firstRange)
- firstRange = range;
- if (range && range.end.row >= row)
- break;
- }
- i--;
- }
-
- return {
- range: i !== -1 && range,
- firstRange: firstRange
- };
- }
-
this.onFoldWidgetClick = function(row, e) {
- e = e.domEvent;
- var options = {
- children: e.shiftKey,
- all: e.ctrlKey || e.metaKey,
- siblings: e.altKey
- };
-
- var range = this.$toggleFoldWidget(row, options);
- if (!range) {
- var el = (e.target || e.srcElement)
- if (el && /ace_fold-widget/.test(el.className))
- el.className += " ace_invalid";
- }
- };
-
- this.$toggleFoldWidget = function(row, options) {
- if (!this.getFoldWidget)
- return;
var type = this.getFoldWidget(row);
var line = this.getLine(row);
+ var onlySubfolds = e.shiftKey;
+ var addSubfolds = onlySubfolds || e.ctrlKey || e.altKey || e.metaKey;
+ var fold;
- var dir = type === "end" ? -1 : 1;
- var fold = this.getFoldAt(row, dir === -1 ? 0 : line.length, dir);
+ if (type == "end")
+ fold = this.getFoldAt(row, 0, -1);
+ else
+ fold = this.getFoldAt(row, line.length, 1);
if (fold) {
- if (options.children || options.all)
+ if (addSubfolds)
this.removeFold(fold);
else
this.expandFold(fold);
return;
}
- var range = this.getFoldWidgetRange(row, true);
- // sometimes singleline folds can be missed by the code above
- if (range && !range.isMultiLine()) {
- fold = this.getFoldAt(range.start.row, range.start.column, 1);
- if (fold && range.isEqual(fold.range)) {
- this.removeFold(fold);
- return;
- }
- }
-
- if (options.siblings) {
- var data = this.getParentFoldRangeData(row);
- if (data.range) {
- var startRow = data.range.start.row + 1;
- var endRow = data.range.end.row;
- }
- this.foldAll(startRow, endRow, options.all ? 10000 : 0);
- } else if (options.children) {
- endRow = range ? range.end.row : this.getLength();
- this.foldAll(row + 1, endRow, options.all ? 10000 : 0);
- } else if (range) {
- if (options.all)
- range.collapseChildren = 10000;
- this.addFold("...", range);
- }
-
- return range;
- };
-
-
-
- this.toggleFoldWidget = function(toggleParent) {
- var row = this.selection.getCursor().row;
- row = this.getRowFoldStart(row);
- var range = this.$toggleFoldWidget(row, {});
-
- if (range)
- return;
- // handle toggleParent
- var data = this.getParentFoldRangeData(row, true);
- range = data.range || data.firstRange;
-
+ var range = this.getFoldWidgetRange(row);
if (range) {
- row = range.start.row;
- var fold = this.getFoldAt(row, this.getLine(row).length, 1);
-
- if (fold) {
- this.removeFold(fold);
- } else {
- this.addFold("...", range);
+ // sometimes singleline folds can be missed by the code above
+ if (!range.isMultiLine()) {
+ fold = this.getFoldAt(range.start.row, range.start.column, 1);
+ if (fold && range.isEqual(fold.range)) {
+ this.removeFold(fold);
+ return;
+ }
}
+
+ if (!onlySubfolds)
+ this.addFold("...", range);
+
+ if (addSubfolds)
+ this.foldAll(range.start.row + 1, range.end.row);
+ } else {
+ if (addSubfolds)
+ this.foldAll(row + 1, this.getLength());
+ (e.target || e.srcElement).className += " invalid"
}
};
-
- this.updateFoldWidgets = function(delta) {
- var firstRow = delta.start.row;
- var len = delta.end.row - firstRow;
+
+ this.updateFoldWidgets = function(e) {
+ var delta = e.data;
+ var range = delta.range;
+ var firstRow = range.start.row;
+ var len = range.end.row - firstRow;
if (len === 0) {
this.foldWidgets[firstRow] = null;
- } else if (delta.action == 'remove') {
+ } else if (delta.action == "removeText" || delta.action == "removeLines") {
this.foldWidgets.splice(firstRow, len + 1, null);
} else {
var args = Array(len + 1);
@@ -843,13 +749,7 @@ function Folding() {
this.foldWidgets.splice.apply(this.foldWidgets, args);
}
};
- this.tokenizerUpdateFoldWidgets = function(e) {
- var rows = e.data;
- if (rows.first != rows.last) {
- if (this.foldWidgets.length > rows.first)
- this.foldWidgets.splice(rows.first, this.foldWidgets.length);
- }
- }
+
}
exports.Folding = Folding;
diff --git a/lib/ace/edit_session_test.js b/lib/ace/edit_session_test.js
index 0b904b63..0f7edd9e 100644
--- a/lib/ace/edit_session_test.js
+++ b/lib/ace/edit_session_test.js
@@ -1,30 +1,38 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ * Julian Viereck
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -61,14 +69,6 @@ function createFoldTestSession() {
return session;
}
-function assertArray(a, b) {
- assert.equal(a+"", b+"");
- assert.ok(a.length == b.length);
- for (var i = 0; i < a.length; i++) {
- assert.equal(a[i], b[i]);
- }
-}
-
module.exports = {
"test: find matching opening bracket in Text mode" : function() {
@@ -280,7 +280,7 @@ module.exports = {
session.setUseWrapMode(true);
session.setWrapLimitRange(12, 12);
session.adjustWrapLimit(80);
- session.setOption("wrapMethod", "text");
+
assert.position(session.documentToScreenPosition(0, 11), 0, 11);
assert.position(session.documentToScreenPosition(0, 12), 1, 0);
},
@@ -380,20 +380,17 @@ module.exports = {
line = lang.stringTrimRight(line);
var tokens = EditSession.prototype.$getDisplayTokens(line);
var splits = EditSession.prototype.$computeWrapSplits(tokens, wrapLimit, tabSize);
- console.log("String:", line, "Result:", splits, "Expected:", assertEqual);
-
+ // console.log("String:", line, "Result:", splits, "Expected:", assertEqual);
assert.ok(splits.length == assertEqual.length);
for (var i = 0; i < splits.length; i++) {
assert.ok(splits[i] == assertEqual[i]);
}
}
-
- EditSession.prototype.$wrapAsCode = true;
- EditSession.prototype.$indentedSoftWrap = false;
+
// Basic splitting.
computeAndAssert("foo bar foo bar", [ 12 ]);
computeAndAssert("foo bar f bar", [ 12 ]);
- computeAndAssert("foo bar f r", [ 12 ]); // 14 if we enable
+ computeAndAssert("foo bar f r", [ 14 ]);
computeAndAssert("foo bar foo bar foo bara foo", [12, 25]);
// Don't split if there is only whitespaces/tabs at the end of the line.
@@ -409,32 +406,18 @@ module.exports = {
computeAndAssert("foo \t \tbar", [ 7 ]);
// Ignore spaces/tabs at beginning of split.
- computeAndAssert("foo \t \t \t \t bar", [ 7 ]); // 14
+ computeAndAssert("foo \t \t \t \t bar", [ 14 ]);
// Test wrapping for asian characters.
computeAndAssert("ぁぁ", [1], 2);
computeAndAssert(" ぁぁ", [1, 2], 2);
computeAndAssert(" ぁ\tぁ", [1, 3], 2);
- computeAndAssert(" ぁぁ\tぁ", [2, 4], 4);
- computeAndAssert("ぁぁ ぁぁ\tぁ", [3, 6], 6);
+ computeAndAssert(" ぁぁ\tぁ", [1, 4], 4);
// Test wrapping for punctuation.
- computeAndAssert(" ab.c;ef++", [2, 4, 6, 8], 2);
- computeAndAssert(" ab.c;ef++", [3, 5, 8], 3);
+ computeAndAssert(" ab.c;ef++", [1, 3, 5, 7, 8], 2);
computeAndAssert(" a.b", [1, 2, 3], 1);
computeAndAssert("#>>", [1, 2], 1);
-
- // Test wrapping for punctuation in
- EditSession.prototype.$wrapAsCode = false;
- computeAndAssert("ab cde, Juhu kinners", [3, 8, 13, 19], 6);
-
- // test indented wrapping
- EditSession.prototype.$indentedSoftWrap = true;
- computeAndAssert("foo bar foo bar foo bara foo", [12, 25]);
- computeAndAssert("fooooooooooooooooooooooooooo", [12, 24]);
- computeAndAssert("\t\tfoo bar fooooooooooobooooooo", [6, 10, 16, 22, 28]);
- computeAndAssert("\t\t\tfoo bar fooooooooooobooooooo", [3, 7, 11, 17, 23, 29]);
- computeAndAssert("\tfoo \t \t \t \t bar", [6, 12]); // 14
},
"test get longest line" : function() {
@@ -442,12 +425,12 @@ module.exports = {
session.setTabSize(4);
assert.equal(session.getScreenWidth(), 2);
- session.doc.insertMergedLines({row: 0, column: Infinity}, ['', '']);
- session.doc.insertFullLines(1, ["123"]);
+ session.doc.insertNewLine({row: 0, column: Infinity});
+ session.doc.insertLines(1, ["123"]);
assert.equal(session.getScreenWidth(), 3);
- session.doc.insertMergedLines({row: 0, column: Infinity}, ['', '']);
- session.doc.insertFullLines(1, ["\t\t"]);
+ session.doc.insertNewLine({row: 0, column: Infinity});
+ session.doc.insertLines(1, ["\t\t"]);
assert.equal(session.getScreenWidth(), 8);
@@ -471,9 +454,9 @@ module.exports = {
session.setUseWrapMode(true);
- document.insertFullLines(0, ["a", "b"]);
- document.insertFullLines(2, ["c", "d"]);
- document.removeFullLines(1, 2);
+ document.insertLines(0, ["a", "b"]);
+ document.insertLines(2, ["c", "d"]);
+ document.removeLines(1, 2);
},
"test wrapMode init has to create wrapData array": function() {
@@ -825,6 +808,13 @@ module.exports = {
},
"test fold wrap data compution": function() {
+ function assertArray(a, b) {
+ assert.ok(a.length == b.length);
+ for (var i = 0; i < a.length; i++) {
+ assert.equal(a[i], b[i]);
+ }
+ }
+
function assertWrap(line0, line1, line2) {
line0 && assertArray(wrapData[0], line0);
line1 && assertArray(wrapData[1], line1);
@@ -916,27 +906,7 @@ module.exports = {
return session;
},
-
- "test delete fold with wrap enabled": function() {
- var session = new EditSession("");
- session.setValue([
- "This is some placeholder text that will be folded inline.",
- "This is some placeholder text that will be folded inline.",
- "More text.",
- "The cursor in this paragraph text will be offset by 1 row.
",
- "
Everything after this will be offset as well due to the folds in the row before too.
"
- ].join("\n"));
- session.addFold('...', new Range(0, 8, 0, 42));
- session.addFold('...', new Range(1, 8, 1, 42));
- session.addFold('...', new Range(3, 7, 3, 51));
- session.setOption("wrap", 40);
- session.remove(new Range(0,0, 2, 5));
- // needed because adjustWrapLimit is called async from renderer
- session.adjustWrapLimit(80);
-
- assert.equal(session.$wrapData + "", [[], [], [40, 76]] + "");
- },
-
+
"test add fold": function() {
var session = createFoldTestSession();
var fold;
@@ -949,7 +919,7 @@ module.exports = {
fail = true;
}
if (fail != shouldFail) {
- throw new Error("Expected to get an exception");
+ throw "Expected to get an exception";
}
}
@@ -958,7 +928,7 @@ module.exports = {
tryAddFold("foo", new Range(0, 13, 0, 18), false);
assert.equal(session.$foldData[0].folds.length, 1);
- tryAddFold("f", new Range(0, 13, 0, 18), false);
+ tryAddFold("f", new Range(0, 13, 0, 18), true);
tryAddFold("foo", new Range(0, 18, 0, 21), false);
assert.equal(session.$foldData[0].folds.length, 2);
session.removeFold(fold);
@@ -1001,87 +971,11 @@ module.exports = {
session.addFold("fold0", new Range(0, 1, 0, 5));
session.addFold("fold0", new Range(0, 6, 0, 8));
assert.equal(fold.subFolds.length, 2);
- },
-
- "test row cache": function() {
- var session = createFoldTestSession();
-
- session.screenToDocumentPosition(2,3);
- assertArray(session.$docRowCache, [1,3]);
- assertArray(session.$screenRowCache, [1,2]);
-
- session.screenToDocumentPosition(5,3);
- assertArray(session.$docRowCache, [1,3,4]);
- assertArray(session.$screenRowCache, [1,2,3]);
-
- session.screenToDocumentPosition(0,3);
- assertArray(session.$docRowCache, [1,3,4]);
- assertArray(session.$screenRowCache, [1,2,3]);
-
- var pos = session.screenToDocumentPosition(0,0);
- assert.equal(pos.row, 0);
- assertArray(session.$docRowCache, [1,3,4]);
- assertArray(session.$screenRowCache, [1,2,3]);
-
- session.screenToDocumentPosition(1,0);
- assertArray(session.$docRowCache, [1,3,4]);
- assertArray(session.$screenRowCache, [1,2,3]);
-
- session.$resetRowCache();
- assertArray(session.$docRowCache, []);
- assertArray(session.$screenRowCache, []);
-
- session.screenToDocumentPosition(1,3);
- assertArray(session.$docRowCache, [1]);
- assertArray(session.$screenRowCache, [1]);
-
- session.screenToDocumentPosition(5,3);
- assertArray(session.$docRowCache, [1,3,4]);
- assertArray(session.$screenRowCache, [1,2,3]);
-
- session = new EditSession(new Array(30).join("\n"));
- session.documentToScreenPosition(2,0);
- session.documentToScreenPosition(2,0);
- assertArray(session.$docRowCache, [1,2]);
- assertArray(session.$screenRowCache, [1,2]);
- },
-
- "test annotations": function() {
- var session = new EditSession([]),
- annotation = {row: 0, type: 'info', text: "This is a test."};
-
- session.clearAnnotations();
- assertArray(session.getAnnotations(), []);
- session.setAnnotations([annotation]);
- assertArray(session.getAnnotations(), [annotation]);
- },
-
- "test: mode loading" : function(next) {
- if (!require.undef) {
- console.log("Skipping test: This test only runs in the browser");
- next();
- return;
- }
- var session = new EditSession([]);
- session.setMode("ace/mode/javascript");
- assert.equal(session.$modeid, "ace/mode/javascript");
- session.on("changeMode", function() {
- assert.equal(session.$modeid, "ace/mode/javascript");
- });
- session.setMode("ace/mode/sh", function(mode) {
- assert.ok(!mode);
- });
- setTimeout(function() {
- session.setMode("ace/mode/javascript", function(mode) {
- session.setMode("ace/mode/javascript");
- assert.equal(session.$modeid, "ace/mode/javascript");
- next();
- });
- }, 0);
}
};
+
});
if (typeof module !== "undefined" && module === require.main) {
- require("asyncjs").test.testcase(module.exports).exec();
+ require("asyncjs").test.testcase(module.exports).exec()
}
diff --git a/lib/ace/editor.js b/lib/ace/editor.js
index 5da8a961..54becfcf 100644
--- a/lib/ace/editor.js
+++ b/lib/ace/editor.js
@@ -1,30 +1,40 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ * Irakli Gozalishvili (http://jeditoolkit.com)
+ * Julian Viereck
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -34,12 +44,12 @@ define(function(require, exports, module) {
require("./lib/fixoldbrowsers");
var oop = require("./lib/oop");
-var dom = require("./lib/dom");
var lang = require("./lib/lang");
var useragent = require("./lib/useragent");
var TextInput = require("./keyboard/textinput").TextInput;
var MouseHandler = require("./mouse/mouse_handler").MouseHandler;
var FoldHandler = require("./mouse/fold_handler").FoldHandler;
+var TouchHandler = require("./mouse/touch_handler").TouchHandler;
var KeyBinding = require("./keyboard/keybinding").KeyBinding;
var EditSession = require("./edit_session").EditSession;
var Search = require("./search").Search;
@@ -47,26 +57,21 @@ var Range = require("./range").Range;
var EventEmitter = require("./lib/event_emitter").EventEmitter;
var CommandManager = require("./commands/command_manager").CommandManager;
var defaultCommands = require("./commands/default_commands").commands;
-var config = require("./config");
-var TokenIterator = require("./token_iterator").TokenIterator;
/**
- * The main entry point into the Ace functionality.
+ * class Editor
*
- * The `Editor` manages the [[EditSession]] (which manages [[Document]]s), as well as the [[VirtualRenderer]], which draws everything to the screen.
+ * The main entry point into the Ace functionality. The `Editor` manages the `EditSession` (which manages `Document`s), as well as the `VirtualRenderer`, which draws everything to the screen. Event sessions dealing with the mouse and keyboard are bubbled up from `Document` to the `Editor`, which decides what to do with them.
*
- * Event sessions dealing with the mouse and keyboard are bubbled up from `Document` to the `Editor`, which decides what to do with them.
- * @class Editor
**/
/**
+ * new Editor(renderer, session)
+ * - renderer (VirtualRenderer): Associated `VirtualRenderer` that draws everything
+ * - session (EditSession): The `EditSession` to refer to
+ *
* Creates a new `Editor` object.
*
- * @param {VirtualRenderer} renderer Associated `VirtualRenderer` that draws everything
- * @param {EditSession} session The `EditSession` to refer to
- *
- *
- * @constructor
**/
var Editor = function(renderer, session) {
var container = renderer.getContainerElement();
@@ -79,212 +84,55 @@ var Editor = function(renderer, session) {
this.keyBinding = new KeyBinding(this);
// TODO detect touch event support
- this.$mouseHandler = new MouseHandler(this);
- new FoldHandler(this);
+ if ('ontouchstart' in this.container || 1) {
+ this.$mouseHandler = new TouchHandler(this);
+ } else {
+ this.$mouseHandler = new MouseHandler(this);
+ new FoldHandler(this);
+ }
this.$blockScrolling = 0;
this.$search = new Search().set({
wrap: true
});
- this.$historyTracker = this.$historyTracker.bind(this);
- this.commands.on("exec", this.$historyTracker);
-
- this.$initOperationListeners();
-
- this._$emitInputEvent = lang.delayedCall(function() {
- this._signal("input", {});
- if (this.session && this.session.bgTokenizer)
- this.session.bgTokenizer.scheduleStart();
- }.bind(this));
-
- this.on("change", function(_, _self) {
- _self._$emitInputEvent.schedule(31);
- });
-
this.setSession(session || new EditSession(""));
- config.resetOptions(this);
- config._signal("editor", this);
};
(function(){
oop.implement(this, EventEmitter);
- this.$initOperationListeners = function() {
- function last(a) {return a[a.length - 1]}
-
- this.selections = [];
- this.commands.on("exec", this.startOperation.bind(this), true);
- this.commands.on("afterExec", this.endOperation.bind(this), true);
-
- this.$opResetTimer = lang.delayedCall(this.endOperation.bind(this));
-
- this.on("change", function() {
- this.curOp || this.startOperation();
- this.curOp.docChanged = true;
- }.bind(this), true);
-
- this.on("changeSelection", function() {
- this.curOp || this.startOperation();
- this.curOp.selectionChanged = true;
- }.bind(this), true);
- };
-
- this.curOp = null;
- this.prevOp = {};
- this.startOperation = function(commadEvent) {
- if (this.curOp) {
- if (!commadEvent || this.curOp.command)
- return;
- this.prevOp = this.curOp;
- }
- if (!commadEvent) {
- this.previousCommand = null;
- commadEvent = {};
- }
-
- this.$opResetTimer.schedule();
- this.curOp = {
- command: commadEvent.command || {},
- args: commadEvent.args,
- scrollTop: this.renderer.scrollTop
- };
- if (this.curOp.command.name && this.curOp.command.scrollIntoView !== undefined)
- this.$blockScrolling++;
- };
-
- this.endOperation = function(e) {
- if (this.curOp) {
- if (e && e.returnValue === false)
- return this.curOp = null;
- this._signal("beforeEndOperation");
- var command = this.curOp.command;
- if (command.name && this.$blockScrolling > 0)
- this.$blockScrolling--;
- var scrollIntoView = command && command.scrollIntoView;
- if (scrollIntoView) {
- switch (scrollIntoView) {
- case "center-animate":
- scrollIntoView = "animate";
- /* fall through */
- case "center":
- this.renderer.scrollCursorIntoView(null, 0.5);
- break;
- case "animate":
- case "cursor":
- this.renderer.scrollCursorIntoView();
- break;
- case "selectionPart":
- var range = this.selection.getRange();
- var config = this.renderer.layerConfig;
- if (range.start.row >= config.lastRow || range.end.row <= config.firstRow) {
- this.renderer.scrollSelectionIntoView(this.selection.anchor, this.selection.lead);
- }
- break;
- default:
- break;
- }
- if (scrollIntoView == "animate")
- this.renderer.animateScrolling(this.curOp.scrollTop);
- }
-
- this.prevOp = this.curOp;
- this.curOp = null;
- }
- };
-
- // TODO use property on commands instead of this
- this.$mergeableCommands = ["backspace", "del", "insertstring"];
- this.$historyTracker = function(e) {
- if (!this.$mergeUndoDeltas)
- return;
-
- var prev = this.prevOp;
- var mergeableCommands = this.$mergeableCommands;
- // previous command was the same
- var shouldMerge = prev.command && (e.command.name == prev.command.name);
- if (e.command.name == "insertstring") {
- var text = e.args;
- if (this.mergeNextCommand === undefined)
- this.mergeNextCommand = true;
-
- shouldMerge = shouldMerge
- && this.mergeNextCommand // previous command allows to coalesce with
- && (!/\s/.test(text) || /\s/.test(prev.args)); // previous insertion was of same type
-
- this.mergeNextCommand = true;
- } else {
- shouldMerge = shouldMerge
- && mergeableCommands.indexOf(e.command.name) !== -1; // the command is mergeable
- }
-
- if (
- this.$mergeUndoDeltas != "always"
- && Date.now() - this.sequenceStartTime > 2000
- ) {
- shouldMerge = false; // the sequence is too long
- }
-
- if (shouldMerge)
- this.session.mergeUndoDeltas = true;
- else if (mergeableCommands.indexOf(e.command.name) !== -1)
- this.sequenceStartTime = Date.now();
- };
-
/**
- * Sets a new key handler, such as "vim" or "windows".
- * @param {String} keyboardHandler The new key handler
- *
+ * Editor.setKeyboardHandler(keyboardHandler)
+ *
+ * Sets a new keyboard handler.
**/
- this.setKeyboardHandler = function(keyboardHandler, cb) {
- if (keyboardHandler && typeof keyboardHandler === "string") {
- this.$keybindingId = keyboardHandler;
- var _self = this;
- config.loadModule(["keybinding", keyboardHandler], function(module) {
- if (_self.$keybindingId == keyboardHandler)
- _self.keyBinding.setKeyboardHandler(module && module.handler);
- cb && cb();
- });
- } else {
- this.$keybindingId = null;
- this.keyBinding.setKeyboardHandler(keyboardHandler);
- cb && cb();
- }
+ this.setKeyboardHandler = function(keyboardHandler) {
+ this.keyBinding.setKeyboardHandler(keyboardHandler);
};
- /**
- * Returns the keyboard handler, such as "vim" or "windows".
- *
- * @returns {String}
- *
+ /** related to: KeyBinding
+ * Editor.getKeyboardHandler() -> String
+ *
+ * Returns the keyboard handler.
**/
this.getKeyboardHandler = function() {
return this.keyBinding.getKeyboardHandler();
};
-
/**
- * Emitted whenever the [[EditSession]] changes.
- * @event changeSession
- * @param {Object} e An object with two properties, `oldSession` and `session`, that represent the old and new [[EditSession]]s.
+ * Editor.setSession(session)
+ * - session (EditSession): The new session to use
*
- **/
- /**
* Sets a new editsession to use. This method also emits the `'changeSession'` event.
- * @param {EditSession} session The new session to use
- *
**/
this.setSession = function(session) {
if (this.session == session)
return;
-
- // make sure operationEnd events are not emitted to wrong session
- if (this.curOp) this.endOperation();
- this.curOp = {};
- var oldSession = this.session;
- if (oldSession) {
+ if (this.session) {
+ var oldSession = this.session;
this.session.removeEventListener("change", this.$onDocumentChange);
this.session.removeEventListener("changeMode", this.$onChangeMode);
this.session.removeEventListener("tokenizerUpdate", this.$onTokenizerUpdate);
@@ -298,7 +146,7 @@ var Editor = function(renderer, session) {
this.session.removeEventListener("changeAnnotation", this.$onChangeAnnotation);
this.session.removeEventListener("changeOverwrite", this.$onCursorChange);
this.session.removeEventListener("changeScrollTop", this.$onScrollTopChange);
- this.session.removeEventListener("changeScrollLeft", this.$onScrollLeftChange);
+ this.session.removeEventListener("changeLeftTop", this.$onScrollLeftChange);
var selection = this.session.getSelection();
selection.removeEventListener("changeCursor", this.$onCursorChange);
@@ -306,102 +154,93 @@ var Editor = function(renderer, session) {
}
this.session = session;
- if (session) {
- this.$onDocumentChange = this.onDocumentChange.bind(this);
- session.addEventListener("change", this.$onDocumentChange);
- this.renderer.setSession(session);
-
- this.$onChangeMode = this.onChangeMode.bind(this);
- session.addEventListener("changeMode", this.$onChangeMode);
-
- this.$onTokenizerUpdate = this.onTokenizerUpdate.bind(this);
- session.addEventListener("tokenizerUpdate", this.$onTokenizerUpdate);
-
- this.$onChangeTabSize = this.renderer.onChangeTabSize.bind(this.renderer);
- session.addEventListener("changeTabSize", this.$onChangeTabSize);
-
- this.$onChangeWrapLimit = this.onChangeWrapLimit.bind(this);
- session.addEventListener("changeWrapLimit", this.$onChangeWrapLimit);
-
- this.$onChangeWrapMode = this.onChangeWrapMode.bind(this);
- session.addEventListener("changeWrapMode", this.$onChangeWrapMode);
-
- this.$onChangeFold = this.onChangeFold.bind(this);
- session.addEventListener("changeFold", this.$onChangeFold);
-
- this.$onChangeFrontMarker = this.onChangeFrontMarker.bind(this);
- this.session.addEventListener("changeFrontMarker", this.$onChangeFrontMarker);
-
- this.$onChangeBackMarker = this.onChangeBackMarker.bind(this);
- this.session.addEventListener("changeBackMarker", this.$onChangeBackMarker);
-
- this.$onChangeBreakpoint = this.onChangeBreakpoint.bind(this);
- this.session.addEventListener("changeBreakpoint", this.$onChangeBreakpoint);
-
- this.$onChangeAnnotation = this.onChangeAnnotation.bind(this);
- this.session.addEventListener("changeAnnotation", this.$onChangeAnnotation);
-
- this.$onCursorChange = this.onCursorChange.bind(this);
- this.session.addEventListener("changeOverwrite", this.$onCursorChange);
-
- this.$onScrollTopChange = this.onScrollTopChange.bind(this);
- this.session.addEventListener("changeScrollTop", this.$onScrollTopChange);
-
- this.$onScrollLeftChange = this.onScrollLeftChange.bind(this);
- this.session.addEventListener("changeScrollLeft", this.$onScrollLeftChange);
-
- this.selection = session.getSelection();
- this.selection.addEventListener("changeCursor", this.$onCursorChange);
-
- this.$onSelectionChange = this.onSelectionChange.bind(this);
- this.selection.addEventListener("changeSelection", this.$onSelectionChange);
-
- this.onChangeMode();
-
- this.$blockScrolling += 1;
- this.onCursorChange();
- this.$blockScrolling -= 1;
-
- this.onScrollTopChange();
- this.onScrollLeftChange();
- this.onSelectionChange();
- this.onChangeFrontMarker();
- this.onChangeBackMarker();
- this.onChangeBreakpoint();
- this.onChangeAnnotation();
- this.session.getUseWrapMode() && this.renderer.adjustWrapLimit();
- this.renderer.updateFull();
- } else {
- this.selection = null;
- this.renderer.setSession(session);
- }
- this._signal("changeSession", {
+ this.$onDocumentChange = this.onDocumentChange.bind(this);
+ session.addEventListener("change", this.$onDocumentChange);
+ this.renderer.setSession(session);
+
+ this.$onChangeMode = this.onChangeMode.bind(this);
+ session.addEventListener("changeMode", this.$onChangeMode);
+
+ this.$onTokenizerUpdate = this.onTokenizerUpdate.bind(this);
+ session.addEventListener("tokenizerUpdate", this.$onTokenizerUpdate);
+
+ this.$onChangeTabSize = this.renderer.onChangeTabSize.bind(this.renderer);
+ session.addEventListener("changeTabSize", this.$onChangeTabSize);
+
+ this.$onChangeWrapLimit = this.onChangeWrapLimit.bind(this);
+ session.addEventListener("changeWrapLimit", this.$onChangeWrapLimit);
+
+ this.$onChangeWrapMode = this.onChangeWrapMode.bind(this);
+ session.addEventListener("changeWrapMode", this.$onChangeWrapMode);
+
+ this.$onChangeFold = this.onChangeFold.bind(this);
+ session.addEventListener("changeFold", this.$onChangeFold);
+
+ this.$onChangeFrontMarker = this.onChangeFrontMarker.bind(this);
+ this.session.addEventListener("changeFrontMarker", this.$onChangeFrontMarker);
+
+ this.$onChangeBackMarker = this.onChangeBackMarker.bind(this);
+ this.session.addEventListener("changeBackMarker", this.$onChangeBackMarker);
+
+ this.$onChangeBreakpoint = this.onChangeBreakpoint.bind(this);
+ this.session.addEventListener("changeBreakpoint", this.$onChangeBreakpoint);
+
+ this.$onChangeAnnotation = this.onChangeAnnotation.bind(this);
+ this.session.addEventListener("changeAnnotation", this.$onChangeAnnotation);
+
+ this.$onCursorChange = this.onCursorChange.bind(this);
+ this.session.addEventListener("changeOverwrite", this.$onCursorChange);
+
+ this.$onScrollTopChange = this.onScrollTopChange.bind(this);
+ this.session.addEventListener("changeScrollTop", this.$onScrollTopChange);
+
+ this.$onScrollLeftChange = this.onScrollLeftChange.bind(this);
+ this.session.addEventListener("changeScrollLeft", this.$onScrollLeftChange);
+
+ this.selection = session.getSelection();
+ this.selection.addEventListener("changeCursor", this.$onCursorChange);
+
+ this.$onSelectionChange = this.onSelectionChange.bind(this);
+ this.selection.addEventListener("changeSelection", this.$onSelectionChange);
+
+ this.onChangeMode();
+
+ this.$blockScrolling += 1;
+ this.onCursorChange();
+ this.$blockScrolling -= 1;
+
+ this.onScrollTopChange();
+ this.onScrollLeftChange();
+ this.onSelectionChange();
+ this.onChangeFrontMarker();
+ this.onChangeBackMarker();
+ this.onChangeBreakpoint();
+ this.onChangeAnnotation();
+ this.session.getUseWrapMode() && this.renderer.adjustWrapLimit();
+ this.renderer.updateFull();
+
+ this._emit("changeSession", {
session: session,
oldSession: oldSession
});
-
- this.curOp = null;
-
- oldSession && oldSession._signal("changeEditor", {oldEditor: this});
- session && session._signal("changeEditor", {editor: this});
};
/**
+ * Editor.getSession() -> EditSession
+ *
* Returns the current session being used.
- * @returns {EditSession}
**/
this.getSession = function() {
return this.session;
};
- /**
- * Sets the current document to `val`.
- * @param {String} val The new value to set for the document
- * @param {Number} cursorPos Where to set the new value. `undefined` or 0 is selectAll, -1 is at the document start, and 1 is at the end
+ /** related to: Document.setValue
+ * Editor.setValue(val [,cursorPos]) -> String
+ * - val (String): The new value to set for the document
+ * - cursorPos (Number): Where to set the new value. `undefined` or 0 is selectAll, -1 is at the document start, and 1 is at the end
*
- * @returns {String} The current document value
- * @related Document.setValue
+ * Sets the current document to `val`.
**/
this.setValue = function(val, cursorPos) {
this.session.doc.setValue(val);
@@ -416,92 +255,84 @@ var Editor = function(renderer, session) {
return val;
};
- /**
- * Returns the current session's content.
+ /** related to: EditSession.getValue
+ * Editor.getValue() -> String
*
- * @returns {String}
- * @related EditSession.getValue
+ * Returns the current session's content.
**/
this.getValue = function() {
return this.session.getValue();
};
/**
- *
+ * Editor.getSelection() -> String
+ *
* Returns the currently highlighted selection.
- * @returns {String} The highlighted selection
**/
this.getSelection = function() {
return this.selection;
};
- /**
+ /** related to: VirtualRenderer.onResize
+ * Editor.resize()
+ *
* {:VirtualRenderer.onResize}
- * @param {Boolean} force If `true`, recomputes the size, even if the height and width haven't changed
- *
- *
- * @related VirtualRenderer.onResize
**/
this.resize = function(force) {
this.renderer.onResize(force);
};
/**
+ * Editor.setTheme(theme)
+ *
* {:VirtualRenderer.setTheme}
- * @param {String} theme The path to a theme
- * @param {Function} cb optional callback called when theme is loaded
**/
- this.setTheme = function(theme, cb) {
- this.renderer.setTheme(theme, cb);
+ this.setTheme = function(theme) {
+ this.renderer.setTheme(theme);
};
- /**
+ /** related to: VirtualRenderer.getTheme
+ * Editor.getTheme() -> String
+ *
* {:VirtualRenderer.getTheme}
- *
- * @returns {String} The set theme
- * @related VirtualRenderer.getTheme
**/
this.getTheme = function() {
return this.renderer.getTheme();
};
- /**
+ /** related to: VirtualRenderer.setStyle
+ * Editor.setStyle(style)
+ *
* {:VirtualRenderer.setStyle}
- * @param {String} style A class name
- *
- *
- * @related VirtualRenderer.setStyle
**/
this.setStyle = function(style) {
this.renderer.setStyle(style);
};
- /**
+ /** related to: VirtualRenderer.unsetStyle
+ * Editor.unsetStyle(style)
+ *
* {:VirtualRenderer.unsetStyle}
- * @related VirtualRenderer.unsetStyle
**/
this.unsetStyle = function(style) {
this.renderer.unsetStyle(style);
};
/**
- * Gets the current font size of the editor text.
- */
- this.getFontSize = function () {
- return this.getOption("fontSize") ||
- dom.computedStyle(this.container, "fontSize");
- };
-
- /**
+ * Editor.setFontSize(size)
+ * - size (Number): A font size
+ *
* Set a new font size (in pixels) for the editor text.
- * @param {String} size A font size ( _e.g._ "12px")
- *
- *
**/
this.setFontSize = function(size) {
- this.setOption("fontSize", size);
+ this.container.style.fontSize = size;
+ this.renderer.updateFontSize();
};
+ /** internal, hide
+ * Editor.$highlightBrackets()
+ *
+ **/
this.$highlightBrackets = function() {
if (this.session.$bracketHighlight) {
this.session.removeMarker(this.session.$bracketHighlight);
@@ -517,110 +348,18 @@ var Editor = function(renderer, session) {
this.$highlightPending = true;
setTimeout(function() {
self.$highlightPending = false;
- var session = self.session;
- if (!session || !session.bgTokenizer) return;
- var pos = session.findMatchingBracket(self.getCursorPosition());
+
+ var pos = self.session.findMatchingBracket(self.getCursorPosition());
if (pos) {
- var range = new Range(pos.row, pos.column, pos.row, pos.column + 1);
- } else if (session.$mode.getMatching) {
- var range = session.$mode.getMatching(self.session);
+ var range = new Range(pos.row, pos.column, pos.row, pos.column+1);
+ self.session.$bracketHighlight = self.session.addMarker(range, "ace_bracket", "text");
}
- if (range)
- session.$bracketHighlight = session.addMarker(range, "ace_bracket", "text");
- }, 50);
- };
-
- // todo: move to mode.getMatching
- this.$highlightTags = function() {
- if (this.$highlightTagPending)
- return;
-
- // perform highlight async to not block the browser during navigation
- var self = this;
- this.$highlightTagPending = true;
- setTimeout(function() {
- self.$highlightTagPending = false;
-
- var session = self.session;
- if (!session || !session.bgTokenizer) return;
-
- var pos = self.getCursorPosition();
- var iterator = new TokenIterator(self.session, pos.row, pos.column);
- var token = iterator.getCurrentToken();
-
- if (!token || !/\b(?:tag-open|tag-name)/.test(token.type)) {
- session.removeMarker(session.$tagHighlight);
- session.$tagHighlight = null;
- return;
- }
-
- if (token.type.indexOf("tag-open") != -1) {
- token = iterator.stepForward();
- if (!token)
- return;
- }
-
- var tag = token.value;
- var depth = 0;
- var prevToken = iterator.stepBackward();
-
- if (prevToken.value == '<'){
- //find closing tag
- do {
- prevToken = token;
- token = iterator.stepForward();
-
- if (token && token.value === tag && token.type.indexOf('tag-name') !== -1) {
- if (prevToken.value === '<'){
- depth++;
- } else if (prevToken.value === '= 0);
- } else {
- //find opening tag
- do {
- token = prevToken;
- prevToken = iterator.stepBackward();
-
- if (token && token.value === tag && token.type.indexOf('tag-name') !== -1) {
- if (prevToken.value === '<') {
- depth++;
- } else if (prevToken.value === ' Boolean
+ *
+ * Returns true if the current `textInput` is in focus.
**/
this.isFocused = function() {
return this.textInput.isFocused();
};
/**
- *
+ * Editor.blur()
+ *
* Blurs the current `textInput`.
**/
this.blur = function() {
@@ -651,33 +392,31 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor@focus()
+ *
* Emitted once the editor comes into focus.
- * @event focus
- *
- *
**/
- this.onFocus = function(e) {
+ this.onFocus = function() {
if (this.$isFocused)
return;
this.$isFocused = true;
this.renderer.showCursor();
this.renderer.visualizeFocus();
- this._emit("focus", e);
+ this._emit("focus");
};
/**
+ * Editor@blur()
+ *
* Emitted once the editor has been blurred.
- * @event blur
- *
- *
**/
- this.onBlur = function(e) {
+ this.onBlur = function() {
if (!this.$isFocused)
return;
this.$isFocused = false;
this.renderer.hideCursor();
this.renderer.visualizeBlur();
- this._emit("blur", e);
+ this._emit("blur");
};
this.$cursorChange = function() {
@@ -685,24 +424,27 @@ var Editor = function(renderer, session) {
};
/**
- * Emitted whenever the document is changed.
- * @event change
- * @param {Object} e Contains a single property, `data`, which has the delta of changes
- *
- *
+ * Editor@change(e)
+ * - e (Object): Contains a single property, `data`, which has the delta of changes
*
+ * Emitted whenever the document is changed.
+ *
**/
- this.onDocumentChange = function(delta) {
- // Rerender and emit "change" event.
- var wrap = this.session.$useWrapMode;
- var lastRow = (delta.start.row == delta.end.row ? delta.end.row : Infinity);
- this.renderer.updateLines(delta.start.row, lastRow, wrap);
+ this.onDocumentChange = function(e) {
+ var delta = e.data;
+ var range = delta.range;
+ var lastRow;
- this._signal("change", delta);
-
- // Update cursor because tab characters can influence the cursor position.
+ if (range.start.row == range.end.row && delta.action != "insertLines" && delta.action != "removeLines")
+ lastRow = range.end.row;
+ else
+ lastRow = Infinity;
+ this.renderer.updateLines(range.start.row, lastRow);
+
+ this._emit("change", e);
+
+ // update cursor because tab characters can influence the cursor position
this.$cursorChange();
- this.$updateHighlightActiveLine();
};
this.onTokenizerUpdate = function(e) {
@@ -714,58 +456,64 @@ var Editor = function(renderer, session) {
this.onScrollTopChange = function() {
this.renderer.scrollToY(this.session.getScrollTop());
};
-
+
this.onScrollLeftChange = function() {
this.renderer.scrollToX(this.session.getScrollLeft());
};
/**
- * Emitted when the selection changes.
- *
+ * Editor@cursorChange()
+ *
+ * Emitted when the cursor changes.
**/
this.onCursorChange = function() {
this.$cursorChange();
if (!this.$blockScrolling) {
- config.warn("Automatically scrolling cursor into view after selection change",
- "this will be disabled in the next version",
- "set editor.$blockScrolling = Infinity to disable this message"
- );
this.renderer.scrollCursorIntoView();
}
this.$highlightBrackets();
- this.$highlightTags();
this.$updateHighlightActiveLine();
- this._signal("changeSelection");
+ this._emit("changeSelection");
};
+ /** internal, hide
+ * Editor.$updateHighlightActiveLine()
+ *
+ *
+ **/
this.$updateHighlightActiveLine = function() {
var session = this.getSession();
- var highlight;
- if (this.$highlightActiveLine) {
- if ((this.$selectionStyle != "line" || !this.selection.isMultiLine()))
- highlight = this.getCursorPosition();
- if (this.renderer.$maxLines && this.session.getLength() === 1 && !(this.renderer.$minLines > 1))
- highlight = false;
- }
+ if (session.$highlightLineMarker)
+ session.removeMarker(session.$highlightLineMarker);
- if (session.$highlightLineMarker && !highlight) {
- session.removeMarker(session.$highlightLineMarker.id);
- session.$highlightLineMarker = null;
- } else if (!session.$highlightLineMarker && highlight) {
- var range = new Range(highlight.row, highlight.column, highlight.row, Infinity);
- range.id = session.addMarker(range, "ace_active-line", "screenLine");
- session.$highlightLineMarker = range;
- } else if (highlight) {
- session.$highlightLineMarker.start.row = highlight.row;
- session.$highlightLineMarker.end.row = highlight.row;
- session.$highlightLineMarker.start.column = highlight.column;
- session._signal("changeBackMarker");
+ session.$highlightLineMarker = null;
+
+ if (this.$highlightActiveLine) {
+ var cursor = this.getCursorPosition();
+ var foldLine = this.session.getFoldLine(cursor.row);
+
+ if ((this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) {
+ var range;
+ if (foldLine) {
+ range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0);
+ } else {
+ range = new Range(cursor.row, 0, cursor.row+1, 0);
+ }
+ session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
+ }
}
};
+
+ /**
+ * Editor@selectionChange(e)
+ * - e (Object): Contains a single property, `data`, which has the delta of changes
+ *
+ * Emitted when a selection has changed.
+ **/
this.onSelectionChange = function(e) {
var session = this.session;
@@ -782,10 +530,10 @@ var Editor = function(renderer, session) {
this.$updateHighlightActiveLine();
}
- var re = this.$highlightSelectedWord && this.$getSelectionHighLightRegexp();
+ var re = this.$highlightSelectedWord && this.$getSelectionHighLightRegexp()
this.session.highlight(re);
-
- this._signal("changeSelection");
+
+ this._emit("changeSelection");
};
this.$getSelectionHighLightRegexp = function() {
@@ -820,40 +568,74 @@ var Editor = function(renderer, session) {
return re;
};
-
+ /**
+ * Editor@changeFrontMarker()
+ *
+ * Emitted when a front marker changes.
+ **/
this.onChangeFrontMarker = function() {
this.renderer.updateFrontMarkers();
};
+ /**
+ * Editor@changeBackMarker()
+ *
+ * Emitted when a back marker changes.
+ **/
this.onChangeBackMarker = function() {
this.renderer.updateBackMarkers();
};
-
+ /**
+ * Editor@changeBreakpoint()
+ *
+ * Emitted when a breakpoint changes.
+ **/
this.onChangeBreakpoint = function() {
this.renderer.updateBreakpoints();
};
+ /**
+ * Editor@changeAnnotation()
+ *
+ * Emitted when an annotation changes.
+ **/
this.onChangeAnnotation = function() {
this.renderer.setAnnotations(this.session.getAnnotations());
};
-
- this.onChangeMode = function(e) {
+ /**
+ * Editor@changeMode()
+ *
+ * Emitted when the mode changes.
+ **/
+ this.onChangeMode = function() {
this.renderer.updateText();
- this._emit("changeMode", e);
};
-
+ /**
+ * Editor@changeWrapLimit()
+ *
+ * Emitted when the wrap limit changes.
+ **/
this.onChangeWrapLimit = function() {
this.renderer.updateFull();
};
+ /**
+ * Editor@changeWrapMode()
+ *
+ * Emitted when the wrap mode changes.
+ **/
this.onChangeWrapMode = function() {
this.renderer.onResize(true);
};
-
+ /**
+ * Editor@changeFold()
+ *
+ * Emitted when the code folds change.
+ **/
this.onChangeFold = function() {
// Update the active line marker as due to folding changes the current
// line range on the screen might have changed.
@@ -862,33 +644,23 @@ var Editor = function(renderer, session) {
this.renderer.updateFull();
};
-
/**
+ * Editor.getCopyText() -> String
+ *
* Returns the string of text currently highlighted.
- * @returns {String}
- **/
- this.getSelectedText = function() {
- return this.session.getTextRange(this.getSelectionRange());
- };
-
- /**
- * Emitted when text is copied.
- * @event copy
- * @param {String} text The copied text
- *
- **/
- /**
- * Returns the string of text currently highlighted.
- * @returns {String}
- * @deprecated Use getSelectedText instead.
**/
this.getCopyText = function() {
- var text = this.getSelectedText();
- this._signal("copy", text);
+ var text = "";
+ if (!this.selection.isEmpty())
+ text = this.session.getTextRange(this.getSelectionRange());
+
+ this._emit("copy", text);
return text;
};
/**
+ * Editor.onCopy()
+ *
* Called whenever a text "copy" happens.
**/
this.onCopy = function() {
@@ -896,88 +668,51 @@ var Editor = function(renderer, session) {
};
/**
- * Called whenever a text "cut" happens.
+ * Editor.onCut()
+ *
+ * called whenever a text "cut" happens.
**/
this.onCut = function() {
this.commands.exec("cut", this);
};
/**
- * Emitted when text is pasted.
- * @event paste
- * @param {Object} an object which contains one property, `text`, that represents the text to be pasted. Editing this property will alter the text that is pasted.
- *
- *
+ * Editor.onPaste()
+ *
+ * called whenever a text "paste" happens.
**/
- /**
- * Called whenever a text "paste" happens.
- * @param {String} text The pasted text
- *
- *
- **/
- this.onPaste = function(text, event) {
- var e = {text: text, event: event};
- this.commands.exec("paste", this, e);
- };
-
- this.$handlePaste = function(e) {
- if (typeof e == "string")
- e = {text: e};
- this._signal("paste", e);
- var text = e.text;
- if (!this.inMultiSelectMode || this.inVirtualSelectionMode) {
- this.insert(text);
- } else {
- var lines = text.split(/\r\n|\r|\n/);
- var ranges = this.selection.rangeList.ranges;
-
- if (lines.length > ranges.length || lines.length < 2 || !lines[1])
- return this.commands.exec("insertstring", this, text);
-
- for (var i = ranges.length; i--;) {
- var range = ranges[i];
- if (!range.isEmpty())
- this.session.remove(range);
-
- this.session.insert(range.start, lines[i]);
- }
- }
- };
-
- this.execCommand = function(command, args) {
- return this.commands.exec(command, this, args);
+ this.onPaste = function(text) {
+ // todo this should change when paste becomes a command
+ if (this.$readOnly)
+ return;
+ this._emit("paste", text);
+ this.insert(text);
};
/**
+ * Editor.insert(text)
+ * - text (String): The new text to add
+ *
* Inserts `text` into wherever the cursor is pointing.
- * @param {String} text The new text to add
- *
**/
- this.insert = function(text, pasted) {
+ this.insert = function(text) {
var session = this.session;
var mode = session.getMode();
+
var cursor = this.getCursorPosition();
- if (this.getBehavioursEnabled() && !pasted) {
+ if (this.getBehavioursEnabled()) {
// Get a transform if the current mode wants one.
var transform = mode.transformAction(session.getState(cursor.row), 'insertion', this, session, text);
- if (transform) {
- if (text !== transform.text) {
- this.session.mergeUndoDeltas = false;
- this.$mergeNextCommand = false;
- }
+ if (transform)
text = transform.text;
-
- }
}
-
- if (text == "\t")
- text = this.session.getTabString();
+
+ text = text.replace("\t", this.session.getTabString());
// remove selected text
if (!this.selection.isEmpty()) {
- var range = this.getSelectionRange();
- cursor = this.session.remove(range);
+ cursor = this.session.remove(this.getSelectionRange());
this.clearSelection();
}
else if (this.session.getOverwrite()) {
@@ -986,19 +721,13 @@ var Editor = function(renderer, session) {
this.session.remove(range);
}
- if (text == "\n" || text == "\r\n") {
- var line = session.getLine(cursor.row);
- if (cursor.column > line.search(/\S|$/)) {
- var d = line.substr(cursor.column).search(/\S|$/);
- session.doc.removeInLine(cursor.row, cursor.column, cursor.column + d);
- }
- }
this.clearSelection();
var start = cursor.column;
var lineState = session.getState(cursor.row);
+ var shouldOutdent = mode.checkOutdent(lineState, session.getLine(cursor.row), text);
var line = session.getLine(cursor.row);
- var shouldOutdent = mode.checkOutdent(lineState, line, text);
+ var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
var end = session.insert(cursor, text);
if (transform && transform.selection) {
@@ -1015,10 +744,44 @@ var Editor = function(renderer, session) {
}
}
- if (session.getDocument().isNewLine(text)) {
- var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
+ var lineState = session.getState(cursor.row);
- session.insert({row: cursor.row+1, column: 0}, lineIndent);
+ // TODO disabled multiline auto indent
+ // possibly doing the indent before inserting the text
+ // if (cursor.row !== end.row) {
+ if (session.getDocument().isNewLine(text)) {
+ this.moveCursorTo(cursor.row+1, 0);
+
+ var size = session.getTabSize();
+ var minIndent = Number.MAX_VALUE;
+
+ for (var row = cursor.row + 1; row <= end.row; ++row) {
+ var indent = 0;
+
+ line = session.getLine(row);
+ for (var i = 0; i < line.length; ++i)
+ if (line.charAt(i) == '\t')
+ indent += size;
+ else if (line.charAt(i) == ' ')
+ indent += 1;
+ else
+ break;
+ if (/[^\s]/.test(line))
+ minIndent = Math.min(indent, minIndent);
+ }
+
+ for (var row = cursor.row + 1; row <= end.row; ++row) {
+ var outdent = minIndent;
+
+ line = session.getLine(row);
+ for (var i = 0; i < line.length && outdent > 0; ++i)
+ if (line.charAt(i) == '\t')
+ outdent -= size;
+ else if (line.charAt(i) == ' ')
+ outdent -= 1;
+ session.remove(new Range(row, 0, row, i));
+ }
+ session.indentRows(cursor.row + 1, end.row, lineIndent);
}
if (shouldOutdent)
mode.autoOutdent(lineState, session, cursor.row);
@@ -1032,122 +795,158 @@ var Editor = function(renderer, session) {
this.keyBinding.onCommandKey(e, hashId, keyCode);
};
- /**
+ /** related to: EditSession.setOverwrite
+ * Editor.setOverwrite(overwrite)
+ * - overwrite (Boolean): Defines wheter or not to set overwrites
+ *
* Pass in `true` to enable overwrites in your session, or `false` to disable. If overwrites is enabled, any text you enter will type over any text after it. If the value of `overwrite` changes, this function also emites the `changeOverwrite` event.
- * @param {Boolean} overwrite Defines wheter or not to set overwrites
*
- *
- * @related EditSession.setOverwrite
**/
this.setOverwrite = function(overwrite) {
this.session.setOverwrite(overwrite);
};
- /**
+ /** related to: EditSession.getOverwrite
+ * Editor.getOverwrite() -> Boolean
+ *
* Returns `true` if overwrites are enabled; `false` otherwise.
- * @returns {Boolean}
- * @related EditSession.getOverwrite
**/
this.getOverwrite = function() {
return this.session.getOverwrite();
};
- /**
+ /** related to: EditSession.toggleOverwrite
+ * Editor.toggleOverwrite()
+ *
* Sets the value of overwrite to the opposite of whatever it currently is.
- * @related EditSession.toggleOverwrite
**/
this.toggleOverwrite = function() {
this.session.toggleOverwrite();
};
/**
+ * Editor.setScrollSpeed(speed)
+ * - speed (Number): A value indicating the new speed
+ *
* Sets how fast the mouse scrolling should do.
- * @param {Number} speed A value indicating the new speed (in milliseconds)
- **/
- this.setScrollSpeed = function(speed) {
- this.setOption("scrollSpeed", speed);
- };
-
- /**
- * Returns the value indicating how fast the mouse scroll speed is (in milliseconds).
- * @returns {Number}
- **/
- this.getScrollSpeed = function() {
- return this.getOption("scrollSpeed");
- };
-
- /**
- * Sets the delay (in milliseconds) of the mouse drag.
- * @param {Number} dragDelay A value indicating the new delay
- **/
- this.setDragDelay = function(dragDelay) {
- this.setOption("dragDelay", dragDelay);
- };
-
- /**
- * Returns the current mouse drag delay.
- * @returns {Number}
- **/
- this.getDragDelay = function() {
- return this.getOption("dragDelay");
- };
-
- /**
- * Emitted when the selection style changes, via [[Editor.setSelectionStyle]].
- * @event changeSelectionStyle
- * @param {Object} data Contains one property, `data`, which indicates the new selection style
- **/
- /**
- * Draw selection markers spanning whole line, or only over selected text. Default value is "line"
- * @param {String} style The new selection style "line"|"text"
*
**/
- this.setSelectionStyle = function(val) {
- this.setOption("selectionStyle", val);
+ this.setScrollSpeed = function(speed) {
+ this.$mouseHandler.setScrollSpeed(speed);
};
/**
+ * Editor.getScrollSpeed() -> Number
+ *
+ * Returns the value indicating how fast the mouse scroll speed is.
+ **/
+ this.getScrollSpeed = function() {
+ return this.$mouseHandler.getScrollSpeed();
+ };
+
+ /**
+ * Editor.setDragDelay(dragDelay)
+ * - dragDelay (Number): A value indicating the new delay
+ *
+ * Sets the delay (in milliseconds) of the mouse drag.
+ *
+ **/
+ this.setDragDelay = function(dragDelay) {
+ this.$mouseHandler.setDragDelay(dragDelay);
+ };
+
+ /**
+ * Editor.getDragDelay() -> Number
+ *
+ * Returns the current mouse drag delay.
+ **/
+ this.getDragDelay = function() {
+ return this.$mouseHandler.getDragDelay();
+ };
+
+ this.$selectionStyle = "line";
+ /**
+ * Editor.setSelectionStyle(style)
+ * - style (String): The new selection style
+ *
+ * Indicates how selections should occur. By default, selections are set to "line". This function also emits the `'changeSelectionStyle'` event.
+ *
+ **/
+ this.setSelectionStyle = function(style) {
+ if (this.$selectionStyle == style) return;
+
+ this.$selectionStyle = style;
+ this.onSelectionChange();
+ this._emit("changeSelectionStyle", {data: style});
+ };
+
+ /**
+ * Editor.getSelectionStyle() -> String
+ *
* Returns the current selection style.
- * @returns {String}
**/
this.getSelectionStyle = function() {
- return this.getOption("selectionStyle");
+ return this.$selectionStyle;
+ };
+
+ this.$highlightActiveLine = true;
+
+ /**
+ * Editor.setHighlightActiveLine(shouldHighlight)
+ * - shouldHighlight (Boolean): Set to `true` to highlight the current line
+ *
+ * Determines whether or not the current line should be highlighted.
+ *
+ **/
+ this.setHighlightActiveLine = function(shouldHighlight) {
+ if (this.$highlightActiveLine == shouldHighlight)
+ return;
+
+ this.$highlightActiveLine = shouldHighlight;
+ this.$updateHighlightActiveLine();
};
/**
- * Determines whether or not the current line should be highlighted.
- * @param {Boolean} shouldHighlight Set to `true` to highlight the current line
- **/
- this.setHighlightActiveLine = function(shouldHighlight) {
- this.setOption("highlightActiveLine", shouldHighlight);
- };
- /**
+ * Editor.getHighlightActiveLine() -> Boolean
+ *
* Returns `true` if current lines are always highlighted.
- * @return {Boolean}
**/
this.getHighlightActiveLine = function() {
- return this.getOption("highlightActiveLine");
+ return this.$highlightActiveLine;
};
+
+ this.$highlightGutterLine = true;
this.setHighlightGutterLine = function(shouldHighlight) {
- this.setOption("highlightGutterLine", shouldHighlight);
+ if (this.$highlightGutterLine == shouldHighlight)
+ return;
+
+ this.renderer.setHighlightGutterLine(shouldHighlight);
+ this.$highlightGutterLine = shouldHighlight;
};
this.getHighlightGutterLine = function() {
- return this.getOption("highlightGutterLine");
+ return this.$highlightGutterLine;
};
+ this.$highlightSelectedWord = true;
/**
- * Determines if the currently selected word should be highlighted.
- * @param {Boolean} shouldHighlight Set to `true` to highlight the currently selected word
+ * Editor.setHighlightSelectedWord(shouldHighlight)
+ * - shouldHighlight (Boolean): Set to `true` to highlight the currently selected word
*
+ * Determines if the currently selected word should be highlighted.
**/
this.setHighlightSelectedWord = function(shouldHighlight) {
- this.setOption("highlightSelectedWord", shouldHighlight);
+ if (this.$highlightSelectedWord == shouldHighlight)
+ return;
+
+ this.$highlightSelectedWord = shouldHighlight;
+ this.$onSelectionChange();
};
/**
+ * Editor.getHighlightSelectedWord() -> Boolean
+ *
* Returns `true` if currently highlighted words are to be highlighted.
- * @returns {Boolean}
**/
this.getHighlightSelectedWord = function() {
return this.$highlightSelectedWord;
@@ -1162,17 +961,19 @@ var Editor = function(renderer, session) {
};
/**
- * If `showInvisibles` is set to `true`, invisible characters—like spaces or new lines—are show in the editor.
- * @param {Boolean} showInvisibles Specifies whether or not to show invisible characters
- *
+ * Editor.setShowInvisibles(showInvisibles)
+ * - showInvisibles (Boolean): Specifies whether or not to show invisible characters
+ *
+ * If `showInvisibiles` is set to `true`, invisible characters—like spaces or new lines—are show in the editor.
**/
this.setShowInvisibles = function(showInvisibles) {
this.renderer.setShowInvisibles(showInvisibles);
};
/**
+ * Editor.getShowInvisibles() -> Boolean
+ *
* Returns `true` if invisible characters are being shown.
- * @returns {Boolean}
**/
this.getShowInvisibles = function() {
return this.renderer.getShowInvisibles();
@@ -1187,118 +988,123 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.setShowPrintMargin(showPrintMargin)
+ * - showPrintMargin (Boolean): Specifies whether or not to show the print margin
+ *
* If `showPrintMargin` is set to `true`, the print margin is shown in the editor.
- * @param {Boolean} showPrintMargin Specifies whether or not to show the print margin
- *
**/
this.setShowPrintMargin = function(showPrintMargin) {
this.renderer.setShowPrintMargin(showPrintMargin);
};
/**
+ * Editor.getShowPrintMargin() -> Boolean
+ *
* Returns `true` if the print margin is being shown.
- * @returns {Boolean}
**/
this.getShowPrintMargin = function() {
return this.renderer.getShowPrintMargin();
};
/**
- * Sets the column defining where the print margin should be.
- * @param {Number} showPrintMargin Specifies the new print margin
+ * Editor.setPrintMarginColumn(showPrintMargin)
+ * - showPrintMargin (Number): Specifies the new print margin
*
+ * Sets the column defining where the print margin should be.
+ *
**/
this.setPrintMarginColumn = function(showPrintMargin) {
this.renderer.setPrintMarginColumn(showPrintMargin);
};
/**
+ * Editor.getPrintMarginColumn() -> Number
+ *
* Returns the column number of where the print margin is.
- * @returns {Number}
**/
this.getPrintMarginColumn = function() {
return this.renderer.getPrintMarginColumn();
};
+ this.$readOnly = false;
/**
+ * Editor.setReadOnly(readOnly)
+ * - readOnly (Boolean): Specifies whether the editor can be modified or not
+ *
* If `readOnly` is true, then the editor is set to read-only mode, and none of the content can change.
- * @param {Boolean} readOnly Specifies whether the editor can be modified or not
- *
**/
this.setReadOnly = function(readOnly) {
- this.setOption("readOnly", readOnly);
+ this.$readOnly = readOnly;
};
/**
+ * Editor.getReadOnly() -> Boolean
+ *
* Returns `true` if the editor is set to read-only mode.
- * @returns {Boolean}
**/
this.getReadOnly = function() {
- return this.getOption("readOnly");
+ return this.$readOnly;
};
+ this.$modeBehaviours = true;
+
/**
+ * Editor.setBehavioursEnabled(enabled)
+ * - enabled (Boolean): Enables or disables behaviors
+ *
* Specifies whether to use behaviors or not. ["Behaviors" in this case is the auto-pairing of special characters, like quotation marks, parenthesis, or brackets.]{: #BehaviorsDef}
- * @param {Boolean} enabled Enables or disables behaviors
- *
**/
this.setBehavioursEnabled = function (enabled) {
- this.setOption("behavioursEnabled", enabled);
+ this.$modeBehaviours = enabled;
};
/**
+ * Editor.getBehavioursEnabled() -> Boolean
+ *
* Returns `true` if the behaviors are currently enabled. {:BehaviorsDef}
- *
- * @returns {Boolean}
**/
this.getBehavioursEnabled = function () {
- return this.getOption("behavioursEnabled");
+ return this.$modeBehaviours;
};
/**
- * Specifies whether to use wrapping behaviors or not, i.e. automatically wrapping the selection with characters such as brackets
- * when such a character is typed in.
- * @param {Boolean} enabled Enables or disables wrapping behaviors
- *
- **/
- this.setWrapBehavioursEnabled = function (enabled) {
- this.setOption("wrapBehavioursEnabled", enabled);
- };
-
- /**
- * Returns `true` if the wrapping behaviors are currently enabled.
- **/
- this.getWrapBehavioursEnabled = function () {
- return this.getOption("wrapBehavioursEnabled");
- };
-
- /**
- * Indicates whether the fold widgets should be shown or not.
- * @param {Boolean} show Specifies whether the fold widgets are shown
+ * Editor.setShowFoldWidgets(show)
+ * - show (Boolean): Specifies whether the fold widgets are shown
+ *
+ * Indicates whether the fold widgets are shown or not.
**/
this.setShowFoldWidgets = function(show) {
- this.setOption("showFoldWidgets", show);
+ var gutter = this.renderer.$gutterLayer;
+ if (gutter.getShowFoldWidgets() == show)
+ return;
+ this.renderer.$gutterLayer.setShowFoldWidgets(show);
+ this.$showFoldWidgets = show;
+ this.renderer.updateFull();
};
+
/**
+ * Editor.getShowFoldWidgets() -> Boolean
+ *
* Returns `true` if the fold widgets are shown.
- * @return {Boolean}
**/
this.getShowFoldWidgets = function() {
- return this.getOption("showFoldWidgets");
+ return this.renderer.$gutterLayer.getShowFoldWidgets();
};
- this.setFadeFoldWidgets = function(fade) {
- this.setOption("fadeFoldWidgets", fade);
+ this.setFadeFoldWidgets = function(show) {
+ this.renderer.setFadeFoldWidgets(show);
};
this.getFadeFoldWidgets = function() {
- return this.getOption("fadeFoldWidgets");
+ return this.renderer.getFadeFoldWidgets();
};
/**
- * Removes the current selection or one character.
- * @param {String} dir The direction of the deletion to occur, either "left" or "right"
+ * Editor.remove(dir)
+ * - dir (String): The direction of the deletion to occur, either "left" or "right"
+ *
+ * Removes words of text from the editor. A "word" is defined as a string of characters bookended by whitespace.
*
**/
this.remove = function(dir) {
@@ -1314,16 +1120,6 @@ var Editor = function(renderer, session) {
var session = this.session;
var state = session.getState(range.start.row);
var new_range = session.getMode().transformAction(state, 'deletion', this, session, range);
-
- if (range.end.column === 0) {
- var text = session.getTextRange(range);
- if (text[text.length - 1] == "\n") {
- var line = session.getLine(range.end.row);
- if (/^\s+$/.test(line)) {
- range.end.column = line.length;
- }
- }
- }
if (new_range)
range = new_range;
}
@@ -1333,6 +1129,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.removeWordRight()
+ *
* Removes the word directly to the right of the current selection.
**/
this.removeWordRight = function() {
@@ -1344,6 +1142,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.removeWordLeft()
+ *
* Removes the word directly to the left of the current selection.
**/
this.removeWordLeft = function() {
@@ -1355,6 +1155,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.removeToLineStart()
+ *
* Removes all the words to the left of the current selection, until the start of the line.
**/
this.removeToLineStart = function() {
@@ -1366,6 +1168,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.removeToLineEnd()
+ *
* Removes all the words to the right of the current selection, until the end of the line.
**/
this.removeToLineEnd = function() {
@@ -1383,6 +1187,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.splitLine()
+ *
* Splits the line at the current selection (by inserting an `'\n'`).
**/
this.splitLine = function() {
@@ -1397,6 +1203,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.transposeLetters()
+ *
* Transposes current line.
**/
this.transposeLetters = function() {
@@ -1423,6 +1231,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.toLowerCase()
+ *
* Converts the current selection entirely into lowercase.
**/
this.toLowerCase = function() {
@@ -1438,6 +1248,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.toUpperCase()
+ *
* Converts the current selection entirely into uppercase.
**/
this.toUpperCase = function() {
@@ -1452,93 +1264,48 @@ var Editor = function(renderer, session) {
this.selection.setSelectionRange(originalRange);
};
- /**
- * Inserts an indentation into the current cursor position or indents the selected lines.
- *
- * @related EditSession.indentRows
+ /** related to: EditSession.indentRows
+ * Editor.indent()
+ *
+ * Indents the current line.
**/
this.indent = function() {
var session = this.session;
var range = this.getSelectionRange();
- if (range.start.row < range.end.row) {
+ if (range.start.row < range.end.row || range.start.column < range.end.column) {
var rows = this.$getSelectedRows();
session.indentRows(rows.first, rows.last, "\t");
- return;
- } else if (range.start.column < range.end.column) {
- var text = session.getTextRange(range);
- if (!/^\s+$/.test(text)) {
- var rows = this.$getSelectedRows();
- session.indentRows(rows.first, rows.last, "\t");
- return;
- }
- }
-
- var line = session.getLine(range.start.row);
- var position = range.start;
- var size = session.getTabSize();
- var column = session.documentToScreenColumn(position.row, position.column);
-
- if (this.session.getUseSoftTabs()) {
- var count = (size - column % size);
- var indentString = lang.stringRepeat(" ", count);
} else {
- var count = column % size;
- while (line[range.start.column] == " " && count) {
- range.start.column--;
- count--;
- }
- this.selection.setSelectionRange(range);
- indentString = "\t";
+ var indentString;
+
+ if (this.session.getUseSoftTabs()) {
+ var size = session.getTabSize(),
+ position = this.getCursorPosition(),
+ column = session.documentToScreenColumn(position.row, position.column),
+ count = (size - column % size);
+
+ indentString = lang.stringRepeat(" ", count);
+ } else
+ indentString = "\t";
+ return this.insert(indentString);
}
- return this.insert(indentString);
};
- /**
- * Indents the current line.
- * @related EditSession.indentRows
- **/
- this.blockIndent = function() {
- var rows = this.$getSelectedRows();
- this.session.indentRows(rows.first, rows.last, "\t");
- };
-
- /**
+ /** related to: EditSession.outdentRows
+ * Editor.blockOutdent()
+ *
* Outdents the current line.
- * @related EditSession.outdentRows
**/
this.blockOutdent = function() {
var selection = this.session.getSelection();
this.session.outdentRows(selection.getRange());
};
- // TODO: move out of core when we have good mechanism for managing extensions
- this.sortLines = function() {
- var rows = this.$getSelectedRows();
- var session = this.session;
-
- var lines = [];
- for (i = rows.first; i <= rows.last; i++)
- lines.push(session.getLine(i));
-
- lines.sort(function(a, b) {
- if (a.toLowerCase() < b.toLowerCase()) return -1;
- if (a.toLowerCase() > b.toLowerCase()) return 1;
- return 0;
- });
-
- var deleteRange = new Range(0, 0, 0, 0);
- for (var i = rows.first; i <= rows.last; i++) {
- var line = session.getLine(i);
- deleteRange.start.row = i;
- deleteRange.end.row = i;
- deleteRange.end.column = line.length;
- session.replace(deleteRange, lines[i-rows.first]);
- }
- };
-
/**
- * Given the currently selected range, this function either comments all the lines, or uncomments all of them.
+ * Editor.toggleCommentLines()
+ *
+ * Given the currently selected range, this function either comments all lines or uncomments all lines (depending on whether it's commented or not).
**/
this.toggleCommentLines = function() {
var state = this.session.getState(this.getCursorPosition().row);
@@ -1546,234 +1313,166 @@ var Editor = function(renderer, session) {
this.session.getMode().toggleCommentLines(state, this.session, rows.first, rows.last);
};
- this.toggleBlockComment = function() {
- var cursor = this.getCursorPosition();
- var state = this.session.getState(cursor.row);
- var range = this.getSelectionRange();
- this.session.getMode().toggleBlockComment(state, this.session, range, cursor);
- };
-
- /**
- * Works like [[EditSession.getTokenAt]], except it returns a number.
- * @returns {Number}
- **/
- this.getNumberAt = function(row, column) {
- var _numberRx = /[\-]?[0-9]+(?:\.[0-9]+)?/g;
- _numberRx.lastIndex = 0;
-
- var s = this.session.getLine(row);
- while (_numberRx.lastIndex < column) {
- var m = _numberRx.exec(s);
- if(m.index <= column && m.index+m[0].length >= column){
- var number = {
- value: m[0],
- start: m.index,
- end: m.index+m[0].length
- };
- return number;
- }
- }
- return null;
- };
-
- /**
- * If the character before the cursor is a number, this functions changes its value by `amount`.
- * @param {Number} amount The value to change the numeral by (can be negative to decrease value)
- *
- **/
- this.modifyNumber = function(amount) {
- var row = this.selection.getCursor().row;
- var column = this.selection.getCursor().column;
-
- // get the char before the cursor
- var charRange = new Range(row, column-1, row, column);
-
- var c = this.session.getTextRange(charRange);
- // if the char is a digit
- if (!isNaN(parseFloat(c)) && isFinite(c)) {
- // get the whole number the digit is part of
- var nr = this.getNumberAt(row, column);
- // if number found
- if (nr) {
- var fp = nr.value.indexOf(".") >= 0 ? nr.start + nr.value.indexOf(".") + 1 : nr.end;
- var decimals = nr.start + nr.value.length - fp;
-
- var t = parseFloat(nr.value);
- t *= Math.pow(10, decimals);
-
-
- if(fp !== nr.end && column < fp){
- amount *= Math.pow(10, nr.end - column - 1);
- } else {
- amount *= Math.pow(10, nr.end - column);
- }
-
- t += amount;
- t /= Math.pow(10, decimals);
- var nnr = t.toFixed(decimals);
-
- //update number
- var replaceRange = new Range(row, nr.start, row, nr.end);
- this.session.replace(replaceRange, nnr);
-
- //reposition the cursor
- this.moveCursorTo(row, Math.max(nr.start +1, column + nnr.length - nr.value.length));
-
- }
- }
- };
-
- /**
+ /** related to: EditSession.remove
+ * Editor.removeLines()
+ *
* Removes all the lines in the current selection
- * @related EditSession.remove
**/
this.removeLines = function() {
var rows = this.$getSelectedRows();
- this.session.removeFullLines(rows.first, rows.last);
+ var range;
+ if (rows.first === 0 || rows.last+1 < this.session.getLength())
+ range = new Range(rows.first, 0, rows.last+1, 0);
+ else
+ range = new Range(
+ rows.first-1, this.session.getLine(rows.first-1).length,
+ rows.last, this.session.getLine(rows.last).length
+ );
+ this.session.remove(range);
this.clearSelection();
};
this.duplicateSelection = function() {
var sel = this.selection;
- var doc = this.session;
- var range = sel.getRange();
- var reverse = sel.isBackwards();
- if (range.isEmpty()) {
- var row = range.start.row;
- doc.duplicateLines(row, row);
- } else {
- var point = reverse ? range.start : range.end;
- var endPoint = doc.insert(point, doc.getTextRange(range), false);
- range.start = point;
- range.end = endPoint;
-
- sel.setSelectionRange(range, reverse);
- }
+ var doc = this.session;
+ var range = sel.getRange();
+ if (range.isEmpty()) {
+ var row = range.start.row;
+ doc.duplicateLines(row, row);
+ } else {
+ var reverse = sel.isBackwards()
+ var point = sel.isBackwards() ? range.start : range.end;
+ var endPoint = doc.insert(point, doc.getTextRange(range), false);
+ range.start = point;
+ range.end = endPoint;
+
+ sel.setSelectionRange(range, reverse)
+ }
};
-
- /**
+
+ /** related to: EditSession.moveLinesDown
+ * Editor.moveLinesDown() -> Number
+ * + (Number): On success, it returns -1.
+ *
* Shifts all the selected lines down one row.
*
- * @returns {Number} On success, it returns -1.
- * @related EditSession.moveLinesUp
+ *
+ *
**/
this.moveLinesDown = function() {
- this.$moveLines(1, false);
+ this.$moveLines(function(firstRow, lastRow) {
+ return this.session.moveLinesDown(firstRow, lastRow);
+ });
};
- /**
+ /** related to: EditSession.moveLinesUp
+ * Editor.moveLinesUp() -> Number
+ * + (Number): On success, it returns -1.
+ *
* Shifts all the selected lines up one row.
- * @returns {Number} On success, it returns -1.
- * @related EditSession.moveLinesDown
+ *
+ *
**/
this.moveLinesUp = function() {
- this.$moveLines(-1, false);
+ this.$moveLines(function(firstRow, lastRow) {
+ return this.session.moveLinesUp(firstRow, lastRow);
+ });
};
- /**
+ /** related to: EditSession.moveText
+ * Editor.moveText(fromRange, toPosition) -> Range
+ * - fromRange (Range): The range of text you want moved within the document
+ * - toPosition (Object): The location (row and column) where you want to move the text to
+ * + (Range): The new range where the text was moved to.
+ *
* Moves a range of text from the given range to the given position. `toPosition` is an object that looks like this:
- * ```json
- * { row: newRowLocation, column: newColumnLocation }
- * ```
- * @param {Range} fromRange The range of text you want moved within the document
- * @param {Object} toPosition The location (row and column) where you want to move the text to
*
- * @returns {Range} The new range where the text was moved to.
- * @related EditSession.moveText
+ * { row: newRowLocation, column: newColumnLocation }
+ *
+ *
**/
- this.moveText = function(range, toPosition, copy) {
- return this.session.moveText(range, toPosition, copy);
+ this.moveText = function(range, toPosition) {
+ if (this.$readOnly)
+ return null;
+
+ return this.session.moveText(range, toPosition);
};
- /**
- * Copies all the selected lines up one row.
- * @returns {Number} On success, returns 0.
+ /** related to: EditSession.duplicateLines
+ * Editor.copyLinesUp() -> Number
+ * + (Number): On success, returns 0.
*
+ * Copies all the selected lines up one row.
+ *
+ *
**/
this.copyLinesUp = function() {
- this.$moveLines(-1, true);
+ this.$moveLines(function(firstRow, lastRow) {
+ this.session.duplicateLines(firstRow, lastRow);
+ return 0;
+ });
};
- /**
+ /** related to: EditSession.duplicateLines
+ * Editor.copyLinesDown() -> Number
+ * + (Number): On success, returns the number of new rows added; in other words, `lastRow - firstRow + 1`.
+ *
* Copies all the selected lines down one row.
- * @returns {Number} On success, returns the number of new rows added; in other words, `lastRow - firstRow + 1`.
- * @related EditSession.duplicateLines
+ *
+ *
*
**/
this.copyLinesDown = function() {
- this.$moveLines(1, true);
+ this.$moveLines(function(firstRow, lastRow) {
+ return this.session.duplicateLines(firstRow, lastRow);
+ });
};
+
/**
- * for internal use
- * @ignore
+ * Editor.$moveLines(mover)
+ * - mover (Function): A method to call on each selected row
+ *
+ * Executes a specific function, which can be anything that manipulates selected lines, such as copying them, duplicating them, or shifting them.
*
**/
- this.$moveLines = function(dir, copy) {
- var rows, moved;
+ this.$moveLines = function(mover) {
+ var rows = this.$getSelectedRows();
var selection = this.selection;
- if (!selection.inMultiSelectMode || this.inVirtualSelectionMode) {
- var range = selection.toOrientedRange();
- rows = this.$getSelectedRows(range);
- moved = this.session.$moveLines(rows.first, rows.last, copy ? 0 : dir);
- if (copy && dir == -1) moved = 0;
- range.moveBy(moved, 0);
- selection.fromOrientedRange(range);
- } else {
- var ranges = selection.rangeList.ranges;
- selection.rangeList.detach(this.session);
- this.inVirtualSelectionMode = true;
-
- var diff = 0;
- var totalDiff = 0;
- var l = ranges.length;
- for (var i = 0; i < l; i++) {
- var rangeIndex = i;
- ranges[i].moveBy(diff, 0);
- rows = this.$getSelectedRows(ranges[i]);
- var first = rows.first;
- var last = rows.last;
- while (++i < l) {
- if (totalDiff) ranges[i].moveBy(totalDiff, 0);
- var subRows = this.$getSelectedRows(ranges[i]);
- if (copy && subRows.first != last)
- break;
- else if (!copy && subRows.first > last + 1)
- break;
- last = subRows.last;
- }
- i--;
- diff = this.session.$moveLines(first, last, copy ? 0 : dir);
- if (copy && dir == -1) rangeIndex = i + 1;
- while (rangeIndex <= i) {
- ranges[rangeIndex].moveBy(diff, 0);
- rangeIndex++;
- }
- if (!copy) diff = 0;
- totalDiff += diff;
- }
-
- selection.fromOrientedRange(selection.ranges[0]);
- selection.rangeList.attach(this.session);
- this.inVirtualSelectionMode = false;
+ if (!selection.isMultiLine()) {
+ var range = selection.getRange();
+ var reverse = selection.isBackwards();
+ }
+
+ var linesMoved = mover.call(this, rows.first, rows.last);
+
+ if (range) {
+ range.start.row += linesMoved;
+ range.end.row += linesMoved;
+ selection.setSelectionRange(range, reverse);
+ }
+ else {
+ selection.setSelectionAnchor(rows.last+linesMoved+1, 0);
+ selection.$moveSelection(function() {
+ selection.moveCursorTo(rows.first+linesMoved, 0);
+ });
}
};
/**
+ * Editor.$getSelectedRows() -> Object
+ *
* Returns an object indicating the currently selected rows. The object looks like this:
*
- * ```json
* { first: range.start.row, last: range.end.row }
- * ```
*
- * @returns {Object}
**/
- this.$getSelectedRows = function(range) {
- range = (range || this.getSelectionRange()).collapseRows();
+ this.$getSelectedRows = function() {
+ var range = this.getSelectionRange().collapseRows();
return {
- first: this.session.getRowFoldStart(range.start.row),
- last: this.session.getRowFoldEnd(range.end.row)
+ first: range.start.row,
+ last: range.end.row
};
};
@@ -1789,50 +1488,48 @@ var Editor = function(renderer, session) {
this.renderer.hideComposition();
};
- /**
+ /** related to: VirtualRenderer.getFirstVisibleRow
+ * Editor.getFirstVisibleRow() -> Number
+ *
* {:VirtualRenderer.getFirstVisibleRow}
- *
- * @returns {Number}
- * @related VirtualRenderer.getFirstVisibleRow
**/
this.getFirstVisibleRow = function() {
return this.renderer.getFirstVisibleRow();
};
- /**
+ /** related to: VirtualRenderer.getLastVisibleRow
+ * Editor.getLastVisibleRow() -> Number
+ *
* {:VirtualRenderer.getLastVisibleRow}
- *
- * @returns {Number}
- * @related VirtualRenderer.getLastVisibleRow
**/
this.getLastVisibleRow = function() {
return this.renderer.getLastVisibleRow();
};
/**
+ * Editor.isRowVisible(row) -> Boolean
+ * - row (Number): The row to check
+ *
* Indicates if the row is currently visible on the screen.
- * @param {Number} row The row to check
- *
- * @returns {Boolean}
**/
this.isRowVisible = function(row) {
return (row >= this.getFirstVisibleRow() && row <= this.getLastVisibleRow());
};
/**
+ * Editor.isRowFullyVisible(row) -> Boolean
+ * - row (Number): The row to check
+ *
* Indicates if the entire row is currently visible on the screen.
- * @param {Number} row The row to check
- *
- *
- * @returns {Boolean}
**/
this.isRowFullyVisible = function(row) {
return (row >= this.renderer.getFirstFullyVisibleRow() && row <= this.renderer.getLastFullyVisibleRow());
};
/**
+ * Editor.$getVisibleRowCount() -> Number
+ *
* Returns the number of currently visibile rows.
- * @returns {Number}
**/
this.$getVisibleRowCount = function() {
return this.renderer.getScrollBottomRow() - this.renderer.getScrollTopRow() + 1;
@@ -1844,11 +1541,11 @@ var Editor = function(renderer, session) {
var rows = dir * Math.floor(config.height / config.lineHeight);
this.$blockScrolling++;
- if (select === true) {
+ if (select == true) {
this.selection.$moveSelection(function(){
this.moveCursorBy(rows, 0);
});
- } else if (select === false) {
+ } else if (select == false) {
this.selection.moveCursorBy(rows, 0);
this.selection.clearSelection();
}
@@ -1864,6 +1561,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.selectPageDown()
+ *
* Selects the text from the current position of the document until where a "page down" finishes.
**/
this.selectPageDown = function() {
@@ -1871,6 +1570,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.selectPageUp()
+ *
* Selects the text from the current position of the document until where a "page up" finishes.
**/
this.selectPageUp = function() {
@@ -1878,6 +1579,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.gotoPageDown()
+ *
* Shifts the document to wherever "page down" is, as well as moving the cursor position.
**/
this.gotoPageDown = function() {
@@ -1885,6 +1588,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.gotoPageUp()
+ *
* Shifts the document to wherever "page up" is, as well as moving the cursor position.
**/
this.gotoPageUp = function() {
@@ -1892,6 +1597,8 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.scrollPageDown()
+ *
* Scrolls the document to wherever "page down" is, without changing the cursor position.
**/
this.scrollPageDown = function() {
@@ -1899,35 +1606,41 @@ var Editor = function(renderer, session) {
};
/**
+ * Editor.scrollPageUp()
+ *
* Scrolls the document to wherever "page up" is, without changing the cursor position.
**/
this.scrollPageUp = function() {
this.$moveByPage(-1);
};
- /**
+ /** related to: VirtualRenderer.scrollToRow
+ * Editor.scrollToRow(row)
+ * - row (Number): The row to move to
+ *
* Moves the editor to the specified row.
- * @related VirtualRenderer.scrollToRow
+ *
**/
this.scrollToRow = function(row) {
this.renderer.scrollToRow(row);
};
- /**
- * Scrolls to a line. If `center` is `true`, it puts the line in middle of screen (or attempts to).
- * @param {Number} line The line to scroll to
- * @param {Boolean} center If `true`
- * @param {Boolean} animate If `true` animates scrolling
- * @param {Function} callback Function to be called when the animation has finished
+ /** related to: VirtualRenderer.scrollToLine
+ * Editor.scrollToLine(line, center, animate, callback())
+ * - line (Number): The line to scroll to
+ * - center (Boolean): If `true`
+ * - animate (Boolean): If `true` animates scrolling
+ * - callback (Function): Function to be called when the animation has finished
*
- *
- * @related VirtualRenderer.scrollToLine
+ * TODO scrolls a to line, if center == true, puts line in middle of screen or attempts to)
**/
this.scrollToLine = function(line, center, animate, callback) {
this.renderer.scrollToLine(line, center, animate, callback);
};
/**
+ * Editor.centerSelection()
+ *
* Attempts to center the current selection on the screen.
**/
this.centerSelection = function() {
@@ -1935,46 +1648,47 @@ var Editor = function(renderer, session) {
var pos = {
row: Math.floor(range.start.row + (range.end.row - range.start.row) / 2),
column: Math.floor(range.start.column + (range.end.column - range.start.column) / 2)
- };
+ }
this.renderer.alignCursor(pos, 0.5);
};
- /**
+ /** related to: Selection.getCursor
+ * Editor.getCursorPosition() -> Object
+ * + (Object): This returns an object that looks something like this:
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
diff --git a/lib/ace/editor_highlight_selected_word_test.js b/lib/ace/editor_highlight_selected_word_test.js
index 13e19c23..c18a78bb 100644
--- a/lib/ace/editor_highlight_selected_word_test.js
+++ b/lib/ace/editor_highlight_selected_word_test.js
@@ -1,30 +1,38 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+/* vim:ts=4:sts=4:sw=4:
+ * ***** BEGIN LICENSE BLOCK *****
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
*
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Mihai Sucan.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
diff --git a/lib/ace/editor_navigation_test.js b/lib/ace/editor_navigation_test.js
index ab348241..ebd55a89 100644
--- a/lib/ace/editor_navigation_test.js
+++ b/lib/ace/editor_navigation_test.js
@@ -1,30 +1,37 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
diff --git a/lib/ace/editor_text_edit_test.js b/lib/ace/editor_text_edit_test.js
index 77ec34ed..171d40c7 100644
--- a/lib/ace/editor_text_edit_test.js
+++ b/lib/ace/editor_text_edit_test.js
@@ -1,30 +1,37 @@
/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
+ * Version: MPL 1.1/GPL 2.0/LGPL 2.1
*
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * The contents of this file are subject to the Mozilla Public License Version
+ * 1.1 (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ * http://www.mozilla.org/MPL/
+ *
+ * Software distributed under the License is distributed on an "AS IS" basis,
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ * for the specific language governing rights and limitations under the
+ * License.
+ *
+ * The Original Code is Ajax.org Code Editor (ACE).
+ *
+ * The Initial Developer of the Original Code is
+ * Ajax.org B.V.
+ * Portions created by the Initial Developer are Copyright (C) 2010
+ * the Initial Developer. All Rights Reserved.
+ *
+ * Contributor(s):
+ * Fabian Jakobs
+ *
+ * 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
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
+ * in which case the provisions of the GPL or the LGPL are applicable instead
+ * of those above. If you wish to allow use of your version of this file only
+ * under the terms of either the GPL or the LGPL, and not to allow others to
+ * use your version of this file under the terms of the MPL, indicate your
+ * decision by deleting the provisions above and replace them with the notice
+ * and other provisions required by the GPL or the LGPL. If you do not delete
+ * the provisions above, a recipient may use your version of this file under
+ * the terms of any one of the MPL, the GPL or the LGPL.
*
* ***** END LICENSE BLOCK ***** */
@@ -42,7 +49,6 @@ var JavaScriptMode = require("./mode/javascript").Mode;
var UndoManager = require("./undomanager").UndoManager;
var MockRenderer = require("./test/mockrenderer").MockRenderer;
var assert = require("./test/assertions");
-var whitespace = require("./ext/whitespace");
module.exports = {
"test: delete line from the middle" : function() {
@@ -185,23 +191,21 @@ module.exports = {
"test: comment lines should perserve selection" : function() {
var session = new EditSession([" abc", "cde"].join("\n"), new JavaScriptMode());
var editor = new Editor(new MockRenderer(), session);
- whitespace.detectIndentation(session);
-
+
editor.moveCursorTo(0, 2);
editor.getSelection().selectDown();
editor.toggleCommentLines();
- assert.equal(["// abc", "// cde"].join("\n"), session.toString());
+ assert.equal(["// abc", "//cde"].join("\n"), session.toString());
var selection = editor.getSelectionRange();
- assert.position(selection.start, 0, 5);
- assert.position(selection.end, 1, 5);
+ assert.position(selection.start, 0, 4);
+ assert.position(selection.end, 1, 4);
},
"test: uncomment lines should perserve selection" : function() {
- var session = new EditSession(["// abc", "//cde"].join("\n"), new JavaScriptMode());
+ var session = new EditSession(["// abc", "//cde"].join("\n"), new JavaScriptMode());
var editor = new Editor(new MockRenderer(), session);
- session.setTabSize(2);
editor.moveCursorTo(0, 1);
editor.getSelection().selectDown();
@@ -238,7 +242,7 @@ module.exports = {
editor.getSelection().selectDown();
editor.toggleCommentLines();
- assert.range(editor.getSelectionRange(), 0, 3, 1, 0);
+ assert.range(editor.getSelectionRange(), 0, 2, 1, 0);
// select up
var session = new EditSession(["abc", "cde"].join("\n"), new JavaScriptMode());
@@ -248,10 +252,10 @@ module.exports = {
editor.getSelection().selectUp();
editor.toggleCommentLines();
- assert.range(editor.getSelectionRange(), 0, 3, 1, 0);
+ assert.range(editor.getSelectionRange(), 0, 2, 1, 0);
},
- "test: move lines down should keep selection on moved lines" : function() {
+ "test: move lines down should select moved lines" : function() {
var session = new EditSession(["11", "22", "33", "44"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
@@ -260,25 +264,25 @@ module.exports = {
editor.moveLinesDown();
assert.equal(["33", "11", "22", "44"].join("\n"), session.toString());
- assert.position(editor.getCursorPosition(), 2, 1);
- assert.position(editor.getSelection().getSelectionAnchor(), 1, 1);
- assert.position(editor.getSelection().getSelectionLead(), 2, 1);
+ assert.position(editor.getCursorPosition(), 1, 0);
+ assert.position(editor.getSelection().getSelectionAnchor(), 3, 0);
+ assert.position(editor.getSelection().getSelectionLead(), 1, 0);
editor.moveLinesDown();
assert.equal(["33", "44", "11", "22"].join("\n"), session.toString());
- assert.position(editor.getCursorPosition(), 3, 1);
- assert.position(editor.getSelection().getSelectionAnchor(), 2, 1);
- assert.position(editor.getSelection().getSelectionLead(), 3, 1);
+ assert.position(editor.getCursorPosition(), 2, 0);
+ assert.position(editor.getSelection().getSelectionAnchor(), 3, 2);
+ assert.position(editor.getSelection().getSelectionLead(), 2, 0);
// moving again should have no effect
editor.moveLinesDown();
assert.equal(["33", "44", "11", "22"].join("\n"), session.toString());
- assert.position(editor.getCursorPosition(), 3, 1);
- assert.position(editor.getSelection().getSelectionAnchor(), 2, 1);
- assert.position(editor.getSelection().getSelectionLead(), 3, 1);
+ assert.position(editor.getCursorPosition(), 2, 0);
+ assert.position(editor.getSelection().getSelectionAnchor(), 3, 2);
+ assert.position(editor.getSelection().getSelectionLead(), 2, 0);
},
- "test: move lines up should keep selection on moved lines" : function() {
+ "test: move lines up should select moved lines" : function() {
var session = new EditSession(["11", "22", "33", "44"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
@@ -287,18 +291,19 @@ module.exports = {
editor.moveLinesUp();
assert.equal(session.toString(), ["11", "33", "44", "22"].join("\n"));
- assert.position(editor.getCursorPosition(), 2, 1);
- assert.position(editor.getSelection().getSelectionAnchor(), 1, 1);
- assert.position(editor.getSelection().getSelectionLead(), 2, 1);
+ assert.position(editor.getCursorPosition(), 1, 0);
+ assert.position(editor.getSelection().getSelectionAnchor(), 3, 0);
+ assert.position(editor.getSelection().getSelectionLead(), 1, 0);
editor.moveLinesUp();
assert.equal(session.toString(), ["33", "44", "11", "22"].join("\n"));
- assert.position(editor.getCursorPosition(), 1, 1);
- assert.position(editor.getSelection().getSelectionAnchor(), 0, 1);
- assert.position(editor.getSelection().getSelectionLead(), 1, 1);
+ assert.position(editor.getCursorPosition(), 0, 0);
+ assert.position(editor.getSelection().getSelectionAnchor(), 2, 0);
+ assert.position(editor.getSelection().getSelectionLead(), 0, 0);
},
- "test: move line without active selection should not move cursor relative to the moved line" : function() {
+ "test: move line without active selection should not move cursor relative to the moved line" : function()
+ {
var session = new EditSession(["11", "22", "33", "44"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
@@ -316,7 +321,7 @@ module.exports = {
assert.position(editor.getCursorPosition(), 1, 1);
},
- "test: copy lines down should keep selection" : function() {
+ "test: copy lines down should select lines and place cursor at the selection start" : function() {
var session = new EditSession(["11", "22", "33", "44"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
@@ -326,12 +331,12 @@ module.exports = {
editor.copyLinesDown();
assert.equal(["11", "22", "33", "22", "33", "44"].join("\n"), session.toString());
- assert.position(editor.getCursorPosition(), 4, 1);
- assert.position(editor.getSelection().getSelectionAnchor(), 3, 1);
- assert.position(editor.getSelection().getSelectionLead(), 4, 1);
+ assert.position(editor.getCursorPosition(), 3, 0);
+ assert.position(editor.getSelection().getSelectionAnchor(), 5, 0);
+ assert.position(editor.getSelection().getSelectionLead(), 3, 0);
},
- "test: copy lines up should keep selection" : function() {
+ "test: copy lines up should select lines and place cursor at the selection start" : function() {
var session = new EditSession(["11", "22", "33", "44"].join("\n"));
var editor = new Editor(new MockRenderer(), session);
@@ -341,9 +346,9 @@ module.exports = {
editor.copyLinesUp();
assert.equal(["11", "22", "33", "22", "33", "44"].join("\n"), session.toString());
- assert.position(editor.getCursorPosition(), 2, 1);
- assert.position(editor.getSelection().getSelectionAnchor(), 1, 1);
- assert.position(editor.getSelection().getSelectionLead(), 2, 1);
+ assert.position(editor.getCursorPosition(), 1, 0);
+ assert.position(editor.getSelection().getSelectionAnchor(), 3, 0);
+ assert.position(editor.getSelection().getSelectionLead(), 1, 0);
},
"test: input a tab with soft tab should convert it to spaces" : function() {
diff --git a/lib/ace/ext/beautify.js b/lib/ace/ext/beautify.js
deleted file mode 100644
index d0fa1799..00000000
--- a/lib/ace/ext/beautify.js
+++ /dev/null
@@ -1,57 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2012, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-// [WIP]
-
-define(function(require, exports, module) {
-"use strict";
-var TokenIterator = require("ace/token_iterator").TokenIterator;
-
-var phpTransform = require("./beautify/php_rules").transform;
-
-exports.beautify = function(session) {
- var iterator = new TokenIterator(session, 0, 0);
- var token = iterator.getCurrentToken();
-
- var context = session.$modeId.split("/").pop();
-
- var code = phpTransform(iterator, context);
- session.doc.setValue(code);
-};
-
-exports.commands = [{
- name: "beautify",
- exec: function(editor) {
- exports.beautify(editor.session);
- },
- bindKey: "Ctrl-Shift-B"
-}]
-
-});
\ No newline at end of file
diff --git a/lib/ace/ext/beautify/php_rules.js b/lib/ace/ext/beautify/php_rules.js
deleted file mode 100644
index 9a5bed36..00000000
--- a/lib/ace/ext/beautify/php_rules.js
+++ /dev/null
@@ -1,366 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2012, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-"use strict";
-var TokenIterator = require("ace/token_iterator").TokenIterator;
-exports.newLines = [{
- type: 'support.php_tag',
- value: ''
-}, {
- type: 'paren.lparen',
- value: '{',
- indent: true
-}, {
- type: 'paren.rparen',
- breakBefore: true,
- value: '}',
- indent: false
-}, {
- type: 'paren.rparen',
- breakBefore: true,
- value: '})',
- indent: false,
- dontBreak: true
-}, {
- type: 'comment'
-}, {
- type: 'text',
- value: ';'
-}, {
- type: 'text',
- value: ':',
- context: 'php'
-}, {
- type: 'keyword',
- value: 'case',
- indent: true,
- dontBreak: true
-}, {
- type: 'keyword',
- value: 'default',
- indent: true,
- dontBreak: true
-}, {
- type: 'keyword',
- value: 'break',
- indent: false,
- dontBreak: true
-}, {
- type: 'punctuation.doctype.end',
- value: '>'
-}, {
- type: 'meta.tag.punctuation.end',
- value: '>'
-}, {
- type: 'meta.tag.punctuation.begin',
- value: '<',
- blockTag: true,
- indent: true,
- dontBreak: true
-}, {
- type: 'meta.tag.punctuation.begin',
- value: '' ){
- context = 'php';
- }
- else if( token.type == 'support.php_tag' && token.value == '?>' ){
- context = 'html';
- }
- //css
- else if( token.type == 'meta.tag.name.style' && context != 'css' ){
- context = 'css';
- }
- else if( token.type == 'meta.tag.name.style' && context == 'css' ){
- context = 'html';
- }
- //js
- else if( token.type == 'meta.tag.name.script' && context != 'js' ){
- context = 'js';
- }
- else if( token.type == 'meta.tag.name.script' && context == 'js' ){
- context = 'html';
- }
-
- nextToken = iterator.stepForward();
-
- //tag name
- if (nextToken && nextToken.type.indexOf('meta.tag.name') == 0) {
- nextTag = nextToken.value;
- }
-
- //don't linebreak
- if ( lastToken.type == 'support.php_tag' && lastToken.value == '' ) {
- dontBreak = false;
- }
-
- //next token
- lastTag = tag;
-
- lastToken = token;
-
- token = nextToken;
-
- if (token===null) {
- break;
- }
- }
-
- return code;
-};
-
-
-
-});
\ No newline at end of file
diff --git a/lib/ace/ext/chromevox.js b/lib/ace/ext/chromevox.js
deleted file mode 100644
index 52a180d4..00000000
--- a/lib/ace/ext/chromevox.js
+++ /dev/null
@@ -1,979 +0,0 @@
-define(function(require, exports, module) {
-
-/* ChromeVox Ace namespace. */
-var cvoxAce = {};
-
-/* Typedefs for Closure compiler. */
-/**
- * @typedef {{
- rate: number,
- pitch: number,
- volume: number,
- relativePitch: number,
- punctuationEcho: string
- }}
- */
-/* TODO(peterxiao): Export this typedef through cvox.Api. */
-cvoxAce.SpeechProperty;
-
-/**
- * @typedef {{
- * row: number,
- * column: number
- * }}
- */
-cvoxAce.Cursor;
-
-/**
- * @typedef {{
- type: string,
- value: string
- }}
- }
- */
-cvoxAce.Token;
-
-/**
- * These are errors and information that Ace will display in the gutter.
- * @typedef {{
- row: number,
- column: number,
- value: string
- }}
- }
- */
-cvoxAce.Annotation;
-
-/* Speech Properties. */
-/**
- * Speech property for speaking constant tokens.
- * @type {cvoxAce.SpeechProperty}
- */
-var CONSTANT_PROP = {
- 'rate': 0.8,
- 'pitch': 0.4,
- 'volume': 0.9
-};
-
-/**
- * Default speech property for speaking tokens.
- * @type {cvoxAce.SpeechProperty}
- */
-var DEFAULT_PROP = {
- 'rate': 1,
- 'pitch': 0.5,
- 'volume': 0.9
-};
-
-/**
- * Speech property for speaking entity tokens.
- * @type {cvoxAce.SpeechProperty}
- */
-var ENTITY_PROP = {
- 'rate': 0.8,
- 'pitch': 0.8,
- 'volume': 0.9
-};
-
-/**
- * Speech property for speaking keywords.
- * @type {cvoxAce.SpeechProperty}
- */
-var KEYWORD_PROP = {
- 'rate': 0.8,
- 'pitch': 0.3,
- 'volume': 0.9
-};
-
-/**
- * Speech property for speaking storage tokens.
- * @type {cvoxAce.SpeechProperty}
- */
-var STORAGE_PROP = {
- 'rate': 0.8,
- 'pitch': 0.7,
- 'volume': 0.9
-};
-
-/**
- * Speech property for speaking variable tokens.
- * @type {cvoxAce.SpeechProperty}
- */
-var VARIABLE_PROP = {
- 'rate': 0.8,
- 'pitch': 0.8,
- 'volume': 0.9
-};
-
-/**
- * Speech property for speaking deleted text.
- * @type {cvoxAce.SpeechProperty}
- */
-var DELETED_PROP = {
- 'punctuationEcho': 'none',
- 'relativePitch': -0.6
-};
-
-/* Constants for Earcons. */
-var ERROR_EARCON = 'ALERT_NONMODAL';
-var MODE_SWITCH_EARCON = 'ALERT_MODAL';
-var NO_MATCH_EARCON = 'INVALID_KEYPRESS';
-
-/* Constants for vim state. */
-var INSERT_MODE_STATE = 'insertMode';
-var COMMAND_MODE_STATE = 'start';
-
-var REPLACE_LIST = [
- {
- substr: ';',
- newSubstr: ' semicolon '
- },
- {
- substr: ':',
- newSubstr: ' colon '
- }
-];
-
-/**
- * Context menu commands.
- */
-var Command = {
- SPEAK_ANNOT: 'annots',
- SPEAK_ALL_ANNOTS: 'all_annots',
- TOGGLE_LOCATION: 'toggle_location',
- SPEAK_MODE: 'mode',
- SPEAK_ROW_COL: 'row_col',
- TOGGLE_DISPLACEMENT: 'toggle_displacement',
- FOCUS_TEXT: 'focus_text'
-};
-
-/**
- * Key prefix for each shortcut.
- */
-var KEY_PREFIX = 'CONTROL + SHIFT ';
-
-/* Globals. */
-cvoxAce.editor = null;
-/**
- * Last cursor position.
- * @type {cvoxAce.Cursor}
- */
-var lastCursor = null;
-
-/**
- * Table of annotations.
- * @typedef {!Object.>}
- */
-var annotTable = {};
-
-/**
- * Whether to speak character, word, and then line. This allows blind users
- * to know the location of the cursor when they change lines.
- * @typedef {boolean}
- */
-var shouldSpeakRowLocation = false;
-
-/**
- * Whether to speak displacement.
- * @typedef {boolean}
- */
-var shouldSpeakDisplacement = false;
-
-/**
- * Whether text was changed to cause a cursor change event.
- * @typedef {boolean}
- */
-var changed = false;
-
-/**
- * Current state vim is in.
- */
-var vimState = null;
-
-/**
- * Mapping from key code to shortcut.
- */
-var keyCodeToShortcutMap = {};
-
-/**
- * Mapping from command to shortcut.
- */
-var cmdToShortcutMap = {};
-
-/**
- * Get shortcut string from keyCode.
- * @param {number} keyCode Key code of shortcut.
- * @return {string} String representation of shortcut.
- */
-var getKeyShortcutString = function(keyCode) {
- return KEY_PREFIX + String.fromCharCode(keyCode);
-};
-
-/**
- * Return if in vim mode.
- * @return {boolean} True if in Vim mode.
- */
-var isVimMode = function() {
- var keyboardHandler = cvoxAce.editor.keyBinding.getKeyboardHandler();
- return keyboardHandler.$id === 'ace/keyboard/vim';
-};
-
-/**
- * Gets the current token.
- * @param {!cvoxAce.Cursor} cursor Current position of the cursor.
- * @return {!cvoxAce.Token} Token at the current position.
- */
-var getCurrentToken = function(cursor) {
- return cvoxAce.editor.getSession().getTokenAt(cursor.row, cursor.column + 1);
-};
-
-/**
- * Gets the current line the cursor is under.
- * @param {!cvoxAce.Cursor} cursor Current cursor position.
- */
-var getCurrentLine = function(cursor) {
- return cvoxAce.editor.getSession().getLine(cursor.row);
-};
-
-/**
- * Event handler for row changes. When the user changes rows we want to speak
- * the line so the user can work on this line. If shouldSpeakRowLocation is on
- * then we speak the character, then the row, then the line so the user knows
- * where the cursor is.
- * @param {!cvoxAce.Cursor} currCursor Current cursor position.
- */
-var onRowChange = function(currCursor) {
- /* Notify that this line has an annotation. */
- if (annotTable[currCursor.row]) {
- cvox.Api.playEarcon(ERROR_EARCON);
- }
- if (shouldSpeakRowLocation) {
- cvox.Api.stop();
- speakChar(currCursor);
- speakTokenQueue(getCurrentToken(currCursor));
- speakLine(currCursor.row, 1);
- } else {
- speakLine(currCursor.row, 0);
- }
-};
-
-/**
- * Returns whether the cursor is at the beginning of a word. A word is
- * a grouping of alphanumeric characters including underscores.
- * @param {!cvoxAce.Cursor} cursor Current cursor position.
- * @return {boolean} Whether there is word.
- */
-var isWord = function(cursor) {
- var line = getCurrentLine(cursor);
- var lineSuffix = line.substr(cursor.column - 1);
- if (cursor.column === 0) {
- lineSuffix = ' ' + line;
- }
- /* Use regex to tell if the suffix is at the start of a new word. */
- var firstWordRegExp = /^\W(\w+)/;
- var words = firstWordRegExp.exec(lineSuffix);
- return words !== null;
-};
-
-/**
- * A mapping of syntax type to speech properties / expanding rules.
- */
-var rules = {
- 'constant': {
- prop: CONSTANT_PROP
- },
- 'entity': {
- prop: ENTITY_PROP
- },
- 'keyword': {
- prop: KEYWORD_PROP
- },
- 'storage': {
- prop: STORAGE_PROP
- },
- 'variable': {
- prop: VARIABLE_PROP
- },
- 'meta': {
- prop: DEFAULT_PROP,
- replace: [
- {
- substr: '',
- newSubstr: ' close tag '
- },
- {
- substr: '<',
- newSubstr: ' tag start '
- },
- {
- substr: '>',
- newSubstr: ' tag end '
- }
- ]
- }
-};
-
-/**
- * Default rule to be used.
- */
-var DEFAULT_RULE = {
- prop: DEFAULT_RULE
-};
-
-/**
- * Expands substrings to how they are read based on the given rules.
- * @param {string} value Text to be expanded.
- * @param {Array.} replaceRules Rules to determine expansion.
- * @return {string} New expanded value.
- */
-var expand = function(value, replaceRules) {
- var newValue = value;
- for (var i = 0; i < replaceRules.length; i++) {
- var replaceRule = replaceRules[i];
- var regexp = new RegExp(replaceRule.substr, 'g');
- newValue = newValue.replace(regexp, replaceRule.newSubstr);
- }
- return newValue;
-};
-
-/**
- * Merges tokens from start inclusive to end exclusive.
- * @param {Array.} Tokens to be merged.
- * @param {number} start Start index inclusive.
- * @param {number} end End index exclusive.
- * @return {cvoxAce.Token} Merged token.
- */
-var mergeTokens = function(tokens, start, end) {
- /* Different type of token found! Merge all previous like tokens. */
- var newToken = {};
- newToken.value = '';
- newToken.type = tokens[start].type;
- for (var j = start; j < end; j++) {
- newToken.value += tokens[j].value;
- }
- return newToken;
-};
-
-/**
- * Merges tokens that use the same speech properties.
- * @param {Array.} tokens Tokens to be merged.
- * @return {Array.} Merged tokens.
- */
-var mergeLikeTokens = function(tokens) {
- if (tokens.length <= 1) {
- return tokens;
- }
- var newTokens = [];
- var lastLikeIndex = 0;
- for (var i = 1; i < tokens.length; i++) {
- var lastLikeToken = tokens[lastLikeIndex];
- var currToken = tokens[i];
- if (getTokenRule(lastLikeToken) !== getTokenRule(currToken)) {
- newTokens.push(mergeTokens(tokens, lastLikeIndex, i));
- lastLikeIndex = i;
- }
- }
- newTokens.push(mergeTokens(tokens, lastLikeIndex, tokens.length));
- return newTokens;
-};
-
-/**
- * Returns if given row is a whitespace row.
- * @param {number} row Row.
- * @return {boolean} True if row is whitespaces.
- */
-var isRowWhiteSpace = function(row) {
- var line = cvoxAce.editor.getSession().getLine(row);
- var whiteSpaceRegexp = /^\s*$/;
- return whiteSpaceRegexp.exec(line) !== null;
-};
-
-/**
- * Speak the line with syntax properties.
- * @param {number} row Row to speak.
- * @param {number} queue Queue mode to speak.
- */
-var speakLine = function(row, queue) {
- var tokens = cvoxAce.editor.getSession().getTokens(row);
- if (tokens.length === 0 || isRowWhiteSpace(row)) {
- cvox.Api.playEarcon('EDITABLE_TEXT');
- return;
- }
- tokens = mergeLikeTokens(tokens);
- var firstToken = tokens[0];
- /* Filter out first token. */
- tokens = tokens.filter(function(token) {
- return token !== firstToken;
- });
- /* Speak first token separately to flush if queue. */
- speakToken_(firstToken, queue);
- /* Speak rest of tokens. */
- tokens.forEach(speakTokenQueue);
-};
-
-/**
- * Speak the token based on the syntax of the token, flushing.
- * @param {!cvoxAce.Token} token Token to speak.
- * @param {number} queue Queue mode.
- */
-var speakTokenFlush = function(token) {
- speakToken_(token, 0);
-};
-
-/**
- * Speak the token based on the syntax of the token, queueing.
- * @param {!cvoxAce.Token} token Token to speak.
- * @param {number} queue Queue mode.
- */
-var speakTokenQueue = function(token) {
- speakToken_(token, 1);
-};
-
-/**
- * @param {!cvoxAce.Token} token Token to speak.
- * Get the token speech property.
- */
-var getTokenRule = function(token) {
- /* Types are period delimited. In this case, we only syntax speak the outer
- * most type of token. */
- if (!token || !token.type) {
- return;
- }
- var split = token.type.split('.');
- if (split.length === 0) {
- return;
- }
- var type = split[0];
- var rule = rules[type];
- if (!rule) {
- return DEFAULT_RULE;
- }
- return rule;
-};
-
-/**
- * Speak the token based on the syntax of the token.
- * @private
- * @param {!cvoxAce.Token} token Token to speak.
- * @param {number} queue Queue mode.
- */
-var speakToken_ = function(token, queue) {
- var rule = getTokenRule(token);
- var value = expand(token.value, REPLACE_LIST);
- if (rule.replace) {
- value = expand(value, rule.replace);
- }
- cvox.Api.speak(value, queue, rule.prop);
-};
-
-/**
- * Speaks the character under the cursor. This is queued.
- * @param {!cvoxAce.Cursor} cursor Current cursor position.
- * @return {string} Character.
- */
-var speakChar = function(cursor) {
- var line = getCurrentLine(cursor);
- cvox.Api.speak(line[cursor.column], 1);
-};
-
-/**
- * Speaks the jump from lastCursor to currCursor. This function assumes the
- * jump takes place on the current line.
- * @param {!cvoxAce.Cursor} lastCursor Previous cursor position.
- * @param {!cvoxAce.Cursor} currCursor Current cursor position.
- */
-var speakDisplacement = function(lastCursor, currCursor) {
- var line = getCurrentLine(currCursor);
-
- /* Get the text that we jumped past. */
- var displace = line.substring(lastCursor.column, currCursor.column);
-
- /* Speak out loud spaces. */
- displace = displace.replace(/ /g, ' space ');
- cvox.Api.speak(displace);
-};
-
-/**
- * Speaks the word if the cursor jumped to a new word or to the beginning
- * of the line. Otherwise speak the charactor.
- * @param {!cvoxAce.Cursor} lastCursor Previous cursor position.
- * @param {!cvoxAce.Cursor} currCursor Current cursor position.
- */
-var speakCharOrWordOrLine = function(lastCursor, currCursor) {
- /* Say word only if jump. */
- if (Math.abs(lastCursor.column - currCursor.column) !== 1) {
- var currLineLength = getCurrentLine(currCursor).length;
- /* Speak line if jumping to beginning or end of line. */
- if (currCursor.column === 0 || currCursor.column === currLineLength) {
- speakLine(currCursor.row, 0);
- return;
- }
- if (isWord(currCursor)) {
- cvox.Api.stop();
- speakTokenQueue(getCurrentToken(currCursor));
- return;
- }
- }
- speakChar(currCursor);
-};
-
-/**
- * Event handler for column changes. If shouldSpeakDisplacement is on, then
- * we just speak displacements in row changes. Otherwise, we either speak
- * the character for single character movements, the word when jumping to the
- * next word, or the entire line if jumping to beginning or end of the line.
- * @param {!cvoxAce.Cursor} lastCursor Previous cursor position.
- * @param {!cvoxAce.Cursor} currCursor Current cursor position.
- */
-var onColumnChange = function(lastCursor, currCursor) {
- if (!cvoxAce.editor.selection.isEmpty()) {
- speakDisplacement(lastCursor, currCursor);
- cvox.Api.speak('selected', 1);
- }
- else if (shouldSpeakDisplacement) {
- speakDisplacement(lastCursor, currCursor);
- } else {
- speakCharOrWordOrLine(lastCursor, currCursor);
- }
-};
-
-/**
- * Event handler for cursor changes. Classify cursor changes as either row or
- * column changes, then delegate accordingly.
- * @param {!Event} evt The event.
- */
-var onCursorChange = function(evt) {
- /* Do not speak if cursor change was a result of text insertion. We want to
- * speak the text that was inserted and not where the cursor lands. */
- if (changed) {
- changed = false;
- return;
- }
- var currCursor = cvoxAce.editor.selection.getCursor();
- if (currCursor.row !== lastCursor.row) {
- onRowChange(currCursor);
- } else {
- onColumnChange(lastCursor, currCursor);
- }
- lastCursor = currCursor;
-};
-
-/**
- * Event handler for selection changes.
- * @param {!Event} evt The event.
- */
-var onSelectionChange = function(evt) {
- /* Assumes that when selection changes to empty, the user has unselected. */
- if (cvoxAce.editor.selection.isEmpty()) {
- cvox.Api.speak('unselected');
- }
-};
-
-/**
- * Event handler for source changes. We want auditory feedback for inserting
- * and deleting text.
- * @param {!Event} evt The event.
- */
-var onChange = function(delta) {
- switch (data.action) {
- case 'remove':
- cvox.Api.speak(data.text, 0, DELETED_PROP);
- /* Let the future cursor change event know it's from text change. */
- changed = true;
- break;
- case 'insert':
- cvox.Api.speak(data.text, 0);
- /* Let the future cursor change event know it's from text change. */
- changed = true;
- break;
- }
-};
-
-/**
- * Returns whether or not the annotation is new.
- * @param {!cvoxAce.Annotation} annot Annotation in question.
- * @return {boolean} Whether annot is new.
- */
-var isNewAnnotation = function(annot) {
- var row = annot.row;
- var col = annot.column;
- return !annotTable[row] || !annotTable[row][col];
-};
-
-/**
- * Populates the annotation table.
- * @param {!Array.} annotations Array of annotations.
- */
-var populateAnnotations = function(annotations) {
- annotTable = {};
- for (var i = 0; i < annotations.length; i++) {
- var annotation = annotations[i];
- var row = annotation.row;
- var col = annotation.column;
- if (!annotTable[row]) {
- annotTable[row] = {};
- }
- annotTable[row][col] = annotation;
- }
-};
-
-/**
- * Event handler for annotation changes. We want to notify the user when an
- * a new annotation appears.
- * @param {!Event} evt Event.
- */
-var onAnnotationChange = function(evt) {
- var annotations = cvoxAce.editor.getSession().getAnnotations();
- var newAnnotations = annotations.filter(isNewAnnotation);
- if (newAnnotations.length > 0) {
- cvox.Api.playEarcon(ERROR_EARCON);
- }
- populateAnnotations(annotations);
-};
-
-/**
- * Speak annotation.
- * @param {!cvoxAce.Annotation} annot Annotation to speak.
- */
-var speakAnnot = function(annot) {
- var annotText = annot.type + ' ' + annot.text + ' on ' +
- rowColToString(annot.row, annot.column);
- annotText = annotText.replace(';', 'semicolon');
- cvox.Api.speak(annotText, 1);
-};
-
-/**
- * Speak annotations in a row.
- * @param {number} row Row of annotations to speak.
- */
-var speakAnnotsByRow = function(row) {
- var annots = annotTable[row];
- for (var col in annots) {
- speakAnnot(annots[col]);
- }
-};
-
-/**
- * Get a string representation of a row and column.
- * @param {boolean} row Zero indexed row.
- * @param {boolean} col Zero indexed column.
- * @return {string} Row and column to be spoken.
- */
-var rowColToString = function(row, col) {
- return 'row ' + (row + 1) + ' column ' + (col + 1);
-};
-
-/**
- * Speaks the row and column.
- */
-var speakCurrRowAndCol = function() {
- cvox.Api.speak(rowColToString(lastCursor.row, lastCursor.column));
-};
-
-/**
- * Speaks all annotations.
- */
-var speakAllAnnots = function() {
- for (var row in annotTable) {
- speakAnnotsByRow(row);
- }
-};
-
-/**
- * Speak the vim mode. If no vim mode, this function does nothing.
- */
-var speakMode = function() {
- if (!isVimMode()) {
- return;
- }
- switch (cvoxAce.editor.keyBinding.$data.state) {
- case INSERT_MODE_STATE:
- cvox.Api.speak('Insert mode');
- break;
- case COMMAND_MODE_STATE:
- cvox.Api.speak('Command mode');
- break;
- }
-};
-
-/**
- * Toggle speak location.
- */
-var toggleSpeakRowLocation = function() {
- shouldSpeakRowLocation = !shouldSpeakRowLocation;
- /* Auditory feedback of the change. */
- if (shouldSpeakRowLocation) {
- cvox.Api.speak('Speak location on row change enabled.');
- } else {
- cvox.Api.speak('Speak location on row change disabled.');
- }
-};
-
-/**
- * Toggle speak displacement.
- */
-var toggleSpeakDisplacement = function() {
- shouldSpeakDisplacement = !shouldSpeakDisplacement;
- /* Auditory feedback of the change. */
- if (shouldSpeakDisplacement) {
- cvox.Api.speak('Speak displacement on column changes.');
- } else {
- cvox.Api.speak('Speak current character or word on column changes.');
- }
-};
-
-/**
- * Event handler for key down events. Gets the right shortcut from the map,
- * and calls the associated function.
- * @param {!Event} evt Keyboard event.
- */
-var onKeyDown = function(evt) {
- if (evt.ctrlKey && evt.shiftKey) {
- var shortcut = keyCodeToShortcutMap[evt.keyCode];
- if (shortcut) {
- shortcut.func();
- }
- }
-};
-
-/**
- * Event handler for status change events. Auditory feedback of changing
- * between vim states.
- * @param {!Event} evt Change status event.
- * @param {!Object} editor Editor state.
- */
-var onChangeStatus = function(evt, editor) {
- if (!isVimMode()) {
- return;
- }
- var state = editor.keyBinding.$data.state;
- if (state === vimState) {
- /* State hasn't changed, do nothing. */
- return;
- }
- switch (state) {
- case INSERT_MODE_STATE:
- cvox.Api.playEarcon(MODE_SWITCH_EARCON);
- /* When in insert mode, we want to speak out keys as feedback. */
- cvox.Api.setKeyEcho(true);
- break;
- case COMMAND_MODE_STATE:
- cvox.Api.playEarcon(MODE_SWITCH_EARCON);
- /* When in command mode, we want don't speak out keys because those keys
- * are not being inserted in the document. */
- cvox.Api.setKeyEcho(false);
- break;
- }
- vimState = state;
-};
-
-/**
- * Handles context menu events. This is a ChromeVox feature where hitting
- * the shortcut ChromeVox + comma will open up a search bar where you can
- * type in various commands. All keyboard shortcuts are also commands that
- * can be invoked. This handles the event that ChromeVox sends to the page.
- * @param {Event} evt Event received.
- */
-var contextMenuHandler = function(evt) {
- var cmd = evt.detail['customCommand'];
- var shortcut = cmdToShortcutMap[cmd];
- if (shortcut) {
- shortcut.func();
- /* ChromeVox will bring focus to an element near the cursor instead of the
- * text input. */
- cvoxAce.editor.focus();
- }
-};
-
-/**
- * Initialize the ChromeVox context menu.
- */
-var initContextMenu = function() {
- var ACTIONS = SHORTCUTS.map(function(shortcut) {
- return {
- desc: shortcut.desc + getKeyShortcutString(shortcut.keyCode),
- cmd: shortcut.cmd
- };
- });
-
- /* Attach ContextMenuActions. */
- var body = document.querySelector('body');
- body.setAttribute('contextMenuActions', JSON.stringify(ACTIONS));
-
- /* Listen for ContextMenu events. */
- body.addEventListener('ATCustomEvent', contextMenuHandler, true);
-};
-
-/**
- * Event handler for find events. When there is a match, we want to speak the
- * line we are now at. Otherwise, we want to notify the user there was no
- * match
- * @param {!Event} evt The event.
- */
-var onFindSearchbox = function(evt) {
- if (evt.match) {
- /* There is still a match! Speak the line. */
- speakLine(lastCursor.row, 0);
- } else {
- /* No match, give auditory feedback! */
- cvox.Api.playEarcon(NO_MATCH_EARCON);
- }
-};
-
-/**
- * Focus to text input.
- */
-var focus = function() {
- cvoxAce.editor.focus();
-};
-
-/**
- * Shortcut definitions.
- */
-var SHORTCUTS = [
- {
- /* 1 key. */
- keyCode: 49,
- func: function() {
- speakAnnotsByRow(lastCursor.row);
- },
- cmd: Command.SPEAK_ANNOT,
- desc: 'Speak annotations on line'
- },
- {
- /* 2 key. */
- keyCode: 50,
- func: speakAllAnnots,
- cmd: Command.SPEAK_ALL_ANNOTS,
- desc: 'Speak all annotations'
- },
- {
- /* 3 key. */
- keyCode: 51,
- func: speakMode,
- cmd: Command.SPEAK_MODE,
- desc: 'Speak Vim mode'
- },
- {
- /* 4 key. */
- keyCode: 52,
- func: toggleSpeakRowLocation,
- cmd: Command.TOGGLE_LOCATION,
- desc: 'Toggle speak row location'
- },
- {
- /* 5 key. */
- keyCode: 53,
- func: speakCurrRowAndCol,
- cmd: Command.SPEAK_ROW_COL,
- desc: 'Speak row and column'
- },
- {
- /* 6 key. */
- keyCode: 54,
- func: toggleSpeakDisplacement,
- cmd: Command.TOGGLE_DISPLACEMENT,
- desc: 'Toggle speak displacement'
- },
- {
- /* 7 key. */
- keyCode: 55,
- func: focus,
- cmd: Command.FOCUS_TEXT,
- desc: 'Focus text'
- }
-];
-
-/**
- * Event handler for focus events.
- */
-var onFocus = function() {
- cvoxAce.editor = editor;
-
- /* Set up listeners. */
- editor.getSession().selection.on('changeCursor', onCursorChange);
- editor.getSession().selection.on('changeSelection', onSelectionChange);
- editor.getSession().on('change', onChange);
- editor.getSession().on('changeAnnotation', onAnnotationChange);
- editor.on('changeStatus', onChangeStatus);
- editor.on('findSearchBox', onFindSearchbox);
- editor.container.addEventListener('keydown', onKeyDown);
-
- lastCursor = editor.selection.getCursor();
-};
-
-/**
- * Initialize the theme.
- * @param {Object} editor Editor to use.
- */
-var init = function(editor) {
- onFocus();
-
- /* Construct maps. */
- SHORTCUTS.forEach(function(shortcut) {
- keyCodeToShortcutMap[shortcut.keyCode] = shortcut;
- cmdToShortcutMap[shortcut.cmd] = shortcut;
- });
-
- editor.on('focus', onFocus);
-
- /* Assume we start in command mode if vim. */
- if (isVimMode()) {
- cvox.Api.setKeyEcho(false);
- }
- initContextMenu();
-};
-
-/**
- * Returns if cvox exists, and the api exists.
- * @return {boolean} Whether not Cvox Api exists.
- */
-function cvoxApiExists() {
- return (typeof(cvox) !== 'undefined') && cvox && cvox.Api;
-}
-
-/**
- * Number of tries for Cvox loading.
- * @type {number}
- */
-var tries = 0;
-
-/**
- * Max number of tries to watch for Cvox loading.
- * @type {number}
- */
-var MAX_TRIES = 15;
-
-/**
- * Check for ChromeVox load.
- * @param {Object} editor Editor to use.
- */
-function watchForCvoxLoad(editor) {
- if (cvoxApiExists()) {
- init(editor);
- } else {
- tries++;
- if (tries >= MAX_TRIES) {
- return;
- }
- window.setTimeout(watchForCvoxLoad, 500, editor);
- }
-}
-
-var Editor = require('../editor').Editor;
-require('../config').defineOptions(Editor.prototype, 'editor', {
- enableChromevoxEnhancements: {
- set: function(val) {
- if (val) {
- watchForCvoxLoad(this);
- }
- },
- value: true // turn it on by default or check for window.cvox
- }
-});
-
-});
diff --git a/lib/ace/ext/elastic_tabstops_lite.js b/lib/ace/ext/elastic_tabstops_lite.js
deleted file mode 100644
index 0f89423a..00000000
--- a/lib/ace/ext/elastic_tabstops_lite.js
+++ /dev/null
@@ -1,318 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2012, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-"use strict";
-
-var ElasticTabstopsLite = function(editor) {
- this.$editor = editor;
- var self = this;
- var changedRows = [];
- var recordChanges = false;
- this.onAfterExec = function() {
- recordChanges = false;
- self.processRows(changedRows);
- changedRows = [];
- };
- this.onExec = function() {
- recordChanges = true;
- };
- this.onChange = function(delta) {
- if (recordChanges) {
- if (changedRows.indexOf(delta.start.row) == -1)
- changedRows.push(delta.start.row);
- if (delta.end.row != delta.start.row)
- changedRows.push(delta.end.row);
- }
- };
-};
-
-(function() {
- this.processRows = function(rows) {
- this.$inChange = true;
- var checkedRows = [];
-
- for (var r = 0, rowCount = rows.length; r < rowCount; r++) {
- var row = rows[r];
-
- if (checkedRows.indexOf(row) > -1)
- continue;
-
- var cellWidthObj = this.$findCellWidthsForBlock(row);
- var cellWidths = this.$setBlockCellWidthsToMax(cellWidthObj.cellWidths);
- var rowIndex = cellWidthObj.firstRow;
-
- for (var w = 0, l = cellWidths.length; w < l; w++) {
- var widths = cellWidths[w];
- checkedRows.push(rowIndex);
- this.$adjustRow(rowIndex, widths);
- rowIndex++;
- }
- }
- this.$inChange = false;
- };
-
- this.$findCellWidthsForBlock = function(row) {
- var cellWidths = [], widths;
-
- // starting row and backward
- var rowIter = row;
- while (rowIter >= 0) {
- widths = this.$cellWidthsForRow(rowIter);
- if (widths.length == 0)
- break;
-
- cellWidths.unshift(widths);
- rowIter--;
- }
- var firstRow = rowIter + 1;
-
- // forward (not including starting row)
- rowIter = row;
- var numRows = this.$editor.session.getLength();
-
- while (rowIter < numRows - 1) {
- rowIter++;
-
- widths = this.$cellWidthsForRow(rowIter);
- if (widths.length == 0)
- break;
-
- cellWidths.push(widths);
- }
-
- return { cellWidths: cellWidths, firstRow: firstRow };
- };
-
- this.$cellWidthsForRow = function(row) {
- var selectionColumns = this.$selectionColumnsForRow(row);
- // todo: support multicursor
-
- var tabs = [-1].concat(this.$tabsForRow(row));
- var widths = tabs.map(function(el) { return 0; } ).slice(1);
- var line = this.$editor.session.getLine(row);
-
- for (var i = 0, len = tabs.length - 1; i < len; i++) {
- var leftEdge = tabs[i]+1;
- var rightEdge = tabs[i+1];
-
- var rightmostSelection = this.$rightmostSelectionInCell(selectionColumns, rightEdge);
- var cell = line.substring(leftEdge, rightEdge);
- widths[i] = Math.max(cell.replace(/\s+$/g,'').length, rightmostSelection - leftEdge);
- }
-
- return widths;
- };
-
- this.$selectionColumnsForRow = function(row) {
- var selections = [], cursor = this.$editor.getCursorPosition();
- if (this.$editor.session.getSelection().isEmpty()) {
- // todo: support multicursor
- if (row == cursor.row)
- selections.push(cursor.column);
- }
-
- return selections;
- };
-
- this.$setBlockCellWidthsToMax = function(cellWidths) {
- var startingNewBlock = true, blockStartRow, blockEndRow, maxWidth;
- var columnInfo = this.$izip_longest(cellWidths);
-
- for (var c = 0, l = columnInfo.length; c < l; c++) {
- var column = columnInfo[c];
- if (!column.push) {
- console.error(column);
- continue;
- }
- // add an extra None to the end so that the end of the column automatically
- // finishes a block
- column.push(NaN);
-
- for (var r = 0, s = column.length; r < s; r++) {
- var width = column[r];
- if (startingNewBlock) {
- blockStartRow = r;
- maxWidth = 0;
- startingNewBlock = false;
- }
- if (isNaN(width)) {
- // block ended
- blockEndRow = r;
-
- for (var j = blockStartRow; j < blockEndRow; j++) {
- cellWidths[j][c] = maxWidth;
- }
- startingNewBlock = true;
- }
-
- maxWidth = Math.max(maxWidth, width);
- }
- }
-
- return cellWidths;
- };
-
- this.$rightmostSelectionInCell = function(selectionColumns, cellRightEdge) {
- var rightmost = 0;
-
- if (selectionColumns.length) {
- var lengths = [];
- for (var s = 0, length = selectionColumns.length; s < length; s++) {
- if (selectionColumns[s] <= cellRightEdge)
- lengths.push(s);
- else
- lengths.push(0);
- }
- rightmost = Math.max.apply(Math, lengths);
- }
-
- return rightmost;
- };
-
- this.$tabsForRow = function(row) {
- var rowTabs = [], line = this.$editor.session.getLine(row),
- re = /\t/g, match;
-
- while ((match = re.exec(line)) != null) {
- rowTabs.push(match.index);
- }
-
- return rowTabs;
- };
-
- this.$adjustRow = function(row, widths) {
- var rowTabs = this.$tabsForRow(row);
-
- if (rowTabs.length == 0)
- return;
-
- var bias = 0, location = -1;
-
- // this always only contains two elements, so we're safe in the loop below
- var expandedSet = this.$izip(widths, rowTabs);
-
- for (var i = 0, l = expandedSet.length; i < l; i++) {
- var w = expandedSet[i][0], it = expandedSet[i][1];
- location += 1 + w;
- it += bias;
- var difference = location - it;
-
- if (difference == 0)
- continue;
-
- var partialLine = this.$editor.session.getLine(row).substr(0, it );
- var strippedPartialLine = partialLine.replace(/\s*$/g, "");
- var ispaces = partialLine.length - strippedPartialLine.length;
-
- if (difference > 0) {
- // put the spaces after the tab and then delete the tab, so any insertion
- // points behave as expected
- this.$editor.session.getDocument().insertInLine({row: row, column: it + 1}, Array(difference + 1).join(" ") + "\t");
- this.$editor.session.getDocument().removeInLine(row, it, it + 1);
-
- bias += difference;
- }
-
- if (difference < 0 && ispaces >= -difference) {
- this.$editor.session.getDocument().removeInLine(row, it + difference, it);
- bias += difference;
- }
- }
- };
-
- // the is a (naive) Python port--but works for these purposes
- this.$izip_longest = function(iterables) {
- if (!iterables[0])
- return [];
- var longest = iterables[0].length;
- var iterablesLength = iterables.length;
-
- for (var i = 1; i < iterablesLength; i++) {
- var iLength = iterables[i].length;
- if (iLength > longest)
- longest = iLength;
- }
-
- var expandedSet = [];
-
- for (var l = 0; l < longest; l++) {
- var set = [];
- for (var i = 0; i < iterablesLength; i++) {
- if (iterables[i][l] === "")
- set.push(NaN);
- else
- set.push(iterables[i][l]);
- }
-
- expandedSet.push(set);
- }
-
-
- return expandedSet;
- };
-
- // an even more (naive) Python port
- this.$izip = function(widths, tabs) {
- // grab the shorter size
- var size = widths.length >= tabs.length ? tabs.length : widths.length;
-
- var expandedSet = [];
- for (var i = 0; i < size; i++) {
- var set = [ widths[i], tabs[i] ];
- expandedSet.push(set);
- }
- return expandedSet;
- };
-
-}).call(ElasticTabstopsLite.prototype);
-
-exports.ElasticTabstopsLite = ElasticTabstopsLite;
-
-var Editor = require("../editor").Editor;
-require("../config").defineOptions(Editor.prototype, "editor", {
- useElasticTabstops: {
- set: function(val) {
- if (val) {
- if (!this.elasticTabstops)
- this.elasticTabstops = new ElasticTabstopsLite(this);
- this.commands.on("afterExec", this.elasticTabstops.onAfterExec);
- this.commands.on("exec", this.elasticTabstops.onExec);
- this.on("change", this.elasticTabstops.onChange);
- } else if (this.elasticTabstops) {
- this.commands.removeListener("afterExec", this.elasticTabstops.onAfterExec);
- this.commands.removeListener("exec", this.elasticTabstops.onExec);
- this.removeListener("change", this.elasticTabstops.onChange);
- }
- }
- }
-});
-
-});
\ No newline at end of file
diff --git a/lib/ace/ext/emmet.js b/lib/ace/ext/emmet.js
deleted file mode 100644
index 4faacef2..00000000
--- a/lib/ace/ext/emmet.js
+++ /dev/null
@@ -1,434 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Distributed under the BSD license:
- *
- * Copyright (c) 2010, Ajax.org B.V.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- * * Neither the name of Ajax.org B.V. nor the
- * names of its contributors may be used to endorse or promote products
- * derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- * DISCLAIMED. IN NO EVENT SHALL AJAX.ORG B.V. BE LIABLE FOR ANY
- * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * ***** END LICENSE BLOCK ***** */
-
-define(function(require, exports, module) {
-"use strict";
-var HashHandler = require("ace/keyboard/hash_handler").HashHandler;
-var Editor = require("ace/editor").Editor;
-var snippetManager = require("ace/snippets").snippetManager;
-var Range = require("ace/range").Range;
-var emmet, emmetPath;
-
-/**
- * Implementation of {@link IEmmetEditor} interface for Ace
- */
-function AceEmmetEditor() {}
-
-AceEmmetEditor.prototype = {
- setupContext: function(editor) {
- this.ace = editor;
- this.indentation = editor.session.getTabString();
- if (!emmet)
- emmet = window.emmet;
- emmet.require("resources").setVariable("indentation", this.indentation);
- this.$syntax = null;
- this.$syntax = this.getSyntax();
- },
- /**
- * Returns character indexes of selected text: object with
- 
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-