Skip to content

Commit f65d6b9

Browse files
jzaeffererjzaefferer
committed
Merge branch 'data-naming'
2 parents 63215a6 + 2321ae0 commit f65d6b9

File tree

8 files changed

+94
-61
lines changed

8 files changed

+94
-61
lines changed

‎tests/unit/widget/widget_core.js

Lines changed: 31 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -32,36 +32,36 @@ test( "element normalization", function() {
3232
// workaround for core ticket #8381
3333
this.element.appendTo( "#qunit-fixture" );
3434
ok( this.element.is( "div" ), "generated div" );
35-
deepEqual( this.element.data( "testWidget" ), this, "intance stored in .data()" );
35+
deepEqual( this.element.data( "ui-testWidget" ), this, "instance stored in .data()" );
3636
};
3737
$.ui.testWidget();
3838

3939
$.ui.testWidget.prototype.defaultElement = "<span data-test='pass'></span>";
4040
$.ui.testWidget.prototype._create = function() {
4141
ok( this.element.is( "span[data-test=pass]" ), "generated span with properties" );
42-
deepEqual( this.element.data( "testWidget" ), this, "instace stored in .data()" );
42+
deepEqual( this.element.data( "ui-testWidget" ), this, "instace stored in .data()" );
4343
};
4444
$.ui.testWidget();
4545

4646
elem = $( "<input>" );
4747
$.ui.testWidget.prototype._create = function() {
4848
deepEqual( this.element[ 0 ], elem[ 0 ], "from element" );
49-
deepEqual( elem.data( "testWidget" ), this, "instace stored in .data()" );
49+
deepEqual( elem.data( "ui-testWidget" ), this, "instace stored in .data()" );
5050
};
5151
$.ui.testWidget( {}, elem[ 0 ] );
5252

5353
elem = $( "<div>" );
5454
$.ui.testWidget.prototype._create = function() {
5555
deepEqual( this.element[ 0 ], elem[ 0 ], "from jQuery object" );
56-
deepEqual( elem.data( "testWidget" ), this, "instace stored in .data()" );
56+
deepEqual( elem.data( "ui-testWidget" ), this, "instace stored in .data()" );
5757
};
5858
$.ui.testWidget( {}, elem );
5959

6060
elem = $( "<div id='element-normalization-selector'></div>" )
6161
.appendTo( "#qunit-fixture" );
6262
$.ui.testWidget.prototype._create = function() {
6363
deepEqual( this.element[ 0 ], elem[ 0 ], "from selector" );
64-
deepEqual( elem.data( "testWidget" ), this, "instace stored in .data()" );
64+
deepEqual( elem.data( "ui-testWidget" ), this, "instace stored in .data()" );
6565
};
6666
$.ui.testWidget( {}, "#element-normalization-selector" );
6767

@@ -73,8 +73,16 @@ test( "element normalization", function() {
7373
$.ui.testWidget();
7474
});
7575

76+
test( "custom selector expression", function() {
77+
var elem = $( "<div>" ).appendTo( "#qunit-fixture" );
78+
$.widget( "ui.testWidget", {} );
79+
elem.testWidget();
80+
deepEqual( $( ":ui-testWidget" )[0], elem[0] );
81+
elem.testWidget( "destroy" );
82+
});
83+
7684
test( "jQuery usage", function() {
77-
expect( 13 );
85+
expect( 16 );
7886

7987
var shouldCreate = false;
8088

@@ -112,12 +120,18 @@ test( "jQuery usage", function() {
112120
.testWidget();
113121
shouldCreate = false;
114122

115-
var instance = elem.data( "testWidget" );
123+
var instance = elem.data( "ui-testWidget" );
116124
equal( typeof instance, "object", "instance stored in .data(pluginName)" );
117125
equal( instance.element[0], elem[0], "element stored on widget" );
118126
var ret = elem.testWidget( "methodWithParams", "value1", "value2" );
119127
equal( ret, elem, "jQuery object returned from method call" );
120128

129+
// 1.9 BC for #7810
130+
// TODO remove
131+
var bcInstance = elem.data("testWidget");
132+
equal( typeof bcInstance, "object", "instance stored in .data(pluginName)" );
133+
equal( bcInstance.element[0], elem[0], "element stored on widget" );
134+
121135
ret = elem.testWidget( "getterSetterMethod" );
122136
equal( ret, 5, "getter/setter can act as getter" );
123137
ret = elem.testWidget( "getterSetterMethod", 30 );
@@ -126,6 +140,9 @@ test( "jQuery usage", function() {
126140
ret = elem.testWidget( "jQueryObject" );
127141
equal( ret[ 0 ], document.body, "returned jQuery object" );
128142
equal( ret.end(), elem, "stack preserved" );
143+
144+
elem.testWidget( "destroy" );
145+
equal( elem.data( "ui-testWidget" ), null );
129146
});
130147

131148
test( "direct usage", function() {
@@ -160,7 +177,7 @@ test( "direct usage", function() {
160177
var instance = new $.ui.testWidget( {}, elem );
161178
shouldCreate = false;
162179

163-
equal( $( elem ).data( "testWidget" ), instance,
180+
equal( $( elem ).data( "ui-testWidget" ), instance,
164181
"instance stored in .data(pluginName)" );
165182
equal( instance.element[ 0 ], elem, "element stored on widget" );
166183

@@ -374,7 +391,7 @@ test( "._super()", function() {
374391
}
375392
});
376393

377-
instance = $( "<div>" ).testWidget3().data( "testWidget3" );
394+
instance = $( "<div>" ).testWidget3().data( "ui-testWidget3" );
378395
instance.method( 5 );
379396
delete $.ui.testWidget3;
380397
delete $.ui.testWidget2;
@@ -411,7 +428,7 @@ test( "._superApply()", function() {
411428
}
412429
});
413430

414-
instance = $( "<div>" ).testWidget3().data( "testWidget3" );
431+
instance = $( "<div>" ).testWidget3().data( "ui-testWidget3" );
415432
instance.method( 5, 10 );
416433
delete $.ui.testWidget3;
417434
delete $.ui.testWidget2;
@@ -521,7 +538,7 @@ test( ".option() - deep option setter", function() {
521538
$.widget( "ui.testWidget", {} );
522539
var div = $( "<div>" ).testWidget();
523540
function deepOption( from, to, msg ) {
524-
div.data( "testWidget" ).options.foo = from;
541+
div.data( "ui-testWidget" ).options.foo = from;
525542
$.ui.testWidget.prototype._setOption = function( key, value ) {
526543
deepEqual( key, "foo", msg + ": key" );
527544
deepEqual( value, to, msg + ": value" );
@@ -804,7 +821,7 @@ test( "._trigger() - no event, no ui", function() {
804821
deepEqual( ui, {}, "empty ui hash passed" );
805822
handlers.push( this );
806823
});
807-
deepEqual( $( "#widget" ).data( "testWidget" )._trigger( "foo" ), true,
824+
deepEqual( $( "#widget" ).data( "ui-testWidget" )._trigger( "foo" ), true,
808825
"_trigger returns true when event is not cancelled" );
809826
deepEqual( handlers, [
810827
$( "#widget" )[ 0 ],
@@ -832,7 +849,7 @@ test( "._trigger() - cancelled event", function() {
832849
ok( true, "event was triggered" );
833850
return false;
834851
});
835-
deepEqual( $( "#widget" ).data( "testWidget" )._trigger( "foo" ), false,
852+
deepEqual( $( "#widget" ).data( "ui-testWidget" )._trigger( "foo" ), false,
836853
"_trigger returns false when event is cancelled" );
837854
});
838855

@@ -846,7 +863,7 @@ test( "._trigger() - cancelled callback", function() {
846863
return false;
847864
}
848865
});
849-
deepEqual( $( "#widget" ).data( "testWidget" )._trigger( "foo" ), false,
866+
deepEqual( $( "#widget" ).data( "ui-testWidget" )._trigger( "foo" ), false,
850867
"_trigger returns false when callback returns false" );
851868
});
852869

‎ui/jquery.effects.core.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ var classAnimationActions = [ "add", "remove", "toggle" ],
159159
padding: 1
160160
},
161161
// prefix used for storing data on .data()
162-
dataSpace = "ec.storage.";
162+
dataSpace = "ui-effects-";
163163

164164
$.each([ "borderLeftStyle", "borderRightStyle", "borderBottomStyle", "borderTopStyle" ], function( _, prop ) {
165165
$.fx.step[ prop ] = function( fx ) {
@@ -689,7 +689,7 @@ $.extend( baseEasings, {
689689
Bounce: function ( p ) {
690690
var pow2,
691691
bounce = 4;
692-
692+
693693
while ( p < ( ( pow2 = Math.pow( 2, --bounce ) ) - 1 ) / 11 ) {}
694694
return 1 / Math.pow( 4, 3 - bounce ) - 7.5625 * Math.pow( ( pow2 * 3 - 2 ) / 22 - p, 2 );
695695
}

‎ui/jquery.ui.accordion.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -405,7 +405,7 @@ $.widget( "ui.accordion", {
405405
animate = this.options.animate || {},
406406
options = down && animate.down || animate,
407407
complete = function() {
408-
toShow.removeData( "accordionHeight" );
408+
toShow.removeData( "ui-accordion-height" );
409409
that._completed( data );
410410
};
411411

@@ -430,7 +430,7 @@ $.widget( "ui.accordion", {
430430
toHide.animate( hideProps, duration, easing );
431431
toShow
432432
.hide()
433-
.data( "accordionHeight", {
433+
.data( "ui-accordion-height", {
434434
total: total,
435435
toHide: toHide
436436
})
@@ -455,7 +455,7 @@ $.widget( "ui.accordion", {
455455

456456
$.fx.step.accordionHeight = function( fx ) {
457457
var elem = $( fx.elem ),
458-
data = elem.data( "accordionHeight" );
458+
data = elem.data( "ui-accordion-height" );
459459
elem.height( data.total - elem.outerHeight() - data.toHide.outerHeight() + elem.height() );
460460
};
461461
var hideProps = {},

‎ui/jquery.ui.autocomplete.js

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,9 @@ $.widget( "ui.autocomplete", {
225225
// custom key handling for now
226226
input: $(),
227227
focus: function( event, ui ) {
228-
var item = ui.item.data( "item.autocomplete" );
228+
// back compat for _renderItem using item.autocomplete, via #7810
229+
// TODO remove the fallback, see #8156
230+
var item = ui.item.data( "ui-autocomplete-item" ) || ui.item.data( "item.autocomplete" );
229231
if ( false !== self._trigger( "focus", event, { item: item } ) ) {
230232
// use value to match what will end up in the input, if it was a key event
231233
if ( /^key/.test(event.originalEvent.type) ) {
@@ -234,7 +236,9 @@ $.widget( "ui.autocomplete", {
234236
}
235237
},
236238
select: function( event, ui ) {
237-
var item = ui.item.data( "item.autocomplete" ),
239+
// back compat for _renderItem using item.autocomplete, via #7810
240+
// TODO remove the fallback, see #8156
241+
var item = ui.item.data( "ui-autocomplete-item" ) || ui.item.data( "item.autocomplete" );
238242
previous = self.previous;
239243

240244
// only trigger when focus was lost (click on menu)
@@ -470,13 +474,16 @@ $.widget( "ui.autocomplete", {
470474
_renderMenu: function( ul, items ) {
471475
var self = this;
472476
$.each( items, function( index, item ) {
473-
self._renderItem( ul, item );
477+
self._renderItemData( ul, item );
474478
});
475479
},
476480

477-
_renderItem: function( ul, item) {
481+
_renderItemData: function( ul, item ) {
482+
return this._renderItem( ul, item ).data( "ui-autocomplete-item", item );
483+
},
484+
485+
_renderItem: function( ul, item ) {
478486
return $( "<li></li>" )
479-
.data( "item.autocomplete", item )
480487
.append( $( "<a></a>" ).text( item.label ) )
481488
.appendTo( ul );
482489
},

‎ui/jquery.ui.slider.js

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ $.widget( "ui.slider", $.ui.mouse, {
7474
.addClass( "ui-slider-range" +
7575
// note: this isn't the most fittingly semantic framework class for this element,
7676
// but worked best visually with a variety of themes
77-
" ui-widget-header" +
77+
" ui-widget-header" +
7878
( ( o.range === "min" || o.range === "max" ) ? " ui-slider-range-" + o.range : "" ) );
7979
}
8080

@@ -110,21 +110,21 @@ $.widget( "ui.slider", $.ui.mouse, {
110110
});
111111

112112
this.handles.each(function( i ) {
113-
$( this ).data( "index.ui-slider-handle", i );
113+
$( this ).data( "ui-slider-handle-index", i );
114114
});
115115

116116
this.handles
117117
.keydown(function( event ) {
118-
var index = $( this ).data( "index.ui-slider-handle" ),
118+
var index = $( this ).data( "ui-slider-handle-index" ),
119119
allowed,
120120
curVal,
121121
newVal,
122122
step;
123-
123+
124124
if ( self.options.disabled ) {
125125
return;
126126
}
127-
127+
128128
switch ( event.keyCode ) {
129129
case $.ui.keyCode.HOME:
130130
case $.ui.keyCode.END:
@@ -145,14 +145,14 @@ $.widget( "ui.slider", $.ui.mouse, {
145145
}
146146
break;
147147
}
148-
148+
149149
step = self.options.step;
150150
if ( self.options.values && self.options.values.length ) {
151151
curVal = newVal = self.values( index );
152152
} else {
153153
curVal = newVal = self.value();
154154
}
155-
155+
156156
switch ( event.keyCode ) {
157157
case $.ui.keyCode.HOME:
158158
newVal = self._valueMin();
@@ -181,19 +181,19 @@ $.widget( "ui.slider", $.ui.mouse, {
181181
newVal = self._trimAlignValue( curVal - step );
182182
break;
183183
}
184-
184+
185185
self._slide( event, index, newVal );
186186
})
187187
.keyup(function( event ) {
188-
var index = $( this ).data( "index.ui-slider-handle" );
189-
188+
var index = $( this ).data( "ui-slider-handle-index" );
189+
190190
if ( self._keySliding ) {
191191
self._keySliding = false;
192192
self._stop( event, index );
193193
self._change( event, index );
194194
$( this ).removeClass( "ui-state-active" );
195195
}
196-
196+
197197
});
198198

199199
this._refreshValue();
@@ -275,7 +275,7 @@ $.widget( "ui.slider", $.ui.mouse, {
275275
closestHandle
276276
.addClass( "ui-state-active" )
277277
.focus();
278-
278+
279279
offset = closestHandle.offset();
280280
mouseOverHandle = !$( event.target ).parents().andSelf().is( ".ui-slider-handle" );
281281
this._clickOffset = mouseOverHandle ? { left: 0, top: 0 } : {
@@ -301,7 +301,7 @@ $.widget( "ui.slider", $.ui.mouse, {
301301
_mouseDrag: function( event ) {
302302
var position = { x: event.pageX, y: event.pageY },
303303
normValue = this._normValueFromMouse( position );
304-
304+
305305
this._slide( event, this._handleIndex, normValue );
306306

307307
return false;
@@ -320,7 +320,7 @@ $.widget( "ui.slider", $.ui.mouse, {
320320

321321
return false;
322322
},
323-
323+
324324
_detectOrientation: function() {
325325
this.orientation = ( this.options.orientation === "vertical" ) ? "vertical" : "horizontal";
326326
},
@@ -377,7 +377,7 @@ $.widget( "ui.slider", $.ui.mouse, {
377377
if ( this.options.values && this.options.values.length ) {
378378
otherVal = this.values( index ? 0 : 1 );
379379

380-
if ( ( this.options.values.length === 2 && this.options.range === true ) &&
380+
if ( ( this.options.values.length === 2 && this.options.range === true ) &&
381381
( ( index === 0 && newVal > otherVal) || ( index === 1 && newVal < otherVal ) )
382382
) {
383383
newVal = otherVal;
@@ -562,7 +562,7 @@ $.widget( "ui.slider", $.ui.mouse, {
562562
return vals;
563563
}
564564
},
565-
565+
566566
// returns the step-aligned value that val is closest to, between (inclusive) min and max
567567
_trimAlignValue: function( val ) {
568568
if ( val <= this._valueMin() ) {
@@ -591,7 +591,7 @@ $.widget( "ui.slider", $.ui.mouse, {
591591
_valueMax: function() {
592592
return this.options.max;
593593
},
594-
594+
595595
_refreshValue: function() {
596596
var oRange = this.options.range,
597597
o = this.options,

0 commit comments

Comments
 (0)