зеркало из https://github.com/mozilla/brackets.git
Move tern and acorn submodules into thirdparty directory.
This commit is contained in:
Родитель
40e159981a
Коммит
1c62677c18
|
@ -10,3 +10,9 @@
|
|||
[submodule "src/thirdparty/mustache"]
|
||||
path = src/thirdparty/mustache
|
||||
url = https://github.com/janl/mustache.js.git
|
||||
[submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/tern"]
|
||||
path = src/extensions/default/JavaScriptCodeHints/thirdparty/tern
|
||||
url = https://github.com/marijnh/tern.git
|
||||
[submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/acorn"]
|
||||
path = src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
|
||||
url = https://github.com/marijnh/acorn.git
|
||||
|
|
|
@ -70,7 +70,7 @@ define(function (require, exports, module) {
|
|||
* Read in the json files that have type information for the builtins, dom,etc
|
||||
*/
|
||||
function initTernEnv() {
|
||||
var path = module.uri.substring(0, module.uri.lastIndexOf("/") + 1) + "tern/defs/";
|
||||
var path = module.uri.substring(0, module.uri.lastIndexOf("/") + 1) + "thirdparty/tern/defs/";
|
||||
var files = ["ecma5.json", "browser.json"];//, "plugin/requirejs/requirejs.json", "jquery.json"];
|
||||
|
||||
files.forEach(function (i) {
|
||||
|
|
|
@ -31,9 +31,12 @@ importScripts("thirdparty/requirejs/require.js");
|
|||
|
||||
var HintUtils;
|
||||
var Tern;
|
||||
require(["./HintUtils", "./tern/lib/tern", "./tern/plugin/requirejs"], function(hintUtils, tern, requirejs) {
|
||||
require(["./HintUtils"], function(hintUtils) {
|
||||
HintUtils = hintUtils;
|
||||
Tern = tern;
|
||||
var ternRequire = require.config({baseUrl: "./thirdparty"});
|
||||
ternRequire(["tern/lib/tern", "tern/plugin/requirejs"], function(tern, requirejs) {
|
||||
Tern = tern;
|
||||
} );
|
||||
} );
|
||||
|
||||
var ternServer = null;
|
||||
|
|
|
@ -0,0 +1 @@
|
|||
Subproject commit f3c70d76efd79040721f913b5877a4f3149fdbe2
|
|
@ -0,0 +1 @@
|
|||
Subproject commit 6ace086d71e4822b36760cbc3df62dcde13e8e13
|
Загрузка…
Ссылка в новой задаче