Sfoglia il codice sorgente

Move all path declarations from locales.js to main.js

Makes it easier to integrate converse.js into other bower/require projects.
JC Brand 10 anni fa
parent
commit
5ee8c5470d
2 ha cambiato i file con 36 aggiunte e 37 eliminazioni
  1. 0 19
      locale/locales.js
  2. 36 18
      main.js

+ 0 - 19
locale/locales.js

@@ -6,25 +6,6 @@
  */
 
 (function (root, factory) {
-    require.config({
-        paths: {
-            "af": "locale/af/LC_MESSAGES/af",
-            "de": "locale/de/LC_MESSAGES/de",
-            "en": "locale/en/LC_MESSAGES/en",
-            "es": "locale/es/LC_MESSAGES/es",
-            "fr": "locale/fr/LC_MESSAGES/fr",
-            "he": "locale/he/LC_MESSAGES/he",
-            "hu": "locale/hu/LC_MESSAGES/hu",
-            "id": "locale/id/LC_MESSAGES/id",
-            "it": "locale/it/LC_MESSAGES/it",
-            "ja": "locale/ja/LC_MESSAGES/ja",
-            "nl": "locale/nl/LC_MESSAGES/nl",
-            "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
-            "ru": "locale/ru/LC_MESSAGES/ru",
-            "zh": "locale/zh/LC_MESSAGES/zh"
-        }
-    });
-
     define("locales", [
         'jed',
         'af',

+ 36 - 18
main.js

@@ -4,31 +4,14 @@ config = {
         "backbone": "components/backbone/backbone",
         "backbone.browserStorage": "components/backbone.browserStorage/backbone.browserStorage",
         "backbone.overview": "components/backbone.overview/backbone.overview",
-        "bigint": "src/bigint",
         "bootstrap": "components/bootstrap/dist/js/bootstrap",                  // XXX: Only required for https://conversejs.org website
         "converse-dependencies": "src/deps-website",
         "converse-templates": "src/templates",
-        "crypto": "src/crypto",
-        "crypto.aes": "components/otr/vendor/cryptojs/aes",
-        "crypto.cipher-core": "components/otr/vendor/cryptojs/cipher-core",
-        "crypto.core": "components/otr/vendor/cryptojs/core",
-        "crypto.enc-base64": "components/otr/vendor/cryptojs/enc-base64",
-        "crypto.evpkdf": "components/crypto-js-evanvosberg/src/evpkdf",
-        "crypto.hmac": "components/otr/vendor/cryptojs/hmac",
-        "crypto.md5": "components/crypto-js-evanvosberg/src/md5",
-        "crypto.mode-ctr": "components/otr/vendor/cryptojs/mode-ctr",
-        "crypto.pad-nopadding": "components/otr/vendor/cryptojs/pad-nopadding",
-        "crypto.sha1": "components/otr/vendor/cryptojs/sha1",
-        "crypto.sha256": "components/otr/vendor/cryptojs/sha256",
         "eventemitter": "components/otr/build/dep/eventemitter",
-        "jed": "components/jed/jed",
         "jquery": "components/jquery/dist/jquery",
         "jquery.browser": "components/jquery.browser/dist/jquery.browser",
         "jquery.easing": "components/jquery-easing-original/jquery.easing.1.3", // XXX: Only required for https://conversejs.org website
-        "locales": "locale/locales",
         "moment": "components/momentjs/moment",
-        "otr": "src/otr",
-        "salsa20": "components/otr/build/dep/salsa20",
         "strophe": "components/strophe/strophe",
         "strophe.disco": "components/strophe.disco/index",
         "strophe.muc": "components/strophe.muc/index",
@@ -38,7 +21,42 @@ config = {
         "tpl": 'components/requirejs-tpl-jcbrand/tpl',
         "typeahead": 'components/typeahead.js/dist/typeahead.jquery',
         "underscore": "components/underscore/underscore",
-        "utils": "src/utils"
+        "utils": "src/utils",
+
+        // Off-the-record-encryption
+        "bigint": "src/bigint",
+        "crypto": "src/crypto",
+        "crypto.aes": "components/otr/vendor/cryptojs/aes",
+        "crypto.cipher-core": "components/otr/vendor/cryptojs/cipher-core",
+        "crypto.core": "components/otr/vendor/cryptojs/core",
+        "crypto.enc-base64": "components/otr/vendor/cryptojs/enc-base64",
+        "crypto.evpkdf": "components/crypto-js-evanvosberg/src/evpkdf",
+        "crypto.hmac": "components/otr/vendor/cryptojs/hmac",
+        "crypto.md5": "components/crypto-js-evanvosberg/src/md5",
+        "crypto.mode-ctr": "components/otr/vendor/cryptojs/mode-ctr",
+        "crypto.pad-nopadding": "components/otr/vendor/cryptojs/pad-nopadding",
+        "crypto.sha1": "components/otr/vendor/cryptojs/sha1",
+        "crypto.sha256": "components/otr/vendor/cryptojs/sha256",
+        "salsa20": "components/otr/build/dep/salsa20",
+        "otr": "src/otr",
+
+        // Locales paths
+        "locales": "locale/locales",
+        "jed": "components/jed/jed",
+        "af": "locale/af/LC_MESSAGES/af",
+        "de": "locale/de/LC_MESSAGES/de",
+        "en": "locale/en/LC_MESSAGES/en",
+        "es": "locale/es/LC_MESSAGES/es",
+        "fr": "locale/fr/LC_MESSAGES/fr",
+        "he": "locale/he/LC_MESSAGES/he",
+        "hu": "locale/hu/LC_MESSAGES/hu",
+        "id": "locale/id/LC_MESSAGES/id",
+        "it": "locale/it/LC_MESSAGES/it",
+        "ja": "locale/ja/LC_MESSAGES/ja",
+        "nl": "locale/nl/LC_MESSAGES/nl",
+        "pt_BR": "locale/pt_BR/LC_MESSAGES/pt_BR",
+        "ru": "locale/ru/LC_MESSAGES/ru",
+        "zh": "locale/zh/LC_MESSAGES/zh"
     },
 
     tpl: {