Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

Requirejs as submodule (text.js & i18n.js as well) #3680

Merged
merged 5 commits into from
May 13, 2013
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,12 @@
[submodule "src/extensions/default/JavaScriptCodeHints/thirdparty/acorn"]
path = src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
url = https://github.com/marijnh/acorn.git
[submodule "src/thirdparty/requirejs"]
path = src/thirdparty/requirejs
url = https://github.com/jrburke/requirejs.git
[submodule "src/thirdparty/text"]
path = src/thirdparty/text
url = https://github.com/requirejs/text.git
[submodule "src/thirdparty/i18n"]
path = src/thirdparty/i18n
url = https://github.com/requirejs/i18n.git
4 changes: 2 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -101,8 +101,8 @@ module.exports = function (grunt) {
'test' : '../test',
'perf' : '../test/perf',
'spec' : '../test/spec',
'text' : 'thirdparty/text',
'i18n' : 'thirdparty/i18n'
'text' : 'thirdparty/text/text',
'i18n' : 'thirdparty/i18n/i18n'
}
}
}
Expand Down
2,493 changes: 2,353 additions & 140 deletions NOTICE

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions src/brackets.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

require.config({
paths: {
"text" : "thirdparty/text",
"i18n" : "thirdparty/i18n"
"text" : "thirdparty/text/text",
"i18n" : "thirdparty/i18n/i18n"
},
// Use custom brackets property until CEF sets the correct navigator.language
// NOTE: When we change to navigator.language here, we also should change to
Expand Down
2 changes: 1 addition & 1 deletion src/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@
-->

<!-- All other scripts are loaded through require. -->
<script src="thirdparty/require.js" data-main="brackets"></script>
<script src="thirdparty/requirejs/require.js" data-main="brackets"></script>

<!-- Verify that all dependencies are loaded. -->
<script>
Expand Down
1 change: 1 addition & 0 deletions src/thirdparty/i18n
Submodule i18n added at ca7d04
161 changes: 0 additions & 161 deletions src/thirdparty/i18n.js

This file was deleted.

Loading