').append( element.eq(0).clone() ).html();
- },
+ // Store macro/markup pair in the tagmap.
+ ensure_tagmap();
+ Drupal.settings.tagmap[macro] = markup;
+ }
+
+};
- addImageAttributes: function (imgElement, fid, view_mode, additional) {
- // imgElement.attr('fid', fid);
- // imgElement.attr('view_mode', view_mode);
- // Class so we can find this image later.
- imgElement.addClass('media-image');
- this.forceAttributesIntoClass(imgElement, fid, view_mode, additional);
- if (additional) {
- for (k in additional) {
- if (additional.hasOwnProperty(k)) {
- if (k === 'attr') {
- imgElement.attr(k, additional[k]);
- }
- }
- }
- }
- },
+
+/**
+ * Register the plugin with WYSIWYG.
+ */
+Drupal.wysiwyg.plugins.media = {
/**
- * Due to problems handling wrapping divs in ckeditor, this is needed.
- *
- * Going forward, if we don't care about supporting other editors
- * we can use the fakeobjects plugin to ckeditor to provide cleaner
- * transparency between what Drupal will output
![]()
- * instead of just
![]()
, for now though, we're going to remove all the stuff surrounding the images.
- *
- * @param String formattedMedia
- * Element containing the image
+ * Execute the button.
*
- * @return HTML of
![]()
tag inside formattedMedia
+ * @param data
+ * An object containing data about the current selection:
+ * - format: 'html' when the passed data is HTML content, 'text' when the
+ * passed data is plain-text content.
+ * - node: When 'format' is 'html', the focused DOM element in the editor.
+ * - content: The textual representation of the focused/selected editor
+ * content.
+ * @param settings
+ * The plugin settings, as provided in the plugin's PHP include file.
+ * @param instanceId
+ * The ID of the current editor instance.
*/
- stripDivs: function (formattedMedia) {
- // Check to see if the image tag has divs to strip
- var stripped = null;
- if ($(formattedMedia).is('img')) {
- stripped = this.outerHTML($(formattedMedia));
- } else {
- stripped = this.outerHTML($('img', $(formattedMedia)));
+ invoke: function (data, settings, instanceId) {
+ if (data.format == 'html') {
+ var insert = new InsertMedia(instanceId);
+ insert.prompt(settings.global);
}
- // This will fail if we pass the img tag without anything wrapping it, like we do when re-enabling WYSIWYG
- return stripped;
},
/**
* Attach function, called when a rich text editor loads.
- * This finds all [[tags]] and replaces them with the html
- * that needs to show in the editor.
*
+ * This finds all JSON macros and replaces them with the HTML placeholder
+ * that will show in the editor.
*/
attach: function (content, settings, instanceId) {
- var matches = content.match(/\[\[.*?\]\]/g);
- this.initializeTagMap();
- var tagmap = Drupal.settings.tagmap;
+ ensure_tagmap();
+
+ var tagmap = Drupal.settings.tagmap,
+ matches = content.match(/\[\[.*?\]\]/g),
+ media_definition;
+
if (matches) {
- var inlineTag = "";
- for (i = 0; i < matches.length; i++) {
- inlineTag = matches[i];
- if (tagmap[inlineTag]) {
- // This probably needs some work...
- // We need to somehow get the fid propogated here.
- // We really want to
- var tagContent = tagmap[inlineTag];
- var mediaMarkup = this.stripDivs(tagContent); // THis is
..
![]()
-
- var _tag = inlineTag;
- _tag = _tag.replace('[[','');
- _tag = _tag.replace(']]','');
+ for (var index in matches) {
+ var macro = matches[index];
+
+ if (tagmap[macro]) {
+ var media_json = macro.replace('[[', '').replace(']]', '');
+
+ // Make sure that the media JSON is valid.
try {
- mediaObj = JSON.parse(_tag);
+ media_definition = JSON.parse(media_json);
}
- catch(err) {
- mediaObj = null;
+ catch (err) {
+ media_definition = null;
}
- if(mediaObj) {
- var imgElement = $(mediaMarkup);
- this.addImageAttributes(imgElement, mediaObj.fid, mediaObj.view_mode);
- var toInsert = this.outerHTML(imgElement);
- content = content.replace(inlineTag, toInsert);
+
+ if (media_definition) {
+ // Apply attributes.
+ var element = create_element(tagmap[macro], media_definition);
+ var markup = outerHTML(element);
+
+ content = content.replace(macro, markup);
}
}
else {
- debug.debug("Could not find content for " + inlineTag);
+ debug.debug("Could not find content for " + macro);
}
}
}
+
return content;
},
@@ -165,221 +138,124 @@ Drupal.wysiwyg.plugins.media = {
* Detach function, called when a rich text editor detaches
*/
detach: function (content, settings, instanceId) {
- // Replace all Media placeholder images with the appropriate inline json
- // string. Using a regular expression instead of jQuery manipulation to
- // prevent