jyapayne/ace
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

IE fixes

Browse source
This commit is contained in:
Fabian Jakobs 2011-02-01 11:48:46 +01:00
commit 3785b6775f
5 changed files with 44 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
build/editor.html
View file

@ -5,17 +5,27 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Editor</title> <title>Editor</title>
<style type="text/css" media="screen"> <style type="text/css" media="screen">
body { overflow: hidden; } body {
#editor { position: absolute; top: 0; bottom: 0; left: 0; right: 0; } overflow: hidden;
}
#editor {
margin: 0;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
}
</style> </style>
</head> </head>
<body> <body>
<div id="editor">function foo(items) { <pre id="editor">function foo(items) {
for (var i = 0; i &lt; items.length; i++) { for (var i = 0; i &lt; items.length; i++) {
alert("Ace Rocks " + items[i]); alert("Ace Rocks " + items[i]);
} }
}</div> }</pre>
<script src="src/ace.js" type="text/javascript" charset="utf-8"></script> <script src="src/ace.js" type="text/javascript" charset="utf-8"></script>
<script src="src/theme-twilight.js" type="text/javascript" charset="utf-8"></script> <script src="src/theme-twilight.js" type="text/javascript" charset="utf-8"></script>

19
build/src/ace-uncompressed.js
View file

@ -3987,7 +3987,6 @@ var Editor =function(renderer, session) {
}); });
this.setSession(session || new EditSession("")); this.setSession(session || new EditSession(""));
this.focus();
}; };
(function(){ (function(){
@ -9102,8 +9101,7 @@ var oop = require("pilot/oop");
var EventEmitter = require("pilot/event_emitter").EventEmitter; var EventEmitter = require("pilot/event_emitter").EventEmitter;
var BackgroundTokenizer = function(tokenizer, editor) { var BackgroundTokenizer = function(tokenizer, editor) {
this.running = false; this.running = false;
this.doc = [];
this.lines = []; this.lines = [];
this.currentLine = 0; this.currentLine = 0;
this.tokenizer = tokenizer; this.tokenizer = tokenizer;
@ -9195,6 +9193,9 @@ var BackgroundTokenizer = function(tokenizer, editor) {
}; };
this.$tokenizeRows = function(firstRow, lastRow) { this.$tokenizeRows = function(firstRow, lastRow) {
if (!this.doc)
return [];
var rows = []; var rows = [];
// determine start state // determine start state
@ -9953,8 +9954,10 @@ var VirtualRenderer = function(container, theme) {
this.moveTextAreaToCursor = function(textarea) { this.moveTextAreaToCursor = function(textarea) {
// in IE the native cursor always shines through // in IE the native cursor always shines through
if (useragent.isIE) if (useragent.isIE) {
console.log("IE")
return; return;
}
var pos = this.$cursorLayer.getPixelPosition(); var pos = this.$cursorLayer.getPixelPosition();
if (!pos) if (!pos)
@ -11102,7 +11105,7 @@ var Cursor = function(parentEl) {
clearInterval(this.blinkId); clearInterval(this.blinkId);
}; };
this.showCursor = function() { this.showCursor = function() {
this.isVisible = true; this.isVisible = true;
this.element.appendChild(this.cursor); this.element.appendChild(this.cursor);
@ -11427,12 +11430,10 @@ define("text!ace/css/editor.css", ".ace_editor {" +
"" + "" +
".ace_editor textarea {" + ".ace_editor textarea {" +
" position: fixed;" + " position: fixed;" +
" z-index: 0;" + " z-index: -1;" +
" /*z-index: -1;" +
" width: 10px;" + " width: 10px;" +
" height: 30px;*/" + " height: 30px;" +
" opacity: 0;" + " opacity: 0;" +
" width: 1px;" +
" background: transparent;" + " background: transparent;" +
" appearance: none;" + " appearance: none;" +
" border: none;" + " border: none;" +

2
build/src/ace.js
View file

File diff suppressed because one or more lines are too long

20
build_support/editor.html
View file

@ -5,19 +5,29 @@
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
<title>Editor</title> <title>Editor</title>
<style type="text/css" media="screen"> <style type="text/css" media="screen">
body { overflow: hidden; } body {
#editor { position: absolute; top: 0; bottom: 0; left: 0; right: 0; } overflow: hidden;
}
#editor {
margin: 0;
position: absolute;
top: 0;
bottom: 0;
left: 0;
right: 0;
}
</style> </style>
</head> </head>
<body> <body>
<div id="editor">function foo(items) { <pre id="editor">function foo(items) {
for (var i = 0; i &lt; items.length; i++) { for (var i = 0; i &lt; items.length; i++) {
alert("Ace Rocks " + items[i]); alert("Ace Rocks " + items[i]);
} }
}</div> }</pre>
<script src="src/ace.js" type="text/javascript" charset="utf-8"></script> <script src="src/ace-uncompressed.js" type="text/javascript" charset="utf-8"></script>
<script src="src/theme-twilight.js" type="text/javascript" charset="utf-8"></script> <script src="src/theme-twilight.js" type="text/javascript" charset="utf-8"></script>
<script src="src/mode-javascript.js" type="text/javascript" charset="utf-8"></script> <script src="src/mode-javascript.js" type="text/javascript" charset="utf-8"></script>
<script> <script>

6
lib/ace/background_tokenizer.js
View file

@ -41,8 +41,7 @@ var oop = require("pilot/oop");
var EventEmitter = require("pilot/event_emitter").EventEmitter; var EventEmitter = require("pilot/event_emitter").EventEmitter;
var BackgroundTokenizer = function(tokenizer, editor) { var BackgroundTokenizer = function(tokenizer, editor) {
this.running = false; this.running = false;
this.doc = [];
this.lines = []; this.lines = [];
this.currentLine = 0; this.currentLine = 0;
this.tokenizer = tokenizer; this.tokenizer = tokenizer;
@ -134,6 +133,9 @@ var BackgroundTokenizer = function(tokenizer, editor) {
}; };
this.$tokenizeRows = function(firstRow, lastRow) { this.$tokenizeRows = function(firstRow, lastRow) {
if (!this.doc)
return [];
var rows = []; var rows = [];
// determine start state // determine start state