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

Merge commit '8b82f01'

Browse source 
Conflicts:
	build/kitchen-sink.html
	build/src/ace-noconflict.js
	build/src/ace.js
This commit is contained in:
Fabian Jakobs 2012-01-23 15:05:49 +01:00
commit 6e0a9ce53d
5 changed files with 15 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -21387,7 +21387,10 @@ var Editor = function(renderer, session) {
this.onChangeMode(); this.onChangeMode();
this.$blockScrolling += 1;
this.onCursorChange(); this.onCursorChange();
this.$blockScrolling -= 1;
this.onScrollTopChange(); this.onScrollTopChange();
this.onScrollLeftChange(); this.onScrollLeftChange();
this.onSelectionChange(); this.onSelectionChange();

3
build/src/ace-uncompressed-noconflict.js
View file

@ -2546,7 +2546,10 @@ var Editor = function(renderer, session) {
this.onChangeMode(); this.onChangeMode();
this.$blockScrolling += 1;
this.onCursorChange(); this.onCursorChange();
this.$blockScrolling -= 1;
this.onScrollTopChange(); this.onScrollTopChange();
this.onScrollLeftChange(); this.onScrollLeftChange();
this.onSelectionChange(); this.onSelectionChange();

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

@ -2546,7 +2546,10 @@ var Editor = function(renderer, session) {
this.onChangeMode(); this.onChangeMode();
this.$blockScrolling += 1;
this.onCursorChange(); this.onCursorChange();
this.$blockScrolling -= 1;
this.onScrollTopChange(); this.onScrollTopChange();
this.onScrollLeftChange(); this.onScrollLeftChange();
this.onSelectionChange(); this.onSelectionChange();

3
build/textarea/src/ace-bookmarklet.js
View file

@ -3112,7 +3112,10 @@ var Editor = function(renderer, session) {
this.onChangeMode(); this.onChangeMode();
this.$blockScrolling += 1;
this.onCursorChange(); this.onCursorChange();
this.$blockScrolling -= 1;
this.onScrollTopChange(); this.onScrollTopChange();
this.onScrollLeftChange(); this.onScrollLeftChange();
this.onSelectionChange(); this.onSelectionChange();

3
lib/ace/editor.js
View file

@ -174,7 +174,10 @@ var Editor = function(renderer, session) {
this.onChangeMode(); this.onChangeMode();
this.$blockScrolling += 1;
this.onCursorChange(); this.onCursorChange();
this.$blockScrolling -= 1;
this.onScrollTopChange(); this.onScrollTopChange();
this.onScrollLeftChange(); this.onScrollLeftChange();
this.onSelectionChange(); this.onSelectionChange();