--- a/mee.module	Wed Apr 22 23:32:15 2009 -0500
+++ b/mee.module	Thu Apr 23 00:04:10 2009 -0500
@@ -64,11 +64,12 @@
         '#default_value' => url($field['mee_dnd_callback_url']) ? $field['mee_dnd_callback_url'] : '',
         '#description' => t('The absolute URL or relative path of a callback URL that provides proper JSON to the drag and drop library.'),
       );
-      // @TODO: Add an "Editor Context" option on a per-field basis
+      // @@@TODO: Add an "Editor Context" option on a per-field basis
+      // @@@TODO: Add a "Display Context" option on a per-field basis (this is an override)
       return $form;
 
     case 'save':
-      return array('mee_processing', 'mee_dnd_callback_url');
+      return array('mee_processing', 'mee_dnd_callback_url', 'mee_scald_editor_context');
 
     case 'database columns':
       $columns['value'] = array('type' => 'text', 'size' => 'big', 'not null' => FALSE, 'sortable' => TRUE);
@@ -182,19 +183,19 @@
 }
 
 function theme_mee_formatter_default($element) {
-  return $element['#item']['safe'];
+  return scald_sas_to_rendered($element['#item']['safe']);
 }
 
 /**
  * Theme function for 'plain' text field formatter.
  */
 function theme_mee_formatter_plain($element) {
-  return strip_tags($element['#item']['safe']);
+  return strip_tags(scald_sas_to_rendered($element['#item']['safe'], 'title', TRUE));
 }
 
-function theme_mee_context_formatter($element) {
-  return 'foo';
-}
+//function theme_mee_context_formatter($element) {
+//  return 'foo';
+//}
 
 /**
  * Implementation of hook_widget_info().
@@ -301,7 +302,7 @@
 function mee_widget(&$form, &$form_state, $field, $items, $delta = 0) {
   $element = array(
     '#type' => $field['widget']['type'],
-    '#default_value' => isset($items[$delta]) ? $items[$delta] : '',
+    '#default_value' => isset($items[$delta]) ? scald_sas_to_rendered($items[$delta], $field['mee_scald_editor_context'], TRUE) : '',
   );
   return $element;
 }