Skip to content

Commit a5ca9f8

Browse files
committed
Bump 2.4.0
1 parent 9f05ffd commit a5ca9f8

23 files changed

+378
-357
lines changed

config.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<widget android-versionCode="23100" id="com.ecarriou.systemdesignerios" version="2.3.1" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
2+
<widget android-versionCode="24000" id="com.ecarriou.systemdesignerios" version="2.4.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
33
<name>System Designer</name>
44
<description>
55
System Designer, an IDE for designing systems.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "com.ecarriou.systemdesignerios",
3-
"version": "2.3.1",
3+
"version": "2.4.0",
44
"displayName": "System Designer",
55
"cordova": {
66
"platforms": [

www/lib/codemirror/lib/codemirror.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5225,7 +5225,8 @@ function makeChangeInner(doc, change) {
52255225

52265226
// Revert a change stored in a document's history.
52275227
function makeChangeFromHistory(doc, type, allowSelectionOnly) {
5228-
if (doc.cm && doc.cm.state.suppressEdits && !allowSelectionOnly) { return }
5228+
var suppress = doc.cm && doc.cm.state.suppressEdits;
5229+
if (suppress && !allowSelectionOnly) { return }
52295230

52305231
var hist = doc.history, event, selAfter = doc.sel;
52315232
var source = type == "undo" ? hist.done : hist.undone, dest = type == "undo" ? hist.undone : hist.done;
@@ -5250,8 +5251,10 @@ function makeChangeFromHistory(doc, type, allowSelectionOnly) {
52505251
return
52515252
}
52525253
selAfter = event;
5253-
}
5254-
else { break }
5254+
} else if (suppress) {
5255+
source.push(event);
5256+
return
5257+
} else { break }
52555258
}
52565259

52575260
// Build up a reverse change object to add to the opposite history
@@ -5727,7 +5730,7 @@ function addLineWidget(doc, handle, node, options) {
57275730
}
57285731
return true
57295732
});
5730-
signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle));
5733+
if (cm) { signalLater(cm, "lineWidgetAdded", cm, widget, typeof handle == "number" ? handle : lineNo(handle)); }
57315734
return widget
57325735
}
57335736

@@ -9662,7 +9665,7 @@ CodeMirror$1.fromTextArea = fromTextArea;
96629665

96639666
addLegacyProps(CodeMirror$1);
96649667

9665-
CodeMirror$1.version = "5.34.0";
9668+
CodeMirror$1.version = "5.35.0";
96669669

96679670
return CodeMirror$1;
96689671

www/lib/codemirror/mode/javascript/javascript.js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -400,6 +400,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
400400
if (type == "{") return contCommasep(objprop, "}", null, maybeop);
401401
if (type == "quasi") return pass(quasi, maybeop);
402402
if (type == "new") return cont(maybeTarget(noComma));
403+
if (type == "import") return cont(expression);
403404
return cont();
404405
}
405406
function maybeexpression(type) {
@@ -594,7 +595,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
594595
}
595596
function afterType(type, value) {
596597
if (value == "<") return cont(pushlex(">"), commasep(typeexpr, ">"), poplex, afterType)
597-
if (value == "|" || type == ".") return cont(typeexpr)
598+
if (value == "|" || type == "." || value == "&") return cont(typeexpr)
598599
if (type == "[") return cont(expect("]"), afterType)
599600
if (value == "extends" || value == "implements") { cx.marked = "keyword"; return cont(typeexpr) }
600601
}
@@ -637,7 +638,8 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
637638
function maybeelse(type, value) {
638639
if (type == "keyword b" && value == "else") return cont(pushlex("form", "else"), statement, poplex);
639640
}
640-
function forspec(type) {
641+
function forspec(type, value) {
642+
if (value == "await") return cont(forspec);
641643
if (type == "(") return cont(pushlex(")"), forspec1, expect(")"), poplex);
642644
}
643645
function forspec1(type) {
@@ -726,6 +728,7 @@ CodeMirror.defineMode("javascript", function(config, parserConfig) {
726728
}
727729
function afterImport(type) {
728730
if (type == "string") return cont();
731+
if (type == "(") return pass(expression);
729732
return pass(importSpec, maybeMoreImports, maybeFrom);
730733
}
731734
function importSpec(type, value) {

www/lib/jsPlumb/jsplumb.min.js

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

www/lib/system-runtime/system-runtime.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

www/scripts/designer-runtime.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -295,7 +295,7 @@
295295
"_id": "p1524e1d2c414a17",
296296
"component": "channel",
297297
"state": "$designerCreateBehavior",
298-
"action": "function $designerCreateBehavior(behavior) { \n $db._Behavior.insert(component);\t\n}",
298+
"action": "function $designerCreateBehavior(behavior) { \n $db._Behavior.insert(behavior);\t\n}",
299299
"useCoreAPI": true,
300300
"core": true
301301
},

www/scripts/editor-behavior.js

Lines changed: 23 additions & 23 deletions
Large diffs are not rendered by default.

www/scripts/editor-component.js

Lines changed: 23 additions & 23 deletions
Large diffs are not rendered by default.

www/scripts/editor-model.js

Lines changed: 23 additions & 23 deletions
Large diffs are not rendered by default.

0 commit comments

Comments
 (0)