efront 4.0.33 → 4.0.34
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/coms/compile/Javascript.js +3 -3
- package/package.json +1 -1
- package/public/efront.js +1 -1
|
@@ -58,7 +58,7 @@ Javascript.prototype.isProperty = function (o) {
|
|
|
58
58
|
return /^(\+\+|\-\-|;)$/.test(prev.text);
|
|
59
59
|
}
|
|
60
60
|
if (prev.type === EXPRESS && !/\.$/.test(prev.text)) return true;
|
|
61
|
-
if (
|
|
61
|
+
if (prev.type & (SCOPED | VALUE | QUOTED | PROPERTY)) return true;
|
|
62
62
|
}
|
|
63
63
|
if (!prev) return false;
|
|
64
64
|
if (prev.type === PROPERTY && propresolve_reg.test(prev.text)) {
|
|
@@ -207,7 +207,7 @@ var isShortMethodEnd = function (o) {
|
|
|
207
207
|
if (o.type !== SCOPED || o.entry !== "(") return false;
|
|
208
208
|
o = o.prev;
|
|
209
209
|
if (!o) return false;
|
|
210
|
-
return o.
|
|
210
|
+
return o.isprop;
|
|
211
211
|
};
|
|
212
212
|
|
|
213
213
|
Javascript.prototype.setType = function (o) {
|
|
@@ -226,7 +226,7 @@ Javascript.prototype.setType = function (o) {
|
|
|
226
226
|
else if (o.type === SCOPED) {
|
|
227
227
|
if (o.entry === '[') {
|
|
228
228
|
if (queue.isObject) o.isprop = this.isProperty(o);
|
|
229
|
-
if (queue.isClass) o.isprop = !last || last.isprop || last.type === STAMP && last.text === ';';
|
|
229
|
+
if (queue.isClass) o.isprop = !last || last.isprop || last.type === STAMP && last.text === ';' || isShortMethodEnd(last);
|
|
230
230
|
}
|
|
231
231
|
else if (o.entry === "{") {
|
|
232
232
|
if (last && last.type === PROPERTY && last.text === 'static') {
|