Merge pull request #81 from duzun/patch-2

Keep global scope clean with AMD. Always check for jQuery global.

src/ua-parser.js

@@ -739,15 +739,23 @@
         }
         exports.UAParser = UAParser;
     } else {
-        // browser env
+        // requirejs env
-        window.UAParser = UAParser;
-        // requirejs env (optional)
         if (typeof(define) === FUNC_TYPE && define.amd) {
             define(function () {
                 return UAParser;
             });
         }
+        else {
+            // browser env
+            window.UAParser = UAParser;
+        }
+    }
+
     // jQuery/Zepto specific (optional)
+    // Note: 
+    //   In AMD env the global scope should be kept clean, but jQuery is an exception.
+    //   jQuery always exports to global scope, unless jQuery.noConflict(true) is used,
+    //   and we should catch that.
     var $ = window.jQuery || window.Zepto;
     if (typeof($) !== UNDEF_TYPE) {
         var parser = new UAParser();
@@ -763,6 +771,5 @@
             }
         };
     }
-    }
 
 })(this);