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

Merge branch 'master' of github.com:ajaxorg/ace

Browse source 
Conflicts:
	build/demo/kitchen-sink.js
	build/kitchen-sink.html
This commit is contained in:
Fabian Jakobs 2011-09-28 12:25:26 +02:00
commit 7fd597a1b0
8 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build/demo/kitchen-sink-uncompressed.js
View file

@ -10631,7 +10631,7 @@ var EditSession = function(text, mode) {
} else { } else {
lastRow = firstRow; lastRow = firstRow;
} }
len = e.data.lines.length; len = e.data.lines ? e.data.lines.length : lastRow - firstRow;
} else { } else {
len = lastRow - firstRow; len = lastRow - firstRow;
} }

2
build/demo/kitchen-sink.js
View file

File diff suppressed because one or more lines are too long

2
build/kitchen-sink.html
View file

@ -11,7 +11,7 @@
Ace Ace
version 0.2.0 version 0.2.0
commit 314b95eb78f44270330a61883bc320735697b7af commit 3a0ec51aef11f74857b6a285b9c36a0b9118ca89
--> -->

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

@ -9360,7 +9360,7 @@ var EditSession = function(text, mode) {
} else { } else {
lastRow = firstRow; lastRow = firstRow;
} }
len = e.data.lines.length; len = e.data.lines ? e.data.lines.length : lastRow - firstRow;
} else { } else {
len = lastRow - firstRow; len = lastRow - firstRow;
} }

2
build/src/ace.js
View file

File diff suppressed because one or more lines are too long

2
build/textarea/src/ace-uncompressed.js
View file

@ -9352,7 +9352,7 @@ var EditSession = function(text, mode) {
} else { } else {
lastRow = firstRow; lastRow = firstRow;
} }
len = e.data.lines.length; len = e.data.lines ? e.data.lines.length : lastRow - firstRow;
} else { } else {
len = lastRow - firstRow; len = lastRow - firstRow;
} }

2
build/textarea/src/ace.js
View file

File diff suppressed because one or more lines are too long

2
lib/ace/edit_session.js
View file

@ -1021,7 +1021,7 @@ var EditSession = function(text, mode) {
} else { } else {
lastRow = firstRow; lastRow = firstRow;
} }
len = e.data.lines.length; len = e.data.lines ? e.data.lines.length : lastRow - firstRow;
} else { } else {
len = lastRow - firstRow; len = lastRow - firstRow;
} }