Merge branch 'master' of git://github.com/billtrik/bonzo

Conflicts: bonzo.min.js
ded · Jul 25, 2012 · 2e2e3ea · 2e2e3ea
2 parents 43d5e46 + b243d8d
commit 2e2e3ea
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bonzo.js b/bonzo.js
@@ -768,7 +768,7 @@
               v = iter[k];
               // change "5" to "5px" - unless you're line-height, which is allowed
               (p = styleProperty(k)) && digit.test(v) && !(p in unitless) && (v += px)
-              el.style[p] = setter(el, v)
+              try { el.style[p] = setter(el, v) } catch(e) {}
             }
           }
         }
@@ -1124,4 +1124,4 @@
     }
 
   return bonzo
-}, this); // the only line we care about using a semi-colon. placed here for concatenation tools
+}, this); // the only line we care about using a semi-colon. placed here for concatenation tools