public/gallery3-contrib
Archived
1
0
Fork 0
Code Releases Activity

Version 4 RC: Implemented user search, minified JavaScript

Browse Source
This commit is contained in:
hukoeth 2010-09-08 22:55:33 +08:00 committed by Bharat Mediratta
parent 3c7d2c5218
commit b7ee10fce4
11 changed files with 676 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
modules/photoannotation/controllers/photoannotation.php
View File

@ -18,6 +18,50 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class photoannotation_Controller extends Controller { class photoannotation_Controller extends Controller {
public function showuser($item_id) {
$form = photoannotation::get_user_search_form("g-user-cloud-form");
$user_id = Input::instance()->get("name", "");
if ($user_id == "") {
$user_id = Input::instance()->post("name", "");
}
$getuser = photoannotation::getuser($user_id);
if ($getuser->found) {
url::redirect(user_profile::url($getuser->user->id));
return;
}
$page_size = module::get_var("gallery", "page_size", 9);
$page = Input::instance()->get("page", 1);
$offset = ($page - 1) * $page_size;
// Make sure that the page references a valid offset
if ($page < 1) {
$page = 1;
}
list ($count, $result) = photoannotation::search_user($user_id, $page_size, $offset);
$max_pages = max(ceil($count / $page_size), 1);
if ($page > 1) {
$previous_page_url = url::site("photoannotation/showuser/". $item_id ."?name=". $user_id ."&amp;page=". ($page - 1));
}
if ($page < $max_pages) {
$next_page_url = url::site("photoannotation/showuser/". $item_id ."?name=". $user_id ."&amp;page=". ($page + 1));
}
if ($user_id == "") {
$user_id = "*";
}
$template = new Theme_View("page.html", "other", "usersearch");
$template->set_global("position", $page);
$template->set_global("total", $max_pages);
$template->content = new View("photoannotation_user_search.html");
$template->content->search_form = photoannotation::get_user_search_form(g-user-search-form);
$template->content->users = $result;
$template->content->q = $user_id;
$template->content->count = $count;
$template->content->paginator = new View("paginator.html");
$template->content->paginator->previous_page_url = $previous_page_url;
$template->content->paginator->next_page_url = $next_page_url;
print $template;
}
public function save($item_id) { public function save($item_id) {
// Prevent Cross Site Request Forgery // Prevent Cross Site Request Forgery
access::verify_csrf(); access::verify_csrf();
@ -37,21 +81,18 @@ class photoannotation_Controller extends Controller {
$redir_uri = url::abs_site("{$item->type}s/{$item->id}"); $redir_uri = url::abs_site("{$item->type}s/{$item->id}");
//If this is a user then get the id //If this is a user then get the id
if ($user_id != "") { if ($user_id != "") {
$user_parts = explode("(", $user_id); $getuser = photoannotation::getuser($user_id);
$user_part = rtrim(ltrim(end($user_parts)), ")"); if (!$getuser->found) {
$user = ORM::factory("user")->where("name", "=", $user_part)->find();
$user_firstpart = trim(implode(array_slice($user_parts, 0, count($user_parts)-1)));
if (!$user->loaded() || strcasecmp($user_firstpart, $user->display_name()) <> 0) {
message::error(t("Could not find user %user.", array("user" => $user_id))); message::error(t("Could not find user %user.", array("user" => $user_id)));
url::redirect($redir_uri); url::redirect($redir_uri);
return; return;
} }
if (strcasecmp($user->name, "guest") == 0) { if ($getuser->isguest) {
message::error(t("You cannot create an annotation for the guest user.")); message::error(t("You cannot create an annotation for the guest user."));
url::redirect($redir_uri); url::redirect($redir_uri);
return; return;
} }
$user_id = $user->id; $user_id = $getuser->user->id;
} }
//Add tag to item, create tag if not exists //Add tag to item, create tag if not exists

6
modules/photoannotation/css/photoannotation.css
View File

@ -1,4 +1,8 @@
/* Tag cloud ~~~~~~~~~~~~~~~~~~~~~~~ */ .photoannotation-user-search {
border-bottom-style:solid;
border-bottom-width:1px;
padding: 0.8em 0.8em !important;
}
#g-user-cloud ul { #g-user-cloud ul {
font-size: 1.2em; font-size: 1.2em;

68
modules/photoannotation/helpers/photoannotation.php
View File

@ -18,6 +18,62 @@
* Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
*/ */
class photoannotation_Core { class photoannotation_Core {
static function search_user($q, $page_size, $offset) {
$db = Database::instance();
$q = trim($q, "*");
$q = $db->escape($q) ."*";
if ($q == "*") {
$users = ORM::factory("user");
$count = $users->count_all();
$data = $users->order_by("name", "ASC")->find_all($page_size, $offset);
return array($count, $data);
} else {
$query =
"SELECT SQL_CALC_FOUND_ROWS {users}.*, " .
" MATCH({users}.`name`) AGAINST ('$q' IN BOOLEAN MODE) AS `score` " .
"FROM {users} " .
"WHERE MATCH({users}.`name`) AGAINST ('$q' IN BOOLEAN MODE) " .
"ORDER BY `score` DESC " .
"LIMIT $page_size OFFSET $offset";
$data = $db->query($query);
$count = $db->query("SELECT FOUND_ROWS() as c")->current()->c;
return array($count, new ORM_Iterator(ORM::factory("user"), $data));
}
}
static function get_user_search_form($form_id) {
$form = new Forge("photoannotation/showuser/{$item->id}", "", "post", array("id" => $form_id, "class" => "g-short-form"));
$label = t("Type user name");
$group = $form->group("showuser")->label("Search for a user");
$group->input("name")->label($label)->id("name");
$group->submit("")->value(t("Search"));
return $form;
}
public static function getuser($user_string) {
$user_parts = explode("(", $user_string);
$user_part = rtrim(ltrim(end($user_parts)), ")");
$user = ORM::factory("user")->where("name", "=", $user_part)->find();
$user_firstpart = trim(implode(array_slice($user_parts, 0, count($user_parts)-1)));
if (!$user->loaded() || strcasecmp($user_firstpart, $user->display_name()) <> 0) {
$result->found = false;
$result->isguest = false;
$result->user = "";
return $result;
}
if (identity::guest()->id == $user->id) {
$result->found = true;
$result->isguest = true;
$result->user = "";
return $result;
}
$result->found = true;
$result->isguest = false;
$result->user = $user;
return $result;
}
public static function saveuser($user_id, $item_id, $str_x1, $str_y1, $str_x2, $str_y2, $description) { public static function saveuser($user_id, $item_id, $str_x1, $str_y1, $str_x2, $str_y2, $description) {
//Since we are associating a user we will remove any old annotation of this user on this photo //Since we are associating a user we will remove any old annotation of this user on this photo
$item_old_users = ORM::factory("items_user") $item_old_users = ORM::factory("items_user")
@ -202,4 +258,16 @@ class photoannotation_Core {
return $cloud; return $cloud;
} }
} }
static function comment_count($user_id) {
if (module::is_active("comment")) {
return ORM::factory("comment")->where("author_id", "=", $user_id)->count_all();
} else {
return false;
}
}
static function annotation_count($user_id) {
return ORM::factory("items_user")->where("user_id", "=", $user_id)->count_all();
}
} }

4
modules/photoannotation/helpers/photoannotation_block.php
View File

@ -31,8 +31,8 @@ class photoannotation_block_Core {
$block->title = t("Users"); $block->title = t("Users");
$block->content = new View("photoannotation_block.html"); $block->content = new View("photoannotation_block.html");
$block->content->cloud = photoannotation::cloud(30); $block->content->cloud = photoannotation::cloud(30);
$block->content->form = ""; $block->content->form = photoannotation::get_user_search_form("g-user-cloud-form");
} }
return $block; return $block;
} }
} }

4
modules/photoannotation/helpers/photoannotation_theme.php
View File

@ -21,7 +21,7 @@ class photoannotation_theme_Core {
static function head($theme) { static function head($theme) {
$theme->css("photoannotation.css"); $theme->css("photoannotation.css");
if ($theme->page_subtype == "photo") { if ($theme->page_subtype == "photo") {
$theme->script("jquery.annotate.js"); $theme->script("jquery.annotate.min.js");
$noborder = module::get_var("photoannotation", "noborder", false); $noborder = module::get_var("photoannotation", "noborder", false);
$noclickablehover = module::get_var("photoannotation", "noclickablehover", false); $noclickablehover = module::get_var("photoannotation", "noclickablehover", false);
$nohover = module::get_var("photoannotation", "nohover", false); $nohover = module::get_var("photoannotation", "nohover", false);
@ -74,7 +74,7 @@ class photoannotation_theme_Core {
static function admin_head($theme) { static function admin_head($theme) {
if (strpos($theme->content->kohana_filename, "admin_photoannotation.html.php")) { if (strpos($theme->content->kohana_filename, "admin_photoannotation.html.php")) {
$theme->css("colorpicker.css"); $theme->css("colorpicker.css");
$theme->script("colorpicker.js"); $theme->script("jquery.colorpicker.min.js");
} }
} }

37
modules/photoannotation/js/jquery.annotate.js
View File

@ -25,7 +25,7 @@
this.csrf = opts.csrf; this.csrf = opts.csrf;
this.cssaclass = opts.cssaclass; this.cssaclass = opts.cssaclass;
this.rtlsupport = opts.rtlsupport; this.rtlsupport = opts.rtlsupport;
this.users = opts.users this.users = opts.users;
// Add the canvas // Add the canvas
this.canvas = $('<div class="image-annotate-canvas g-thumbnail"><div class="image-annotate-view"></div><div class="image-annotate-edit"><div class="image-annotate-edit-area"></div></div></div>'); this.canvas = $('<div class="image-annotate-canvas g-thumbnail"><div class="image-annotate-view"></div><div class="image-annotate-edit"><div class="image-annotate-edit-area"></div></div></div>');
@ -65,7 +65,7 @@
} }
// Add the "Add a note" button // Add the "Add a note" button
if ($('#g-photoannotation-link').length != 0) { if ($('#g-photoannotation-link').length !== 0) {
this.button = $('#g-photoannotation-link'); this.button = $('#g-photoannotation-link');
this.button.click(function() { this.button.click(function() {
$.fn.annotateImage.add(image, opts.tags, opts.labels, opts.saveUrl, opts.csrf, opts.rtlsupport, opts.users); $.fn.annotateImage.add(image, opts.tags, opts.labels, opts.saveUrl, opts.csrf, opts.rtlsupport, opts.users);
@ -156,7 +156,7 @@
ok.click(function() { ok.click(function() {
var form = $('#image-annotate-edit-form form'); var form = $('#image-annotate-edit-form form');
var text = $('#image-annotate-text').val(); var text = $('#image-annotate-text').val();
$.fn.annotateImage.appendPosition(form, editable) $.fn.annotateImage.appendPosition(form, editable);
image.mode = 'view'; image.mode = 'view';
form.submit(); form.submit();
@ -242,24 +242,7 @@
} else { } else {
notetitle = this.note.text; notetitle = this.note.text;
} }
var form = $('<div id="image-annotate-edit-form" class="ui-dialog-content ui-widget-content ' + rtlsupport + '">\ var form = $('<div id="image-annotate-edit-form" class="ui-dialog-content ui-widget-content ' + rtlsupport + '"><form id="photoannotation-form" action="' + saveUrl + '" method="post"><input type="hidden" name="csrf" value="' + csrf + '" /><input type="hidden" name="noteid" value="' + this.note.noteid + '" /><input type="hidden" name="notetype" value="' + this.note.notetype + '" /><fieldset><legend>' + labels[12] + '</legend><label for="photoannotation-user-list">' + labels[10] + '</label><input id="photoannotation-user-list" class="textbox ui-corner-left ui-corner-right" type="text" name="userlist" style="width: 210px;" value="' + username + '" /><div style="text-align: center"><strong>' + labels[4] + '</strong></div><label for="image-annotate-tag-text">' + labels[0] + '</label><input id="image-annotate-tag-text" class="textbox ui-corner-left ui-corner-right" type="text" name="tagsList" style="width: 210px;" value="' + selectedtag + '" /><div style="text-align: center"><strong>' + labels[4] + '</strong></div><label for="image-annotate-text">' + labels[1] + '</label><input id="image-annotate-text" class="textbox ui-corner-left ui-corner-right" type="text" name="text" style="width: 210px;" value="' + notetitle + '" /></fieldset><fieldset><legend>' + labels[2] + '</legend><textarea id="image-annotate-desc" name="desc" rows="3" style="width: 210px;">' + this.note.description + '</textarea></fieldset</form></div>');
<form id="photoannotation-form" action="' + saveUrl + '" method="post">\
<input type="hidden" name="csrf" value="' + csrf + '" /><input type="hidden" name="noteid" value="' + this.note.noteid + '" />\
<input type="hidden" name="notetype" value="' + this.note.notetype + '" />\
<fieldset><legend>' + labels[12] + '</legend>\
<label for="photoannotation-user-list">' + labels[10] + '</label>\
<input id="photoannotation-user-list" class="textbox ui-corner-left ui-corner-right" type="text" name="userlist" style="width: 210px;" value="' + username + '" />\
<div style="text-align: center"><strong>' + labels[4] + '</strong></div>\
<label for="image-annotate-tag-text">' + labels[0] + '</label>\
<input id="image-annotate-tag-text" class="textbox ui-corner-left ui-corner-right" type="text" name="tagsList" style="width: 210px;" value="' + selectedtag + '" />' +
'<div style="text-align: center"><strong>' + labels[4] + '</strong></div><label for="image-annotate-text">' + labels[1] + '</label>\
<input id="image-annotate-text" class="textbox ui-corner-left ui-corner-right" type="text" name="text" style="width: 210px;" value="' + notetitle + '" />\
</fieldset>\
<fieldset><legend>' + labels[2] + '</legend>\
<textarea id="image-annotate-desc" name="desc" rows="3" style="width: 210px;">' + this.note.description + '</textarea></fieldset</form></div>');
this.form = form; this.form = form;
$('body').append(this.form); $('body').append(this.form);
$("#photoannotation-form").ready(function() { $("#photoannotation-form").ready(function() {
@ -353,7 +336,7 @@
this.area.css('left', ''); this.area.css('left', '');
this.area.css('top', ''); this.area.css('top', '');
this.form.remove(); this.form.remove();
} };
$.fn.annotateView = function(image, note, tags, labels, editable, csrf, deleteUrl, saveUrl, cssaclass, rtlsupport, users) { $.fn.annotateView = function(image, note, tags, labels, editable, csrf, deleteUrl, saveUrl, cssaclass, rtlsupport, users) {
/// <summary> /// <summary>
@ -395,7 +378,7 @@
close: function(event, ui) { location.reload(); }, close: function(event, ui) { location.reload(); },
buttons: btns buttons: btns
}); });
}) });
var form = this; var form = this;
this.editarea.bind('click',function () { this.editarea.bind('click',function () {
var alink = $(cssaclass); var alink = $(cssaclass);
@ -403,7 +386,7 @@
alink.attr ('href', '#'); alink.attr ('href', '#');
alink.removeAttr ('rel'); alink.removeAttr ('rel');
form.edit(tags, labels, saveUrl, csrf, rtlsupport, users); form.edit(tags, labels, saveUrl, csrf, rtlsupport, users);
}) });
this.delarea.hide(); this.delarea.hide();
this.editarea.hide(); this.editarea.hide();
} }
@ -475,7 +458,7 @@
alink.attr ('href', '#'); alink.attr ('href', '#');
alink.removeAttr ('rel'); alink.removeAttr ('rel');
window.location = note.url; window.location = note.url;
}) });
} }
}; };
@ -534,7 +517,7 @@
/// </summary> /// </summary>
this.area.remove(); this.area.remove();
this.form.remove(); this.form.remove();
} };
$.fn.annotateView.prototype.edit = function(tags, labels, saveUrl, csrf, rtlsupport, users) { $.fn.annotateView.prototype.edit = function(tags, labels, saveUrl, csrf, rtlsupport, users) {
/// <summary> /// <summary>
@ -561,7 +544,7 @@
'<input type="hidden" value="' + editable.area.position().left + '" name="left"/>' + '<input type="hidden" value="' + editable.area.position().left + '" name="left"/>' +
'<input type="hidden" value="' + editable.note.id + '" name="id"/>'); '<input type="hidden" value="' + editable.note.id + '" name="id"/>');
form.append(areaFields); form.append(areaFields);
} };
$.fn.annotateView.prototype.resetPosition = function(editable, text) { $.fn.annotateView.prototype.resetPosition = function(editable, text) {
/// <summary> /// <summary>

1
modules/photoannotation/js/jquery.annotate.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

968
modules/photoannotation/js/colorpicker.js → modules/photoannotation/js/jquery.colorpicker.js
View File

@ -1,484 +1,484 @@
/** /**
* *
* Color picker * Color picker
* Author: Stefan Petre www.eyecon.ro * Author: Stefan Petre www.eyecon.ro
* *
* Dual licensed under the MIT and GPL licenses * Dual licensed under the MIT and GPL licenses
* *
*/ */
(function ($) { (function ($) {
var ColorPicker = function () { var ColorPicker = function () {
var var
ids = {}, ids = {},
inAction, inAction,
charMin = 65, charMin = 65,
visible, visible,
tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"></div></div>', tpl = '<div class="colorpicker"><div class="colorpicker_color"><div><div></div></div></div><div class="colorpicker_hue"><div></div></div><div class="colorpicker_new_color"></div><div class="colorpicker_current_color"></div><div class="colorpicker_hex"><input type="text" maxlength="6" size="6" /></div><div class="colorpicker_rgb_r colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_g colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_rgb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_h colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_s colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_hsb_b colorpicker_field"><input type="text" maxlength="3" size="3" /><span></span></div><div class="colorpicker_submit"></div></div>',
defaults = { defaults = {
eventName: 'click', eventName: 'click',
onShow: function () {}, onShow: function () {},
onBeforeShow: function(){}, onBeforeShow: function(){},
onHide: function () {}, onHide: function () {},
onChange: function () {}, onChange: function () {},
onSubmit: function () {}, onSubmit: function () {},
color: 'ff0000', color: 'ff0000',
livePreview: true, livePreview: true,
flat: false flat: false
}, },
fillRGBFields = function (hsb, cal) { fillRGBFields = function (hsb, cal) {
var rgb = HSBToRGB(hsb); var rgb = HSBToRGB(hsb);
$(cal).data('colorpicker').fields $(cal).data('colorpicker').fields
.eq(1).val(rgb.r).end() .eq(1).val(rgb.r).end()
.eq(2).val(rgb.g).end() .eq(2).val(rgb.g).end()
.eq(3).val(rgb.b).end(); .eq(3).val(rgb.b).end();
}, },
fillHSBFields = function (hsb, cal) { fillHSBFields = function (hsb, cal) {
$(cal).data('colorpicker').fields $(cal).data('colorpicker').fields
.eq(4).val(hsb.h).end() .eq(4).val(hsb.h).end()
.eq(5).val(hsb.s).end() .eq(5).val(hsb.s).end()
.eq(6).val(hsb.b).end(); .eq(6).val(hsb.b).end();
}, },
fillHexFields = function (hsb, cal) { fillHexFields = function (hsb, cal) {
$(cal).data('colorpicker').fields $(cal).data('colorpicker').fields
.eq(0).val(HSBToHex(hsb)).end(); .eq(0).val(HSBToHex(hsb)).end();
}, },
setSelector = function (hsb, cal) { setSelector = function (hsb, cal) {
$(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({h: hsb.h, s: 100, b: 100})); $(cal).data('colorpicker').selector.css('backgroundColor', '#' + HSBToHex({h: hsb.h, s: 100, b: 100}));
$(cal).data('colorpicker').selectorIndic.css({ $(cal).data('colorpicker').selectorIndic.css({
left: parseInt(150 * hsb.s/100, 10), left: parseInt(150 * hsb.s/100, 10),
top: parseInt(150 * (100-hsb.b)/100, 10) top: parseInt(150 * (100-hsb.b)/100, 10)
}); });
}, },
setHue = function (hsb, cal) { setHue = function (hsb, cal) {
$(cal).data('colorpicker').hue.css('top', parseInt(150 - 150 * hsb.h/360, 10)); $(cal).data('colorpicker').hue.css('top', parseInt(150 - 150 * hsb.h/360, 10));
}, },
setCurrentColor = function (hsb, cal) { setCurrentColor = function (hsb, cal) {
$(cal).data('colorpicker').currentColor.css('backgroundColor', '#' + HSBToHex(hsb)); $(cal).data('colorpicker').currentColor.css('backgroundColor', '#' + HSBToHex(hsb));
}, },
setNewColor = function (hsb, cal) { setNewColor = function (hsb, cal) {
$(cal).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(hsb)); $(cal).data('colorpicker').newColor.css('backgroundColor', '#' + HSBToHex(hsb));
}, },
keyDown = function (ev) { keyDown = function (ev) {
var pressedKey = ev.charCode || ev.keyCode || -1; var pressedKey = ev.charCode || ev.keyCode || -1;
if ((pressedKey > charMin && pressedKey <= 90) || pressedKey == 32) { if ((pressedKey > charMin && pressedKey <= 90) || pressedKey == 32) {
return false; return false;
} }
var cal = $(this).parent().parent(); var cal = $(this).parent().parent();
if (cal.data('colorpicker').livePreview === true) { if (cal.data('colorpicker').livePreview === true) {
change.apply(this); change.apply(this);
} }
}, },
change = function (ev) { change = function (ev) {
var cal = $(this).parent().parent(), col; var cal = $(this).parent().parent(), col;
if (this.parentNode.className.indexOf('_hex') > 0) { if (this.parentNode.className.indexOf('_hex') > 0) {
cal.data('colorpicker').color = col = HexToHSB(fixHex(this.value)); cal.data('colorpicker').color = col = HexToHSB(fixHex(this.value));
} else if (this.parentNode.className.indexOf('_hsb') > 0) { } else if (this.parentNode.className.indexOf('_hsb') > 0) {
cal.data('colorpicker').color = col = fixHSB({ cal.data('colorpicker').color = col = fixHSB({
h: parseInt(cal.data('colorpicker').fields.eq(4).val(), 10), h: parseInt(cal.data('colorpicker').fields.eq(4).val(), 10),
s: parseInt(cal.data('colorpicker').fields.eq(5).val(), 10), s: parseInt(cal.data('colorpicker').fields.eq(5).val(), 10),
b: parseInt(cal.data('colorpicker').fields.eq(6).val(), 10) b: parseInt(cal.data('colorpicker').fields.eq(6).val(), 10)
}); });
} else { } else {
cal.data('colorpicker').color = col = RGBToHSB(fixRGB({ cal.data('colorpicker').color = col = RGBToHSB(fixRGB({
r: parseInt(cal.data('colorpicker').fields.eq(1).val(), 10), r: parseInt(cal.data('colorpicker').fields.eq(1).val(), 10),
g: parseInt(cal.data('colorpicker').fields.eq(2).val(), 10), g: parseInt(cal.data('colorpicker').fields.eq(2).val(), 10),
b: parseInt(cal.data('colorpicker').fields.eq(3).val(), 10) b: parseInt(cal.data('colorpicker').fields.eq(3).val(), 10)
})); }));
} }
if (ev) { if (ev) {
fillRGBFields(col, cal.get(0)); fillRGBFields(col, cal.get(0));
fillHexFields(col, cal.get(0)); fillHexFields(col, cal.get(0));
fillHSBFields(col, cal.get(0)); fillHSBFields(col, cal.get(0));
} }
setSelector(col, cal.get(0)); setSelector(col, cal.get(0));
setHue(col, cal.get(0)); setHue(col, cal.get(0));
setNewColor(col, cal.get(0)); setNewColor(col, cal.get(0));
cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col)]); cal.data('colorpicker').onChange.apply(cal, [col, HSBToHex(col), HSBToRGB(col)]);
}, },
blur = function (ev) { blur = function (ev) {
var cal = $(this).parent().parent(); var cal = $(this).parent().parent();
cal.data('colorpicker').fields.parent().removeClass('colorpicker_focus'); cal.data('colorpicker').fields.parent().removeClass('colorpicker_focus');
}, },
focus = function () { focus = function () {
charMin = this.parentNode.className.indexOf('_hex') > 0 ? 70 : 65; charMin = this.parentNode.className.indexOf('_hex') > 0 ? 70 : 65;
$(this).parent().parent().data('colorpicker').fields.parent().removeClass('colorpicker_focus'); $(this).parent().parent().data('colorpicker').fields.parent().removeClass('colorpicker_focus');
$(this).parent().addClass('colorpicker_focus'); $(this).parent().addClass('colorpicker_focus');
}, },
downIncrement = function (ev) { downIncrement = function (ev) {
var field = $(this).parent().find('input').focus(); var field = $(this).parent().find('input').focus();
var current = { var current = {
el: $(this).parent().addClass('colorpicker_slider'), el: $(this).parent().addClass('colorpicker_slider'),
max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255), max: this.parentNode.className.indexOf('_hsb_h') > 0 ? 360 : (this.parentNode.className.indexOf('_hsb') > 0 ? 100 : 255),
y: ev.pageY, y: ev.pageY,
field: field, field: field,
val: parseInt(field.val(), 10), val: parseInt(field.val(), 10),
preview: $(this).parent().parent().data('colorpicker').livePreview preview: $(this).parent().parent().data('colorpicker').livePreview
}; };
$(document).bind('mouseup', current, upIncrement); $(document).bind('mouseup', current, upIncrement);
$(document).bind('mousemove', current, moveIncrement); $(document).bind('mousemove', current, moveIncrement);
}, },
moveIncrement = function (ev) { moveIncrement = function (ev) {
ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val + ev.pageY - ev.data.y, 10)))); ev.data.field.val(Math.max(0, Math.min(ev.data.max, parseInt(ev.data.val + ev.pageY - ev.data.y, 10))));
if (ev.data.preview) { if (ev.data.preview) {
change.apply(ev.data.field.get(0), [true]); change.apply(ev.data.field.get(0), [true]);
} }
return false; return false;
}, },
upIncrement = function (ev) { upIncrement = function (ev) {
change.apply(ev.data.field.get(0), [true]); change.apply(ev.data.field.get(0), [true]);
ev.data.el.removeClass('colorpicker_slider').find('input').focus(); ev.data.el.removeClass('colorpicker_slider').find('input').focus();
$(document).unbind('mouseup', upIncrement); $(document).unbind('mouseup', upIncrement);
$(document).unbind('mousemove', moveIncrement); $(document).unbind('mousemove', moveIncrement);
return false; return false;
}, },
downHue = function (ev) { downHue = function (ev) {
var current = { var current = {
cal: $(this).parent(), cal: $(this).parent(),
y: $(this).offset().top y: $(this).offset().top
}; };
current.preview = current.cal.data('colorpicker').livePreview; current.preview = current.cal.data('colorpicker').livePreview;
$(document).bind('mouseup', current, upHue); $(document).bind('mouseup', current, upHue);
$(document).bind('mousemove', current, moveHue); $(document).bind('mousemove', current, moveHue);
}, },
moveHue = function (ev) { moveHue = function (ev) {
change.apply( change.apply(
ev.data.cal.data('colorpicker') ev.data.cal.data('colorpicker')
.fields .fields
.eq(4) .eq(4)
.val(parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.y))))/150, 10)) .val(parseInt(360*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.y))))/150, 10))
.get(0), .get(0),
[ev.data.preview] [ev.data.preview]
); );
return false; return false;
}, },
upHue = function (ev) { upHue = function (ev) {
fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
$(document).unbind('mouseup', upHue); $(document).unbind('mouseup', upHue);
$(document).unbind('mousemove', moveHue); $(document).unbind('mousemove', moveHue);
return false; return false;
}, },
downSelector = function (ev) { downSelector = function (ev) {
var current = { var current = {
cal: $(this).parent(), cal: $(this).parent(),
pos: $(this).offset() pos: $(this).offset()
}; };
current.preview = current.cal.data('colorpicker').livePreview; current.preview = current.cal.data('colorpicker').livePreview;
$(document).bind('mouseup', current, upSelector); $(document).bind('mouseup', current, upSelector);
$(document).bind('mousemove', current, moveSelector); $(document).bind('mousemove', current, moveSelector);
}, },
moveSelector = function (ev) { moveSelector = function (ev) {
change.apply( change.apply(
ev.data.cal.data('colorpicker') ev.data.cal.data('colorpicker')
.fields .fields
.eq(6) .eq(6)
.val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.pos.top))))/150, 10)) .val(parseInt(100*(150 - Math.max(0,Math.min(150,(ev.pageY - ev.data.pos.top))))/150, 10))
.end() .end()
.eq(5) .eq(5)
.val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - ev.data.pos.left))))/150, 10)) .val(parseInt(100*(Math.max(0,Math.min(150,(ev.pageX - ev.data.pos.left))))/150, 10))
.get(0), .get(0),
[ev.data.preview] [ev.data.preview]
); );
return false; return false;
}, },
upSelector = function (ev) { upSelector = function (ev) {
fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); fillRGBFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0)); fillHexFields(ev.data.cal.data('colorpicker').color, ev.data.cal.get(0));
$(document).unbind('mouseup', upSelector); $(document).unbind('mouseup', upSelector);
$(document).unbind('mousemove', moveSelector); $(document).unbind('mousemove', moveSelector);
return false; return false;
}, },
enterSubmit = function (ev) { enterSubmit = function (ev) {
$(this).addClass('colorpicker_focus'); $(this).addClass('colorpicker_focus');
}, },
leaveSubmit = function (ev) { leaveSubmit = function (ev) {
$(this).removeClass('colorpicker_focus'); $(this).removeClass('colorpicker_focus');
}, },
clickSubmit = function (ev) { clickSubmit = function (ev) {
var cal = $(this).parent(); var cal = $(this).parent();
var col = cal.data('colorpicker').color; var col = cal.data('colorpicker').color;
cal.data('colorpicker').origColor = col; cal.data('colorpicker').origColor = col;
setCurrentColor(col, cal.get(0)); setCurrentColor(col, cal.get(0));
cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el); cal.data('colorpicker').onSubmit(col, HSBToHex(col), HSBToRGB(col), cal.data('colorpicker').el);
}, },
show = function (ev) { show = function (ev) {
var cal = $('#' + $(this).data('colorpickerId')); var cal = $('#' + $(this).data('colorpickerId'));
cal.data('colorpicker').onBeforeShow.apply(this, [cal.get(0)]); cal.data('colorpicker').onBeforeShow.apply(this, [cal.get(0)]);
var pos = $(this).offset(); var pos = $(this).offset();
var viewPort = getViewport(); var viewPort = getViewport();
var top = pos.top + this.offsetHeight; var top = pos.top + this.offsetHeight;
var left = pos.left; var left = pos.left;
if (top + 176 > viewPort.t + viewPort.h) { if (top + 176 > viewPort.t + viewPort.h) {
top -= this.offsetHeight + 176; top -= this.offsetHeight + 176;
} }
if (left + 356 > viewPort.l + viewPort.w) { if (left + 356 > viewPort.l + viewPort.w) {
left -= 356; left -= 356;
} }
cal.css({left: left + 'px', top: top + 'px'}); cal.css({left: left + 'px', top: top + 'px'});
if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) { if (cal.data('colorpicker').onShow.apply(this, [cal.get(0)]) != false) {
cal.show(); cal.show();
} }
$(document).bind('mousedown', {cal: cal}, hide); $(document).bind('mousedown', {cal: cal}, hide);
return false; return false;
}, },
hide = function (ev) { hide = function (ev) {
if (!isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) { if (!isChildOf(ev.data.cal.get(0), ev.target, ev.data.cal.get(0))) {
if (ev.data.cal.data('colorpicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) { if (ev.data.cal.data('colorpicker').onHide.apply(this, [ev.data.cal.get(0)]) != false) {
ev.data.cal.hide(); ev.data.cal.hide();
} }
$(document).unbind('mousedown', hide); $(document).unbind('mousedown', hide);
} }
}, },
isChildOf = function(parentEl, el, container) { isChildOf = function(parentEl, el, container) {
if (parentEl == el) { if (parentEl == el) {
return true; return true;
} }
if (parentEl.contains) { if (parentEl.contains) {
return parentEl.contains(el); return parentEl.contains(el);
} }
if ( parentEl.compareDocumentPosition ) { if ( parentEl.compareDocumentPosition ) {
return !!(parentEl.compareDocumentPosition(el) & 16); return !!(parentEl.compareDocumentPosition(el) & 16);
} }
var prEl = el.parentNode; var prEl = el.parentNode;
while(prEl && prEl != container) { while(prEl && prEl != container) {
if (prEl == parentEl) if (prEl == parentEl)
return true; return true;
prEl = prEl.parentNode; prEl = prEl.parentNode;
} }
return false; return false;
}, },
getViewport = function () { getViewport = function () {
var m = document.compatMode == 'CSS1Compat'; var m = document.compatMode == 'CSS1Compat';
return { return {
l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft), l : window.pageXOffset || (m ? document.documentElement.scrollLeft : document.body.scrollLeft),
t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop), t : window.pageYOffset || (m ? document.documentElement.scrollTop : document.body.scrollTop),
w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth), w : window.innerWidth || (m ? document.documentElement.clientWidth : document.body.clientWidth),
h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight) h : window.innerHeight || (m ? document.documentElement.clientHeight : document.body.clientHeight)
}; };
}, },
fixHSB = function (hsb) { fixHSB = function (hsb) {
return { return {
h: Math.min(360, Math.max(0, hsb.h)), h: Math.min(360, Math.max(0, hsb.h)),
s: Math.min(100, Math.max(0, hsb.s)), s: Math.min(100, Math.max(0, hsb.s)),
b: Math.min(100, Math.max(0, hsb.b)) b: Math.min(100, Math.max(0, hsb.b))
}; };
}, },
fixRGB = function (rgb) { fixRGB = function (rgb) {
return { return {
r: Math.min(255, Math.max(0, rgb.r)), r: Math.min(255, Math.max(0, rgb.r)),
g: Math.min(255, Math.max(0, rgb.g)), g: Math.min(255, Math.max(0, rgb.g)),
b: Math.min(255, Math.max(0, rgb.b)) b: Math.min(255, Math.max(0, rgb.b))
}; };
}, },
fixHex = function (hex) { fixHex = function (hex) {
var len = 6 - hex.length; var len = 6 - hex.length;
if (len > 0) { if (len > 0) {
var o = []; var o = [];
for (var i=0; i<len; i++) { for (var i=0; i<len; i++) {
o.push('0'); o.push('0');
} }
o.push(hex); o.push(hex);
hex = o.join(''); hex = o.join('');
} }
return hex; return hex;
}, },
HexToRGB = function (hex) { HexToRGB = function (hex) {
var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16); var hex = parseInt(((hex.indexOf('#') > -1) ? hex.substring(1) : hex), 16);
return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)}; return {r: hex >> 16, g: (hex & 0x00FF00) >> 8, b: (hex & 0x0000FF)};
}, },
HexToHSB = function (hex) { HexToHSB = function (hex) {
return RGBToHSB(HexToRGB(hex)); return RGBToHSB(HexToRGB(hex));
}, },
RGBToHSB = function (rgb) { RGBToHSB = function (rgb) {
var hsb = { var hsb = {
h: 0, h: 0,
s: 0, s: 0,
b: 0 b: 0
}; };
var min = Math.min(rgb.r, rgb.g, rgb.b); var min = Math.min(rgb.r, rgb.g, rgb.b);
var max = Math.max(rgb.r, rgb.g, rgb.b); var max = Math.max(rgb.r, rgb.g, rgb.b);
var delta = max - min; var delta = max - min;
hsb.b = max; hsb.b = max;
if (max != 0) { if (max != 0) {
} }
hsb.s = max != 0 ? 255 * delta / max : 0; hsb.s = max != 0 ? 255 * delta / max : 0;
if (hsb.s != 0) { if (hsb.s != 0) {
if (rgb.r == max) { if (rgb.r == max) {
hsb.h = (rgb.g - rgb.b) / delta; hsb.h = (rgb.g - rgb.b) / delta;
} else if (rgb.g == max) { } else if (rgb.g == max) {
hsb.h = 2 + (rgb.b - rgb.r) / delta; hsb.h = 2 + (rgb.b - rgb.r) / delta;
} else { } else {
hsb.h = 4 + (rgb.r - rgb.g) / delta; hsb.h = 4 + (rgb.r - rgb.g) / delta;
} }
} else { } else {
hsb.h = -1; hsb.h = -1;
} }
hsb.h *= 60; hsb.h *= 60;
if (hsb.h < 0) { if (hsb.h < 0) {
hsb.h += 360; hsb.h += 360;
} }
hsb.s *= 100/255; hsb.s *= 100/255;
hsb.b *= 100/255; hsb.b *= 100/255;
return hsb; return hsb;
}, },
HSBToRGB = function (hsb) { HSBToRGB = function (hsb) {
var rgb = {}; var rgb = {};
var h = Math.round(hsb.h); var h = Math.round(hsb.h);
var s = Math.round(hsb.s*255/100); var s = Math.round(hsb.s*255/100);
var v = Math.round(hsb.b*255/100); var v = Math.round(hsb.b*255/100);
if(s == 0) { if(s == 0) {
rgb.r = rgb.g = rgb.b = v; rgb.r = rgb.g = rgb.b = v;
} else { } else {
var t1 = v; var t1 = v;
var t2 = (255-s)*v/255; var t2 = (255-s)*v/255;
var t3 = (t1-t2)*(h%60)/60; var t3 = (t1-t2)*(h%60)/60;
if(h==360) h = 0; if(h==360) h = 0;
if(h<60) {rgb.r=t1; rgb.b=t2; rgb.g=t2+t3} if(h<60) {rgb.r=t1; rgb.b=t2; rgb.g=t2+t3}
else if(h<120) {rgb.g=t1; rgb.b=t2; rgb.r=t1-t3} else if(h<120) {rgb.g=t1; rgb.b=t2; rgb.r=t1-t3}
else if(h<180) {rgb.g=t1; rgb.r=t2; rgb.b=t2+t3} else if(h<180) {rgb.g=t1; rgb.r=t2; rgb.b=t2+t3}
else if(h<240) {rgb.b=t1; rgb.r=t2; rgb.g=t1-t3} else if(h<240) {rgb.b=t1; rgb.r=t2; rgb.g=t1-t3}
else if(h<300) {rgb.b=t1; rgb.g=t2; rgb.r=t2+t3} else if(h<300) {rgb.b=t1; rgb.g=t2; rgb.r=t2+t3}
else if(h<360) {rgb.r=t1; rgb.g=t2; rgb.b=t1-t3} else if(h<360) {rgb.r=t1; rgb.g=t2; rgb.b=t1-t3}
else {rgb.r=0; rgb.g=0; rgb.b=0} else {rgb.r=0; rgb.g=0; rgb.b=0}
} }
return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)}; return {r:Math.round(rgb.r), g:Math.round(rgb.g), b:Math.round(rgb.b)};
}, },
RGBToHex = function (rgb) { RGBToHex = function (rgb) {
var hex = [ var hex = [
rgb.r.toString(16), rgb.r.toString(16),
rgb.g.toString(16), rgb.g.toString(16),
rgb.b.toString(16) rgb.b.toString(16)
]; ];
$.each(hex, function (nr, val) { $.each(hex, function (nr, val) {
if (val.length == 1) { if (val.length == 1) {
hex[nr] = '0' + val; hex[nr] = '0' + val;
} }
}); });
return hex.join(''); return hex.join('');
}, },
HSBToHex = function (hsb) { HSBToHex = function (hsb) {
return RGBToHex(HSBToRGB(hsb)); return RGBToHex(HSBToRGB(hsb));
}, },
restoreOriginal = function () { restoreOriginal = function () {
var cal = $(this).parent(); var cal = $(this).parent();
var col = cal.data('colorpicker').origColor; var col = cal.data('colorpicker').origColor;
cal.data('colorpicker').color = col; cal.data('colorpicker').color = col;
fillRGBFields(col, cal.get(0)); fillRGBFields(col, cal.get(0));
fillHexFields(col, cal.get(0)); fillHexFields(col, cal.get(0));
fillHSBFields(col, cal.get(0)); fillHSBFields(col, cal.get(0));
setSelector(col, cal.get(0)); setSelector(col, cal.get(0));
setHue(col, cal.get(0)); setHue(col, cal.get(0));
setNewColor(col, cal.get(0)); setNewColor(col, cal.get(0));
}; };
return { return {
init: function (opt) { init: function (opt) {
opt = $.extend({}, defaults, opt||{}); opt = $.extend({}, defaults, opt||{});
if (typeof opt.color == 'string') { if (typeof opt.color == 'string') {
opt.color = HexToHSB(opt.color); opt.color = HexToHSB(opt.color);
} else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) { } else if (opt.color.r != undefined && opt.color.g != undefined && opt.color.b != undefined) {
opt.color = RGBToHSB(opt.color); opt.color = RGBToHSB(opt.color);
} else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) { } else if (opt.color.h != undefined && opt.color.s != undefined && opt.color.b != undefined) {
opt.color = fixHSB(opt.color); opt.color = fixHSB(opt.color);
} else { } else {
return this; return this;
} }
return this.each(function () { return this.each(function () {
if (!$(this).data('colorpickerId')) { if (!$(this).data('colorpickerId')) {
var options = $.extend({}, opt); var options = $.extend({}, opt);
options.origColor = opt.color; options.origColor = opt.color;
var id = 'collorpicker_' + parseInt(Math.random() * 1000); var id = 'collorpicker_' + parseInt(Math.random() * 1000);
$(this).data('colorpickerId', id); $(this).data('colorpickerId', id);
var cal = $(tpl).attr('id', id); var cal = $(tpl).attr('id', id);
if (options.flat) { if (options.flat) {
cal.appendTo(this).show(); cal.appendTo(this).show();
} else { } else {
cal.appendTo(document.body); cal.appendTo(document.body);
} }
options.fields = cal options.fields = cal
.find('input') .find('input')
.bind('keyup', keyDown) .bind('keyup', keyDown)
.bind('change', change) .bind('change', change)
.bind('blur', blur) .bind('blur', blur)
.bind('focus', focus); .bind('focus', focus);
cal cal
.find('span').bind('mousedown', downIncrement).end() .find('span').bind('mousedown', downIncrement).end()
.find('>div.colorpicker_current_color').bind('click', restoreOriginal); .find('>div.colorpicker_current_color').bind('click', restoreOriginal);
options.selector = cal.find('div.colorpicker_color').bind('mousedown', downSelector); options.selector = cal.find('div.colorpicker_color').bind('mousedown', downSelector);
options.selectorIndic = options.selector.find('div div'); options.selectorIndic = options.selector.find('div div');
options.el = this; options.el = this;
options.hue = cal.find('div.colorpicker_hue div'); options.hue = cal.find('div.colorpicker_hue div');
cal.find('div.colorpicker_hue').bind('mousedown', downHue); cal.find('div.colorpicker_hue').bind('mousedown', downHue);
options.newColor = cal.find('div.colorpicker_new_color'); options.newColor = cal.find('div.colorpicker_new_color');
options.currentColor = cal.find('div.colorpicker_current_color'); options.currentColor = cal.find('div.colorpicker_current_color');
cal.data('colorpicker', options); cal.data('colorpicker', options);
cal.find('div.colorpicker_submit') cal.find('div.colorpicker_submit')
.bind('mouseenter', enterSubmit) .bind('mouseenter', enterSubmit)
.bind('mouseleave', leaveSubmit) .bind('mouseleave', leaveSubmit)
.bind('click', clickSubmit); .bind('click', clickSubmit);
fillRGBFields(options.color, cal.get(0)); fillRGBFields(options.color, cal.get(0));
fillHSBFields(options.color, cal.get(0)); fillHSBFields(options.color, cal.get(0));
fillHexFields(options.color, cal.get(0)); fillHexFields(options.color, cal.get(0));
setHue(options.color, cal.get(0)); setHue(options.color, cal.get(0));
setSelector(options.color, cal.get(0)); setSelector(options.color, cal.get(0));
setCurrentColor(options.color, cal.get(0)); setCurrentColor(options.color, cal.get(0));
setNewColor(options.color, cal.get(0)); setNewColor(options.color, cal.get(0));
if (options.flat) { if (options.flat) {
cal.css({ cal.css({
position: 'relative', position: 'relative',
display: 'block' display: 'block'
}); });
} else { } else {
$(this).bind(options.eventName, show); $(this).bind(options.eventName, show);
} }
} }
}); });
}, },
showPicker: function() { showPicker: function() {
return this.each( function () { return this.each( function () {
if ($(this).data('colorpickerId')) { if ($(this).data('colorpickerId')) {
show.apply(this); show.apply(this);
} }
}); });
}, },
hidePicker: function() { hidePicker: function() {
return this.each( function () { return this.each( function () {
if ($(this).data('colorpickerId')) { if ($(this).data('colorpickerId')) {
$('#' + $(this).data('colorpickerId')).hide(); $('#' + $(this).data('colorpickerId')).hide();
} }
}); });
}, },
setColor: function(col) { setColor: function(col) {
if (typeof col == 'string') { if (typeof col == 'string') {
col = HexToHSB(col); col = HexToHSB(col);
} else if (col.r != undefined && col.g != undefined && col.b != undefined) { } else if (col.r != undefined && col.g != undefined && col.b != undefined) {
col = RGBToHSB(col); col = RGBToHSB(col);
} else if (col.h != undefined && col.s != undefined && col.b != undefined) { } else if (col.h != undefined && col.s != undefined && col.b != undefined) {
col = fixHSB(col); col = fixHSB(col);
} else { } else {
return this; return this;
} }
return this.each(function(){ return this.each(function(){
if ($(this).data('colorpickerId')) { if ($(this).data('colorpickerId')) {
var cal = $('#' + $(this).data('colorpickerId')); var cal = $('#' + $(this).data('colorpickerId'));
cal.data('colorpicker').color = col; cal.data('colorpicker').color = col;
cal.data('colorpicker').origColor = col; cal.data('colorpicker').origColor = col;
fillRGBFields(col, cal.get(0)); fillRGBFields(col, cal.get(0));
fillHSBFields(col, cal.get(0)); fillHSBFields(col, cal.get(0));
fillHexFields(col, cal.get(0)); fillHexFields(col, cal.get(0));
setHue(col, cal.get(0)); setHue(col, cal.get(0));
setSelector(col, cal.get(0)); setSelector(col, cal.get(0));
setCurrentColor(col, cal.get(0)); setCurrentColor(col, cal.get(0));
setNewColor(col, cal.get(0)); setNewColor(col, cal.get(0));
} }
}); });
} }
}; };
}(); }();
$.fn.extend({ $.fn.extend({
ColorPicker: ColorPicker.init, ColorPicker: ColorPicker.init,
ColorPickerHide: ColorPicker.hidePicker, ColorPickerHide: ColorPicker.hidePicker,
ColorPickerShow: ColorPicker.showPicker, ColorPickerShow: ColorPicker.showPicker,
ColorPickerSetColor: ColorPicker.setColor ColorPickerSetColor: ColorPicker.setColor
}); });
})(jQuery); })(jQuery);

1
modules/photoannotation/js/jquery.colorpicker.min.js vendored Normal file
View File

File diff suppressed because one or more lines are too long

9
modules/photoannotation/views/photoannotation_block.html.php
View File

@ -9,15 +9,6 @@
cacheLength: 1 cacheLength: 1
} }
); );
$("#g-user-cloud-form").ajaxForm({
dataType: "json",
success: function(data) {
if (data.result == "success") {
$("#g-user-cloud").html(data.cloud);
}
$("#g-add-user-form").resetForm();
}
});
}); });
</script> </script>
<div id="g-user-cloud" ref="<?= url::site("photoannotation") ?>"> <div id="g-user-cloud" ref="<?= url::site("photoannotation") ?>">

55
modules/photoannotation/views/photoannotation_user_search.html.php Normal file
View File

@ -0,0 +1,55 @@
<?php defined("SYSPATH") or die("No direct script access.") ?>
<script type="text/javascript">
$("#g-user-search-form").ready(function() {
var url = $("#g-user-search-results").attr("ref") + "/autocomplete";
$("#g-user-search-form input:text").autocomplete(
url, {
max: 30,
multiple: false,
cacheLength: 1
}
);
});
</script>
<div id="g-user-search-results" ref="<?= url::site("photoannotation") ?>">
<h1><?= t("Search results") ?></h1>
<?= $search_form ?>
<? if (count($users)): ?>
<div class="g-message photoannotation-user-search">
<?= t("%count users found for <b>%term</b>", array("count" => $count, "term" => $q)) ?>
</div>
<? foreach ($users as $user): ?>
<? $profile_link = "<a href=\"". user_profile::url($user->id) ."\">" ?>
<div class="g-block">
<h2><img src="<?= $user->avatar_url(40, $theme->url("images/avatar.jpg", true)) ?>"
alt="<?= html::clean_attribute($user->display_name()) ?>"
class="g-avatar" width="40" height="40" />
<?= $profile_link . $user->name ?></a></h2>
<div>
<table class="g-message">
<tbody>
<tr>
<th style="width: 20%"><?= t("Full name") ?></th>
<td><?= $user->display_name() ?></td>
</tr>
<tr>
<th style="width: 20%"><?= t("Tagged photos") ?></th>
<td colspan="2"><?= photoannotation::annotation_count($user->id) ?></td>
</tr>
<? if (module::is_active("comment")): ?>
<tr>
<th style="width: 20%"><?= t("Comments") ?></th>
<td colspan="2"><?= photoannotation::comment_count($user->id) ?></td>
</tr>
<? endif ?>
</tbody></table>
</div>
</div>
<? endforeach ?>
<?= $paginator ?>
<? else: ?>
<div class="photoannotation-user-search">
<?= t("No users found for <b>%term</b>", array("term" => $q)) ?>
</div>
<? endif; ?>
</div>