Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Updated all widgets to use proper data keys when getting plugin insta… 
…nces.
  • Loading branch information
@scottgonzalez @MatteS75
scottgonzalez authored and MatteS75 committed Nov 15, 2012
1 parent 618844a commit 1624bf5
Show file tree
Hide file tree
Showing 12 changed files with 54 additions and 54 deletions.
4 changes: 2 additions & 2 deletions tests/unit/autocomplete/autocomplete_core.js
View file
Expand Up @@ -99,7 +99,7 @@ test( "allow form submit on enter when menu is not active", function() {
delay: 0,
minLength: 0
});
element.data( "autocomplete" )._move = function() {
element.data( "ui-autocomplete" )._move = function() {
didMove = true;
};
element.simulate( "keydown", { keyCode: ( isKeyUp ? $.ui.keyCode.UP : $.ui.keyCode.DOWN ) } );
Expand All @@ -114,7 +114,7 @@ test( "allow form submit on enter when menu is not active", function() {
delay: 0,
minLength: 0
});
element.data( "autocomplete" )._move = function() {
element.data( "ui-autocomplete" )._move = function() {
ok( true, "repsond to arrow" );
};
element.autocomplete( "search" );
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/dialog/dialog_events.js
View file
Expand Up @@ -11,7 +11,7 @@ test("open", function() {
var el = $("<div></div>");
el.dialog({
open: function(ev, ui) {
ok(el.data("dialog")._isOpen, "interal _isOpen flag is set");
ok(el.data("ui-dialog")._isOpen, "interal _isOpen flag is set");
ok(true, 'autoOpen: true fires open callback');
equal(this, el[0], "context of callback");
equal(ev.type, 'dialogopen', 'event type in callback');
Expand All @@ -30,7 +30,7 @@ test("open", function() {
deepEqual(ui, {}, 'ui hash in callback');
}
}).bind('dialogopen', function(ev, ui) {
ok(el.data("dialog")._isOpen, "interal _isOpen flag is set");
ok(el.data("ui-dialog")._isOpen, "interal _isOpen flag is set");
ok(true, 'dialog("open") fires open event');
equal(this, el[0], 'context of event');
deepEqual(ui, {}, 'ui hash in event');
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/draggable/draggable_events.js
View file
Expand Up @@ -79,7 +79,7 @@ test("stopping the stop callback", function() {

TestHelpers.draggable.drag(el, 10, 10);

ok($("#draggable2").data('draggable').helper, "the clone should not be deleted if the stop callback is stopped");
ok($("#draggable2").data('ui-draggable').helper, "the clone should not be deleted if the stop callback is stopped");


});
Expand Down
6 changes: 3 additions & 3 deletions tests/unit/tabs/tabs_core.js
View file
Expand Up @@ -33,7 +33,7 @@ test( "nested list", function() {
expect( 1 );

var element = $( "#tabs6" ).tabs();
equal( element.data( "tabs" ).anchors.length, 2, "should contain 2 tab" );
equal( element.data( "ui-tabs" ).anchors.length, 2, "should contain 2 tab" );
});

test( "disconnected from DOM", function() {
Expand Down Expand Up @@ -155,7 +155,7 @@ asyncTest( "keyboard support - LEFT, RIGHT, UP, DOWN, HOME, END, SPACE, ENTER",
panels = element.find( ".ui-tabs-panel" ),
keyCode = $.ui.keyCode;

element.data( "tabs" ).delay = 50;
element.data( "ui-tabs" ).delay = 50;

equal( tabs.filter( ".ui-state-focus" ).length, 0, "no tabs focused on init" );
tabs.eq( 0 ).simulate( "focus" );
Expand Down Expand Up @@ -306,7 +306,7 @@ asyncTest( "keyboard support - CTRL navigation", function() {
panels = element.find( ".ui-tabs-panel" ),
keyCode = $.ui.keyCode;

element.data( "tabs" ).delay = 50;
element.data( "ui-tabs" ).delay = 50;

equal( tabs.filter( ".ui-state-focus" ).length, 0, "no tabs focused on init" );
tabs.eq( 0 ).simulate( "focus" );
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/tabs/tabs_options.js
View file
Expand Up @@ -290,7 +290,7 @@ test( "hide and show: false", function() {
show: false,
hide: false
}),
widget = element.data( "tabs" ),
widget = element.data( "ui-tabs" ),
panels = element.find( ".ui-tabs-panel" );
widget._show = function() {
ok( false, "_show() called" );
Expand All @@ -311,7 +311,7 @@ asyncTest( "hide and show - animation", function() {
show: "drop",
hide: 2000
}),
widget = element.data( "tabs" ),
widget = element.data( "ui-tabs" ),
panels = element.find( ".ui-tabs-panel" );
widget._show = function( element, options, callback ) {
strictEqual( element[ 0 ], panels[ 1 ], "correct element in _show()" );
Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.ui.autocomplete.js
View file
Expand Up @@ -190,7 +190,7 @@ $.widget( "ui.autocomplete", {
})
.zIndex( this.element.zIndex() + 1 )
.hide()
.data( "menu" );
.data( "ui-menu" );

this._on( this.menu.element, {
mousedown: function( event ) {
Expand Down
2 changes: 1 addition & 1 deletion ui/jquery.ui.button.js
View file
Expand Up @@ -358,7 +358,7 @@ $.widget( "ui.button", {
$.widget( "ui.buttonset", {
version: "@VERSION",
options: {
items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(button)"
items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
},

_create: function() {
Expand Down
8 changes: 4 additions & 4 deletions ui/jquery.ui.dialog.js
View file
Expand Up @@ -516,7 +516,7 @@ $.widget("ui.dialog", {
if ( resize ) {
this._size();
}
if ( this.uiDialog.is( ":data(resizable)" ) ) {
if ( this.uiDialog.is( ":data(ui-resizable)" ) ) {
this.uiDialog.resizable( "option", resizableOptions );
}
},
Expand Down Expand Up @@ -546,7 +546,7 @@ $.widget("ui.dialog", {
}
break;
case "draggable":
isDraggable = uiDialog.is( ":data(draggable)" );
isDraggable = uiDialog.is( ":data(ui-draggable)" );
if ( isDraggable && !value ) {
uiDialog.draggable( "destroy" );
}
Expand All @@ -560,7 +560,7 @@ $.widget("ui.dialog", {
break;
case "resizable":
// currently resizable, becoming non-resizable
isResizable = uiDialog.is( ":data(resizable)" );
isResizable = uiDialog.is( ":data(ui-resizable)" );
if ( isResizable && !value ) {
uiDialog.resizable( "destroy" );
}
Expand Down Expand Up @@ -621,7 +621,7 @@ $.widget("ui.dialog", {
this.element.height( Math.max( options.height - nonContentHeight, 0 ) );
}

if (this.uiDialog.is( ":data(resizable)" ) ) {
if (this.uiDialog.is( ":data(ui-resizable)" ) ) {
this.uiDialog.resizable( "option", "minHeight", this._minHeight() );
}
}
Expand Down
34 changes: 17 additions & 17 deletions ui/jquery.ui.draggable.js
View file
Expand Up @@ -506,11 +506,11 @@ $.widget("ui.draggable", $.ui.mouse, {
$.ui.plugin.add("draggable", "connectToSortable", {
start: function(event, ui) {

var inst = $(this).data("draggable"), o = inst.options,
var inst = $(this).data("ui-draggable"), o = inst.options,
uiSortable = $.extend({}, ui, { item: inst.element });
inst.sortables = [];
$(o.connectToSortable).each(function() {
var sortable = $.data(this, 'sortable');
var sortable = $.data(this, 'ui-sortable');
if (sortable && !sortable.options.disabled) {
inst.sortables.push({
instance: sortable,
Expand All @@ -525,7 +525,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
stop: function(event, ui) {

//If we are still over the sortable, we fake the stop event of the sortable, but also remove helper
var inst = $(this).data("draggable"),
var inst = $(this).data("ui-draggable"),
uiSortable = $.extend({}, ui, { item: inst.element });

$.each(inst.sortables, function() {
Expand Down Expand Up @@ -558,7 +558,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
},
drag: function(event, ui) {

var inst = $(this).data("draggable"), that = this;
var inst = $(this).data("ui-draggable"), that = this;

$.each(inst.sortables, function() {

Expand Down Expand Up @@ -592,7 +592,7 @@ $.ui.plugin.add("draggable", "connectToSortable", {
//Now we fake the start of dragging for the sortable instance,
//by cloning the list group item, appending it to the sortable and using it as inst.currentItem
//We can then fire the start event of the sortable with our passed browser event, and our own helper (so it doesn't create a new one)
this.instance.currentItem = $(that).clone().removeAttr('id').appendTo(this.instance.element).data("sortable-item", true);
this.instance.currentItem = $(that).clone().removeAttr('id').appendTo(this.instance.element).data("ui-sortable-item", true);
this.instance.options._helper = this.instance.options.helper; //Store helper option to later restore it
this.instance.options.helper = function() { return ui.helper[0]; };

Expand Down Expand Up @@ -652,36 +652,36 @@ $.ui.plugin.add("draggable", "connectToSortable", {

$.ui.plugin.add("draggable", "cursor", {
start: function() {
var t = $('body'), o = $(this).data('draggable').options;
var t = $('body'), o = $(this).data('ui-draggable').options;
if (t.css("cursor")) o._cursor = t.css("cursor");
t.css("cursor", o.cursor);
},
stop: function() {
var o = $(this).data('draggable').options;
var o = $(this).data('ui-draggable').options;
if (o._cursor) $('body').css("cursor", o._cursor);
}
});

$.ui.plugin.add("draggable", "opacity", {
start: function(event, ui) {
var t = $(ui.helper), o = $(this).data('draggable').options;
var t = $(ui.helper), o = $(this).data('ui-draggable').options;
if(t.css("opacity")) o._opacity = t.css("opacity");
t.css('opacity', o.opacity);
},
stop: function(event, ui) {
var o = $(this).data('draggable').options;
var o = $(this).data('ui-draggable').options;
if(o._opacity) $(ui.helper).css('opacity', o._opacity);
}
});

$.ui.plugin.add("draggable", "scroll", {
start: function() {
var i = $(this).data("draggable");
var i = $(this).data("ui-draggable");
if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') i.overflowOffset = i.scrollParent.offset();
},
drag: function( event ) {

var i = $(this).data("draggable"), o = i.options, scrolled = false;
var i = $(this).data("ui-draggable"), o = i.options, scrolled = false;

if(i.scrollParent[0] != document && i.scrollParent[0].tagName != 'HTML') {

Expand Down Expand Up @@ -726,10 +726,10 @@ $.ui.plugin.add("draggable", "scroll", {
$.ui.plugin.add("draggable", "snap", {
start: function() {

var i = $(this).data("draggable"), o = i.options;
var i = $(this).data("ui-draggable"), o = i.options;
i.snapElements = [];

$(o.snap.constructor != String ? ( o.snap.items || ':data(draggable)' ) : o.snap).each(function() {
$(o.snap.constructor != String ? ( o.snap.items || ':data(ui-draggable)' ) : o.snap).each(function() {
var $t = $(this); var $o = $t.offset();
if(this != i.element[0]) i.snapElements.push({
item: this,
Expand All @@ -741,7 +741,7 @@ $.ui.plugin.add("draggable", "snap", {
},
drag: function(event, ui) {

var inst = $(this).data("draggable"), o = inst.options;
var inst = $(this).data("ui-draggable"), o = inst.options;
var d = o.snapTolerance;

var x1 = ui.offset.left, x2 = x1 + inst.helperProportions.width,
Expand Down Expand Up @@ -795,7 +795,7 @@ $.ui.plugin.add("draggable", "snap", {
$.ui.plugin.add("draggable", "stack", {
start: function() {

var o = $(this).data("draggable").options;
var o = $(this).data("ui-draggable").options;

var group = $.makeArray($(o.stack)).sort(function(a,b) {
return (parseInt($(a).css("zIndex"),10) || 0) - (parseInt($(b).css("zIndex"),10) || 0);
Expand All @@ -814,12 +814,12 @@ $.ui.plugin.add("draggable", "stack", {

$.ui.plugin.add("draggable", "zIndex", {
start: function(event, ui) {
var t = $(ui.helper), o = $(this).data("draggable").options;
var t = $(ui.helper), o = $(this).data("ui-draggable").options;
if(t.css("zIndex")) o._zIndex = t.css("zIndex");
t.css('zIndex', o.zIndex);
},
stop: function(event, ui) {
var o = $(this).data("draggable").options;
var o = $(this).data("ui-draggable").options;
if(o._zIndex) $(ui.helper).css('zIndex', o._zIndex);
}
});
Expand Down
12 changes: 6 additions & 6 deletions ui/jquery.ui.droppable.js
View file
Expand Up @@ -110,8 +110,8 @@ $.widget("ui.droppable", {
if (!draggable || (draggable.currentItem || draggable.element)[0] == this.element[0]) return false; // Bail if draggable and droppable are same element

var childrenIntersection = false;
this.element.find(":data(droppable)").not(".ui-draggable-dragging").each(function() {
var inst = $.data(this, 'droppable');
this.element.find(":data(ui-droppable)").not(".ui-draggable-dragging").each(function() {
var inst = $.data(this, 'ui-droppable');
if(
inst.options.greedy
&& !inst.options.disabled
Expand Down Expand Up @@ -193,7 +193,7 @@ $.ui.ddmanager = {

var m = $.ui.ddmanager.droppables[t.options.scope] || [];
var type = event ? event.type : null; // workaround for #2317
var list = (t.currentItem || t.element).find(":data(droppable)").andSelf();
var list = (t.currentItem || t.element).find(":data(ui-droppable)").andSelf();

droppablesLoop: for (var i = 0; i < m.length; i++) {

Expand Down Expand Up @@ -257,12 +257,12 @@ $.ui.ddmanager = {
if (this.options.greedy) {
// find droppable parents with same scope
var scope = this.options.scope;
var parent = this.element.parents(':data(droppable)').filter(function () {
return $.data(this, 'droppable').options.scope === scope;
var parent = this.element.parents(':data(ui-droppable)').filter(function () {
return $.data(this, 'ui-droppable').options.scope === scope;
});

if (parent.length) {
parentInstance = $.data(parent[0], 'droppable');
parentInstance = $.data(parent[0], 'ui-droppable');
parentInstance.greedyChild = (c == 'isover' ? 1 : 0);
}
}
Expand Down

0 comments on commit 1624bf5

Please sign in to comment.