Explicitly define AMD modules to prevent errors with AlmondJS and Ang…

…ularJS
strophe · Mar 22, 2015 · fb717ab · fb717ab
1 parent 9e285ea
commit fb717ab
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 16 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Strophe.js Change Log
 
+## Version 1.2.2 - 2015-03-22
+* Explicitly define AMD modules to prevent errors with AlmondJS and AngularJS
+
 ## Version 1.2.1 - 2015-02-22 
 * Rerelease of 1.2.0 but with a semver tag and proper formatting of bower.json
   for usage with Bower.io.

diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "strophe.js",
   "description": "Strophe.js is an XMPP library for JavaScript",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "homepage": "http://strophe.im/strophejs",
   "repository": {
     "type": "git",

diff --git a/src/base64.js b/src/base64.js
@@ -5,7 +5,7 @@
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define(function () {
+        define('strophe-base64', function () {
             return factory();
         });
     } else {

diff --git a/src/bosh.js b/src/bosh.js
@@ -11,7 +11,7 @@
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define(['strophe-core'], function (core) {
+        define('strophe-bosh', ['strophe-core'], function (core) {
             return factory(
                 core.Strophe,
                 core.$build

diff --git a/src/core.js b/src/core.js
@@ -11,7 +11,7 @@
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define([
+        define('strophe-core', [
             'strophe-sha1',
             'strophe-base64',
             'strophe-md5',

diff --git a/src/md5.js b/src/md5.js
@@ -14,7 +14,7 @@
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define(function () {
+        define('strophe-md5', function () {
             return factory();
         });
     } else {

diff --git a/src/sha1.js b/src/sha1.js
@@ -15,7 +15,7 @@
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define(function () {
+        define('strophe-sha1', function () {
             return factory();
         });
     } else {

diff --git a/src/websocket.js b/src/websocket.js
@@ -11,7 +11,7 @@
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define(['strophe-core'], function (core) {
+        define('strophe-websocket', ['strophe-core'], function (core) {
             return factory(
                 core.Strophe,
                 core.$build

diff --git a/strophe.js b/strophe.js
@@ -29,7 +29,7 @@
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define(function () {
+        define('strophe-base64', function () {
             return factory();
         });
     } else {
@@ -130,7 +130,7 @@
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define(function () {
+        define('strophe-sha1', function () {
             return factory();
         });
     } else {
@@ -326,7 +326,7 @@ return {
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define(function () {
+        define('strophe-md5', function () {
             return factory();
         });
     } else {
@@ -630,7 +630,7 @@ if (!Array.prototype.indexOf)
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define([
+        define('strophe-core', [
             'strophe-sha1',
             'strophe-base64',
             'strophe-md5',
@@ -3927,7 +3927,7 @@ return {
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define(['strophe-core'], function (core) {
+        define('strophe-bosh', ['strophe-core'], function (core) {
             return factory(
                 core.Strophe,
                 core.$build
@@ -4797,7 +4797,7 @@ return Strophe;
 (function (root, factory) {
     if (typeof define === 'function' && define.amd) {
         // AMD. Register as an anonymous module.
-        define(['strophe-core'], function (core) {
+        define('strophe-websocket', ['strophe-core'], function (core) {
             return factory(
                 core.Strophe,
                 core.$build

diff --git a/strophe.min.js b/strophe.min.js