Skip to content

Commit acca0ba

Browse files
committed
Fixed jquery#2340: Consistent parameters for dispatched events and callbacks.
1 parent 93c2dff commit acca0ba

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

ui/ui.accordion.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ function completed(cancel) {
111111
overflow: ""
112112
});
113113
}
114-
$(this).triggerHandler("accordionchange", [options.data], options.change);
114+
$(this).triggerHandler("accordionchange", [null, options.data], options.change);
115115
}
116116

117117
function toggle(toShow, toHide, data, clickedActive, down) {

ui/ui.tabs.js

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ $.widget("ui.tabs", {
134134
// seems to be expected behavior that the show callback is fired
135135
var onShow = function() {
136136
$(self.element).triggerHandler('tabsshow',
137-
[self.ui(self.$tabs[o.selected], self.$panels[o.selected])], o.show);
137+
[null, self.ui(self.$tabs[o.selected], self.$panels[o.selected])], o.show);
138138
};
139139

140140
// load if remote tab
@@ -198,7 +198,7 @@ $.widget("ui.tabs", {
198198

199199
// callback
200200
$(self.element).triggerHandler('tabsshow',
201-
[self.ui(clicked, $show[0])], o.show);
201+
[null, self.ui(clicked, $show[0])], o.show);
202202

203203
});
204204
}
@@ -228,7 +228,7 @@ $.widget("ui.tabs", {
228228
if (($li.hasClass(o.selectedClass) && !o.unselect)
229229
|| $li.hasClass(o.disabledClass)
230230
|| $(this).hasClass(o.loadingClass)
231-
|| $(self.element).triggerHandler('tabsselect', [self.ui(this, $show[0])], o.select) === false
231+
|| $(self.element).triggerHandler('tabsselect', [null, self.ui(this, $show[0])], o.select) === false
232232
) {
233233
this.blur();
234234
return false;
@@ -354,7 +354,7 @@ $.widget("ui.tabs", {
354354

355355
// callback
356356
this.element.triggerHandler('tabsadd',
357-
[this.ui(this.$tabs[index], this.$panels[index])], o.add
357+
[null, this.ui(this.$tabs[index], this.$panels[index])], o.add
358358
);
359359
},
360360
remove: function(index) {
@@ -373,7 +373,7 @@ $.widget("ui.tabs", {
373373

374374
// callback
375375
this.element.triggerHandler('tabsremove',
376-
[this.ui($li.find('a')[0], $panel[0])], o.remove
376+
[null, this.ui($li.find('a')[0], $panel[0])], o.remove
377377
);
378378
},
379379
enable: function(index) {
@@ -393,7 +393,7 @@ $.widget("ui.tabs", {
393393

394394
// callback
395395
this.element.triggerHandler('tabsenable',
396-
[this.ui(this.$tabs[index], this.$panels[index])], o.enable
396+
[null, this.ui(this.$tabs[index], this.$panels[index])], o.enable
397397
);
398398

399399
},
@@ -407,7 +407,7 @@ $.widget("ui.tabs", {
407407

408408
// callback
409409
this.element.triggerHandler('tabsdisable',
410-
[this.ui(this.$tabs[index], this.$panels[index])], o.disable
410+
[null, this.ui(this.$tabs[index], this.$panels[index])], o.disable
411411
);
412412
}
413413
},
@@ -461,7 +461,7 @@ $.widget("ui.tabs", {
461461

462462
// callbacks
463463
$(self.element).triggerHandler('tabsload',
464-
[self.ui(self.$tabs[index], self.$panels[index])], o.load
464+
[null, self.ui(self.$tabs[index], self.$panels[index])], o.load
465465
);
466466
o.ajaxOptions.success && o.ajaxOptions.success(r, s);
467467

0 commit comments

Comments
 (0)