Inicio Explorar Axuda
Rexistro Iniciar sesión
im-changing.ru
/
converse.js
réplica de https://github.com/conversejs/converse.js.git
2
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

Fixes #220. Enable usage of both `_` and `fp` in non-AMD case

JC Brand %!s(int64=8) %!d(string=hai) anos
pai
93e67567ce
achega
4d2c807cf2
Modificáronse 6 ficheiros con 19 adicións e 1055 borrados
Unificar vista Mostrar estatísticas de Diff
  1. 4 2
      3rdparty/lodash.fp.js
  2. 10 11
      demo/without_bundled_dependencies.html
  3. 0 1040
      dist/converse-no-dependencies.js
  4. 3 1
      src/build-no-dependencies.js
  5. 1 1
      src/config.js
  6. 1 0
      src/end-no-dependencies.frag

+ 4 - 2
3rdparty/lodash.fp.js
Ver ficheiro 

@@ -69,7 +69,9 @@ return /******/ (function(modules) { // webpackBootstrap
 
 	}
 
 	}
 
 
 
 	if (typeof _ == 'function' && typeof _.runInContext == 'function') {
 
 	if (typeof _ == 'function' && typeof _.runInContext == 'function') {
 
-	  _ = browserConvert(_.runInContext());
 
+      // XXX: Customization in order to be able to run both _ and fp in the
 
+      // non-AMD usecase.
 
+	  fp = browserConvert(_.runInContext());
 
 	}
 
 	}
 
 	module.exports = browserConvert;
 
 	module.exports = browserConvert;
 
 
 
@@ -1037,4 +1039,4 @@ return /******/ (function(modules) { // webpackBootstrap
 
 /***/ }
 
 /***/ }
 
 /******/ ])
 
 /******/ ])
 
 });
 
 });
 
-;
 
+;

+ 10 - 11
demo/without_bundled_dependencies.html
Ver ficheiro 

@@ -52,9 +52,10 @@
 
     <script type="text/javascript" src="../dist/locales.js"></script>
 
     <script type="text/javascript" src="../dist/locales.js"></script>
 
     <!-- END I18N -->
 
     <!-- END I18N -->
 
 
 
-    <script type="text/javascript" src="../node_modules/awesomplete/awesomplete.js"></script>
 
+    <script type="text/javascript" src="../node_modules/awesomplete-avoid-xss/awesomplete.js"></script>
 
     <script type="text/javascript" src="../node_modules/moment/min/moment-with-locales.js"></script>
 
     <script type="text/javascript" src="../node_modules/moment/min/moment-with-locales.js"></script>
 
 
 
+    <script type="text/javascript" src="../3rdparty/lodash.fp.js"></script>
 
 	<script src="../dist/converse-no-dependencies.js"></script>
 
 	<script src="../dist/converse-no-dependencies.js"></script>
 
 </head>
 
 </head>
 
 <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
 
 <body id="page-top" data-spy="scroll" data-target=".navbar-custom">
 
@@ -80,16 +81,14 @@
 
 </body>
 
 </body>
 
 
 
 <script>
 
 <script>
 
-    require(['converse'], function (converse) {
 
-        converse.initialize({
 
-            bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
 
-            i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
 
-            prebind: false,
 
-            show_controlbox_by_default: true,
 
-            debug: true,
 
-            roster_groups: true,
 
-            keepalive: true
 
-        });
 
+    converse.initialize({
 
+        bosh_service_url: 'https://conversejs.org/http-bind/', // Please use this connection manager only for testing purposes
 
+        i18n: locales.en, // Refer to ./locale/locales.js to see which locales are supported
 
+        prebind: false,
 
+        show_controlbox_by_default: true,
 
+        debug: true,
 
+        roster_groups: true,
 
+        keepalive: true
 
     });
 
     });
 
 </script>
 
 </script>
 
 </html>
 
 </html>

A diferenza do arquivo foi suprimida porque é demasiado grande
+ 0 - 1040
dist/converse-no-dependencies.js


+ 3 - 1
src/build-no-dependencies.js
Ver ficheiro 

@@ -36,7 +36,9 @@
 
         "strophe.vcard",
 
         "strophe.vcard",
 
         "strophe.ping",
 
         "strophe.ping",
 
         "otr",
 
         "otr",
 
-        "lodash"
 
+        "lodash",
 
+        "lodash.converter",
 
+        "lodash.noconflict"
 
     ],
 
     ],
 
     paths: {
 
     paths: {
 
         "converse-bookmarks":       "builds/converse-bookmarks",
 
         "converse-bookmarks":       "builds/converse-bookmarks",

+ 1 - 1
src/config.js
Ver ficheiro 

@@ -44,7 +44,7 @@ require.config({
 
         "typeahead":                "components/typeahead.js/index",
 
         "typeahead":                "components/typeahead.js/index",
 
         "underscore":               "src/underscore-shim",
 
         "underscore":               "src/underscore-shim",
 
         "utils":                    "src/utils",
 
         "utils":                    "src/utils",
 
-        "xss.noconflict":               "src/xss.noconflict",
 
+        "xss.noconflict":           "src/xss.noconflict",
 
         "xss":                      "node_modules/xss/dist/xss",
 
         "xss":                      "node_modules/xss/dist/xss",
 
 
 
         // Converse
 
         // Converse

+ 1 - 0
src/end-no-dependencies.frag
Ver ficheiro 

@@ -4,6 +4,7 @@
 
     define('jquery.browser', [], function () { return jQuery; });
 
     define('jquery.browser', [], function () { return jQuery; });
 
     define('awesomplete', [], function () { return jQuery; });
 
     define('awesomplete', [], function () { return jQuery; });
 
     define('lodash', [], function () { return _; });
 
     define('lodash', [], function () { return _; });
 
+    define('lodash.converter', [], function () { return fp; });
 
     define('lodash.noconflict', [], function () { return _; });
 
     define('lodash.noconflict', [], function () { return _; });
 
     define('moment_with_locales', [], function () { return moment; });
 
     define('moment_with_locales', [], function () { return moment; });
 
     define('strophe', [], function () {
 
     define('strophe', [], function () {

Algúns arquivos non se mostraron porque demasiados arquivos cambiaron neste cambio