@@ -189,12 +189,19 @@ function cs_date_formatter_field_formatter_view($entity_type, $entity, $field, $
189189
190190 if ($display['type'] == 'cs_date_format') {
191191 $settings = $display['settings'];
192+ $view_mode = '';
193+ if (isset($display['view_mode'])) {
194+ $view_mode = $display['view_mode'];
195+ }
196+ elseif (isset($display['views_view'])) {
197+ $view_mode = $display['views_view']->name;
198+ }
192199 foreach ($items as $delta => $item) {
193200 $element[$delta] = array(
194201 '#theme' => 'cs_date_formatter_default',
195202 '#element' => $item,
196203 '#field' => $instance,
197- '#view_mode' => isset($display[' view_mode']) ? $display['view_mode'] : '' ,
204+ '#view_mode' => $ view_mode,
198205 );
199206
200207 // Attach our Javascript and settings.
@@ -218,10 +225,7 @@ function cs_date_formatter_field_formatter_view($entity_type, $entity, $field, $
218225 $js_settings['date_format'] = 'simple';
219226 $js_settings['extended'] = array();
220227 }
221- $setting_name = $field['field_name'];
222- if (isset($display['view_mode'])) {
223- $setting_name .= '-' . $display['view_mode'];
224- }
228+ $setting_name = $field['field_name'] . '-' . $view_mode;
225229 $element[$delta]['#attached']['js'][] = array(
226230 'data' => array(
227231 'csDateFormatter' => array($setting_name => $js_settings),
0 commit comments