Index: CHANGELOG.txt =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/img_assist/CHANGELOG.txt,v retrieving revision 1.23.2.36.2.12 diff -u -p -r1.23.2.36.2.12 CHANGELOG.txt --- CHANGELOG.txt 27 Oct 2008 19:15:35 -0000 1.23.2.36.2.12 +++ CHANGELOG.txt 26 Dec 2008 17:29:51 -0000 @@ -6,6 +6,7 @@ Img_Assist x.x-x.x, xxxx-xx-xx Img_Assist 5.x-2.x, xxxx-xx-xx ------------------------------ +#245799 by sun: Added support for TinyMCE 3; dropped support for TinyMCE 2. #326640 by Anselm Heaton, sun: Fixed wysiwyg_editor renamed to wysiwyg module. #308005 by sun: Moved includes into /includes. #295946 by smk-ka: Fixed module settings cannot be saved without Token module. Index: img_assist.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/img_assist/img_assist.module,v retrieving revision 1.68.2.50.2.12 diff -u -p -r1.68.2.50.2.12 img_assist.module --- img_assist.module 27 Oct 2008 19:15:35 -0000 1.68.2.50.2.12 +++ img_assist.module 26 Dec 2008 17:41:46 -0000 @@ -521,26 +521,21 @@ function img_assist_cache_clear() { * @todo Remove hard-coded TinyMCE integration. */ function img_assist_loader() { + $path = drupal_get_path('module', 'img_assist'); $editor = arg(2) ? arg(2) : 'textarea'; - + + drupal_add_js($path .'/img_assist.js'); + if ($editor == 'tinymce') { + $tinymce_path = drupal_get_path('module', 'wysiwyg'); + drupal_add_js($tinymce_path .'/tinymce/jscripts/tiny_mce/tiny_mce_popup.js'); + } + drupal_add_js($path .'/img_assist_'. $editor .'.js'); + $output = ''."\n"; $output .= "\n"; $output .= "\n"; $output .= ''. t('Add image') ."\n"; - $output .= "\n\n"; - - $path = drupal_get_path('module', 'img_assist'); - $output .= ''."\n"; - if ($editor == 'tinymce') { - $tinymce_path = drupal_get_path('module', 'wysiwyg'); - $tinymce_js = base_path() . $tinymce_path .'/tinymce/jscripts/tiny_mce/tiny_mce_popup.js'; - $output .= '' . "\n"; - } - $editor_js = base_path() . $path .'/img_assist_'. $editor .'.js'; - $output .= '' . "\n"; - + $output .= drupal_get_js(); $output .= "\n\n"; $output .= '' . "\n"; @@ -550,12 +545,14 @@ function img_assist_loader() { $output .= "\n"; echo $output; + exit; } function img_assist_header($mode) { // Mode may be 'uploading', 'properties' or 'browse'. $output = drupal_get_form('img_assist_header_form', $mode); echo theme('img_assist_page', $output, array('id' => 'img_assist_header', 'onload' => 'parent.initHeader();', 'class' => 'img_assist')); + exit; } function img_assist_header_form($mode) { @@ -692,6 +689,7 @@ function img_assist_upload() { } } echo theme('img_assist_page', $output, array('id' => 'img_assist_upload', 'class' => 'img_assist')); + exit; } /** @@ -788,6 +786,7 @@ function img_assist_thumbs() { $output = t('The image module must be enabled to use Image assist.'); } echo theme('img_assist_page', $output, array('id' => 'img_assist_thumbs', 'onload' => 'parent.initThumbs();', 'class' => 'img_assist')); + exit; } /** @@ -806,6 +805,7 @@ function img_assist_properties() { } echo theme('img_assist_page', $output, array('id' => 'img_assist_properties', 'onload' => 'parent.initProperties();', 'class' => 'img_assist')); + exit; } /** @@ -1466,6 +1466,7 @@ function img_assist_popup() { $attributes = array('id' => 'img_assist_popup'); echo theme('img_assist_popup', $content, $attributes); + exit; } /** @@ -1794,7 +1795,7 @@ function theme_img_assist_page($content, $output .= drupal_get_js(); $output .= "\n