Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information...
2 parents dab7bf8 + e21fc29 commit 44e472a6134be8382a4809a1bfa34e864b63ad52 @fnagel fnagel committed Dec 20, 2012
Showing with 3 additions and 12 deletions.
  1. +1 −0 tests/.jshintrc
  2. +2 −12 ui/jquery.ui.datepicker.js
View
@@ -22,6 +22,7 @@
"Globalize",
"module",
"notEqual",
+ "notStrictEqual",
"ok",
"QUnit",
"start",
View
@@ -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);

0 comments on commit 44e472a

Please sign in to comment.