Merge pull request #5 from guddo/DDBEASY-45

Issue #453 by guddo: Availability types fix.

Author: cableman

ding_availability.field.inc

@@ -80,7 +80,7 @@ function ding_availability_field_formatter_info() {
  */
 function ding_availability_field_formatter_view($entity_type, $entity, $field, $instance, $langcode, $items, $display) {
   $element = array();
-  $online_types = variable_get('ting_online_types', _ting_default_online_types());
+  $online_types = array_filter(variable_get('ting_online_types', _ting_default_online_types()));
   $reservable_sources = variable_get('ting_reservable_sources', _ting_default_reservable_sources());
 
   // Attach front-end style and JS to the element.
@@ -291,6 +291,7 @@ function ding_availability_field_formatter_view($entity_type, $entity, $field, $
           ), 'type' => 'setting',
         );
         $output['#attached']['js'][] = drupal_get_path('module', 'ding_availability') . '/js/ding_availability_labels.js';
+        $output['#attached']['js'][] = drupal_get_path('module', 'ding_availability') . '/js/ding_availability.js';
 
         $element[$delta] = $output;
         break;

js/ding_availability.js

@@ -88,49 +88,49 @@
         available = available || Drupal.DADB[entity_id]['available'];
         reservable = reservable || Drupal.DADB[entity_id]['reservable'];
         is_internet = is_internet || Drupal.DADB[entity_id]['is_internet'];
-      }
-    });
 
-    var element = $('#' + id);
-    element.removeClass('pending').addClass('processed');
+        var element = $('#' + id);
+        element.removeClass('pending').addClass('processed');
 
-    // Reserve button
-    var reserver_btn = element.parents('.ting-object:first').find('.reserve-button');
+        // Reserve button
+        var reserver_btn = element.parents('.ting-object:first').find('.reserve-button');
 
-    if (available) {
-      element.addClass('available');
+        if (available) {
+          element.addClass('available');
 
-      // Add class to reserve button
-      if (reserver_btn.length) {
-        reserver_btn.addClass('available');
-      }
-    }
-    else {
-      element.addClass('unavailable');
+          // Add class to reserve button
+          if (reserver_btn.length) {
+            reserver_btn.addClass('available');
+          }
+        }
+        else {
+          element.addClass('unavailable');
 
-      // Add class to reserve button
-      if (reserver_btn.length) {
-        reserver_btn.addClass('unavailable');
-      }
-    }
+          // Add class to reserve button
+          if (reserver_btn.length) {
+            reserver_btn.addClass('unavailable');
+          }
+        }
 
-    if (reservable) {
-      element.addClass('reservable');
+        if (reservable) {
+          element.addClass('reservable');
 
-      // Add class to reserve button
-      if (reserver_btn.length) {
-        reserver_btn.addClass('reservable');
-      }
-    }
+          // Add class to reserve button
+          if (reserver_btn.length) {
+            reserver_btn.addClass('reservable');
+          }
+        }
 
-    if (!available && !reservable) {
-      element.addClass('not-reservable');
+        if (!available && !reservable) {
+          element.addClass('not-reservable');
 
-      // Add class to reserve button
-      if (reserver_btn.length) {
-        reserver_btn.addClass('not-reservable');
+          // Add class to reserve button
+          if (reserver_btn.length) {
+            reserver_btn.addClass('not-reservable');
+          }
+        }
       }
-    }
+    });
   }
 
   /**