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

Remove redundant setWrapLimit method

Browse source
This commit is contained in:
Joe Cheng 2011-02-11 16:02:53 +08:00 • committed by Fabian Jakobs
commit 9226825600
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
demo/demo.js
View file

@ -84,6 +84,7 @@ exports.launch = function(env) {
} }
docs.plain = new EditSession(loreIpsum); docs.plain = new EditSession(loreIpsum);
docs.plain.setUseWrapMode(true); docs.plain.setUseWrapMode(true);
docs.plain.setWrapLimitRange(80, 80)
docs.plain.setMode(new TextMode()); docs.plain.setMode(new TextMode());
docs.plain.setUndoManager(new UndoManager()); docs.plain.setUndoManager(new UndoManager());
@ -189,7 +190,7 @@ exports.launch = function(env) {
if (!doc.getUseWrapMode()) { if (!doc.getUseWrapMode()) {
wrapModeEl.value = "off"; wrapModeEl.value = "off";
} else { } else {
wrapModeEl.value = doc.getWrapLimit(); wrapModeEl.value = doc.getWrapLimitRange().min || "free";
} }
env.editor.focus(); env.editor.focus();
}); });
@ -220,12 +221,12 @@ exports.launch = function(env) {
break; break;
case "40": case "40":
session.setUseWrapMode(true); session.setUseWrapMode(true);
session.setWrapLimit(40); session.setWrapLimitRange(40, 40);
renderer.setPrintMarginColumn(40); renderer.setPrintMarginColumn(40);
break; break;
case "80": case "80":
session.setUseWrapMode(true); session.setUseWrapMode(true);
session.setWrapLimit(80); session.setWrapLimitRange(80, 80);
renderer.setPrintMarginColumn(80); renderer.setPrintMarginColumn(80);
break; break;
case "free": case "free":

4
lib/ace/edit_session.js
View file

@ -670,10 +670,6 @@ var EditSession = function(text, mode) {
return this.$useWrapMode; return this.$useWrapMode;
}; };
this.setWrapLimit = function(wrapLimit) {
this.setWrapLimitRange(wrapLimit, wrapLimit);
};
// Allow the wrap limit to move freely between min and max. Either // Allow the wrap limit to move freely between min and max. Either
// parameter can be null to allow the wrap limit to be unconstrained // parameter can be null to allow the wrap limit to be unconstrained
// in that direction. Or set both parameters to the same number to pin // in that direction. Or set both parameters to the same number to pin

8
lib/ace/test/edit_session_test.js
View file

@ -169,14 +169,14 @@ var Test = {
var wrapLimit = 12; var wrapLimit = 12;
var session = new EditSession(["foo bar foo bar"]); var session = new EditSession(["foo bar foo bar"]);
session.setUseWrapMode(true); session.setUseWrapMode(true);
session.setWrapLimit(12); session.setWrapLimitRange(12, 12);
assert.position(session.documentToScreenPosition(0, 11), 0, 11); assert.position(session.documentToScreenPosition(0, 11), 0, 11);
assert.position(session.documentToScreenPosition(0, 12), 1, 0); assert.position(session.documentToScreenPosition(0, 12), 1, 0);
session = new EditSession(["ぁぁa"]); session = new EditSession(["ぁぁa"]);
session.setUseWrapMode(true); session.setUseWrapMode(true);
session.setWrapLimit(2); session.setWrapLimitRange(2, 2);
assert.position(session.documentToScreenPosition(0, 1), 1, 0); assert.position(session.documentToScreenPosition(0, 1), 1, 0);
assert.position(session.documentToScreenPosition(0, 2), 2, 0); assert.position(session.documentToScreenPosition(0, 2), 2, 0);
assert.position(session.documentToScreenPosition(0, 4), 2, 1); assert.position(session.documentToScreenPosition(0, 4), 2, 1);
@ -202,7 +202,7 @@ var Test = {
var wrapLimit = 12; var wrapLimit = 12;
var session = new EditSession(["foo bar foo bar"]); var session = new EditSession(["foo bar foo bar"]);
session.setUseWrapMode(true); session.setUseWrapMode(true);
session.setWrapLimit(12); session.setWrapLimitRange(12, 12);
assert.position(session.screenToDocumentPosition(1, 0), 0, 12); assert.position(session.screenToDocumentPosition(1, 0), 0, 12);
assert.position(session.screenToDocumentPosition(0, 11), 0, 11); assert.position(session.screenToDocumentPosition(0, 11), 0, 11);
@ -378,7 +378,7 @@ var Test = {
var document = session.getDocument(); var document = session.getDocument();
session.setUseWrapMode(true); session.setUseWrapMode(true);
session.setWrapLimit(3); session.setWrapLimitRange(3, 3);
// Test if wrapData is there and was computed. // Test if wrapData is there and was computed.
assert.equal(session.$wrapData.length, 2); assert.equal(session.$wrapData.length, 2);