Merge 8650899 into d83a57f

collective · Oct 10, 2014 · 599f39f · 599f39f
2 parents d83a57f + 8650899
commit 599f39f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -4,8 +4,8 @@ Changelog
 1.2 (unreleased)
 ----------------
 
-- Remove hard dependency on plone.app.contenttypes to avoid compatibility issues with Plone 4.2 (fixes `#57`_).
-  [hvelarde]
+- Fix Chameleon compatibility
+  [datakurre]
 
 - Update package dependencies.
   [hvelarde]

diff --git a/src/plone/app/imagecropping/browser/editor.pt b/src/plone/app/imagecropping/browser/editor.pt
@@ -152,7 +152,7 @@
               tal:content="string:
           var imagecropping = new ImageCropping();
           imagecropping.i18n_message_ids.confirm_discard_changes = '${view/translated_confirm_discard_changes}';
-          $$(document).ready(function(){
+          jQuery(function(jq) {
              imagecropping.init_editor();
           });"></script>