Permalink
Browse files

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

  • Loading branch information...
2 parents 46be74e + 69dc510 commit 2db75403f733c336d6a4380f329d5e5b737b40d8 @rvagg rvagg committed Dec 7, 2011
Showing with 11 additions and 27 deletions.
  1. +0 −21 integration/ender.min.js
  2. +1 −1 integration/integration.html
  3. +10 −5 src/ender.js
View

Some generated files are not rendered by default. Learn more.

Oops, something went wrong.
@@ -23,4 +23,4 @@
</ul>
</div>
</body>
-</html>
+</html>
View
@@ -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({

0 comments on commit 2db7540

Please sign in to comment.