-removed unneeded comment block in sortables

-added changes proposed by Filament group to colorpicker

diff --git a/ui/ui.colorpicker.js b/ui/ui.colorpicker.js
index 60a93d6a41c7a2847afb0b35ddf5a3e817f38fef..4919804e89480b18f4fb363462e950a3a3f6d949 100644 (file)
--- a/ui/ui.colorpicker.js
+++ b/ui/ui.colorpicker.js
@@ -18,7 +18,7 @@ $.widget("ui.colorpicker", {
                \r
                this.charMin = 65;\r
                var o = this.options, self = this,\r
-               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>';\r
+               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>';\r
 \r
                if (typeof o.color == 'string') {\r
                        this.color = this.HexToHSB(o.color);\r

diff --git a/ui/ui.sortable.js b/ui/ui.sortable.js
index ec42d2589f2586843c48a073235551e8b4c2a38a..81b71fb24f9ecd30b22ae39e6d46a5dc74cf3f9f 100644 (file)
--- 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