Skip to content
Permalink
Browse files

-removed unneeded comment block in sortables

-added changes proposed by Filament group to colorpicker
  • Loading branch information
Paul Bakaus
Paul Bakaus committed Aug 11, 2008
1 parent f84585a commit 736a4f60741d1eb0a0563fe315829b39bc7567dc
Showing with 1 addition and 2 deletions.
  1. +1 −1 ui/ui.colorpicker.js
  2. +0 −1 ui/ui.sortable.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);
@@ -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

0 comments on commit 736a4f6

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