| 94,15 → 94,23 |
|---|
| dataType: 'xml', // 'xml', 'script', or 'json' (expected server response type) |
| resetForm: true // reset the form after successful submit |
| }; |
| var imgCheminTmp = $( '#fichier' ).val(), |
| parts = imgCheminTmp.split( '\\' ), |
| nomImage = parts[ parts.length - 1 ], |
| formatImgOk = lthis.verifierFormat( nomImage ), |
| imgNonDupliquee = lthis.verifierDuplication( nomImage ); |
| |
| $( '#miniature' ).append( '<img id="miniature-chargement" class="miniature" alt="chargement" src="' + this.chargementImageIconeUrl + '"/>' ); |
| |
| var imgCheminTmp = $( '#fichier' ).val(), |
| formatImgOk = lthis.verifierFormat( imgCheminTmp ), |
| imgNonDupliquee = lthis.verifierDuplication( imgCheminTmp ); |
| |
| if( formatImgOk && imgNonDupliquee ) { |
| $( '#form-upload' ).ajaxSubmit( options ); |
| $( '#miniatures' ).append( |
| '<div class="miniature mr-3 miniature-chargement" data-image="' + nomImage + '">'+ |
| '<img class="miniature-img chargement-img" alt="chargement" src="' + lthis.chargementImageIconeUrl + '" style="min-height:100%;"/>'+ |
| '<a class="effacer-miniature">Supprimer</a>'+ |
| '</div>' |
| ); |
| $( '#ajouter-obs' ).addClass( 'hidden' ); |
| $( '#message-chargement' ).removeClass( 'hidden' ); |
| } else { |
| $( '#form-upload' )[0].reset(); |
| if ( !formatImgOk ) { |
| 116,6 → 124,10 |
|---|
| }); |
| $( 'body' ).on( 'click', '.effacer-miniature', function() { |
| $( this ).parent().remove(); |
| if ( !lthis.valOk( $('.miniature-chargement' ) ) ) { |
| $( '#ajouter-obs' ).removeClass( 'hidden' ); |
| $( '#message-chargement' ).addClass( 'hidden' ); |
| } |
| }); |
| }; |
| |
| 554,36 → 566,46 |
|---|
| var debogage = $( 'debogage', reponse ).text(); |
| } |
| |
| var message = $( 'message', reponse ).text(); |
| var message = $( 'message', reponse ).text(); |
| $blocMiniature = $( '#miniatures .miniature[data-image="' + $( 'image-nom', reponse ).text() + '"]'); |
| |
| if ( this.valOk( message ) ) { |
| $( '#miniature-msg' ).append( message ); |
| } else { |
| $( '#miniatures' ).append( this.creerWidgetMiniature( reponse ) ); |
| if( this.valOk( $blocMiniature ) ) { |
| if ( this.valOk( message ) ) { |
| $( '#miniature-msg' ).append( message ); |
| $blocMiniature.remove(); |
| |
| } else { |
| this.creerWidgetMiniature( reponse, $blocMiniature ); |
| } |
| if ( !lthis.valOk( $( '.miniature-chargement' ) ) ) { |
| $( '#ajouter-obs' ).removeClass( 'hidden' ); |
| $( '#message-chargement' ).addClass( 'hidden' ); |
| } |
| $( '#ajouter-obs' ).removeAttr( 'disabled' ); |
| } |
| $( '#ajouter-obs' ).removeAttr( 'disabled' ); |
| }; |
| |
| /** |
| * Crée la miniature temporaire (formulaire) + bouton pour l'effacer |
| */ |
| WidgetsSaisiesCommun.prototype.creerWidgetMiniature = function( reponse ) { |
| WidgetsSaisiesCommun.prototype.creerWidgetMiniature = function( reponse, $blocMiniature ) { |
| var miniatureUrl = $( 'miniature-url', reponse ).text(); |
| var imgNom = $( 'image-nom', reponse ).text(); |
| var html = |
| '<div class="miniature mr-3">'+ |
| '<img class="miniature-img" class="miniature img-rounded" alt="' + imgNom + '" src="' + miniatureUrl + '" style="min-height:100%;"/>'+ |
| '<a class="effacer-miniature">Supprimer</a>'+ |
| '</div>'; |
| |
| return html; |
| $blocMiniature.removeClass( 'miniature-chargement' ); |
| $( '.miniature-img', $blocMiniature ) |
| .removeClass( 'chargement-img' ) |
| .attr({ |
| 'alt' : imgNom, |
| 'src' : miniatureUrl |
| }); |
| }; |
| |
| /** |
| * Retourne true si l'extension de l'image 'nom' est .jpg ou .jpeg |
| */ |
| WidgetsSaisiesCommun.prototype.verifierFormat = function( cheminTmp ) { |
| var parts = cheminTmp.split( '.' ), |
| WidgetsSaisiesCommun.prototype.verifierFormat = function( nomImage ) { |
| var parts = nomImage.split( '.' ), |
| extension = parts[ parts.length - 1 ]; |
| |
| return ( 'jpeg' === extension.toLowerCase() || 'jpg' === extension.toLowerCase() ); |
| 594,12 → 616,10 |
|---|
| * renvoie false si le même nom est rencontré 2 fois |
| * renvoie true sinon |
| */ |
| WidgetsSaisiesCommun.prototype.verifierDuplication = function( cheminTmp ) { |
| WidgetsSaisiesCommun.prototype.verifierDuplication = function( nomImage ) { |
| const lthis = this; |
| |
| var parts = cheminTmp.split( '\\' ), |
| nomImage = parts[ parts.length - 1 ], |
| thisSrcParts = [], |
| var thisSrcParts = [], |
| thisNomImage = '', |
| nonDupliquee = true; |
| |