Merge remote-tracking branch 'origin/byId' into byId

ded · Dec 7, 2011 · 2db7540 · 2db7540
2 parents 46be74e + 69dc510
commit 2db7540
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 27 deletions.
diff --git a/integration/ender.min.js b/integration/ender.min.js
diff --git a/integration/integration.html b/integration/integration.html
@@ -23,4 +23,4 @@
       </ul>
     </div>
   </body>
-</html>
+</html>
diff --git a/src/ender.js b/src/ender.js
@@ -1,5 +1,5 @@
 !function (doc, $) {
-  var q = require('qwery'), b
+  var q = require('qwery')
 
   $.pseudos = q.pseudos
 
@@ -8,10 +8,15 @@
     // rather than load-time since technically it's not a dependency and
     // can be loaded in any order
     // hence the lazy function re-definition
-    $._select = !(b = require('bonzo')) ? q : function (s, r) {
-      return /^\s*</.test(s) ? b.create(s, r) : q(s, r)
-    }
-    return b && /^\s*</.test(s) ? b.create(s, r) : q(s, r)
+    return ($._select = (function(b) {
+      try {
+        b = require('bonzo')
+        return function (s, r) {
+          return /^\s*</.test(s) ? b.create(s, r) : q(s, r)
+        }
+      } catch (e) { }
+      return q
+    })())(s, r)
   }
 
   $.ender({