Made _.noConflict conditional, changed standard example to use node m…

…odules instead of bower
postaljs · Jun 4, 2016 · 507ef4d · 507ef4d
1 parent 145f0c9
commit 507ef4d
Show file tree

Hide file tree

Showing 9 changed files with 23 additions and 13 deletions.
diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,8 @@
 # v2.x
 
+## v2.0.4
+* Conditionally calling _.noConflict (only if previous global._ was truthy and not equal to postal's lodash version)
+
 ## v2.0.3
 * Fixed lodash isEqual file name casing.
 

diff --git a/component.json b/component.json
@@ -2,7 +2,7 @@
     "name": "postal.js",
     "repo": "postaljs/postal.js",
     "description": "Client-side messaging library",
-    "version": "2.0.3",
+    "version": "2.0.4",
     "keywords": [
         "pub/sub",
         "pub",

diff --git a/example/standard/index.html b/example/standard/index.html
@@ -4,11 +4,10 @@
 <head>
 	<title>Postal Examples (Standard Lib Format)</title>
 	<link rel="stylesheet" type="text/css" href="style.css">
-	<script type="text/javascript" src="../../bower/lodash/dist/lodash.js"></script>
-	<script type="text/javascript" src="../../bower/jquery/jquery.min.js"></script>
-	<script type="text/javascript" src="../../bower/conduitjs/lib/conduit.min.js"></script>
+	<script type="text/javascript" src="../../node_modules/lodash/lodash.js"></script>
+	<script type="text/javascript" src="../../node_modules/jquery/dist/jquery.js"></script>
 	<script type="text/javascript" src="../../lib/postal.js"></script>
-	<script type="text/javascript" src="../../bower/postal.diagnostics/lib/postal.diagnostics.js"></script>
+	<script type="text/javascript" src="../../node_modules/postal.diagnostics/lib/postal.diagnostics.js"></script>
 	<script type="text/javascript" src="js/main.js"></script>
 </head>
 <body>

diff --git a/lib/postal.js b/lib/postal.js
@@ -1,7 +1,7 @@
 /**
  * postal - Pub/Sub library providing wildcard subscriptions, complex message handling, etc.  Works server and client-side.
  * Author: Jim Cowart (http://ifandelse.com)
- * Version: v2.0.3
+ * Version: v2.0.4
  * Url: http://github.com/postaljs/postal.js
  * License(s): MIT
  */
@@ -22,8 +22,11 @@
 		root.postal = factory( root._, root );
 	}
 }( this, function( _, global, undefined ) {
-	_ = _.noConflict();
 	var prevPostal = global && global.postal;
+	var prevLodash = global && global._;
+	if ( prevLodash && prevLodash !== _ ) {
+		_ = _.noConflict();
+	}
 	var _defaultConfig = {
 		DEFAULT_CHANNEL: "/",
 		SYSTEM_CHANNEL: "postal",

diff --git a/lib/postal.lodash.js b/lib/postal.lodash.js
@@ -1,7 +1,7 @@
 /**
  * postal - Pub/Sub library providing wildcard subscriptions, complex message handling, etc.  Works server and client-side.
  * Author: Jim Cowart (http://ifandelse.com)
- * Version: v2.0.3
+ * Version: v2.0.4
  * Url: http://github.com/postaljs/postal.js
  * License(s): MIT
  */

diff --git a/lib/postal.lodash.min.js b/lib/postal.lodash.min.js
diff --git a/lib/postal.min.js b/lib/postal.min.js
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "postal",
   "description": "Pub/Sub library providing wildcard subscriptions, complex message handling, etc.  Works server and client-side.",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "homepage": "http://github.com/postaljs/postal.js",
   "repository": {
     "type": "git",
@@ -115,10 +115,12 @@
     "gulp-uglify": "^1.2.0",
     "gulp-util": "~2.2.9",
     "istanbul": "^0.3.13",
+    "jquery": "^2.2.4",
     "jshint-stylish": "^1.0.2",
     "karma": "^0.12.31",
     "mocha": "^2.2.4",
     "open": "~0.0.4",
+    "postal.diagnostics": "^0.7.4",
     "should": "^6.0.1",
     "sinon": "~1.14.1"
   },

diff --git a/src/postal.js b/src/postal.js
@@ -15,8 +15,11 @@
 		root.postal = factory( root._, root );
 	}
 }( this, function( _, global, undefined ) {
-	_ = _.noConflict();
 	var prevPostal = global && global.postal;
+	var prevLodash = global && global._;
+	if ( prevLodash && prevLodash !== _ ) {
+		_ = _.noConflict();
+	}
 	var _defaultConfig = {
 		DEFAULT_CHANNEL: "/",
 		SYSTEM_CHANNEL: "postal",