Merge pull request #3680 from TuckerWhitehouse/requirejs_submodule

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

.gitmodules

@@ -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

Gruntfile.js

@@ -113,8 +113,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'
                         }
                     }
                 }

src/brackets.js

@@ -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

src/index.html

@@ -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>