r3212 committed - watermark: fixing tests
Revision: 3212
Author: joern.zaefferer
Date: Mon Sep 14 11:02:06 2009
Log: watermark: fixing tests
http://code.google.com/p/jquery-ui/source/detail?r=3212
Modified:
/branches/dev/watermark/tests/unit/watermark/watermark.html
/branches/dev/watermark/ui/ui.watermark.js
=======================================
--- /branches/dev/watermark/tests/unit/watermark/watermark.html Fri Jun 5
17:12:58 2009
+++ /branches/dev/watermark/tests/unit/watermark/watermark.html Mon Sep 14
11:02:06 2009
@@ -9,8 +9,8 @@
<link type="text/css" href="../testsuite.css" rel="stylesheet" />
<script type="text/javascript" src="../testsuite.js"></script>
- <script type="text/javascript"
src="../../../external/qunit/testrunner.js"></script>
- <script type="text/javascript"
src="../../../external/simulate/jquery.simulate.js"></script>
+ <script type="text/javascript"
src="../../../external/testrunner-r6343.js"></script>
+ <script type="text/javascript" src="../../jquery.simulate.js"></script>
<script type="text/javascript" src="watermark_core.js"></script>
<script type="text/javascript" src="watermark_defaults.js"></script>
=======================================
--- /branches/dev/watermark/ui/ui.watermark.js Mon Aug 17 10:56:36 2009
+++ /branches/dev/watermark/ui/ui.watermark.js Mon Sep 14 11:02:06 2009
@@ -42,7 +42,9 @@
if (this.element.data("placeholder")) {
this.element.attr("placeholder", this.element.data("placeholder"));
}
- this.element.parent().replaceWith(this.element);
+ // TODO remove this once replaceWith handles a disconnected element (see
core #3940)
+ if (this.element.parent().parent().length)
+ this.element.parent().replaceWith(this.element);
this.label.remove();
$.widget.prototype.destroy.apply(this, arguments);
}