diff options
| author | Felix Nagel <info@felixnagel.com> | 2012-12-20 22:05:23 +0100 |
|---|---|---|
| committer | Felix Nagel <info@felixnagel.com> | 2012-12-20 22:05:23 +0100 |
| commit | 44e472a6134be8382a4809a1bfa34e864b63ad52 (patch) | |
| tree | 820c0d2e4ec487af16cc36ba819e4d8538e4a714 | |
| parent | dab7bf89933c15132b81eaee46a0220357fb27cd (diff) | |
| parent | e21fc296102c2b8b159404c378cf39470da9a13e (diff) | |
| download | jquery-ui-44e472a6134be8382a4809a1bfa34e864b63ad52.tar.gz jquery-ui-44e472a6134be8382a4809a1bfa34e864b63ad52.zip | |
Merge branch 'master' into selectmenu
| -rw-r--r-- | tests/.jshintrc | 1 | ||||
| -rw-r--r-- | ui/jquery.ui.datepicker.js | 14 |
2 files changed, 3 insertions, 12 deletions
diff --git a/tests/.jshintrc b/tests/.jshintrc index 59ae11530..44e23699f 100644 --- a/tests/.jshintrc +++ b/tests/.jshintrc @@ -22,6 +22,7 @@ "Globalize", "module", "notEqual", + "notStrictEqual", "ok", "QUnit", "start", diff --git a/ui/jquery.ui.datepicker.js b/ui/jquery.ui.datepicker.js index 4ab1fa201..e3a9286dd 100644 --- a/ui/jquery.ui.datepicker.js +++ b/ui/jquery.ui.datepicker.js @@ -175,12 +175,7 @@ $.extend(Datepicker.prototype, { } this._attachments(input, inst); input.addClass(this.markerClassName).keydown(this._doKeyDown). - keypress(this._doKeyPress).keyup(this._doKeyUp). - bind("setData.datepicker", function(event, key, value) { - inst.settings[key] = value; - }).bind("getData.datepicker", function(event, key) { - return this._get(inst, key); - }); + keypress(this._doKeyPress).keyup(this._doKeyUp); this._autoSize(inst); $.data(target, PROP_NAME, inst); //If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665) @@ -271,12 +266,7 @@ $.extend(Datepicker.prototype, { if (divSpan.hasClass(this.markerClassName)) { return; } - divSpan.addClass(this.markerClassName).append(inst.dpDiv). - bind("setData.datepicker", function(event, key, value){ - inst.settings[key] = value; - }).bind("getData.datepicker", function(event, key){ - return this._get(inst, key); - }); + divSpan.addClass(this.markerClassName).append(inst.dpDiv); $.data(target, PROP_NAME, inst); this._setDate(inst, this._getDefaultDate(inst), true); this._updateDatepicker(inst); |