Index: wysiwyg.admin.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/wysiwyg.admin.inc,v retrieving revision 1.18 diff -u -p -r1.18 wysiwyg.admin.inc --- wysiwyg.admin.inc 26 Sep 2009 05:37:56 -0000 1.18 +++ wysiwyg.admin.inc 24 Oct 2009 13:55:05 -0000 @@ -98,7 +98,7 @@ function wysiwyg_profile_form($form, &$f '#description' => t('The language to use for the editor interface. Language codes are based on the ISO-639-2 format.'), ); - $form['buttons'] = array( + $form['wysiwyg_buttons'] = array( '#type' => 'fieldset', '#title' => t('Buttons and plugins'), '#collapsible' => TRUE, @@ -125,7 +125,7 @@ function wysiwyg_profile_form($form, &$f } $title = (isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : $title); $title = (!empty($icon) ? $icon . ' ' . $title : $title); - $form['buttons'][$name][$button] = array( + $form['wysiwyg_buttons'][$name][$button] = array( '#type' => 'checkbox', '#title' => $title, '#default_value' => !empty($profile->settings['buttons'][$name][$button]) ? $profile->settings['buttons'][$name][$button] : FALSE, @@ -134,7 +134,7 @@ function wysiwyg_profile_form($form, &$f } else if (isset($meta['extensions']) && is_array($meta['extensions'])) { foreach ($meta['extensions'] as $extension => $title) { - $form['buttons'][$name][$extension] = array( + $form['wysiwyg_buttons'][$name][$extension] = array( '#type' => 'checkbox', '#title' => isset($meta['url']) ? l($title, $meta['url'], array('target' => '_blank')) : $title, '#default_value' => !empty($profile->settings['buttons'][$name][$extension]) ? $profile->settings['buttons'][$name][$extension] : FALSE, @@ -292,10 +292,10 @@ function wysiwyg_profile_form($form, &$f */ function wysiwyg_profile_form_submit($form, &$form_state) { $values = $form_state['values']; - if (isset($values['buttons'])) { + if (isset($values['wysiwyg_buttons'])) { // Store only enabled buttons for each plugin. - foreach ($values['buttons'] as $plugin => $buttons) { - $values['buttons'][$plugin] = array_filter($values['buttons'][$plugin]); + foreach ($values['wysiwyg_buttons'] as $plugin => $buttons) { + $values['buttons'][$plugin] = array_filter($values['wysiwyg_buttons'][$plugin]); } // Store only enabled plugins. $values['buttons'] = array_filter($values['buttons']); @@ -321,7 +321,8 @@ function wysiwyg_profile_form_submit($fo /** * Layout for the buttons in the Wysiwyg Editor profile form. */ -function theme_wysiwyg_admin_button_table($form) { +function theme_wysiwyg_admin_button_table($variables) { + $form = $variables['form']; $buttons = array(); // Flatten forms array. @@ -346,7 +347,7 @@ function theme_wysiwyg_admin_button_tabl $rows[] = $row; } - $output = theme('table', array(), $rows, array('width' => '100%')); + $output = theme('table', array('rows' => $rows, 'attributes' => array('width' => '100%'))); return $output; } @@ -403,12 +404,11 @@ function wysiwyg_profile_overview($form, '#description' => (!$count ? t('There are no editor libraries installed currently. The following list contains a list of currently supported editors:') : ''), '#weight' => 10, ); - $form['status']['report'] = array('#markup' => theme('status_report', $status)); + $form['status']['report'] = array('#markup' => theme('status_report', array('requirements' => $status))); if (!$count) { return $form; } - $formats = filter_formats(); $profiles = wysiwyg_profile_load_all(); $form['formats'] = array( @@ -451,7 +451,8 @@ function wysiwyg_profile_overview($form, /** * Return HTML for the Wysiwyg profile overview form. */ -function theme_wysiwyg_profile_overview($form) { +function theme_wysiwyg_profile_overview($variables) { + $form = $variables['form']; if (!isset($form['formats'])) { return; } @@ -467,7 +468,7 @@ function theme_wysiwyg_profile_overview( isset($format['delete']) ? drupal_render($format['delete']) : '', ); } - $form['formats']['table']['#markup'] = theme('table', $header, $rows); + $form['formats']['table']['#markup'] = theme('table', array('header' => $header, 'rows' => $rows)); $output .= drupal_render_children($form); return $output; } Index: wysiwyg.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/wysiwyg.js,v retrieving revision 1.17 diff -u -p -r1.17 wysiwyg.js --- wysiwyg.js 26 Sep 2009 05:37:56 -0000 1.17 +++ wysiwyg.js 24 Oct 2009 13:55:05 -0000 @@ -44,9 +44,8 @@ Drupal.behaviors.attachWysiwyg = { if (/KDE/.test(navigator.vendor)) { return; } - $('.wysiwyg', context).once('wysiwyg', function() { - if (!this.id || !this.value || typeof Drupal.settings.wysiwyg.triggers[this.id] === undefined) { + if (!this.id || !this.value || typeof Drupal.settings.wysiwyg.triggers[this.id] === 'undefined') { return; } var $this = $(this); @@ -76,7 +75,7 @@ Drupal.behaviors.attachWysiwyg = { Drupal.wysiwygDetach(context, params[format]); }); }); - } + }, }; /** Index: wysiwyg.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/wysiwyg.module,v retrieving revision 1.40 diff -u -p -r1.40 wysiwyg.module --- wysiwyg.module 26 Sep 2009 05:37:57 -0000 1.40 +++ wysiwyg.module 24 Oct 2009 13:55:05 -0000 @@ -248,7 +248,7 @@ function wysiwyg_load_editor($profile) { foreach ($files as $file => $options) { if (is_array($options)) { $options += array('type' => 'file', 'scope' => 'header', 'defer' => FALSE, 'cache' => TRUE, 'preprocess' => TRUE); - drupal_add_js($editor['library path'] . '/' . $file, $options['type'], $options['scope'], $options['defer'], $options['cache'], $options['preprocess']); + drupal_add_js($editor['library path'] . '/' . $file, $options); } else { drupal_add_js($editor['library path'] . '/' . $options); Index: plugins/break/break.js =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/wysiwyg/plugins/break/break.js,v retrieving revision 1.6 diff -u -p -r1.6 break.js --- plugins/break/break.js 13 Jun 2009 01:14:43 -0000 1.6 +++ plugins/break/break.js 24 Oct 2009 13:55:05 -0000 @@ -1,5 +1,6 @@ // $Id: break.js,v 1.6 2009/06/13 01:14:43 sun Exp $ +(function ($) { // @todo Array syntax required; 'break' is a predefined token in JavaScript. Drupal.wysiwyg.plugins['break'] = { @@ -64,3 +65,4 @@ Drupal.wysiwyg.plugins['break'] = { return '<--break->'; } }; +})(jQuery);