r3468 committed - updating to latest trunk
Revision: 3468
Author: joern.zaefferer
Date: Wed Nov 18 10:13:25 2009
Log: updating to latest trunk
http://code.google.com/p/jquery-ui/source/detail?r=3468
Added:
/branches/dev/ui/jquery.effects.fade.js
Modified:
/branches/dev
/branches/dev/build/build.xml
/branches/dev/demos/addClass/default.html
/branches/dev/demos/effect/default.html
/branches/dev/tests/unit/accordion/accordion_methods.js
/branches/dev/tests/unit/dialog/dialog_methods.js
/branches/dev/tests/unit/dialog/dialog_options.js
/branches/dev/tests/unit/draggable/draggable_methods.js
/branches/dev/tests/unit/droppable/droppable_methods.js
/branches/dev/tests/unit/resizable/resizable_methods.js
/branches/dev/tests/unit/selectable/selectable_methods.js
/branches/dev/tests/unit/slider/slider_core.js
/branches/dev/tests/unit/slider/slider_methods.js
/branches/dev/tests/unit/sortable/sortable_methods.js
/branches/dev/tests/unit/tabs/tabs_methods.js
/branches/dev/tests/unit/tabs/tabs_options.js
/branches/dev/ui/i18n/jquery.ui.datepicker-da.js
/branches/dev/ui/jquery.effects.core.js
/branches/dev/ui/jquery.effects.pulsate.js
/branches/dev/ui/jquery.ui.core.js
/branches/dev/ui/jquery.ui.slider.js
/branches/dev/ui/jquery.ui.tabs.js
=======================================
--- /dev/null
+++ /branches/dev/ui/jquery.effects.fade.js Wed Nov 18 10:13:25 2009
@@ -0,0 +1,32 @@
+/*
+ * jQuery UI Effects Fade @VERSION
+ *
+ * Copyright (c) 2009 AUTHORS.txt (http://jqueryui.com/about)
+ * Dual licensed under the MIT (MIT-LICENSE.txt)
+ * and GPL (GPL-LICENSE.txt) licenses.
+ *
+ * http://docs.jquery.com/UI/Effects/Fade
+ *
+ * Depends:
+ * jquery.effects.core.js
+ */
+(function($) {
+
+$.effects.fade = function(o) {
+ return this.queue(function() {
+ var elem = $(this),
+ mode = $.effects.setMode(elem, o.options.mode || 'hide');
+
+ elem.animate({ opacity: mode }, {
+ queue: false,
+ duration: o.duration,
+ easing: o.options.easing,
+ complete: function() {
+ (o.callback && o.callback.apply(this, arguments));
+ elem.dequeue();
+ }
+ });
+ });
+};
+
+})(jQuery);
=======================================
--- /branches/dev/build/build.xml Thu Sep 17 03:39:12 2009
+++ /branches/dev/build/build.xml Wed Nov 18 10:13:25 2009
@@ -59,7 +59,8 @@
<for param="file">
<path><fileset dir="${dist.dir}/ui/minified/" includes="*.js" /></path>
<sequential>
- <propertyregex override="yes" property="target" input="@{file}"
regexp=".+\\(.+)\.min\.js$" replace="\1"/>
+ <basename file="@{file}" property="target" />
+ <propertyregex override="yes" property="target" input="${target}"
regexp="(.+)\.min\.js$" replace="\1"/>
<concat destfile="${dist.dir}/ui-headered/${target}.min.js">
<header file="${dist.dir}/headers/${target}.js" />
<fileset file="@{file}" />
@@ -86,7 +87,7 @@
<concat destfile="${dist.dir}/ui/${concatenated}.js">
<filelist dir="${src.dir}/" files="${core.files}" />
- <fileset dir="${src.dir}/" includes="ui.*.js, effects.*.js"
excludes="${core.files}" />
+ <fileset dir="${src.dir}/" includes="jquery.ui.*.js, effects.*.js"
excludes="${core.files}" />
</concat>
<echo message="Concatenated built." />
@@ -115,7 +116,7 @@
<apply executable="java" parallel="false">
<filelist dir="${dist.dir}/ui/" files="${concatenated}.js" />
- <fileset dir="${src.dir}/" includes="ui.*.js, effects.*.js" />
+ <fileset dir="${src.dir}/" includes="jquery.ui.*.js,
jquery.effects.*.js" />
<arg line="-jar" />
<arg path="${yui-jar}" />
<arg value="--charset" />
@@ -129,7 +130,7 @@
<apply executable="java" parallel="false">
<filelist dir="${dist.dir}/ui/i18n/" files="${concatenated.i18n}.js" />
- <fileset dir="${src.dir}/i18n/" includes="ui.*.js" />
+ <fileset dir="${src.dir}/i18n/" includes="jquery.ui.*.js" />
<arg line="-jar" />
<arg path="${yui-jar}" />
<arg value="--charset" />
@@ -151,7 +152,7 @@
</copy>
<copy overwrite="true" todir="${dist.dir}/ui/">
- <fileset dir="${src.dir}/" includes="ui.*.js, effects.*.js" />
+ <fileset dir="${src.dir}/" includes="jquery.ui.*.js,
jquery.effects.*.js" />
</copy>
<copy overwrite="true" todir="${dist.dir}/ui/i18n/" >
=======================================
--- /branches/dev/demos/addClass/default.html Thu Sep 17 03:39:12 2009
+++ /branches/dev/demos/addClass/default.html Wed Nov 18 10:13:25 2009
@@ -2,14 +2,14 @@
<html lang="en">
<head>
<title>jQuery UI Effects - addClass Demo</title>
- <link type="text/css"
href="http://jquery-ui.googlecode.com/svn/trunk/themes/base/ui.all.css"
rel="stylesheet" />
- <script type="text/javascript"
src="http://jquery-ui.googlecode.com/svn/trunk/jquery-1.3.2.js"></script>
- <script type="text/javascript"
src="http://jquery-ui.googlecode.com/svn/trunk/ui/jquery.effects.core.js"></script>
- <link type="text/css"
href="http://jquery-ui.googlecode.com/svn/trunk/demos/demos.css"
rel="stylesheet" />
+ <link type="text/css" href="../../themes/base/ui.all.css"
rel="stylesheet" />
+ <script type="text/javascript" src="../../jquery-1.3.2.js"></script>
+ <script type="text/javascript"
src="../../ui/jquery.effects.core.js"></script>
+ <link type="text/css" href="../demos.css" rel="stylesheet" />
<style type="text/css">
.toggler { width: 500px; height: 200px; position: relative;}
#button { padding: .5em 1em; text-decoration: none; }
- #effect {position: relative; width: 240px; padding: 1em; font-size:
1.2em; border: 1px solid #000; background: #eee; color: #333; }
+ #effect { width: 240px; padding: 1em; font-size: 1.2em; border: 1px
solid #000; background: #eee; color: #333; }
#effect.newClass { text-indent: 40px; letter-spacing: .4em; width:
410px; height: 100px; padding: 30px; margin: 10px; font-size: 1.6em; }
</style>
<script type="text/javascript">
=======================================
--- /branches/dev/demos/effect/default.html Thu Sep 17 03:39:12 2009
+++ /branches/dev/demos/effect/default.html Wed Nov 18 10:13:25 2009
@@ -10,6 +10,7 @@
<script type="text/javascript"
src="../../ui/jquery.effects.clip.js"></script>
<script type="text/javascript"
src="../../ui/jquery.effects.drop.js"></script>
<script type="text/javascript"
src="../../ui/jquery.effects.explode.js"></script>
+ <script type="text/javascript"
src="../../ui/jquery.effects.fade.js"></script>
<script type="text/javascript"
src="../../ui/jquery.effects.fold.js"></script>
<script type="text/javascript"
src="../../ui/jquery.effects.highlight.js"></script>
<script type="text/javascript"
src="../../ui/jquery.effects.pulsate.js"></script>
@@ -78,6 +79,7 @@
<option value="clip">Clip</option>
<option value="drop">Drop</option>
<option value="explode">Explode</option>
+ <option value="fade">Fade</option>
<option value="fold">Fold</option>
<option value="highlight">Highlight</option>
<option value="puff">Puff</option>
=======================================
--- /branches/dev/tests/unit/accordion/accordion_methods.js Tue Sep 15
14:19:23 2009
+++ /branches/dev/tests/unit/accordion/accordion_methods.js Wed Nov 18
10:13:25 2009
@@ -31,11 +31,11 @@
ok(true, 'arbitrary method called after init');
var el = $('<div></div>').accordion();
- var foo = el.data("foo.accordion");
+ var foo = el.accordion("option", "foo");
el.remove();
ok(true, 'arbitrary option getter after init');
- $('<div></div>').accordion().data("foo.accordion", "bar").remove();
+ $('<div></div>').accordion().accordion("option", "foo", "bar").remove();
ok(true, 'arbitrary option setter after init');
});
@@ -52,14 +52,6 @@
$('<div></div>').accordion().accordion("destroy").accordion("foo").remove();
ok(true, 'arbitrary method called after destroy');
- var el = $('<div></div>').accordion();
- var foo = el.accordion("destroy").data("foo.accordion");
- el.remove();
- ok(true, 'arbitrary option getter after destroy');
-
-
$('<div></div>').accordion().accordion("destroy").data("foo.accordion", "bar").remove();
- ok(true, 'arbitrary option setter after destroy');
-
var expected = $('<div></div>').accordion(),
actual = expected.accordion('destroy');
equals(actual, expected, 'destroy is chainable');
=======================================
--- /branches/dev/tests/unit/dialog/dialog_methods.js Tue Sep 22 00:54:11
2009
+++ /branches/dev/tests/unit/dialog/dialog_methods.js Wed Nov 18 10:13:25
2009
@@ -28,17 +28,15 @@
ok(true, 'arbitrary method called after init');
el = $('<div></div>').dialog();
- var foo = el.data("foo.dialog");
+ var foo = el.dialog("option", "foo");
el.remove();
ok(true, 'arbitrary option getter after init');
- $('<div></div>').dialog().data("foo.dialog", "bar").remove();
+ $('<div></div>').dialog().dialog("option", "foo", "bar").remove();
ok(true, 'arbitrary option setter after init');
});
test("destroy", function() {
- expect(7);
-
$("<div></div>").appendTo('body').dialog().dialog("destroy").remove();
ok(true, '.dialog("destroy") called on element');
@@ -51,14 +49,6 @@
$('<div></div>').dialog().dialog("destroy").dialog("foo").remove();
ok(true, 'arbitrary method called after destroy');
- el = $('<div></div>').dialog();
- var foo = el.dialog("destroy").data("foo.dialog");
- el.remove();
- ok(true, 'arbitrary option getter after destroy');
-
-
$('<div></div>').dialog().dialog("destroy").data("foo.dialog", "bar").remove();
- ok(true, 'arbitrary option setter after destroy');
-
var expected = $('<div></div>').dialog(),
actual = expected.dialog('destroy');
equals(actual, expected, 'destroy is chainable');
=======================================
--- /branches/dev/tests/unit/dialog/dialog_options.js Tue Sep 22 00:54:11
2009
+++ /branches/dev/tests/unit/dialog/dialog_options.js Wed Nov 18 10:13:25
2009
@@ -54,9 +54,9 @@
}
};
- same(el.data("buttons.dialog"), buttons, '.data("buttons.dialog")
getter');
- el.data("buttons.dialog", newButtons);
- same(el.data("buttons.dialog"), newButtons, '.data("buttons.dialog", ...)
setter');
+ same(el.dialog("option", "buttons"),
buttons, '.dialog("option", "buttons") getter');
+ el.dialog("option", "buttons", newButtons);
+ same(el.dialog("option", "buttons"),
newButtons, '.dialog("option", "buttons", ...) setter');
btn = $("button", dlg());
equals(btn.length, 1, "number of buttons after setter");
@@ -155,7 +155,7 @@
el.remove();
el = $('<div></div>').dialog();
- el.data('height.dialog', 438);
+ el.dialog('option', 'height', 438);
equals(dlg().height(), 438, "explicit height set after init");
el.remove();
});
@@ -173,7 +173,7 @@
equals(heightAfter, 400, "maxHeight");
el.remove();
- el = $('<div></div>').dialog({ maxHeight: 400 }).data('maxHeight.dialog',
600);
+ el = $('<div></div>').dialog({ maxHeight: 400
}).dialog('option', 'maxHeight', 600);
drag('.ui-resizable-n', -1000, -1000);
equals(heightAfter, 600, "maxHeight");
el.remove();
@@ -192,7 +192,7 @@
equals(widthAfter, 400, "maxWidth");
el.remove();
- el = $('<div></div>').dialog({ maxWidth: 400 }).data('maxWidth.dialog',
600);
+ el = $('<div></div>').dialog({ maxWidth: 400
}).dialog('option', 'maxWidth', 600);
drag('.ui-resizable-w', -1000, -1000);
equals(widthAfter, 600, "maxWidth");
el.remove();
@@ -211,7 +211,7 @@
equals(heightAfter, 10, "minHeight");
el.remove();
- el = $('<div></div>').dialog({ minHeight: 10 }).data('minHeight.dialog',
30);
+ el = $('<div></div>').dialog({ minHeight: 10
}).dialog('option', 'minHeight', 30);
drag('.ui-resizable-n', 1000, 1000);
equals(heightAfter, 30, "minHeight");
el.remove();
@@ -230,7 +230,7 @@
equals(widthAfter, 10, "minWidth");
el.remove();
- el = $('<div></div>').dialog({ minWidth: 30 }).data('minWidth.dialog',
30);
+ el = $('<div></div>').dialog({ minWidth: 30
}).dialog('option', 'minWidth', 30);
drag('.ui-resizable-w', 1000, 1000);
equals(widthAfter, 30, "minWidth");
el.remove();
@@ -258,13 +258,13 @@
el = $('<div></div>').dialog();
shouldresize("[default]");
- el.data('resizable.dialog', false);
+ el.dialog('option', 'resizable', false);
shouldnotresize('disabled after init');
el.remove();
el = $('<div></div>').dialog({ resizable: false });
shouldnotresize("disabled in init options");
- el.data('resizable.dialog', true);
+ el.dialog('option', 'resizable', true);
shouldresize('enabled after init');
el.remove();
});
@@ -296,7 +296,7 @@
equals(titleText(), "bar", "title in init options should override title
in element attribute");
el.remove();
- el = $('<div></div>').dialog().data('title.dialog', 'foo');
+ el = $('<div></div>').dialog().dialog('option', 'title', 'foo');
equals(titleText(), 'foo', 'title after init');
el.remove();
});
@@ -310,7 +310,7 @@
el = $('<div></div>').dialog({width: 437 });
equals(dlg().width(), 437, "explicit width");
- el.data('width.dialog', 438);
+ el.dialog('option', 'width', 438);
equals(dlg().width(), 438, 'explicit width after init');
el.remove();
});
=======================================
--- /branches/dev/tests/unit/draggable/draggable_methods.js Tue Apr 14
19:33:28 2009
+++ /branches/dev/tests/unit/draggable/draggable_methods.js Wed Nov 18
10:13:25 2009
@@ -30,16 +30,14 @@
$("<div></div>").draggable().draggable("foo");
ok(true, 'arbitrary method called after init');
- $("<div></div>").draggable().data("foo.draggable");
+ $("<div></div>").draggable().draggable("option", "foo");
ok(true, 'arbitrary option getter after init');
- $("<div></div>").draggable().data("foo.draggable", "bar");
+ $("<div></div>").draggable().draggable("option", "foo", "bar");
ok(true, 'arbitrary option setter after init');
});
test("destroy", function() {
- expect(7);
-
$("<div></div>").appendTo('body').draggable().draggable("destroy").remove();
ok(true, '.draggable("destroy") called on element');
@@ -52,12 +50,6 @@
$("<div></div>").draggable().draggable("destroy").draggable("foo");
ok(true, 'arbitrary method called after destroy');
- $("<div></div>").draggable().draggable("destroy").data("foo.draggable");
- ok(true, 'arbitrary option getter after destroy');
-
-
$("<div></div>").draggable().draggable("destroy").data("foo.draggable", "bar");
- ok(true, 'arbitrary option setter after destroy');
-
var expected = $('<div></div>').draggable(),
actual = expected.draggable('destroy');
equals(actual, expected, 'destroy is chainable');
@@ -69,14 +61,14 @@
shouldnotmove('.draggable({ disabled: true })');
el.draggable("enable");
shouldmove('.draggable("enable")');
- equals(el.data("disabled.draggable"), false, "disabled.draggable getter");
+ equals(el.draggable("option", "disabled"), false, "disabled option
getter");
el.draggable("destroy");
el.draggable({ disabled: true });
shouldnotmove('.draggable({ disabled: true })');
- el.data("disabled.draggable", false);
- equals(el.data("disabled.draggable"), false, "disabled.draggable setter");
- shouldmove('.data("disabled.draggable", false)');
+ el.draggable("option", "disabled", false);
+ equals(el.draggable("option", "disabled"), false, "disabled option
setter");
+ shouldmove('.draggable("option", "disabled", false)');
var expected = $('<div></div>').draggable(),
actual = expected.draggable('enable');
@@ -89,15 +81,15 @@
shouldmove('.draggable({ disabled: false })');
el.draggable("disable");
shouldnotmove('.draggable("disable")');
- equals(el.data("disabled.draggable"), true, "disabled.draggable getter");
+ equals(el.draggable("option", "disabled"), true, "disabled option
getter");
el.draggable("destroy");
el.draggable({ disabled: false });
shouldmove('.draggable({ disabled: false })');
- el.data("disabled.draggable", true);
- equals(el.data("disabled.draggable"), true, "disabled.draggable setter");
- shouldnotmove('.data("disabled.draggable", true)');
+ el.draggable("option", "disabled", true);
+ equals(el.draggable("option", "disabled"), true, "disabled option
setter");
+ shouldnotmove('.draggable("option", "disabled", true)');
var expected = $('<div></div>').draggable(),
actual = expected.draggable('disable');
=======================================
--- /branches/dev/tests/unit/droppable/droppable_methods.js Tue Apr 14
19:33:28 2009
+++ /branches/dev/tests/unit/droppable/droppable_methods.js Wed Nov 18
10:13:25 2009
@@ -20,16 +20,14 @@
$("<div></div>").droppable().droppable("foo");
ok(true, 'arbitrary method called after init');
- $("<div></div>").droppable().data("foo.droppable");
+ $("<div></div>").droppable().droppable("option", "foo");
ok(true, 'arbitrary option getter after init');
- $("<div></div>").droppable().data("foo.droppable", "bar");
+ $("<div></div>").droppable().droppable("option", "foo", "bar");
ok(true, 'arbitrary option setter after init');
});
test("destroy", function() {
- expect(7);
-
$("<div></div>").appendTo('body').droppable().droppable("destroy").remove();
ok(true, '.droppable("destroy") called on element');
@@ -41,12 +39,6 @@
$("<div></div>").droppable().droppable("destroy").droppable("foo");
ok(true, 'arbitrary method called after destroy');
-
- $("<div></div>").droppable().droppable("destroy").data("foo.droppable");
- ok(true, 'arbitrary option getter after destroy');
-
-
$("<div></div>").droppable().droppable("destroy").data("foo.droppable", "bar");
- ok(true, 'arbitrary option setter after destroy');
var expected = $('<div></div>').droppable(),
actual = expected.droppable('destroy');
@@ -59,12 +51,12 @@
shouldNotBeDroppable();
el.droppable("enable");
shouldBeDroppable();
- equals(el.data("disabled.droppable"), false, "disabled.droppable getter");
+ equals(el.droppable("option", "disabled"), false, "disabled option
getter");
el.droppable("destroy");
el.droppable({ disabled: true });
shouldNotBeDroppable();
- el.data("disabled.droppable", false);
- equals(el.data("disabled.droppable"), false, "disabled.droppable setter");
+ el.droppable("option", "disabled", false);
+ equals(el.droppable("option", "disabled"), false, "disabled option
setter");
shouldBeDroppable();
var expected = $('<div></div>').droppable(),
@@ -78,12 +70,12 @@
shouldBeDroppable();
el.droppable("disable");
shouldNotBeDroppable();
- equals(el.data("disabled.droppable"), true, "disabled.droppable getter");
+ equals(el.droppable("option", "disabled"), true, "disabled option
getter");
el.droppable("destroy");
el.droppable({ disabled: false });
shouldBeDroppable();
- el.data("disabled.droppable", true);
- equals(el.data("disabled.droppable"), true, "disabled.droppable setter");
+ el.droppable("option", "disabled", true);
+ equals(el.droppable("option", "disabled"), true, "disabled option
setter");
shouldNotBeDroppable();
var expected = $('<div></div>').droppable(),
=======================================
--- /branches/dev/tests/unit/resizable/resizable_methods.js Tue Apr 14
19:33:28 2009
+++ /branches/dev/tests/unit/resizable/resizable_methods.js Wed Nov 18
10:13:25 2009
@@ -21,17 +21,15 @@
ok(true, 'arbitrary method called after init');
el = $('<div></div>').resizable()
- var foo = el.data("foo.resizable");
+ var foo = el.resizable("option", "foo");
el.remove();
ok(true, 'arbitrary option getter after init');
- $('<div></div>').resizable().data("foo.resizable", "bar").remove();
+ $('<div></div>').resizable().resizable("option", "foo", "bar").remove();
ok(true, 'arbitrary option setter after init');
});
test("destroy", function() {
- expect(7);
-
$("<div></div>").appendTo('body').resizable().resizable("destroy").remove();
ok(true, '.resizable("destroy") called on element');
@@ -44,14 +42,6 @@
$('<div></div>').resizable().resizable("destroy").resizable("foo").remove();
ok(true, 'arbitrary method called after destroy');
- el = $('<div></div>').resizable();
- var foo = el.resizable("destroy").data("foo.resizable");
- el.remove();
- ok(true, 'arbitrary option getter after destroy');
-
-
$('<div></div>').resizable().resizable("destroy").data("foo.resizable", "bar").remove();
- ok(true, 'arbitrary option setter after destroy');
-
var expected = $('<div></div>').resizable(),
actual = expected.resizable('destroy');
equals(actual, expected, 'destroy is chainable');
=======================================
--- /branches/dev/tests/unit/selectable/selectable_methods.js Tue Apr 14
19:33:28 2009
+++ /branches/dev/tests/unit/selectable/selectable_methods.js Wed Nov 18
10:13:25 2009
@@ -21,17 +21,15 @@
ok(true, 'arbitrary method called after init');
el = $("<div></div>").selectable()
- var foo = el.data("foo.selectable");
+ var foo = el.selectable("option", "foo");
el.remove();
ok(true, 'arbitrary option getter after init');
- $("<div></div>").selectable().data("foo.selectable", "bar").remove();
+ $("<div></div>").selectable().selectable("option", "foo", "bar").remove();
ok(true, 'arbitrary option setter after init');
});
test("destroy", function() {
- expect(7);
-
$("<div></div>").appendTo('body').selectable().selectable("destroy").remove();
ok(true, '.selectable("destroy") called on element');
@@ -44,14 +42,6 @@
$("<div></div>").selectable().selectable("destroy").selectable("foo").remove();
ok(true, 'arbitrary method called after destroy');
- el = $("<div></div>").selectable();
-