Mercurial > defr > drupal > scald > dnd
diff dnd.module @ 20:89fe0aca43d4
Refactored the entire interval system, and started on form behavior.
author | David Eads <eads@chicagotech.org> |
---|---|
date | Sun, 08 Mar 2009 20:29:57 -0500 |
parents | d83073a08b25 |
children | 69db20fdbac2 |
line wrap: on
line diff
--- a/dnd.module Fri Mar 06 14:26:06 2009 -0600 +++ b/dnd.module Sun Mar 08 20:29:57 2009 -0500 @@ -76,10 +76,18 @@ */ function dnd_process_textarea($element, $form_state) { if ($element['#dnd-enabled']) { + + // BeautyTips drupal_add_js(drupal_get_path('module', 'dnd') .'/js/bt/other_libs/excanvas_0002/excanvas-compressed.js'); + drupal_add_js(drupal_get_path('module', 'dnd') .'/js/bt/other_libs/jquery.hoverIntent.minified.js'); + drupal_add_js(drupal_get_path('module', 'dnd') .'/js/bt/jquery.bt.js'); + + // Dependencies drupal_add_js(drupal_get_path('module', 'dnd') .'/js/jquery.url.packed.js'); drupal_add_js(drupal_get_path('module', 'dnd') .'/js/jquery.fieldselection.js'); - drupal_add_js(drupal_get_path('module', 'dnd') .'/js/bt/jquery.bt.js'); + drupal_add_js('misc/jquery.form.js'); + + // Drag and drop drupal_add_js(drupal_get_path('module', 'dnd') .'/js/jquery.draganddrop.js'); drupal_add_js(drupal_get_path('module', 'dnd') .'/js/dnd-library.js'); @@ -135,14 +143,14 @@ // Generate an array of editor representations to add if (is_array($json['editor_representations'])) { foreach ($json['editor_representations'] as $editor_id=>$editor_item) { - $editor_representations[$editor_id] = filter_xss_admin($editor_item); + $editor_representations[$editor_id] = $editor_item; } } // Generate an array of library previews to add if (is_array($json['library_previews'])) { foreach ($json['library_previews'] as $preview_id=>$preview_item) { - $library_previews[$preview_id] = filter_xss_admin($preview_item); + $library_previews[$preview_id] = $preview_item; } } @@ -153,7 +161,7 @@ ), 'setting'); $variables['library_id'] = $settings['library_id']; - $variables['header'] = filter_xss_admin($json['header']); - $variables['library'] = filter_xss_admin($json['library']); - $variables['footer'] = filter_xss_admin($json['footer']); + $variables['header'] = $json['header']; + $variables['library'] = $json['library']; + $variables['footer'] = $json['footer']; }