jyapayne/ace
Watch
1
0
Fork
You've already forked ace
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into worker

Browse source
This commit is contained in:
Fabian Jakobs 2011-01-18 08:35:36 +01:00
commit 8bb97fbbea
16 changed files with 22 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

9
doc/Editor.mm
View file

@ -40,7 +40,7 @@
<node CREATED="1271052825952" ID="Freemind_Link_622561431" MODIFIED="1271052828013" TEXT="qooxdoo"/>
<node CREATED="1271052830859" ID="Freemind_Link_18779066" MODIFIED="1271052833496" TEXT="APF!"/>
</node>
<node CREATED="1271052839079" ID="Freemind_Link_439583810" MODIFIED="1271052852530" TEXT="Options">
<node CREATED="1271052839079" FOLDED="true" ID="Freemind_Link_439583810" MODIFIED="1271052852530" TEXT="Options">
<node CREATED="1271052853166" ID="Freemind_Link_629899491" MODIFIED="1271052860101" TEXT="Tabs to spaces"/>
<node CREATED="1271052862867" ID="Freemind_Link_746641062" MODIFIED="1271052866129" TEXT="Spaces to tabs"/>
<node CREATED="1271052866517" ID="Freemind_Link_192666733" MODIFIED="1271052869210" TEXT="tab width"/>
@ -50,8 +50,13 @@
<node CREATED="1271052900934" ID="Freemind_Link_62594174" MODIFIED="1271052907981" TEXT="comment block"/>
</node>
</node>
<node CREATED="1295094741432" ID="Freemind_Link_1547780849" MODIFIED="1295094754462" TEXT="shadow doc synced in web worker">
<node CREATED="1295094757135" ID="Freemind_Link_1288894358" MODIFIED="1295094769539" TEXT="do computation intensive stuff in a worker"/>
<node CREATED="1295094772327" ID="Freemind_Link_294024951" MODIFIED="1295094784554" TEXT="all operation &gt;= O(n)"/>
<node CREATED="1295265748917" ID="Freemind_Link_730092876" MODIFIED="1295265754848" TEXT="jslint in worker"/>
</node>
<node CREATED="1271061753644" ID="Freemind_Link_1898747747" MODIFIED="1271061761714" POSITION="left" TEXT="Competition">
</node>
<node CREATED="1271061753644" FOLDED="true" ID="Freemind_Link_1898747747" MODIFIED="1271061761714" POSITION="left" TEXT="Competition">
<node CREATED="1271061762151" ID="Freemind_Link_248244633" MODIFIED="1271061764275" TEXT="bespin"/>
<node CREATED="1271061764616" ID="Freemind_Link_1186004994" MODIFIED="1271061768509" TEXT="codeMirror"/>
<node CREATED="1271061780744" ID="Freemind_Link_457888774" LINK="http://www.cdolivet.com/index.php?page=editArea" MODIFIED="1271061808808" TEXT="editarea"/>

2
lib/ace/css/editor.css
View file

@ -32,7 +32,7 @@
left: 0px;
}
.ace_editor .ace_printMargin {
.ace_editor .ace_print_margin {
position: absolute;
height: 100%;
}

2
lib/ace/renderloop.js
View file

@ -71,7 +71,7 @@ var RenderLoop = function(onRender) {
if (!this.attached) {
var _self = this;
event.addListener(window, "message", function(e) {
if (e.source == window && _self.callback && e.data == _self.messageName) {
if (_self.callback && e.data == _self.messageName) {
event.stopPropagation(e);
_self.callback();
}

2
lib/ace/theme/clouds.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-clouds .ace_editor .ace_printMargin {\
.ace-clouds .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

196
lib/ace/theme/clouds_midnight.js Normal file
View file

@ -0,0 +1,196 @@
/* ***** 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 <fabian AT ajax DOT org>
*
* 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) {
var dom = require("pilot/dom");
var cssText = ".ace-clouds-midnight .ace_editor {\
border: 2px solid rgb(159, 159, 159);\
}\
\
.ace-clouds-midnight .ace_editor.ace_focus {\
border: 2px solid #327fbd;\
}\
\
.ace-clouds-midnight .ace_gutter {\
width: 50px;\
background: #e8e8e8;\
color: #333;\
overflow : hidden;\
}\
\
.ace-clouds-midnight .ace_gutter-layer {\
width: 100%;\
text-align: right;\
}\
\
.ace-clouds-midnight .ace_gutter-layer .ace_gutter-cell {\
padding-right: 6px;\
}\
\
.ace-clouds-midnight .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\
\
.ace-clouds-midnight .ace_scroller {\
background-color: #191919;\
}\
\
.ace-clouds-midnight .ace_text-layer {\
cursor: text;\
color: #929292;\
}\
\
.ace-clouds-midnight .ace_cursor {\
border-left: 2px solid #7DA5DC;\
}\
\
.ace-clouds-midnight .ace_cursor.ace_overwrite {\
border-left: 0px;\
border-bottom: 1px solid #7DA5DC;\
}\
\
.ace-clouds-midnight .ace_marker-layer .ace_selection {\
background: #000000;\
}\
\
.ace-clouds-midnight .ace_marker-layer .ace_step {\
background: rgb(198, 219, 174);\
}\
\
.ace-clouds-midnight .ace_marker-layer .ace_bracket {\
margin: -1px 0 0 -1px;\
border: 1px solid #BFBFBF;\
}\
\
.ace-clouds-midnight .ace_marker-layer .ace_active_line {\
background: rgba(215, 215, 215, 0.031);\
}\
\
\
.ace-clouds-midnight .ace_invisible {\
color: #BFBFBF;\
}\
\
.ace-clouds-midnight .ace_keyword {\
color:#927C5D;\
}\
\
.ace-clouds-midnight .ace_keyword.ace_operator {\
color:#4B4B4B;\
}\
\
.ace-clouds-midnight .ace_constant {\
\
}\
\
.ace-clouds-midnight .ace_constant.ace_language {\
color:#39946A;\
}\
\
.ace-clouds-midnight .ace_constant.ace_library {\
\
}\
\
.ace-clouds-midnight .ace_constant.ace_numeric {\
color:#46A609;\
}\
\
.ace-clouds-midnight .ace_invalid {\
color:#FFFFFF;\
background-color:#E92E2E;\
}\
\
.ace-clouds-midnight .ace_invalid.ace_illegal {\
\
}\
\
.ace-clouds-midnight .ace_invalid.ace_deprecated {\
\
}\
\
.ace-clouds-midnight .ace_support {\
\
}\
\
.ace-clouds-midnight .ace_support.ace_function {\
color:#E92E2E;\
}\
\
.ace-clouds-midnight .ace_function.ace_buildin {\
\
}\
\
.ace-clouds-midnight .ace_string {\
color:#5D90CD;\
}\
\
.ace-clouds-midnight .ace_string.ace_regexp {\
\
}\
\
.ace-clouds-midnight .ace_comment {\
color:#3C403B;\
}\
\
.ace-clouds-midnight .ace_comment.ace_doc {\
\
}\
\
.ace-clouds-midnight .ace_comment.ace_doc.ace_tag {\
\
}\
\
.ace-clouds-midnight .ace_variable {\
\
}\
\
.ace-clouds-midnight .ace_variable.ace_language {\
\
}\
\
.ace-clouds-midnight .ace_xml_pe {\
\
}";
// import CSS once
dom.importCssString(cssText);
exports.cssClass = "ace-clouds-midnight";
});

2
lib/ace/theme/cobalt.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-cobalt .ace_editor .ace_printMargin {\
.ace-cobalt .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/dawn.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-dawn .ace_editor .ace_printMargin {\
.ace-dawn .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/idle_fingers.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-idle-fingers .ace_editor .ace_printMargin {\
.ace-idle-fingers .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/kr_theme.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-kr-theme .ace_editor .ace_printMargin {\
.ace-kr-theme .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/mono_industrial.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-mono-industrial .ace_editor .ace_printMargin {\
.ace-mono-industrial .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/monokai.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-monokai .ace_editor .ace_printMargin {\
.ace-monokai .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/pastel_on_dark.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-pastel-on-dark .ace_editor .ace_printMargin {\
.ace-pastel-on-dark .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/theme/tm.css
View file

@ -22,7 +22,7 @@
padding-right: 6px;
}
.ace-tm .ace_editor .ace_printMargin {
.ace-tm .ace_print_margin {
width: 1px;
background: #e8e8e8;
}

2
lib/ace/theme/twilight.js
View file

@ -63,7 +63,7 @@ define(function(require, exports, module) {
padding-right: 6px;\
}\
\
.ace-twilight .ace_editor .ace_printMargin {\
.ace-twilight .ace_print_margin {\
width: 1px;\
background: #e8e8e8;\
}\

2
lib/ace/virtual_renderer.js
View file

@ -270,8 +270,8 @@ var VirtualRenderer = function(container, theme) {
if (!this.$printMarginEl) {
this.$printMarginEl = document.createElement("div");
this.$printMarginEl.className = "ace_printMargin";
this.content.insertBefore(this.$printMarginEl, this.$textLayer.element);
this.$printMarginEl.className = "ace_print_margin";
}
var style = this.$printMarginEl.style;

2
tool/Theme.tmpl.css
View file

@ -22,7 +22,7 @@
padding-right: 6px;
}
.%cssClass% .ace_editor .ace_printMargin {
.%cssClass% .ace_print_margin {
width: 1px;
background: %printMargin%;
}