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

Merge pull request #1612 from ajaxorg/small_bugs

Browse source 
Small bugs
This commit is contained in:
Lennart Kats 2013-09-20 05:55:13 -07:00
commit 2ae8a967f4
3 changed files with 27 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

18
index.html
View file

@ -784,16 +784,15 @@ if (match) {
style="left: 10px; top: -4px; width:80px" />
<a href="http://www.wolfcms.org/repository/133">Wolf CMS</a>
</li>
<li>
<img src="http://upload.wikimedia.org/wikipedia/commons/6/63/Wikipedia-logo.png" style="left: -5px; top: -35px; width: 110px;">
<a href="https://en.wikipedia.org/wiki/Special:Version" style="font-family: 'Linux Libertine','Hoefler Text',Georgia,'Times New Roman',Times,serif;">W<span style="font-variant: small-caps;">ikipedi</span>A</a>
</li>
<li>
<img src="doc/site/images/codiad.png"
style="left: 10px; top: -4px; width:80px" />
<a href="http://codiad.com/">Codiad</a>
</li>
<li>
<img src="doc/site/images/FineCut_small_logo.png"
style="left: 12px; top: -4px" />
<a href="http://finecut.info/">Fine Cut Engine</a>
</li>
<li>
<img src="doc/site/images/zorba-logo.png"
style="left: -5px; top: 16px;
@ -880,6 +879,11 @@ if (match) {
style="left: 9px; top: -5px; width: 84px">
<a href="https://drivenotepad.appspot.com/support">Drive Notepad</a>
</li>
<li>
<img src="doc/site/images/FineCut_small_logo.png"
style="left: 12px; top: -4px" />
<a href="http://finecut.info/">Fine Cut Engine</a>
</li>
<li>
<img src="http://phpassist.com/images/logo-large.png"
style="left: 3px; top: -10px; width: 95px">
@ -962,10 +966,6 @@ if (match) {
style="left: 12px; width: 79px;top: -18px;">
<a href="http://www.divshot.com/">Divshot</a>
</li>
<li>
<div class="text-logo">Codio</div>
<a href="https://codio.com/">Codio</a>
</li>
<li>
<script>
ace.require("ace/lib/dom").importCssStylsheet("https://fonts.googleapis.com/css?family=Henny+Penny", document);

16
lib/ace/keyboard/textinput.js
View file

@ -51,7 +51,7 @@ var TextInput = function(parentNode, host) {
text.autocapitalize = "off";
text.spellcheck = false;
text.style.bottom = "2000em";
text.style.opacity = "0";
parentNode.insertBefore(text, parentNode.firstChild);
var PLACEHOLDER = "\x01\x01";
@ -372,10 +372,13 @@ var TextInput = function(parentNode, host) {
var onCompositionUpdate = function() {
// console.log("onCompositionUpdate", inComposition && JSON.stringify(text.value))
if (!inComposition) return;
host.onCompositionUpdate(text.value);
var val = text.value.replace(/\x01/g, "");
if (inComposition.lastValue === val) return;
host.onCompositionUpdate(val);
if (inComposition.lastValue)
host.undo();
inComposition.lastValue = text.value.replace(/\x01/g, "")
inComposition.lastValue = val;
if (inComposition.lastValue) {
var r = host.selection.getRange();
host.insert(inComposition.lastValue);
@ -424,7 +427,12 @@ var TextInput = function(parentNode, host) {
var syncComposition = lang.delayedCall(onCompositionUpdate, 50);
event.addListener(text, "compositionstart", onCompositionStart);
event.addListener(text, useragent.isGecko ? "text" : "keyup", function(){syncComposition.schedule()});
if (useragent.isGecko) {
event.addListener(text, "text", function(){syncComposition.schedule()});
} else {
event.addListener(text, "keyup", function(){syncComposition.schedule()});
event.addListener(text, "keydown", function(){syncComposition.schedule()});
}
event.addListener(text, "compositionend", onCompositionEnd);
this.getElement = function() {

9
lib/ace/mode/php/php.js
View file

@ -689,7 +689,7 @@ PHP.Lexer = function( src, ini ) {
result = result.substring( match[ 0 ].length );
match = result.match(/^(\-\>)([a-zA-Z0-9_\x7f-\xff]*)/);
match = result.match(/^(\-\>)\s*([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*)\s*(\()/);
if ( match !== null ) {
@ -703,6 +703,9 @@ PHP.Lexer = function( src, ini ) {
match[ 2 ],
line
]);
if (match[3]) {
results.push(match[3]);
}
result = result.substring( match[ 0 ].length );
}
@ -714,9 +717,9 @@ PHP.Lexer = function( src, ini ) {
var re;
if ( curlyOpen > 0) {
re = /^([^\\\$"{}\]]|\\.)+/g;
re = /^([^\\\$"{}\]\)]|\\.)+/g;
} else {
re = /^([^\\\$"{]|\\.|{[^\$])+/g;
re = /^([^\\\$"{]|\\.|{[^\$]|\$(?=[^a-zA-Z_\x7f-\xff]))+/g;;
}
while(( match = result.match( re )) !== null ) {