diff --git a/lib/WebGUI/Asset.pm b/lib/WebGUI/Asset.pm index 177240403..a58a45336 100644 --- a/lib/WebGUI/Asset.pm +++ b/lib/WebGUI/Asset.pm @@ -2660,11 +2660,7 @@ NOTE: Don't try to override or overload this method. It won't work. What you are sub www_editSave { my $self = shift; - - my $annotations = ""; - if ($self->isa("WebGUI::Asset::File::Image")) { - $annotations = $self->get("annotations"); - } + ##If this is a new asset (www_add), the parent may be locked. We should still be able to add a new asset. my $isNewAsset = $self->session->form->process("assetId") eq "new" ? 1 : 0; return $self->session->privilege->locked() if (!$self->canEditIfLocked and !$isNewAsset); @@ -2702,12 +2698,6 @@ sub www_editSave { return $self->www_edit(); } } - - if ($self->isa("WebGUI::Asset::File::Image")) { - $object->update({ annotations => $annotations }); - } - - ### $object->updateHistory("edited"); diff --git a/lib/WebGUI/Asset/File/Image.pm b/lib/WebGUI/Asset/File/Image.pm index 22f471ee9..ff2085beb 100644 --- a/lib/WebGUI/Asset/File/Image.pm +++ b/lib/WebGUI/Asset/File/Image.pm @@ -113,7 +113,8 @@ sub definition { defaultValue => 'style="border-style:none;"', }, annotations => { - fieldType => 'textarea', + fieldType => 'hidden', + noFormPost => 1, defaultValue => '', }, }, diff --git a/www/extras/yui/build/fonts/imagecropper/assets/sam/imagecropper.css b/www/extras/yui/build/fonts/imagecropper/assets/sam/imagecropper.css deleted file mode 100644 index 73d3216f9..000000000 --- a/www/extras/yui/build/fonts/imagecropper/assets/sam/imagecropper.css +++ /dev/null @@ -1,7 +0,0 @@ -/* -Copyright (c) 2008, Yahoo! Inc. All rights reserved. -Code licensed under the BSD License: -http://developer.yahoo.net/yui/license.txt -version: 2.6.0 -*/ -.yui-crop{position:relative;}.yui-crop .yui-crop-mask{position:absolute;top:0;left:0;height:100%;width:100%;}.yui-crop .yui-resize{position:absolute;top:10px;left:10px;border:0;}.yui-crop .yui-crop-resize-mask{position:absolute;top:0;left:0;height:100%;width:100%;background-position:-10px -10px;overflow:hidden;}.yui-skin-sam .yui-crop .yui-crop-mask{background-color:#000;opacity:.5;filter:alpha(opacity=50);}.yui-skin-sam .yui-crop .yui-resize{border:1px dashed #fff;}