diff options
| author | Felix Nagel <info@felixnagel.com> | 2017-08-26 13:08:14 +0200 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2017-08-26 13:08:14 +0200 |
| commit | 1b885ff76899fb70cce28371968d314ea74b7d7a (patch) | |
| tree | 1a3a19be9d874f9daffd1238950c073ec086ffc2 /demos | |
| parent | 2b611bad90fa6f19e3bf02912c6cd5c08903c993 (diff) | |
| parent | 74f8a0ac952f6f45f773312292baef1c26d81300 (diff) | |
| download | jquery-ui-1b885ff76899fb70cce28371968d314ea74b7d7a.tar.gz jquery-ui-1b885ff76899fb70cce28371968d314ea74b7d7a.zip | |
Merge branch 'master' into datepickerdatepicker
# Conflicts:
# ui/i18n/datepicker-pt.js
Diffstat (limited to 'demos')
| -rw-r--r-- | demos/autocomplete/combobox.html | 2 | ||||
| -rw-r--r-- | demos/effect/easing.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/demos/autocomplete/combobox.html b/demos/autocomplete/combobox.html index 403c48550..32c69b97a 100644 --- a/demos/autocomplete/combobox.html +++ b/demos/autocomplete/combobox.html @@ -48,7 +48,7 @@ .autocomplete({ delay: 0, minLength: 0, - source: $.proxy( this, "_source" ) + source: this._source.bind( this ) }) .tooltip({ classes: { diff --git a/demos/effect/easing.html b/demos/effect/easing.html index b22c69580..4bee1c41f 100644 --- a/demos/effect/easing.html +++ b/demos/effect/easing.html @@ -34,7 +34,7 @@ canvas.width = width; canvas.height = height; var drawHeight = height * 0.8, - cradius = 10; + cradius = 10, ctx = canvas.getContext( "2d" ); ctx.fillStyle = "black"; |