diff options
| author | Scott González <scott.gonzalez@gmail.com> | 2012-04-23 16:33:34 -0400 |
|---|---|---|
| committer | Scott González <scott.gonzalez@gmail.com> | 2012-04-23 16:33:34 -0400 |
| commit | 0f575e03bb9af0b09d18a9207d9f589e05f44d50 (patch) | |
| tree | 18251a2d3e7c51adb8f265158ca0361f5cca73d1 /ui | |
| parent | af1576280a807dcc166ddf619abab1fc24cac664 (diff) | |
| parent | 9df981d268b4029065247cf230a4e988946b7799 (diff) | |
| download | jquery-ui-0f575e03bb9af0b09d18a9207d9f589e05f44d50.tar.gz jquery-ui-0f575e03bb9af0b09d18a9207d9f589e05f44d50.zip | |
Merge branch 'master' into position-notification
Conflicts:
tests/unit/position/position_core_within.js
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/.jshintrc | 17 | ||||
| -rw-r--r-- | ui/i18n/jquery.ui.datepicker-hi.js | 2 | ||||
| -rw-r--r-- | ui/jquery.effects.core.js | 2 | ||||
| -rw-r--r-- | ui/jquery.ui.accordion.js | 9 |
4 files changed, 24 insertions, 6 deletions
diff --git a/ui/.jshintrc b/ui/.jshintrc new file mode 100644 index 000000000..415d69e90 --- /dev/null +++ b/ui/.jshintrc @@ -0,0 +1,17 @@ +{ + "browser": true, + "curly": true, + "eqnull": true, + "eqeqeq": true, + "expr": true, + "jquery": true, + "latedef": true, + "noarg": true, + "onevar": true, + "smarttabs": true, + "trailing": true, + "undef": true, + "predef": [ + "Globalize" + ] +} diff --git a/ui/i18n/jquery.ui.datepicker-hi.js b/ui/i18n/jquery.ui.datepicker-hi.js index edc530679..6c563b997 100644 --- a/ui/i18n/jquery.ui.datepicker-hi.js +++ b/ui/i18n/jquery.ui.datepicker-hi.js @@ -9,7 +9,7 @@ jQuery(function($){ monthNames: ['जनवरी ','फरवरी','मार्च','अप्रेल','मई','जून', 'जूलाई','अगस्त ','सितम्बर','अक्टूबर','नवम्बर','दिसम्बर'], monthNamesShort: ['जन', 'फर', 'मार्च', 'अप्रेल', 'मई', 'जून', - 'जूलाई', 'अग', 'सित', अक्ट', 'नव', 'दि'], + 'जूलाई', 'अग', 'सित', 'अक्ट', 'नव', 'दि'], dayNames: ['रविवार', 'सोमवार', 'मंगलवार', 'बुधवार', 'गुरुवार', 'शुक्रवार', 'शनिवार'], dayNamesShort: ['रवि', 'सोम', 'मंगल', 'बुध', 'गुरु', 'शुक्र', 'शनि'], dayNamesMin: ['रवि', 'सोम', 'मंगल', 'बुध', 'गुरु', 'शुक्र', 'शनि'], diff --git a/ui/jquery.effects.core.js b/ui/jquery.effects.core.js index 626ab1a89..bac060067 100644 --- a/ui/jquery.effects.core.js +++ b/ui/jquery.effects.core.js @@ -722,7 +722,7 @@ $.each( baseEasings, function( name, easeIn ) { $.easing[ "easeInOut" + name ] = function( p ) { return p < 0.5 ? easeIn( p * 2 ) / 2 : - easeIn( p * -2 + 2 ) / -2 + 1; + 1 - easeIn( p * -2 + 2 ) / 2; }; }); diff --git a/ui/jquery.ui.accordion.js b/ui/jquery.ui.accordion.js index 00ecd1b64..81f74f0b9 100644 --- a/ui/jquery.ui.accordion.js +++ b/ui/jquery.ui.accordion.js @@ -12,10 +12,11 @@ * jquery.ui.widget.js */ (function( $, undefined ) { - var uid = 0, - hideProps = {}, - showProps = {}, - showPropsAdjust = {}; + +var uid = 0, + hideProps = {}, + showProps = {}, + showPropsAdjust = {}; hideProps.height = hideProps.paddingTop = hideProps.paddingBottom = hideProps.borderTopWidth = hideProps.borderBottomWidth = "hide"; |