=== modified file 'jquery_slideshow.info'
--- jquery_slideshow.info	2009-11-28 19:00:23 +0000
+++ jquery_slideshow.info	2009-11-28 19:43:22 +0000
@@ -4,7 +4,6 @@
 description = "Create photo gallery slide shows using the cycle plugin for Jquery and imagefields"
 package = "User Interface"
 dependencies[] = jquery_plugin
-dependencies[] = imagecache
 dependencies[] = imagefield
 core = 6.x
 

=== modified file 'jquery_slideshow.module'
--- jquery_slideshow.module	2009-11-28 19:00:23 +0000
+++ jquery_slideshow.module	2009-11-28 19:54:39 +0000
@@ -36,6 +36,10 @@
  */
 function jquery_slideshow_theme() {
     $theme = array();
+    $theme['jquery_slideshow_formatter_jqs_IMAGE'] = array(
+        'arguments' => array('element' => NULL),
+        'function'  => 'theme_jquery_slideshow_formatter'
+    );
     foreach (_jquery_slideshow_get_presets() as $preset) {
         $theme['jquery_slideshow_formatter_jqs__'. $preset] = array(
             'arguments' => array('element' => NULL),
@@ -64,11 +68,18 @@
         $node = node_load($element['#item']['nid']);;
         $jq_slideshow_id = 'jq-slideshow-'. $nid .'-'. $field_name;
         $output = '<div class="jquery_slideshow" id="'. $jq_slideshow_id .'">';
-        $dets = explode('__', $formatter);
-        $preset = $dets[1];
-        foreach ($node->{$field_name} as $image) {
-          $output .= theme('imagecache', $preset, $image['filepath'], $image['data']['alt'], $image['data']['title']);        
-        }
+	if ($formatter != 'jqs_IMAGE' && module_exists('imagecache')) {
+          $dets = explode('__', $formatter);
+          $preset = $dets[1];
+          foreach ($node->{$field_name} as $image) {
+            $output .= theme('imagecache', $preset, $image['filepath'], $image['data']['alt'], $image['data']['title']);        
+          }
+	} else { /* Fall back to regular image if imagecache is disabled or the regular image formatter is selected */
+	  $preset = NULL;
+          foreach ($node->{$field_name} as $image) {
+            $output .= theme('imagefield_image', $image, $image['data']['alt'], $image['data']['title']);        
+	  }
+	}
         $output .= '</div>';
         _jquery_slideshow_get_settings($jq_slideshow_id, $preset);
         return $output;
@@ -82,6 +93,10 @@
  */
 function jquery_slideshow_field_formatter_info() {
     $formatters = array();
+    $formatters['jqs_IMAGE'] = array(
+      'label' => t('Jquery Slideshow: node image'),
+      'field types' => array('image', 'filefield')
+    );
     foreach (_jquery_slideshow_get_presets() as $preset) {
         $formatters['jqs__'. $preset] = array(
           'label' => t('JQuery Slideshow: '. $preset),
@@ -136,7 +151,7 @@
  *Gets javascript settings for slideshow and sets up Drupal behaviour
  *
  *@param string $jq_slideshow_id dom id of slideshow
- *@param string $preset imagecache preset name
+ *@param string $preset imagecache preset name or NULL if using imagefield
  *
  */
 function _jquery_slideshow_get_settings($jq_slideshow_id, $preset) {
@@ -145,10 +160,14 @@
 
   $data = _jquery_slideshow_get_actions($preset);
 
-  $script = "Drupal.behaviors.jquerySlideshow = function(){
-        $('.jquery_slideshow').css({height:'". $data['height'] ."px'});
-        $('.jquery_slideshow').css({width:'". $data['width'] ."px'});
-        $('#". $jq_slideshow_id ."').cycle({
+  $script = "Drupal.behaviors.jquerySlideshow = function(){";
+  
+  if (isset($data['height']))
+    $script .= "$('.jquery_slideshow').css({height:'". $data['height'] ."px'});";
+  if (isset($data['width']))
+    $script .= "$('.jquery_slideshow').css({width:'". $data['width'] ."px'});";
+   
+  $script .= "$('#". $jq_slideshow_id ."').cycle({
           fx: '". variable_get('jquery_slideshow_effect', 'fade') ."',
           speed: ". variable_get('jquery_slideshow_speed', 500) .",
           timeout: ". variable_get('jquery_slideshow_timeout', 4000) ."
@@ -180,6 +199,9 @@
 
   $data = array();
 
+  if ($preset == NULL)
+    return $data;
+
   // Imagecache 1.x
   if (function_exists('_imagecache_actions_get_by_presetid')) {
     $presetid = array_search($preset, _jquery_slideshow_get_presets());