From 736a4f60741d1eb0a0563fe315829b39bc7567dc Mon Sep 17 00:00:00 2001
From: Paul Bakaus <paul.bakaus@googlemail.com>
Date: Mon, 11 Aug 2008 08:56:23 +0000
Subject: -removed unneeded comment block in sortables -added changes proposed
 by Filament group to colorpicker

---
 ui/ui.colorpicker.js | 2 +-
 ui/ui.sortable.js    | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ui/ui.colorpicker.js b/ui/ui.colorpicker.js
index 60a93d6a4..4919804e8 100644
--- a/ui/ui.colorpicker.js
+++ b/ui/ui.colorpicker.js
@@ -18,7 +18,7 @@ $.widget("ui.colorpicker", {
 		
 		this.charMin = 65;
 		var o = this.options, self = this,
-		tpl = '<div class="ui-colorpicker"><div class="ui-colorpicker-color"><div><div></div></div></div><div class="ui-colorpicker-hue"><div></div></div><div class="ui-colorpicker-new-color"></div><div class="ui-colorpicker-current-color"></div><div class="ui-colorpicker-hex"><input type="text" maxlength="6" size="6" /></div><div class="ui-colorpicker-rgb-r ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="ui-colorpicker-rgb-g ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="ui-colorpicker-rgb-b ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="ui-colorpicker-hsb-h ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="ui-colorpicker-hsb-s ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="ui-colorpicker-hsb-b ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="ui-colorpicker-submit"></div></div>';
+		tpl = '<div class="ui-colorpicker clearfix"><div class="ui-colorpicker-color"><div><div></div></div></div><div class="ui-colorpicker-hue"><div></div></div><div class="ui-colorpicker-new-color"></div><div class="ui-colorpicker-current-color"></div><label for="ui-colorpicker-hex" title="hex">#</label><div class="ui-colorpicker-hex"><input type="text" maxlength="6" size="6" /></div><label for="ui-colorpicker-rgb-r">R</label><div class="ui-colorpicker-rgb-r ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><label for="ui-colorpicker-rgb-g">G</label><div class="ui-colorpicker-rgb-g ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><label for="ui-colorpicker-rgb-b">B</label><div class="ui-colorpicker-rgb-b ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><label for="ui-colorpicker-hsb-h">H</label><div class="ui-colorpicker-hsb-h ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><label for="ui-colorpicker-hsb-s">S</label><div class="ui-colorpicker-hsb-s ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><label for="ui-colorpicker-hsb-b">B</label><div class="ui-colorpicker-hsb-b ui-colorpicker-field"><input type="text" maxlength="3" size="3" /><span></span></div><button class="ui-colorpicker-submit ui-default-state" name="submit" type="submit">Done</button></div>';
 
 		if (typeof o.color == 'string') {
 			this.color = this.HexToHSB(o.color);
diff --git a/ui/ui.sortable.js b/ui/ui.sortable.js
index ec42d2589..81b71fb24 100644
--- a/ui/ui.sortable.js
+++ b/ui/ui.sortable.js
@@ -38,7 +38,6 @@ $.widget("ui.sortable", $.extend({}, $.ui.mouse, {
 		this.floating = this.items.length ? (/left|right/).test(this.items[0].item.css('float')) : false;
 		
 		//Let's determine the parent's offset
-		//if(!(/(relative|absolute|fixed)/).test(this.element.css('position'))) this.element.css('position', 'relative');
 		this.offset = this.element.offset();
 
 		//Initialize mouse events for interaction
-- 
cgit v1.2.3