Skip to content

Commit 7d83ce3

Browse files
committed
use preserve instead of mark as default line handling option
1 parent 4b6300e commit 7d83ce3

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

examples/streamlineMe/streamlineMe.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ function _transform() {
167167
try {
168168
var codeOut = Streamline.transform(codeIn, {
169169
noHelpers: !_complete,
170-
lines: _complete ? "mark" : "ignore"
170+
lines: _complete ? "preserve" : "ignore"
171171
});
172172
$('#codeOut').val(codeOut);
173173
info("ready")

lib/callbacks/transform.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1376,7 +1376,7 @@ if (typeof exports !== 'undefined') {
13761376
}
13771377
options.source = source;
13781378
options.callback = options.callback || "_";
1379-
options.lines = options.lines || "mark";
1379+
options.lines = options.lines || "preserve";
13801380
//console.log("TRANSFORMING " + options.sourceName)
13811381
//console.log("source=" + source);
13821382
var node = parse(source + "\n"); // final newline avoids infinite loop if unterminated string literal at the end

lib/compiler/compile._js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function _transform(transform, source, options) {
5050
}
5151
options.source = source;
5252
options.callback = options.callback || "_";
53-
options.lines = options.lines || "mark";
53+
options.lines = options.lines || "preserve";
5454
return transform.transform(source, options);
5555
}
5656

@@ -152,7 +152,7 @@ exports.loadFile = function(_, path, options) {
152152
mtimejs = mtime(_, js);
153153
}
154154
mtimejs_ = mtime(_, js_);
155-
options.lines = options.lines || (dontSave ? "preserve" : "mark");
155+
options.lines = options.lines || "preserve";
156156

157157
var transform = _getTransform(options);
158158
var banner = _banner(transform.version);
@@ -231,7 +231,7 @@ exports.transformModule = function(content, path, options) {
231231
mtimejs = mtimeSync(js);
232232
}
233233
mtimejs_ = mtimeSync(js_);
234-
options.lines = options.lines || (dontSave ? "preserve" : "mark");
234+
options.lines = options.lines || "preserve";
235235

236236
var transform = _getTransform(options);
237237
var banner = _banner(transform.version);

lib/compiler/compile.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function _transform(transform, source, options) {
5050

5151
options.source = source;
5252
options.callback = (options.callback || "_");
53-
options.lines = (options.lines || "mark");
53+
options.lines = (options.lines || "preserve");
5454
return transform.transform(source, options);};
5555

5656

@@ -152,7 +152,7 @@ exports.loadFile = function exports_loadFile__2(_, path, options) { var ext, bas
152152
return mtime(__cb(_, __frame, 22, 12, function ___(__0, __6) { mtimejs = __6; __then(); }, true), js); } ; })(function __$exports_loadFile__2() {
153153

154154
return mtime(__cb(_, __frame, 24, 12, function ___(__0, __7) { mtimejs_ = __7;
155-
options.lines = (options.lines || ((dontSave ? "preserve" : "mark")));
155+
options.lines = (options.lines || "preserve");
156156

157157
transform = _getTransform(options);
158158
banner = _banner(transform.version); return (function __$exports_loadFile__2(__then) {
@@ -231,7 +231,7 @@ exports.transformModule = function(content, path, options) {
231231
mtimejs = mtimeSync(js); };
232232

233233
mtimejs_ = mtimeSync(js_);
234-
options.lines = (options.lines || ((dontSave ? "preserve" : "mark")));
234+
options.lines = (options.lines || "preserve");
235235

236236
var transform = _getTransform(options);
237237
var banner = _banner(transform.version);

0 commit comments

Comments
 (0)