Merge branch 'master' into 1.0

Author: comur

Controller/UploadController.php

@@ -321,7 +321,12 @@ private function resizeCropImage($destSrc, $imgSrc, $destX, $destY, $srcX, $srcY
             $destH = $srcH;
         }
         $dstR = imagecreatetruecolor( $destW, $destH );
-
+        
+        if($type == 'png'){
+            imagealphablending( $dstR, false );
+            imagesavealpha( $dstR, true );
+        }
+        
         imagecopyresampled($dstR,$imgR,$destX,$destY,$srcX,$srcY,$destW,$destH,$srcW,$srcH);
 
         switch ($type) {

Resources/public/js/comur.imagelibrary.js

@@ -123,7 +123,7 @@ function initJCrop(id, options){
             $('#image_preview img').Jcrop({
                 // start off with jcrop-light class
                 bgOpacity: 0.8,
-                bgColor: 'black',
+                bgColor: 'white',
                 addClass: 'jcrop-dark',
                 aspectRatio: options.cropConfig.aspectRatio ? options.cropConfig.minWidth/options.cropConfig.minHeight : false ,
                 minSize: [ options.cropConfig.minWidth, options.cropConfig.minHeight ],