Skip to content
Permalink
Browse files

Merge branch 'master' into selectmenu

  • Loading branch information...
jzaefferer committed Jan 3, 2013
2 parents f244108 + f667d09 commit fb47fd03100aa36c344457c08410fdc43d7fd20d
@@ -22,8 +22,8 @@
});
</script>

<script src="datepicker_common.js"></script>
<script src="datepicker_core.js"></script>
<script src="datepicker_defaults.js"></script>
<script src="datepicker_events.js"></script>
<script src="datepicker_methods.js"></script>
<script src="datepicker_options.js"></script>
@@ -0,0 +1,7 @@
/*
TestHelpers.commonWidgetTests( "datepicker", {
defaults: {
disabled: false
}
});
*/

This file was deleted.

@@ -39,7 +39,7 @@ test("destroy", function() {
ok(inp.next().is("#alt"), "Append - append text removed");
// With both
inp= TestHelpers.datepicker.init("#inp", {showOn: "both", buttonImageOnly: true,
buttonImage: "img/calendar.gif", appendText: "Testing"});
buttonImage: "images/calendar.gif", appendText: "Testing"});
ok(inp.is(".hasDatepicker"), "Both - marker class set");
ok($.data(inp[0], TestHelpers.datepicker.PROP_NAME), "Both - instance present");
ok(inp.next()[0].nodeName.toLowerCase() === "img", "Both - button added");
@@ -92,7 +92,7 @@ test("enableDisable", function() {
inp.datepicker("destroy");
// With an image button
inp = TestHelpers.datepicker.init("#inp", {showOn: "button", buttonImageOnly: true,
buttonImage: "img/calendar.gif"});
buttonImage: "images/calendar.gif"});
ok(!inp.datepicker("isDisabled"), "Enable/disable image - initially marked as enabled");
ok(!inp[0].disabled, "Enable/disable image - field initially enabled");
ok(parseFloat(inp.next("img").css("opacity")) === 1, "Enable/disable image - image initially enabled");
@@ -145,13 +145,13 @@ asyncTest("invocation", function() {
function step3() {
// On image button
inp = TestHelpers.datepicker.init("#inp", {showOn: "button", buttonImageOnly: true,
buttonImage: "img/calendar.gif", buttonText: "Cal"});
buttonImage: "images/calendar.gif", buttonText: "Cal"});
ok(!dp.is(":visible"), "Image button - initially hidden");
button = inp.siblings("button");
ok(button.length === 0, "Image button - button absent");
image = inp.siblings("img");
ok(image.length === 1, "Image button - image present");
equal(image.attr("src"), "img/calendar.gif", "Image button - image source");
equal(image.attr("src"), "images/calendar.gif", "Image button - image source");
equal(image.attr("title"), "Cal", "Image button - image text");
inp[0].focus();
setTimeout(function() {
@@ -168,7 +168,7 @@ asyncTest("invocation", function() {

function step4() {
// On both
inp = TestHelpers.datepicker.init("#inp", {showOn: "both", buttonImage: "img/calendar.gif"});
inp = TestHelpers.datepicker.init("#inp", {showOn: "both", buttonImage: "images/calendar.gif"});
ok(!dp.is(":visible"), "Both - initially hidden");
button = inp.siblings("button");
ok(button.length === 1, "Both - button present");
Binary file not shown.
@@ -6,7 +6,6 @@ TestHelpers.commonWidgetTests( "draggable", {
cancel: "input,textarea,button,select,option",
connectToSortable: false,
containment: false,
create: null,
cursor: "auto",
cursorAt: false,
delay: 0,
@@ -28,6 +27,12 @@ TestHelpers.commonWidgetTests( "draggable", {
snapMode: "both",
snapTolerance: 20,
stack: false,
zIndex: false
zIndex: false,

// callbacks
create: null,
drag: null,
start: null,
stop: null
}
});
@@ -3,11 +3,18 @@ TestHelpers.commonWidgetTests( "droppable", {
accept: "*",
activeClass: false,
addClasses: true,
create: null,
disabled: false,
greedy: false,
hoverClass: false,
scope: "default",
tolerance: "intersect"
tolerance: "intersect",

// callbacks
activate: null,
create: null,
deactivate: null,
drop: null,
out: null,
over: null
}
});
@@ -1,4 +1,4 @@
TestHelpers.commonWidgetTests("resizable", {
TestHelpers.commonWidgetTests( "resizable", {
defaults: {
alsoResize: false,
animate: false,
@@ -22,6 +22,9 @@ TestHelpers.commonWidgetTests("resizable", {
zIndex: 90,

// callbacks
create: null
create: null,
resize: null,
start: null,
stop: null
}
});
@@ -3,11 +3,19 @@ TestHelpers.commonWidgetTests("selectable", {
appendTo: "body",
autoRefresh: true,
cancel: "input,textarea,button,select,option",
create: null,
delay: 0,
disabled: false,
distance: 0,
filter: "*",
tolerance: "touch"
tolerance: "touch",

// callbacks
create: null,
selected: null,
selecting: null,
start: null,
stop: null,
unselected: null,
unselecting: null
}
});
@@ -14,6 +14,10 @@ TestHelpers.commonWidgetTests( "slider", {
values: null,

// callbacks
create: null
create: null,
change: null,
slide: null,
start: null,
stop: null
}
});
@@ -11,7 +11,7 @@
<script src="../testsuite.js"></script>
<script>
TestHelpers.loadResources({
css: [ "ui.core", "ui.sortable" ],
css: [ "ui.core" ],
js: [
"ui/jquery.ui.core.js",
"ui/jquery.ui.widget.js",
@@ -5,7 +5,6 @@ TestHelpers.commonWidgetTests( "sortable", {
cancel: "input,textarea,button,select,option",
connectWith: false,
containment: false,
create: null,
cursor: "auto",
cursorAt: false,
delay: 0,
@@ -26,6 +25,21 @@ TestHelpers.commonWidgetTests( "sortable", {
scrollSpeed: 20,
scope: "default",
tolerance: "intersect",
zIndex: 1000
zIndex: 1000,

// callbacks
activate: null,
beforeStop: null,
change: null,
create: null,
deactivate: null,
out: null,
over: null,
receive: null,
remove: null,
sort: null,
start: null,
stop: null,
update: null
}
});
@@ -42,7 +42,12 @@ $.widget("ui.draggable", $.ui.mouse, {
snapMode: "both",
snapTolerance: 20,
stack: false,
zIndex: false
zIndex: false,

// callbacks
drag: null,
start: null,
stop: null
},
_create: function() {

@@ -30,7 +30,14 @@ $.widget("ui.droppable", {
greedy: false,
hoverClass: false,
scope: "default",
tolerance: "intersect"
tolerance: "intersect",

// callbacks
activate: null,
deactivate: null,
drop: null,
out: null,
over: null
},
_create: function() {

@@ -43,7 +43,12 @@ $.widget("ui.resizable", $.ui.mouse, {
minHeight: 10,
minWidth: 10,
// See #7960
zIndex: 90
zIndex: 90,

// callbacks
resize: null,
start: null,
stop: null
},
_create: function() {

@@ -22,7 +22,15 @@ $.widget("ui.selectable", $.ui.mouse, {
autoRefresh: true,
distance: 0,
filter: "*",
tolerance: "touch"
tolerance: "touch",

// callbacks
selected: null,
selecting: null,
start: null,
stop: null,
unselected: null,
unselecting: null
},
_create: function() {
var selectees,
@@ -32,7 +32,13 @@ $.widget( "ui.slider", $.ui.mouse, {
range: false,
step: 1,
value: 0,
values: null
values: null,

// callbacks
change: null,
slide: null,
start: null,
stop: null
},

_create: function() {
@@ -47,7 +47,21 @@ $.widget("ui.sortable", $.ui.mouse, {
scrollSpeed: 20,
scope: "default",
tolerance: "intersect",
zIndex: 1000
zIndex: 1000,

// callbacks
activate: null,
beforeStop: null,
change: null,
deactivate: null,
out: null,
over: null,
receive: null,
remove: null,
sort: null,
start: null,
stop: null,
update: null
},
_create: function() {

0 comments on commit fb47fd0

Please sign in to comment.
You can’t perform that action at this time.