Merge branch 'master' into 1.0

Conflicts:
	Resources/views/Form/fields.html.twig
	composer.json

Author: comur

Resources/views/Form/croppable_image_modal.html.twig

@@ -13,6 +13,9 @@
 <script src="{{ asset('bundles/comurimage/js/jquery.fileupload.js') }}"></script>
 <script src="{{ asset('bundles/comurimage/js/jquery.Jcrop.min.js') }}"></script>
 <script src="{{ asset('bundles/comurimage/js/jquery.color.js') }}"></script>
+{% if include_holder is not defined or include_holder %}
+    <script src="{{ asset('bundles/comurimage/components/holder/holder.min.js') }}"></script>
+{% endif %}
 {% if include_bootstrap is not defined or include_bootstrap %}
     <script src="{{ asset('bundles/comurimage/js/bootstrap.min.js') }}"></script>
 {% endif %}

Resources/views/Form/fields.html.twig

@@ -7,7 +7,7 @@
         {% if options.uploadConfig.saveOriginal %}
             {{ form_widget(form[options.uploadConfig.saveOriginal])}}
         {% endif %}
-        
+
         <div class="field-error clearfix hidden">
             <div id="{{form[name].vars.id}}_widget_error" class="alert alert-danger span6">
             </div>
@@ -23,16 +23,16 @@
                     {% if form[name].vars.value %}
                         <img src="/{{ options.uploadConfig.webDir ~ '/' ~ form[name].vars.value }}?{{ 'now'  | date('U') }}" id="{{ form[name].vars.id }}_preview" style="{{ options.uploadConfig.saveOriginal ? 'cursor:hand; cursor: pointer' : ''}}"/>
                     {% else %}
-                        <img src="//placehold.io/{{ options.cropConfig.minWidth }}/{{ options.cropConfig.minHeight}}" id="{{ form[name].vars.id }}_preview"/>
+                        <img src="holder.js/{{ options.cropConfig.minWidth }}x{{ options.cropConfig.minHeight}}" id="{{ form[name].vars.id }}_preview"/>
                     {% endif %}
                 {% else %}
                     {% if form[name].vars.value %}
                         <img src="/{{ (options.uploadConfig.webDir ~ '/' ~ form[name].vars.value)|thumb(options.fieldImage.maxWidth, options.fieldImage.maxHeight) }}?{{ 'now'  | date('U') }}" id="{{ form[name].vars.id }}_preview" style="{{ options.uploadConfig.saveOriginal ? 'cursor:hand; cursor: pointer' : ''}}"/>
                     {% else %}
-                        <img src="//placehold.io/{{ options.fieldImage.maxWidth }}/{{ options.fieldImage.maxHeight}}" id="{{ form[name].vars.id }}_preview"/>
+                        <img src="holder.js/{{ options.fieldImage.maxWidth }}x{{ options.fieldImage.maxHeight}}" id="{{ form[name].vars.id }}_preview"/>
                     {% endif %}
                 {% endif %}
-                
+
             </div>
         </div>
     {% endspaceless %}
@@ -50,7 +50,7 @@
                     });
                 }
             {% endif %}
-            $('#image_preview_{{ form[name].vars.id }}.select-image-button .image_edit_button').click(function(event){ 
+            $('#image_preview_{{ form[name].vars.id }}.select-image-button .image_edit_button').click(function(event){
                 var options = $.parseJSON('{{ options | json_encode() | raw }}');
                 {% if options.uploadConfig.saveOriginal %}
                     options['originalImageFieldId'] = '{{ form[options.uploadConfig.saveOriginal].vars.id }}';
@@ -77,7 +77,7 @@
     {# trans_default_domain 'ComurImageBundle' #}
 
     {% spaceless %}
-        
+
         <div class="field-error clearfix hidden">
             <div id="{{form[name].vars.id}}_widget_error" class="alert alert-danger span6">
             </div>
@@ -106,7 +106,7 @@
         $(document).ready(function(){
             rebindGalleryRemove();
             galleries['{{form[name].vars.id}}'] = true;
-            $('#image_add_button_{{form[name].vars.id}}').click(function(event){ 
+            $('#image_add_button_{{form[name].vars.id}}').click(function(event){
                 initializeImageManager('{{ form[name].vars.id }}', $.parseJSON('{{ options | json_encode() | raw }}'));
                 $('#image_upload_modal').modal('show');
             });
@@ -120,4 +120,4 @@
         });
 
     </script>
-{% endblock %}
+{% endblock %}

composer.json

@@ -25,7 +25,8 @@
         "twig/twig": "~1.12",
         "twig/extensions": "~1.0",
         "friendsofsymfony/jsrouting-bundle": "@stable",
-        "jms/translation-bundle": "@stable"
+        "jms/translation-bundle": "@stable",
+        "imsky/holder": "2.5.*"
     },
     "target-dir": "Comur/ImageBundle",
     "autoload": {
@@ -35,6 +36,8 @@
         "branch-alias": {
             "dev-master": "1.0-dev"
         }
-
+    },
+    "config": {
+        "component-dir": "Resources/public/components"
     }
 }