Merge pull request #142 from macgngsta/master

fixed dependencies

src/build-no-locales-no-otr.js

@@ -4,7 +4,7 @@
     out: "../builds/converse-no-locales-no-otr.min.js",
     include: ['main'],
     paths: {
-        "jquery": "components/jquery/jquery",
+        "jquery": "components/jquery/dist/jquery",
         "jed": "components/jed/jed",
         "locales": "locale/nolocales",
         "jquery.tinysort": "components/tinysort/src/jquery.tinysort",
@@ -16,6 +16,11 @@
         "strophe.roster": "components/strophe.roster/index",
         "strophe.vcard": "components/strophe.vcard/index",
         "strophe.disco": "components/strophe.disco/index",
-        "converse-dependencies": "src/deps-no-otr"
+        "converse-dependencies": "src/deps-no-otr",
+        "jquery.browser": "components/jquery.browser/dist/jquery.browser",
+        "moment":"components/momentjs/moment",
+        "converse-templates":"src/templates",
+        "tpl": "components/requirejs-tpl-jcbrand/tpl",
+        "text": "components/requirejs-text/text"
     }
 })

src/build-no-otr.js

@@ -4,7 +4,7 @@
     out: "../builds/converse-no-otr.min.js",
     include: ['main'],
     paths: {
-        "jquery": "components/jquery/jquery",
+        "jquery": "components/jquery/dist/jquery",
         "jed": "components/jed/jed",
         "locales": "locale/locales",
         "af": "locale/af/LC_MESSAGES/af",
@@ -29,6 +29,11 @@
         "strophe.roster": "components/strophe.roster/index",
         "strophe.vcard": "components/strophe.vcard/index",
         "strophe.disco": "components/strophe.disco/index",
-        "converse-dependencies": "src/deps-no-otr"
+        "converse-dependencies": "src/deps-no-otr",
+        "jquery.browser": "components/jquery.browser/dist/jquery.browser",
+        "moment":"components/momentjs/moment",
+        "converse-templates":"src/templates",
+        "tpl": "components/requirejs-tpl-jcbrand/tpl",
+        "text": "components/requirejs-text/text"
     }
 })

src/build.js

@@ -4,7 +4,7 @@
     out: "../builds/converse.min.js",
     include: ['main'],
     paths: {
-        "jquery": "components/jquery/jquery",
+        "jquery": "components/jquery/dist/jquery",
         "jed": "components/jed/jed",
         "locales": "locale/locales",
         "af": "locale/af/LC_MESSAGES/af",
@@ -45,6 +45,11 @@
         "crypto": "src/crypto",
         "eventemitter": "components/otr/build/dep/eventemitter",
         "otr": "components/otr/build/otr",
-        "converse-dependencies": "src/deps-full"
+        "converse-dependencies": "src/deps-full",
+        "jquery.browser": "components/jquery.browser/dist/jquery.browser",
+        "moment":"components/momentjs/moment",
+        "converse-templates":"src/templates",
+        "tpl": "components/requirejs-tpl-jcbrand/tpl",
+        "text": "components/requirejs-text/text"
     }
 })