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

package

Browse source
This commit is contained in:
Fabian Jakobs 2012-04-11 19:10:06 +02:00
commit 101644923e
7 changed files with 31 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -11591,11 +11591,7 @@ var Editor = function(renderer, session) {
this.renderer.updateCursor(); this.renderer.updateCursor();
if (!this.$blockScrolling) { if (!this.$blockScrolling) {
var selection = this.getSelection(); this.renderer.scrollCursorIntoView();
if (selection.isEmpty())
this.renderer.scrollCursorIntoView(selection.getCursor());
else
this.renderer.scrollSelectionIntoView(selection.getSelectionLead(), selection.getSelectionAnchor());
} }
// move text input over the cursor // move text input over the cursor
@ -12430,8 +12426,10 @@ var Editor = function(renderer, session) {
return; return;
this.$tryReplace(range, replacement); this.$tryReplace(range, replacement);
if (range !== null) if (range !== null) {
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
this.renderer.scrollSelectionIntoView(range.start, range.end);
}
}; };
this.replaceAll = function(replacement, options) { this.replaceAll = function(replacement, options) {
@ -12504,6 +12502,7 @@ var Editor = function(renderer, session) {
var range = this.$search.find(this.session); var range = this.$search.find(this.session);
if (range) { if (range) {
this.session.unfold(range); this.session.unfold(range);
this.$blockScrolling += 1; this.$blockScrolling += 1;
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
this.$blockScrolling -= 1; this.$blockScrolling -= 1;
@ -12515,6 +12514,8 @@ var Editor = function(renderer, session) {
//@todo scroll X //@todo scroll X
//if (!this.isRowFullyVisible(cursor.row)) //if (!this.isRowFullyVisible(cursor.row))
//this.scrollToLine(cursor.row, true); //this.scrollToLine(cursor.row, true);
this.renderer.scrollSelectionIntoView(range.start, range.end);
} }
}; };

2
build/kitchen-sink.html
View file

@ -11,7 +11,7 @@
Ace Ace
version 0.2.0 version 0.2.0
commit 4e28a1d31f8c6d5bc6b44aed291ee4bd0c73661f commit 1d0bc19e3e6744a818e30024176cda1d8c7bdc3d
--> -->

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

File diff suppressed because one or more lines are too long

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

@ -2701,11 +2701,7 @@ var Editor = function(renderer, session) {
this.renderer.updateCursor(); this.renderer.updateCursor();
if (!this.$blockScrolling) { if (!this.$blockScrolling) {
var selection = this.getSelection(); this.renderer.scrollCursorIntoView();
if (selection.isEmpty())
this.renderer.scrollCursorIntoView(selection.getCursor());
else
this.renderer.scrollSelectionIntoView(selection.getSelectionLead(), selection.getSelectionAnchor());
} }
// move text input over the cursor // move text input over the cursor
@ -3540,8 +3536,10 @@ var Editor = function(renderer, session) {
return; return;
this.$tryReplace(range, replacement); this.$tryReplace(range, replacement);
if (range !== null) if (range !== null) {
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
this.renderer.scrollSelectionIntoView(range.start, range.end);
}
}; };
this.replaceAll = function(replacement, options) { this.replaceAll = function(replacement, options) {
@ -3614,6 +3612,7 @@ var Editor = function(renderer, session) {
var range = this.$search.find(this.session); var range = this.$search.find(this.session);
if (range) { if (range) {
this.session.unfold(range); this.session.unfold(range);
this.$blockScrolling += 1; this.$blockScrolling += 1;
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
this.$blockScrolling -= 1; this.$blockScrolling -= 1;
@ -3625,6 +3624,8 @@ var Editor = function(renderer, session) {
//@todo scroll X //@todo scroll X
//if (!this.isRowFullyVisible(cursor.row)) //if (!this.isRowFullyVisible(cursor.row))
//this.scrollToLine(cursor.row, true); //this.scrollToLine(cursor.row, true);
this.renderer.scrollSelectionIntoView(range.start, range.end);
} }
}; };

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

@ -2701,11 +2701,7 @@ var Editor = function(renderer, session) {
this.renderer.updateCursor(); this.renderer.updateCursor();
if (!this.$blockScrolling) { if (!this.$blockScrolling) {
var selection = this.getSelection(); this.renderer.scrollCursorIntoView();
if (selection.isEmpty())
this.renderer.scrollCursorIntoView(selection.getCursor());
else
this.renderer.scrollSelectionIntoView(selection.getSelectionLead(), selection.getSelectionAnchor());
} }
// move text input over the cursor // move text input over the cursor
@ -3540,8 +3536,10 @@ var Editor = function(renderer, session) {
return; return;
this.$tryReplace(range, replacement); this.$tryReplace(range, replacement);
if (range !== null) if (range !== null) {
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
this.renderer.scrollSelectionIntoView(range.start, range.end);
}
}; };
this.replaceAll = function(replacement, options) { this.replaceAll = function(replacement, options) {
@ -3614,6 +3612,7 @@ var Editor = function(renderer, session) {
var range = this.$search.find(this.session); var range = this.$search.find(this.session);
if (range) { if (range) {
this.session.unfold(range); this.session.unfold(range);
this.$blockScrolling += 1; this.$blockScrolling += 1;
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
this.$blockScrolling -= 1; this.$blockScrolling -= 1;
@ -3625,6 +3624,8 @@ var Editor = function(renderer, session) {
//@todo scroll X //@todo scroll X
//if (!this.isRowFullyVisible(cursor.row)) //if (!this.isRowFullyVisible(cursor.row))
//this.scrollToLine(cursor.row, true); //this.scrollToLine(cursor.row, true);
this.renderer.scrollSelectionIntoView(range.start, range.end);
} }
}; };

2
build/src/ace.js
View file

File diff suppressed because one or more lines are too long

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

@ -3268,11 +3268,7 @@ var Editor = function(renderer, session) {
this.renderer.updateCursor(); this.renderer.updateCursor();
if (!this.$blockScrolling) { if (!this.$blockScrolling) {
var selection = this.getSelection(); this.renderer.scrollCursorIntoView();
if (selection.isEmpty())
this.renderer.scrollCursorIntoView(selection.getCursor());
else
this.renderer.scrollSelectionIntoView(selection.getSelectionLead(), selection.getSelectionAnchor());
} }
// move text input over the cursor // move text input over the cursor
@ -4107,8 +4103,10 @@ var Editor = function(renderer, session) {
return; return;
this.$tryReplace(range, replacement); this.$tryReplace(range, replacement);
if (range !== null) if (range !== null) {
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
this.renderer.scrollSelectionIntoView(range.start, range.end);
}
}; };
this.replaceAll = function(replacement, options) { this.replaceAll = function(replacement, options) {
@ -4181,6 +4179,7 @@ var Editor = function(renderer, session) {
var range = this.$search.find(this.session); var range = this.$search.find(this.session);
if (range) { if (range) {
this.session.unfold(range); this.session.unfold(range);
this.$blockScrolling += 1; this.$blockScrolling += 1;
this.selection.setSelectionRange(range); this.selection.setSelectionRange(range);
this.$blockScrolling -= 1; this.$blockScrolling -= 1;
@ -4192,6 +4191,8 @@ var Editor = function(renderer, session) {
//@todo scroll X //@todo scroll X
//if (!this.isRowFullyVisible(cursor.row)) //if (!this.isRowFullyVisible(cursor.row))
//this.scrollToLine(cursor.row, true); //this.scrollToLine(cursor.row, true);
this.renderer.scrollSelectionIntoView(range.start, range.end);
} }
}; };