Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ajaxorg/ace
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v1.23.2
Choose a base ref
...
head repository: ajaxorg/ace
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: v1.23.3
Choose a head ref
  • 4 commits
  • 9 files changed
  • 3 contributors

Commits on Jul 9, 2023

  1. Fix tmTheme tool (#5238)

    Update tmTheme tool to use non-deprecated plist.js methods
    NotLazy authored Jul 9, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    133345f View commit details
  2. fix: update jshint version to 2.13.6; change esversion to target ECMA…

    …Script 11 (#5243)
    
    - Update JSHint version to current latest
    - Change default option to target ECMAScript 11
    - Replace deprecated property esnext with esversion
    mkslanc authored Jul 9, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    301aee9 View commit details

Commits on Jul 10, 2023

  1. fix: android bug when deleting multiple lines (#5248)

    Reverts part of #5087 since it caused a regression when deleting multiple lines on android.
    akoreman authored Jul 10, 2023

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    Copy the full SHA
    bd066ff View commit details
  2. release v1.23.3

    akoreman committed Jul 10, 2023
    Copy the full SHA
    0e36379 View commit details
Showing with 20 additions and 77 deletions.
  1. +8 −0 CHANGELOG.md
  2. +1 −1 build
  3. +6 −6 lib/ace/mode/javascript/jshint.js
  4. +1 −1 lib/ace/mode/javascript_worker.js
  5. +1 −1 package.json
  6. +1 −1 src/config.js
  7. +0 −23 src/keyboard/textinput.js
  8. +0 −40 src/keyboard/textinput_test.js
  9. +2 −4 tool/tmtheme.js
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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.23.3](https://github.com/ajaxorg/ace/compare/v1.23.2...v1.23.3) (2023-07-10)


### Bug Fixes

* android bug when deleting multiple lines ([#5248](https://github.com/ajaxorg/ace/issues/5248)) ([bd066ff](https://github.com/ajaxorg/ace/commit/bd066ffef88ca74f5ac32349d3e868cfa875a47b)), closes [#5087](https://github.com/ajaxorg/ace/issues/5087)
* update jshint version to 2.13.6; change esversion to target ECMAScript 11 ([#5243](https://github.com/ajaxorg/ace/issues/5243)) ([301aee9](https://github.com/ajaxorg/ace/commit/301aee91b5974d9fb31d646466ed301c5c3b8249))

### [1.23.2](https://github.com/ajaxorg/ace/compare/v1.23.1...v1.23.2) (2023-07-07)


12 changes: 6 additions & 6 deletions lib/ace/mode/javascript/jshint.js
Original file line number Diff line number Diff line change
@@ -2392,13 +2392,13 @@ module.exports = slice;
exports.noConflict = function () { global._ = current; return exports; };
}()));
}(this, (function () {
// Underscore.js 1.13.4
// Underscore.js 1.13.6
// https://underscorejs.org
// (c) 2009-2022 Jeremy Ashkenas, Julian Gonggrijp, and DocumentCloud and Investigative Reporters & Editors
// Underscore may be freely distributed under the MIT license.

// Current version.
var VERSION = '1.13.4';
var VERSION = '1.13.6';

// Establish the root object, `window` (`self`) in the browser, `global`
// on the server, or `this` in some virtual machines. We use `self`
@@ -4461,7 +4461,7 @@ module.exports = slice;
/*exported console */

var _ = _dereq_("underscore");
_.clone = _dereq_("lodash.clone");
_.clone = _dereq_("lodash.clone");
var events = _dereq_("events");
var vars = _dereq_("./vars.js");
var messages = _dereq_("./messages.js");
@@ -8930,7 +8930,7 @@ var JSHINT = (function() {
var id = state.tokens.prev;
value = expression(context, 10);
if (value) {
if (value.identifier && value.value === "undefined") {
if (!isConst && value.identifier && value.value === "undefined") {
warning("W080", id, id.value);
}
if (!lone) {
@@ -13527,7 +13527,7 @@ var errors = {

// Constants
E011: "'{a}' has already been declared.",
E012: "const '{a}' is initialized to 'undefined'.",
E012: "Missing initializer for constant '{a}'.",
E013: "Attempting to override '{a}' which is a constant.",

// Regular expressions
@@ -15122,7 +15122,7 @@ exports.regexpDot = /(^|[^\\])(\\\\)*\./;
*/

var _ = _dereq_("underscore");
_.slice = _dereq_("lodash.slice");
_.slice = _dereq_("lodash.slice");
var events = _dereq_("events");

// Used to denote membership in lookup tables (a primitive value such as `true`
2 changes: 1 addition & 1 deletion lib/ace/mode/javascript_worker.js
Original file line number Diff line number Diff line change
@@ -79,7 +79,7 @@ oop.inherits(JavaScriptWorker, Mirror);
this.options = options || {
// undef: true,
// unused: true,
esnext: true,
esversion: 11,
moz: true,
devel: true,
browser: true,
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "ace-code",
"description": "Ajax.org Code Editor is a full featured source code highlighting editor that powers the Cloud9 IDE",
"version": "1.23.2",
"version": "1.23.3",
"homepage": "http://github.com/ajaxorg/ace",
"engines": {
"node": ">= 0.6.0"
2 changes: 1 addition & 1 deletion src/config.js
Original file line number Diff line number Diff line change
@@ -168,6 +168,6 @@ var reportErrorIfPathIsNotConfigured = function() {
}
};

exports.version = "1.23.2";
exports.version = "1.23.3";


23 changes: 0 additions & 23 deletions src/keyboard/textinput.js
Original file line number Diff line number Diff line change
@@ -83,8 +83,6 @@ var TextInput = function(parentNode, host) {
if (ignoreFocusEvents) return;
host.onBlur(e);
isFocused = false;
if (isMobile && !isIOS)
document.removeEventListener("selectionchange", detectSelectionChange);
}, host);
event.addListener(text, "focus", function(e) {
if (ignoreFocusEvents) return;
@@ -101,8 +99,6 @@ var TextInput = function(parentNode, host) {
setTimeout(resetSelection);
else
resetSelection();
if (isMobile && !isIOS)
document.addEventListener("selectionchange", detectSelectionChange);
}, host);
this.$focusScroll = false;
this.focus = function() {
@@ -291,25 +287,6 @@ var TextInput = function(parentNode, host) {
}
};

function detectSelectionChange(e) {
if (!text || !text.parentNode)
document.removeEventListener("selectionchange", detectSelectionChange);
if (inComposition) return;

if (text.selectionStart !== text.selectionEnd) return;
var startDiff = text.selectionStart - lastSelectionStart;
var oldLenght = lastSelectionEnd - lastSelectionStart;
if (startDiff > 0) {
startDiff = Math.max(startDiff - oldLenght, 1);
} else if (startDiff === 0 && oldLenght) {
startDiff = -1;
}
var repeat = Math.abs(startDiff);
var key = startDiff > 0 ? KEYS.right : KEYS.left;
for (var i = 0; i < repeat; i++) {
host.onCommandKey({}, 0, key);
}
}

var inputHandler = null;
this.setInputHandler = function(cb) {inputHandler = cb;};
40 changes: 0 additions & 40 deletions src/keyboard/textinput_test.js
Original file line number Diff line number Diff line change
@@ -153,46 +153,6 @@ module.exports = {
assert.equal(editor.getValue(), "y");
},

"test: android spacebar moves cursor": function() {
setUserAgentForTests(true, false);
var value = "Juhu kinners!";
editor.setValue(value);
editor.blur();
editor.focus();
var lastCommand = "";
editor.commands.on("exec", function(e) {
lastCommand += e.command.name;
});

textarea.selectionStart = textarea.selectionEnd;
document.dispatchEvent(new CustomEvent("selectionchange"));
assert.equal(lastCommand, "gotoright");
lastCommand = "";

textarea.selectionStart =
textarea.selectionEnd = textarea.selectionStart - 1;
document.dispatchEvent(new CustomEvent("selectionchange"));
assert.equal(lastCommand, "gotoleft");
lastCommand = "";

assert.equal(editor.getSelectedText(), "");
textarea.selectionStart = 0;
textarea.selectionEnd = textarea.value.length;
textarea.dispatchEvent(new CustomEvent("select"));
assert.equal(editor.getSelectedText(), value);

textarea.selectionEnd = textarea.selectionStart;
document.dispatchEvent(new CustomEvent("selectionchange"));
assert.equal(lastCommand, "gotoleft");
lastCommand = "";

textarea.selectionStart =
textarea.selectionEnd = textarea.selectionEnd + 2;
document.dispatchEvent(new CustomEvent("selectionchange"));
assert.equal(lastCommand, "gotorightgotoright");
lastCommand = "";
},

"test: composition with visible textarea": function() {
var data = [
// select ll
6 changes: 2 additions & 4 deletions tool/tmtheme.js
Original file line number Diff line number Diff line change
@@ -4,11 +4,9 @@ var util = require("util");
var cssParse = require("css-parse");
var cssStringify = require("css-stringify");

var parseString = require("plist").parseString;
var parse = require("plist").parse;
function parseTheme(themeXml, callback) {
parseString(themeXml, function(_, theme) {
callback(theme[0])
});
callback(parse(themeXml));
}

var unsupportedScopes = { };