Skip to content

Commit 2306959

Browse files
committed
Removed define calls from tern.js and acorn.js javascript due to issue with 4.2d
Fixed some error in JS dependencies
1 parent 49d8924 commit 2306959

File tree

12 files changed

+4
-38
lines changed

12 files changed

+4
-38
lines changed

javascript-console-share/src/main/amp/config/alfresco/site-webscripts/de/fme/components/jsconsole/javascript-console.get.head.ftl

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/beautify.js"></@script>
99
<@script type="text/javascript" src="${page.url.context}/res/yui/resize/resize.js"></@script>
1010

11-
<@link href="http://fonts.googleapis.com/css?family=Source+Code+Pro:300" rel="stylesheet" type="text/css"/>
11+
<link href="http://fonts.googleapis.com/css?family=Source+Code+Pro:300" rel="stylesheet" type="text/css"/>
1212

1313
<!-------------------------->
1414
<!-- Codemirror-->
@@ -56,7 +56,7 @@
5656
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/lint/javascript-lint.js"></@script>
5757

5858
<!-- selection addons-->
59-
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/selection/matchbrackets.js"></@script>
59+
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/edit/matchbrackets.js"></@script>
6060
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/addon/selection/active-line.js"></@script>
6161

6262
<!-- search addons-->
@@ -68,15 +68,14 @@
6868
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/mode/javascript/javascript.js"></@script>
6969
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/mode/htmlmixed/htmlmixed.js"></@script>
7070
<@link rel="stylesheet" media="screen" type="text/css" href="${page.url.context}/res/fme/components/jsconsole/codemirror/mode/freemarker/freemarkercolors.css" />
71-
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/codemirror/mode/freemarker/parsefreemarker.js"></@script>
7271

7372
<!-- Tern JS -->
7473
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/ternjs/acorn/acorn.js"></@script>
7574
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/ternjs/acorn/acorn_loose.js"></@script>
7675
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/ternjs/acorn/util/walk.js"></@script>
7776
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/ternjs/tern/lib/signal.js"></@script>
78-
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole//ternjs/tern/lib/tern.js"></@script>
79-
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole//ternjs/tern/lib/def.js"></@script>
77+
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/ternjs/tern/lib/tern.js"></@script>
78+
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/ternjs/tern/lib/def.js"></@script>
8079
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/ternjs/tern/lib/comment.js"></@script>
8180
<@script type="text/javascript" src="${page.url.context}/res/fme/components/jsconsole/ternjs/tern/lib/infer.js"></@script>
8281

javascript-console-share/src/main/amp/web/fme/components/jsconsole/ternjs/acorn/.tern-port

Lines changed: 0 additions & 1 deletion
This file was deleted.

javascript-console-share/src/main/amp/web/fme/components/jsconsole/ternjs/acorn/.tern-project

Lines changed: 0 additions & 1 deletion
This file was deleted.

javascript-console-share/src/main/amp/web/fme/components/jsconsole/ternjs/acorn/acorn.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
(function(root, mod) {
2424
if (typeof exports == "object" && typeof module == "object") return mod(exports); // CommonJS
25-
if (typeof define == "function" && define.amd) return define(["exports"], mod); // AMD
2625
mod(root.acorn || (root.acorn = {})); // Plain browser env
2726
})(this, function(exports) {
2827
"use strict";

javascript-console-share/src/main/amp/web/fme/components/jsconsole/ternjs/acorn/acorn_loose.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
// tangle.
3131

3232
(function(root, mod) {
33-
if (typeof exports == "object" && typeof module == "object") return mod(exports, require("./acorn")); // CommonJS
34-
if (typeof define == "function" && define.amd) return define(["exports", "./acorn"], mod); // AMD
3533
mod(root.acorn || (root.acorn = {}), root.acorn); // Plain browser env
3634
})(this, function(exports, acorn) {
3735
"use strict";

javascript-console-share/src/main/amp/web/fme/components/jsconsole/ternjs/acorn/util/walk.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
// AST walker module for Mozilla Parser API compatible trees
22

33
(function(mod) {
4-
if (typeof exports == "object" && typeof module == "object") return mod(exports); // CommonJS
5-
if (typeof define == "function" && define.amd) return define(["exports"], mod); // AMD
64
mod((this.acorn || (this.acorn = {})).walk = {}); // Plain browser env
75
})(function(exports) {
86
"use strict";

javascript-console-share/src/main/amp/web/fme/components/jsconsole/ternjs/tern/lib/comment.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
11
(function(mod) {
2-
if (typeof exports == "object" && typeof module == "object") // CommonJS
3-
return mod(exports);
4-
if (typeof define == "function" && define.amd) // AMD
5-
return define(["exports"], mod);
62
mod(tern.comment || (tern.comment = {}));
73
})(function(exports) {
84
function isSpace(ch) {

javascript-console-share/src/main/amp/web/fme/components/jsconsole/ternjs/tern/lib/condense.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
// then cheaply included in later analysis.
99

1010
(function(mod) {
11-
if (typeof exports == "object" && typeof module == "object") // CommonJS
12-
return mod(exports, require("./infer"));
13-
if (typeof define == "function" && define.amd) // AMD
14-
return define(["exports", "./infer"], mod);
1511
mod(self.tern || (self.tern = {}), tern); // Plain browser env
1612
})(function(exports, infer) {
1713
"use strict";

javascript-console-share/src/main/amp/web/fme/components/jsconsole/ternjs/tern/lib/def.js

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
// can't be inferred well
1010

1111
(function(mod) {
12-
if (typeof exports == "object" && typeof module == "object") // CommonJS
13-
return exports.init = mod;
14-
if (typeof define == "function" && define.amd) // AMD
15-
return define({init: mod});
1612
tern.def = {init: mod};
1713
})(function(exports, infer) {
1814
"use strict";

javascript-console-share/src/main/amp/web/fme/components/jsconsole/ternjs/tern/lib/infer.js

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
// single type.
1414

1515
(function(mod) {
16-
if (typeof exports == "object" && typeof module == "object") // CommonJS
17-
return mod(exports, require("acorn/acorn"), require("acorn/acorn_loose"), require("acorn/util/walk"),
18-
require("./def"), require("./signal"));
19-
if (typeof define == "function" && define.amd) // AMD
20-
return define(["exports", "acorn/acorn", "acorn/acorn_loose", "acorn/util/walk", "./def", "./signal"], mod);
2116
mod(self.tern || (self.tern = {}), acorn, acorn, acorn.walk, tern.def, tern.signal); // Plain browser env
2217
})(function(exports, acorn, acorn_loose, walk, def, signal) {
2318
"use strict";

0 commit comments

Comments
 (0)