Projet

Général

Profil

Révision 18596a08

Ajouté par Assos Assos il y a presque 7 ans

Weekly update of contrib modules

Voir les différences:

drupal7/sites/all/modules/media/modules/media_wysiwyg/js/media_wysiwyg.filter.js
300 300
      // Attempt to override the link_title if the user has chosen to do this.
301 301
      info.link_text = this.overrideLinkTitle(info);
302 302
      // Apply link_text if present.
303
      if (info.link_text) {
303
      if ((info.link_text) && (info.fields.external_url.length === 0)) {
304 304
        $('a', element).html(info.link_text);
305 305
      }
306 306

  
......
352 352
          });
353 353

  
354 354
          // Extract the link text, if there is any.
355
          file_info.link_text = (Drupal.settings.mediaDoLinkText) ? element.find('a').html() : false;
356

  
355
          file_info.link_text = (Drupal.settings.mediaDoLinkText) ? element.find('a:not(:has(img))').html() : false;
357 356
          // When a file is embedded, its fields can be overridden. To allow for
358 357
          // the edge case where the same file is embedded multiple times with
359 358
          // different field overrides, we look for a data-delta attribute on

Formats disponibles : Unified diff