Conditionally load faye js

CHANGELOG.md

@@ -1,3 +1,7 @@
+## HEAD
+
+* Only load faye.js if the Faye object is not already present (thanks vollnhals)
+
 ## 1.0.3 (August 20, 2012)
 
 * fixed Faye startup error (thanks gitt) - issue #40

README.md

@@ -25,12 +25,15 @@ Next, start up Faye using the rackup file that was generated.
 rackup private_pub.ru -s thin -E production
 ```
 
-**In Rails 3.1** add the JavaScript file to your application.js file manifest.
+**In Rails 3.1 and above** add the JavaScript files to your application.js file manifest.
 
 ```javascript
+//= require faye
 //= require private_pub
 ```
 
+`faye.js` will be automatically loaded if you haven't added it to your `application.js` manifest.
+
 **In Rails 3.0** add the generated private_pub.js file to your layout.
 
 ```rhtml

app/assets/javascripts/private_pub.js

@@ -1,4 +1,4 @@
-function buildPrivatePub(doc) {
+var PrivatePub = (function (doc) {
   var self = {
     connecting: false,
     fayeClient: null,
@@ -13,11 +13,15 @@ function buildPrivatePub(doc) {
         self.fayeCallbacks.push(callback);
         if (self.subscriptions.server && !self.connecting) {
           self.connecting = true;
-          var script = doc.createElement("script");
-          script.type = "text/javascript";
-          script.src = self.subscriptions.server + ".js";
-          script.onload = self.connectToFaye;
-          doc.documentElement.appendChild(script);
+          if (typeof Faye === 'undefined') {
+            var script = doc.createElement("script");
+            script.type = "text/javascript";
+            script.src = self.subscriptions.server + ".js";
+            script.onload = self.connectToFaye;
+            doc.documentElement.appendChild(script);
+          } else {
+            self.connectToFaye();
+          }
         }
       }
     },
@@ -67,6 +71,4 @@ function buildPrivatePub(doc) {
     }
   };
   return self;
-}
-
-var PrivatePub = buildPrivatePub(document);
+}(document));