Skip to content

Commit 8a9fb52

Browse files
committed
Datepicker: Prefix variables with component name.
1 parent 46b8915 commit 8a9fb52

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

ui/jquery.ui.datepicker.js

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@
1515

1616
$.extend($.ui, { datepicker: { version: "@VERSION" } });
1717

18-
var PROP_NAME = "datepicker",
19-
instActive;
18+
var datepicker_instActive;
2019

21-
function getZindex( elem ) {
20+
function datepicker_getZindex( elem ) {
2221
var position, value;
2322
while ( elem.length && elem[ 0 ] !== document ) {
2423
// Ignore z-index if position is set to a value where z-index is ignored by the browser
@@ -130,7 +129,7 @@ function Datepicker() {
130129
disabled: false // The initial disabled state
131130
};
132131
$.extend(this._defaults, this.regional[""]);
133-
this.dpDiv = bindHover($("<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"));
132+
this.dpDiv = datepicker_bindHover($("<div id='" + this._mainDivId + "' class='ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>"));
134133
}
135134

136135
$.extend(Datepicker.prototype, {
@@ -150,7 +149,7 @@ $.extend(Datepicker.prototype, {
150149
* @return the manager object
151150
*/
152151
setDefaults: function(settings) {
153-
extendRemove(this._defaults, settings || {});
152+
datepicker_extendRemove(this._defaults, settings || {});
154153
return this;
155154
},
156155

@@ -183,7 +182,7 @@ $.extend(Datepicker.prototype, {
183182
drawMonth: 0, drawYear: 0, // month being drawn
184183
inline: inline, // is datepicker inline or not
185184
dpDiv: (!inline ? this.dpDiv : // presentation div
186-
bindHover($("<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")))};
185+
datepicker_bindHover($("<div class='" + this._inlineClass + " ui-datepicker ui-widget ui-widget-content ui-helper-clearfix ui-corner-all'></div>")))};
187186
},
188187

189188
/* Attach the date picker to an input field. */
@@ -198,7 +197,7 @@ $.extend(Datepicker.prototype, {
198197
input.addClass(this.markerClassName).keydown(this._doKeyDown).
199198
keypress(this._doKeyPress).keyup(this._doKeyUp);
200199
this._autoSize(inst);
201-
$.data(target, PROP_NAME, inst);
200+
$.data(target, "datepicker", inst);
202201
//If disabled option is true, disable the datepicker once it has been attached to the input (see ticket #5665)
203202
if( inst.settings.disabled ) {
204203
this._disableDatepicker( target );
@@ -288,7 +287,7 @@ $.extend(Datepicker.prototype, {
288287
return;
289288
}
290289
divSpan.addClass(this.markerClassName).append(inst.dpDiv);
291-
$.data(target, PROP_NAME, inst);
290+
$.data(target, "datepicker", inst);
292291
this._setDate(inst, this._getDefaultDate(inst), true);
293292
this._updateDatepicker(inst);
294293
this._updateAlternate(inst);
@@ -324,9 +323,9 @@ $.extend(Datepicker.prototype, {
324323
$("body").append(this._dialogInput);
325324
inst = this._dialogInst = this._newInst(this._dialogInput, false);
326325
inst.settings = {};
327-
$.data(this._dialogInput[0], PROP_NAME, inst);
326+
$.data(this._dialogInput[0], "datepicker", inst);
328327
}
329-
extendRemove(inst.settings, settings || {});
328+
datepicker_extendRemove(inst.settings, settings || {});
330329
date = (date && date.constructor === Date ? this._formatDate(inst, date) : date);
331330
this._dialogInput.val(date);
332331

@@ -349,7 +348,7 @@ $.extend(Datepicker.prototype, {
349348
if ($.blockUI) {
350349
$.blockUI(this.dpDiv);
351350
}
352-
$.data(this._dialogInput[0], PROP_NAME, inst);
351+
$.data(this._dialogInput[0], "datepicker", inst);
353352
return this;
354353
},
355354

@@ -359,14 +358,14 @@ $.extend(Datepicker.prototype, {
359358
_destroyDatepicker: function(target) {
360359
var nodeName,
361360
$target = $(target),
362-
inst = $.data(target, PROP_NAME);
361+
inst = $.data(target, "datepicker");
363362

364363
if (!$target.hasClass(this.markerClassName)) {
365364
return;
366365
}
367366

368367
nodeName = target.nodeName.toLowerCase();
369-
$.removeData(target, PROP_NAME);
368+
$.removeData(target, "datepicker");
370369
if (nodeName === "input") {
371370
inst.append.remove();
372371
inst.trigger.remove();
@@ -386,7 +385,7 @@ $.extend(Datepicker.prototype, {
386385
_enableDatepicker: function(target) {
387386
var nodeName, inline,
388387
$target = $(target),
389-
inst = $.data(target, PROP_NAME);
388+
inst = $.data(target, "datepicker");
390389

391390
if (!$target.hasClass(this.markerClassName)) {
392391
return;
@@ -414,7 +413,7 @@ $.extend(Datepicker.prototype, {
414413
_disableDatepicker: function(target) {
415414
var nodeName, inline,
416415
$target = $(target),
417-
inst = $.data(target, PROP_NAME);
416+
inst = $.data(target, "datepicker");
418417

419418
if (!$target.hasClass(this.markerClassName)) {
420419
return;
@@ -460,7 +459,7 @@ $.extend(Datepicker.prototype, {
460459
*/
461460
_getInst: function(target) {
462461
try {
463-
return $.data(target, PROP_NAME);
462+
return $.data(target, "datepicker");
464463
}
465464
catch (err) {
466465
throw "Missing instance data for this datepicker";
@@ -500,7 +499,7 @@ $.extend(Datepicker.prototype, {
500499
date = this._getDateDatepicker(target, true);
501500
minDate = this._getMinMaxDate(inst, "min");
502501
maxDate = this._getMinMaxDate(inst, "max");
503-
extendRemove(inst.settings, settings);
502+
datepicker_extendRemove(inst.settings, settings);
504503
// reformat the old minDate/maxDate values if dateFormat changes and a new minDate/maxDate isn't provided
505504
if (minDate !== null && settings.dateFormat !== undefined && settings.minDate === undefined) {
506505
inst.settings.minDate = this._formatDate(inst, minDate);
@@ -728,7 +727,7 @@ $.extend(Datepicker.prototype, {
728727
if(beforeShowSettings === false){
729728
return;
730729
}
731-
extendRemove(inst.settings, beforeShowSettings);
730+
datepicker_extendRemove(inst.settings, beforeShowSettings);
732731

733732
inst.lastVal = null;
734733
$.datepicker._lastInput = input;
@@ -765,7 +764,7 @@ $.extend(Datepicker.prototype, {
765764
if (!inst.inline) {
766765
showAnim = $.datepicker._get(inst, "showAnim");
767766
duration = $.datepicker._get(inst, "duration");
768-
inst.dpDiv.css( "z-index", getZindex( $( input ) ) + 1 );
767+
inst.dpDiv.css( "z-index", datepicker_getZindex( $( input ) ) + 1 );
769768
$.datepicker._datepickerShowing = true;
770769

771770
if ( $.effects && $.effects.effect[ showAnim ] ) {
@@ -785,7 +784,7 @@ $.extend(Datepicker.prototype, {
785784
/* Generate the date picker content. */
786785
_updateDatepicker: function(inst) {
787786
this.maxRows = 4; //Reset the max number of rows being displayed (see #7043)
788-
instActive = inst; // for delegate hover events
787+
datepicker_instActive = inst; // for delegate hover events
789788
inst.dpDiv.empty().append(this._generateHTML(inst));
790789
this._attachHandlers(inst);
791790
inst.dpDiv.find("." + this._dayOverClass + " a").mouseover();
@@ -871,7 +870,7 @@ $.extend(Datepicker.prototype, {
871870
var showAnim, duration, postProcess, onClose,
872871
inst = this._curInst;
873872

874-
if (!inst || (input && inst !== $.data(input, PROP_NAME))) {
873+
if (!inst || (input && inst !== $.data(input, "datepicker"))) {
875874
return;
876875
}
877876

@@ -1975,9 +1974,9 @@ $.extend(Datepicker.prototype, {
19751974
/*
19761975
* Bind hover events for datepicker elements.
19771976
* Done via delegate so the binding only occurs once in the lifetime of the parent div.
1978-
* Global instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
1977+
* Global datepicker_instActive, set by _updateDatepicker allows the handlers to find their way back to the active picker.
19791978
*/
1980-
function bindHover(dpDiv) {
1979+
function datepicker_bindHover(dpDiv) {
19811980
var selector = "button, .ui-datepicker-prev, .ui-datepicker-next, .ui-datepicker-calendar td a";
19821981
return dpDiv.delegate(selector, "mouseout", function() {
19831982
$(this).removeClass("ui-state-hover");
@@ -1989,7 +1988,7 @@ function bindHover(dpDiv) {
19891988
}
19901989
})
19911990
.delegate(selector, "mouseover", function(){
1992-
if (!$.datepicker._isDisabledDatepicker( instActive.inline ? dpDiv.parent()[0] : instActive.input[0])) {
1991+
if (!$.datepicker._isDisabledDatepicker( datepicker_instActive.inline ? dpDiv.parent()[0] : datepicker_instActive.input[0])) {
19931992
$(this).parents(".ui-datepicker-calendar").find("a").removeClass("ui-state-hover");
19941993
$(this).addClass("ui-state-hover");
19951994
if (this.className.indexOf("ui-datepicker-prev") !== -1) {
@@ -2003,7 +2002,7 @@ function bindHover(dpDiv) {
20032002
}
20042003

20052004
/* jQuery extend now ignores nulls! */
2006-
function extendRemove(target, props) {
2005+
function datepicker_extendRemove(target, props) {
20072006
$.extend(target, props);
20082007
for (var name in props) {
20092008
if (props[name] == null) {

0 commit comments

Comments
 (0)