Index: imce.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/imce/imce.module,v retrieving revision 1.23.2.5 diff -u -u -p -r1.23.2.5 imce.module --- imce.module 19 Jul 2008 13:21:02 -0000 1.23.2.5 +++ imce.module 6 Dec 2008 19:39:03 -0000 @@ -189,4 +189,40 @@ function imce_user_page_access($account, */ function imce_reg_dir($dirname) { return $dirname == '.' || (is_string($dirname) && $dirname != '' && !preg_match('@(^\s)|(^/)|(^\./)|(\s$)|(/$)|(/\.$)|(\.\.)|(//)|(\\\\)|(/\./)@', $dirname)); +} + +/** + * Implementation of hook_wysiwyg_plugin(). + */ +function imce_wysiwyg_plugin($editor) { + static $integrated; + switch ($editor) { + case 'tinymce': + if (!imce_access()) { + return; + } + if (!isset($integrated)) { + $integrated = TRUE; + $settings = array( + 'imce' => array( + 'url' => url('imce'), + 'appname' => t('editor'), + 'wysiwyg_module' => true, + ), + ); + drupal_add_js($settings, 'setting'); + drupal_add_js(drupal_get_path('module', 'imce') .'/js/imce_set_app.js'); + } + return array( + 'imce' => array( + 'extensions' => array('imce' => t('IMCE')), + 'url' => 'http://drupal.org/project/imce', + 'options' => array( + 'file_browser_callback' => 'imceImageBrowser', + 'inline_styles' => TRUE, + ), + 'load' => FALSE, + ), + ); + } } \ No newline at end of file Index: js/imce_set_app.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/imce/js/imce_set_app.js,v retrieving revision 1.3.2.3 diff -u -u -p -r1.3.2.3 imce_set_app.js --- js/imce_set_app.js 13 Jul 2008 11:23:51 -0000 1.3.2.3 +++ js/imce_set_app.js 6 Dec 2008 19:39:04 -0000 @@ -34,3 +34,8 @@ var appFinish = function(file, win) { win.opener.focus(); win.close(); }; + +//helper function - used as a wysiwyg callback +function imceImageBrowser(fid, url, type, win) { + win.open(Drupal.settings.imce.url +'&app='+ Drupal.settings.imce.appname +'|url@'+ fid, '', 'width=760,height=560,resizable=1'); +} \ No newline at end of file