Skip to content

Commit

Permalink
package 21.08.24
Browse files Browse the repository at this point in the history
  • Loading branch information
akoreman committed Aug 21, 2024
1 parent b25740e commit 3945bab
Show file tree
Hide file tree
Showing 9 changed files with 29 additions and 12 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,14 @@

All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.

## [1.36.0](https://github.com/ajaxorg/ace/compare/v1.35.5...v1.36.0) (2024-08-21)


### Features

* allow setting marker type for MarkerGroups ([#5630](https://github.com/ajaxorg/ace/issues/5630)) ([214df9c](https://github.com/ajaxorg/ace/commit/214df9cea8d729f3071f9c02889cba2b2e7051b3))
* **forced-color:** do not adjust the forced colors for the editor ([#5624](https://github.com/ajaxorg/ace/issues/5624)) ([c8f9df8](https://github.com/ajaxorg/ace/commit/c8f9df84e70ee29e8e989966985bcea95a9bef9b))

### [1.35.5](https://github.com/ajaxorg/ace/compare/v1.35.4...v1.35.5) (2024-08-20)

### [1.35.4](https://github.com/ajaxorg/ace/compare/v1.35.3...v1.35.4) (2024-07-22)
Expand Down
2 changes: 1 addition & 1 deletion ace.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@ export namespace Ace {
}

export class MarkerGroup {
constructor(session: EditSession);
constructor(session: EditSession, options?: {markerType?: "fullLine" | "line"});
setMarkers(markers: MarkerGroupItem[]): void;
getMarkerAtPosition(pos: Position): MarkerGroupItem;
}
Expand Down
1 change: 1 addition & 0 deletions css/ace.css
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ font: 12px/normal 'Monaco', 'Menlo', 'Ubuntu Mono', 'Consolas', 'Source Code Pro
direction: ltr;
text-align: left;
-webkit-tap-highlight-color: rgba(0, 0, 0, 0);
forced-color-adjust: none;
}
.ace_scroller {
position: absolute;
Expand Down
16 changes: 12 additions & 4 deletions demo/kitchen-sink/demo.js
Original file line number Diff line number Diff line change
Expand Up @@ -3474,7 +3474,9 @@ exports.TokenTooltip = TokenTooltip;

define("ace/marker_group",["require","exports","module"], function(require, exports, module){"use strict";
var MarkerGroup = /** @class */ (function () {
function MarkerGroup(session) {
function MarkerGroup(session, options) {
if (options)
this.markerType = options.markerType;
this.markers = [];
this.session = session;
session.addDynamicMarker(this);
Expand Down Expand Up @@ -3527,11 +3529,17 @@ var MarkerGroup = /** @class */ (function () {
}
continue;
}
if (screenRange.isMultiLine()) {
markerLayer.drawTextMarker(html, screenRange, marker.className, config);
if (this.markerType === "fullLine") {
markerLayer.drawFullLineMarker(html, screenRange, marker.className, config);
}
else if (screenRange.isMultiLine()) {
if (this.markerType === "line")
markerLayer.drawMultiLineMarker(html, screenRange, marker.className, config);
else
markerLayer.drawTextMarker(html, screenRange, marker.className, config);
}
else {
markerLayer.drawSingleLineMarker(html, screenRange, marker.className, config);
markerLayer.drawSingleLineMarker(html, screenRange, marker.className + " ace_br15", config);
}
}
};
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "ace-builds",
"main": "./src-noconflict/ace.js",
"typings": "ace.d.ts",
"version": "1.35.5",
"version": "1.36.0",
"description": "Ace (Ajax.org Cloud9 Editor)",
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
Expand Down
2 changes: 1 addition & 1 deletion src-min-noconflict/ace.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src-min/ace.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src-noconflict/ace.js

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/ace.js

Large diffs are not rendered by default.

0 comments on commit 3945bab

Please sign in to comment.