diff --git a/includes/media.filter.inc b/includes/media.filter.inc index 0930699..b217dac 100644 --- a/includes/media.filter.inc +++ b/includes/media.filter.inc @@ -164,6 +164,10 @@ function media_token_to_markup($match, $wysiwyg = FALSE) { if ($wysiwyg) { $settings['wysiwyg'] = $wysiwyg; } + + // We need a way for other modules to be able to alter the settings array passed to styles + // We should have a hook_media_markup_settings_alter(&$settings, $media) + drupal_alter('media_markup_settings', $settings, $media); } catch (Exception $e) { watchdog('media', 'Unable to render media from %tag. Error: %error', array('%tag' => $tag, '%error' => $e->getMessage())); diff --git a/js/wysiwyg-media.js b/js/wysiwyg-media.js index 156229a..beaa75b 100644 --- a/js/wysiwyg-media.js +++ b/js/wysiwyg-media.js @@ -263,6 +263,20 @@ Drupal.wysiwyg.plugins.media = { "fid" : attributes['fid'].value, "attributes": mediaAttributes }; + /* Start custom addition for Media Image Transform */ + if (imgNode.attr('src').indexOf('admin/media_image_transform/preview') > -1) { + var query_str = imgNode.attr('src').substr(imgNode.attr('src').indexOf('?') + 1); + var query_obj = $.deparam(query_str); + if (query_obj.transform) { + if (typeof(query_obj.transform) == 'object') { + var transform_obj = {transform: query_obj.transform}; + } else { + var transform_obj = {transform: $.deparam(query_obj.transform)}; + } + tagContent = $.extend(tagContent, transform_obj); + } + } + /* End custom addition for Media Image Transform */ return '[[' + JSON.stringify(tagContent) + ']]'; },