Index: img_assist-DRUPAL-6--2/img_assist.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/img_assist/img_assist.module,v
retrieving revision 1.75.2.33
diff -u -p -r1.75.2.33 img_assist.module
--- img_assist-DRUPAL-6--2/img_assist.module	3 Aug 2009 21:47:30 -0000	1.75.2.33
+++ img_assist-DRUPAL-6--2/img_assist.module	21 Oct 2009 14:25:20 -0000
@@ -962,6 +962,9 @@ function img_assist_properties_form($for
     $derivatives['other'] = t('Other');
   }
   
+  // Add the $derivatives to the Drupal settings collection:
+  drupal_add_js(array('img_assist' => array_keys($derivatives)), 'setting');
+  
   // Use 'preview' size by default.
   $default_size   = image_get_info(file_create_path($node->images[IMAGE_PREVIEW]));
   $default_width  = $default_size['width'];
Index: img_assist-DRUPAL-6--2/img_assist_tinymce.js
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/img_assist/img_assist_tinymce.js,v
retrieving revision 1.3.4.4
diff -u -p -r1.3.4.4 img_assist_tinymce.js
--- img_assist-DRUPAL-6--2/img_assist_tinymce.js	1 Feb 2009 09:59:57 -0000	1.3.4.4
+++ img_assist-DRUPAL-6--2/img_assist_tinymce.js	21 Oct 2009 14:25:51 -0000
@@ -57,13 +57,15 @@ function initProperties() {
     }
     formObj['edit-align'].value = align;
     
-    // When editing the properties of an image placed with 
+    // When editing the properties of an image placed with
     // img_assist, it's not easy to figure out what standard
-    // size was used.  Until such code is written we will 
-    // just set the size to "other".  Of course, if custom
-    // isn't an option then I guess the image size will default
-    // back to thumbnail.
-    formObj['edit-size-label'].value = "other";
+    // size was used.
+    if (frames['img_assist_main'].Drupal.settings.img_assist.indexOf(width + 'x' + height) != -1) {
+      formObj['edit-size-label'].value = width + 'x' + height;
+    }
+    else {
+      formObj['edit-size-label'].value = "other";
+    }
     formObj['edit-width'].value = width;
     formObj['edit-height'].value = height;
   }