Permalink
Browse files

Add support for jQuery 1.6 prop function.

  • Loading branch information...
1 parent ee1dee4 commit 90306449f7a14580f26162330f473fe172763855 @wvega wvega committed Jan 30, 2012
Showing with 3 additions and 1 deletion.
  1. +3 −1 jquery.timepicker.js
@@ -155,7 +155,9 @@ if(typeof jQuery != 'undefined') {
},
_hasScroll: function() {
- return this.ui.height() < this.ui.attr('scrollHeight');
+ // fix for jQuery 1.6 new prop method
+ m = typeof this.ui.prop !== 'undefined' ? 'prop' : 'attr';
+ return this.ui.height() < this.ui[m]('scrollHeight');
},
/**

0 comments on commit 9030644

Please sign in to comment.