From b85945e62d5b861c06a88ad7ec0faeccad2b535f Mon Sep 17 00:00:00 2001 From: Chris Gross <gross.364@osu.edu> Date: Wed, 18 Apr 2018 16:42:11 -0400 Subject: [PATCH] 7.x-1.7 Release Candidate 1 --- profiles/wcm_base/CHANGELOG.txt | 5 + profiles/wcm_base/modules/contrib/ds/ds.info | 7 +- .../wcm_base/modules/contrib/ds/ds.install | 3 + .../wcm_base/modules/contrib/ds/ds.module | 112 ++++++------------ .../contrib/ds/modules/ds_devel/ds_devel.info | 7 +- .../ds/modules/ds_extras/ds_extras.info | 7 +- .../ds_extras/includes/ds_extras.pages.inc | 5 + .../ds/modules/ds_format/ds_format.info | 7 +- .../contrib/ds/modules/ds_forms/ds_forms.info | 7 +- .../ds/modules/ds_search/ds_search.info | 7 +- .../contrib/ds/modules/ds_ui/ds_ui.info | 7 +- .../ds/modules/ds_ui/includes/ds.fields.inc | 7 ++ .../ds_exportables_test.info | 7 +- .../modules/contrib/ds/tests/ds_test.info | 7 +- .../custom/news_client/news_client.module | 38 ++++++ .../wcm_news_client_display.views_default.inc | 28 +++++ ...s_settings.features.features_overrides.inc | 31 +++++ .../wcm_panels_settings.features.inc | 31 +++++ .../wcm_panels_settings.info | 19 +++ .../panopoly/panopoly_admin/CHANGELOG.txt | 4 + .../panopoly_admin/panopoly_admin.info | 6 +- .../panopoly/panopoly_core/CHANGELOG.txt | 4 + .../panopoly/panopoly_core/panopoly_core.info | 6 +- .../panopoly/panopoly_magic/CHANGELOG.txt | 4 + .../panopoly_magic/panopoly_magic.info | 6 +- .../panopoly/panopoly_pages/CHANGELOG.txt | 4 + .../panopoly_pages/panopoly_pages.info | 6 +- .../panopoly/panopoly_search/CHANGELOG.txt | 4 + .../panopoly_search/panopoly_search.info | 6 +- .../panopoly/panopoly_test/CHANGELOG.txt | 4 + .../panopoly/panopoly_test/panopoly_test.info | 6 +- .../panopoly/panopoly_theme/CHANGELOG.txt | 4 + .../panopoly_theme/panopoly_theme.info | 6 +- .../panopoly/panopoly_widgets/CHANGELOG.txt | 4 + .../panopoly_widgets/panopoly_widgets.info | 6 +- .../js/wcm-omega-accordion.behaviors.js | 27 +++-- .../wcm_omega/js/wcm-omega-menu.behaviors.js | 2 +- .../wcm_omega/js/wcm-omega.behaviors.js | 17 ++- profiles/wcm_base/wcm_base.make | 18 +-- 39 files changed, 318 insertions(+), 168 deletions(-) diff --git a/profiles/wcm_base/CHANGELOG.txt b/profiles/wcm_base/CHANGELOG.txt index 082ea2a4..f856b536 100644 --- a/profiles/wcm_base/CHANGELOG.txt +++ b/profiles/wcm_base/CHANGELOG.txt @@ -1,3 +1,8 @@ +WCM Base 7.x-1.7-rc1, 2018-04-18 +-------------------------------- +- WCM Base: Updated Display Suite to 2.15 per SA-CONTRIB-2018-019. +- WCM Omega: Fixed accordions being processed multiple times in Panels IPE. + WCM Base 7.x-1.6, 2018-03-28 ---------------------------- - WCM Base: Updated Drupal to 7.58 per SA-CORE-2018-002. diff --git a/profiles/wcm_base/modules/contrib/ds/ds.info b/profiles/wcm_base/modules/contrib/ds/ds.info index cf0e73d0..97e4edb0 100644 --- a/profiles/wcm_base/modules/contrib/ds/ds.info +++ b/profiles/wcm_base/modules/contrib/ds/ds.info @@ -13,9 +13,8 @@ files[] = tests/ds.views.test files[] = tests/ds.forms.test configure = admin/structure/ds -; Information added by Drupal.org packaging script on 2016-04-26 -version = "7.x-2.14" +; Information added by Drupal.org packaging script on 2018-04-18 +version = "7.x-2.15" core = "7.x" project = "ds" -datestamp = "1461696967" - +datestamp = "1524068596" diff --git a/profiles/wcm_base/modules/contrib/ds/ds.install b/profiles/wcm_base/modules/contrib/ds/ds.install index b65d8e04..69135efb 100644 --- a/profiles/wcm_base/modules/contrib/ds/ds.install +++ b/profiles/wcm_base/modules/contrib/ds/ds.install @@ -20,6 +20,9 @@ function ds_install() { */ function ds_uninstall() { variable_del('ds_classes_regions'); + variable_del('ds_disable'); + variable_del('ds_extras_region_blocks'); + variable_del('menu_rebuild_needed'); } /** diff --git a/profiles/wcm_base/modules/contrib/ds/ds.module b/profiles/wcm_base/modules/contrib/ds/ds.module index 383c8f51..e3c20572 100644 --- a/profiles/wcm_base/modules/contrib/ds/ds.module +++ b/profiles/wcm_base/modules/contrib/ds/ds.module @@ -736,7 +736,7 @@ function ds_entity_variables(&$vars) { if (!empty($layout['settings']['layout_attributes_merge'])) { // Handle classes separately. if (isset($vars['attributes_array']['class'])) { - $vars['classes_array'] += $vars['attributes_array']['class']; + $vars['classes_array'] = array_unique(array_merge($vars['classes_array'], $vars['attributes_array']['class'])); unset($vars['attributes_array']['class']); } $vars['layout_attributes'] .= ' ' . drupal_attributes($vars['attributes_array']); @@ -925,91 +925,49 @@ function ds_render_ctools_field($field) { * Render a block field. */ function ds_render_block_field($field) { - // Invoke the block_view hook of the module. + global $theme_key; list($module, $delta) = explode('|', $field['properties']['block']); - $block = module_invoke($module, 'block_view', $delta); - - // Get contextual links. - $contextual_links = array(); - $contextual = module_exists('contextual') && user_access('access contextual links'); - if ($contextual) { - if (isset($block['content']) && is_array($block['content']) && isset($block['content']['#contextual_links'])) { - $contextual_links = $block['content']['#contextual_links']; - } + + // Load the block + $result = db_select('block', 'b') + ->fields('b')->condition('b.theme', $theme_key)->condition('b.module', $module)->condition('b.delta', $delta)->addTag('block_load')->addTag('translatable')->execute(); + $block_info = $result->fetchAllAssoc('bid'); + + // Enable the block + if ($block_info[key($block_info)]->status == 0) { + $block_info[key($block_info)]->status = 1; } - // Render the block content. - if (isset($block['content']) && is_array($block['content'])) { - $block['content'] = drupal_render($block['content']); + // Process the block if it respects visibility settings + if (isset($field['properties']['block_visibility']) && $field['properties']['block_visibility']) { + drupal_alter('block_list', $block_info); } - // Go through in case we have actual content. - if (!empty($block['content'])) { + // Simulate _block_load_blocks() return, containing only our block. + $block = array_shift($block_info); - // Make sure subject is set. - if (!isset($block['subject'])) { - $block['subject'] = ''; - } - - global $theme_key; + // Render the block field + if (isset($block)) { + $key = $module . '_' . $delta; if (module_exists('block')) { - $full_block = db_query("SELECT * FROM {block} WHERE module = :module AND delta = :delta AND theme = :theme", array(':module' => $module, ':delta' => $delta, ':theme' => $theme_key))->fetchObject(); - } - if (!empty($full_block)) { - if ($full_block->title == '<none>') { - $block['subject'] = ''; - } - elseif (!empty($full_block->title)) { - $block['subject'] = $full_block->title; - } - } - - // i18n support. - if (function_exists('i18n_block_block_view_alter')) { - - // Check language visibility. - global $language; - static $block_languages = FALSE; - if (!$block_languages) { - $block_languages = array(); - $result = db_query('SELECT module, delta, language FROM {i18n_block_language}'); - foreach ($result as $record) { - $block_languages[$record->module][$record->delta][$record->language] = TRUE; - } - } - if (isset($block_languages[$module][$delta]) && !isset($block_languages[$module][$delta][$language->language])) { - return; - } - - // Translate. - if (!empty($full_block->i18n_mode)) { - i18n_block_block_view_alter($block, $full_block); - if (!empty($block['title'])) { - $block['subject'] = $block['title']; - } + $region_blocks = _block_render_blocks(array($key => $block)); + switch ($field['properties']['block_render']) { + case DS_BLOCK_TEMPLATE: + $renderable_block = _block_get_renderable_array($region_blocks); + return drupal_render($renderable_block); + break; + case DS_BLOCK_TITLE_CONTENT: + if (isset($block->subject) && isset($block->content['#markup'])) { + return '<h2 class="block-title">' . $block->subject . '</h2>' . $block->content['#markup']; + } + break; + case DS_BLOCK_CONTENT: + if (isset($block->content['#markup'])) { + return $block->content['#markup']; + } + break; } } - - $block = (object) $block; - switch ($field['properties']['block_render']) { - case DS_BLOCK_TEMPLATE: - $block->region = NULL; - $block->module = $module; - $block->delta = $delta; - $elements = array('elements' => array('#block' => $block, '#children' => $block->content)); - // Add contextual links. - if ($contextual) { - $elements['elements'] += array('#contextual_links' => array_merge($contextual_links, array('block' => array('admin/structure/block/manage', array($block->module, $block->delta))))); - } - return theme('block', $elements); - break; - case DS_BLOCK_TITLE_CONTENT: - return '<h2 class="block-title">' . $block->subject . '</h2>' . $block->content; - break; - case DS_BLOCK_CONTENT: - return $block->content; - break; - } } } diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_devel/ds_devel.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_devel/ds_devel.info index dcb6cb05..35066a0b 100644 --- a/profiles/wcm_base/modules/contrib/ds/modules/ds_devel/ds_devel.info +++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_devel/ds_devel.info @@ -5,9 +5,8 @@ package = "Display Suite" dependencies[] = ds dependencies[] = devel -; Information added by Drupal.org packaging script on 2016-04-26 -version = "7.x-2.14" +; Information added by Drupal.org packaging script on 2018-04-18 +version = "7.x-2.15" core = "7.x" project = "ds" -datestamp = "1461696967" - +datestamp = "1524068596" diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/ds_extras.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/ds_extras.info index aa2af95c..c5fc287b 100644 --- a/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/ds_extras.info +++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/ds_extras.info @@ -5,9 +5,8 @@ package = "Display Suite" dependencies[] = ds configure = admin/structure/ds/list/extras -; Information added by Drupal.org packaging script on 2016-04-26 -version = "7.x-2.14" +; Information added by Drupal.org packaging script on 2018-04-18 +version = "7.x-2.15" core = "7.x" project = "ds" -datestamp = "1461696967" - +datestamp = "1524068596" diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/includes/ds_extras.pages.inc b/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/includes/ds_extras.pages.inc index 5f728738..34d235cc 100644 --- a/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/includes/ds_extras.pages.inc +++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_extras/includes/ds_extras.pages.inc @@ -38,6 +38,11 @@ function ds_extras_node_page_view($node) { // It's also possible to use $_GET['v'] to switch view modes. if (isset($_GET['v']) && !empty($_GET['v'])) { $view_mode = $_GET['v']; + // Check if this is a valid view mode, switch to default otherwise. + $view_modes = ds_extras_get_bundle_view_modes('node', $node->type); + if (!isset($view_modes[$view_mode])) { + $view_mode = 'full'; + } } drupal_static('ds_extras_view_mode', $view_mode); diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_format/ds_format.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_format/ds_format.info index 949067b5..3d1de7fe 100644 --- a/profiles/wcm_base/modules/contrib/ds/modules/ds_format/ds_format.info +++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_format/ds_format.info @@ -5,9 +5,8 @@ package = "Display Suite" dependencies[] = ds configure = admin/structure/ds/list/extras -; Information added by Drupal.org packaging script on 2016-04-26 -version = "7.x-2.14" +; Information added by Drupal.org packaging script on 2018-04-18 +version = "7.x-2.15" core = "7.x" project = "ds" -datestamp = "1461696967" - +datestamp = "1524068596" diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_forms/ds_forms.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_forms/ds_forms.info index 2153a1c6..7f26da2a 100644 --- a/profiles/wcm_base/modules/contrib/ds/modules/ds_forms/ds_forms.info +++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_forms/ds_forms.info @@ -4,9 +4,8 @@ core = "7.x" package = "Display Suite" dependencies[] = ds -; Information added by Drupal.org packaging script on 2016-04-26 -version = "7.x-2.14" +; Information added by Drupal.org packaging script on 2018-04-18 +version = "7.x-2.15" core = "7.x" project = "ds" -datestamp = "1461696967" - +datestamp = "1524068596" diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_search/ds_search.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_search/ds_search.info index ed7141af..bc85846c 100644 --- a/profiles/wcm_base/modules/contrib/ds/modules/ds_search/ds_search.info +++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_search/ds_search.info @@ -5,9 +5,8 @@ package = "Display Suite" dependencies[] = ds configure = admin/structure/ds/list/search -; Information added by Drupal.org packaging script on 2016-04-26 -version = "7.x-2.14" +; Information added by Drupal.org packaging script on 2018-04-18 +version = "7.x-2.15" core = "7.x" project = "ds" -datestamp = "1461696967" - +datestamp = "1524068596" diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/ds_ui.info b/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/ds_ui.info index 9883a530..0a52303a 100644 --- a/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/ds_ui.info +++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/ds_ui.info @@ -4,9 +4,8 @@ core = "7.x" package = "Display Suite" dependencies[] = ds -; Information added by Drupal.org packaging script on 2016-04-26 -version = "7.x-2.14" +; Information added by Drupal.org packaging script on 2018-04-18 +version = "7.x-2.15" core = "7.x" project = "ds" -datestamp = "1461696967" - +datestamp = "1524068596" diff --git a/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/includes/ds.fields.inc b/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/includes/ds.fields.inc index 18846390..ea7210a0 100644 --- a/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/includes/ds.fields.inc +++ b/profiles/wcm_base/modules/contrib/ds/modules/ds_ui/includes/ds.fields.inc @@ -445,6 +445,12 @@ function ds_edit_block_field_form($form, &$form_state, $custom_block = '') { '#required' => TRUE, '#default_value' => isset($custom_block->properties['block']) ? $custom_block->properties['block'] : '', ); + $form['block_identity']['block_visibility'] = array( + '#type' => 'checkbox', + '#title' => t('Respect Block Visibility'), + '#description' => t('Toggle this checkbox if you would like this field to respect the same visibility settings configured for the block.'), + '#default_value' => isset($custom_block->properties['block_visibility']) ? $custom_block->properties['block_visibility'] : FALSE, + ); $form['block_identity']['block_render'] = array( '#type' => 'select', '#options' => array( @@ -470,6 +476,7 @@ function ds_block_field_form_validate($form, &$form_state) { $form_state['field']->properties = array(); $form_state['field']->properties['block'] = $form_state['values']['block']; $form_state['field']->properties['block_render'] = $form_state['values']['block_render']; + $form_state['field']->properties['block_visibility'] = $form_state['values']['block_visibility']; } /** diff --git a/profiles/wcm_base/modules/contrib/ds/tests/ds_exportables_test/ds_exportables_test.info b/profiles/wcm_base/modules/contrib/ds/tests/ds_exportables_test/ds_exportables_test.info index a0c8b42b..fcbfa514 100644 --- a/profiles/wcm_base/modules/contrib/ds/tests/ds_exportables_test/ds_exportables_test.info +++ b/profiles/wcm_base/modules/contrib/ds/tests/ds_exportables_test/ds_exportables_test.info @@ -4,9 +4,8 @@ package = "Display Suite" core = 7.x hidden = TRUE -; Information added by Drupal.org packaging script on 2016-04-26 -version = "7.x-2.14" +; Information added by Drupal.org packaging script on 2018-04-18 +version = "7.x-2.15" core = "7.x" project = "ds" -datestamp = "1461696967" - +datestamp = "1524068596" diff --git a/profiles/wcm_base/modules/contrib/ds/tests/ds_test.info b/profiles/wcm_base/modules/contrib/ds/tests/ds_test.info index 813346a7..d7db78e4 100644 --- a/profiles/wcm_base/modules/contrib/ds/tests/ds_test.info +++ b/profiles/wcm_base/modules/contrib/ds/tests/ds_test.info @@ -5,9 +5,8 @@ package = "Display Suite" dependencies[] = ds_extras hidden = TRUE -; Information added by Drupal.org packaging script on 2016-04-26 -version = "7.x-2.14" +; Information added by Drupal.org packaging script on 2018-04-18 +version = "7.x-2.15" core = "7.x" project = "ds" -datestamp = "1461696967" - +datestamp = "1524068596" diff --git a/profiles/wcm_base/modules/custom/news_client/news_client.module b/profiles/wcm_base/modules/custom/news_client/news_client.module index 403cd958..468a9d89 100644 --- a/profiles/wcm_base/modules/custom/news_client/news_client.module +++ b/profiles/wcm_base/modules/custom/news_client/news_client.module @@ -78,6 +78,10 @@ function news_client_permission() { 'title' => t('Purge cached articles.'), 'description' => t('Access the purge page in the configuration settings.'), ), + 'news client view future article' => array( + 'title' => t('View future cached articles.'), + 'description' => t('View cached articles with a publication date in the future.'), + ), ); } @@ -300,6 +304,40 @@ function news_client_metatag_metatags_view_alter(&$output, $instance) { } } +/** + * Implements hook_node_view(). + */ +function news_client_node_view($node, $view_mode, $langcode) { + $type = $node->type; + + switch ($type) { + case 'news_client_cached_article': + $published_timestamp = $node->created; + $can_view_future_article = user_access('news client view future article'); + + if ($published_timestamp > REQUEST_TIME && !$can_view_future_article) { + // Clear breadcrumbs. + $node->custom_bredcrumb_is_set = TRUE; + drupal_set_breadcrumb(array()); + + // Deny access. + drupal_access_denied(); + drupal_exit(); + } + else if ($published_timestamp > REQUEST_TIME && $can_view_future_article) { + $publish_date = format_date($published_timestamp); + $message = t('News Client: Article will not be available until: @publish_date', array('@publish_date' => $publish_date)); + + drupal_set_message($message, 'warning'); + } + + break; + + default: + break; + } +} + /** * Implements hook_theme(). */ diff --git a/profiles/wcm_base/modules/custom/wcm_news_client_display/wcm_news_client_display.views_default.inc b/profiles/wcm_base/modules/custom/wcm_news_client_display/wcm_news_client_display.views_default.inc index f4e65eaf..f7b0b74e 100644 --- a/profiles/wcm_base/modules/custom/wcm_news_client_display/wcm_news_client_display.views_default.inc +++ b/profiles/wcm_base/modules/custom/wcm_news_client_display/wcm_news_client_display.views_default.inc @@ -82,6 +82,13 @@ function wcm_news_client_display_views_default_views() { $handler->display->display_options['filters']['type']['value'] = array( 'news_client_cached_article' => 'news_client_cached_article', ); + /* Filter criterion: Content: Post date */ + $handler->display->display_options['filters']['created']['id'] = 'created'; + $handler->display->display_options['filters']['created']['table'] = 'node'; + $handler->display->display_options['filters']['created']['field'] = 'created'; + $handler->display->display_options['filters']['created']['operator'] = '<='; + $handler->display->display_options['filters']['created']['value']['value'] = 'now'; + $handler->display->display_options['filters']['created']['value']['type'] = 'offset'; /* Display: News Archive Page */ $handler = $view->new_display('page', 'News Archive Page', 'page'); @@ -251,6 +258,13 @@ function wcm_news_client_display_views_default_views() { ); $handler->display->display_options['filters']['news_client_tags_tid']['type'] = 'select'; $handler->display->display_options['filters']['news_client_tags_tid']['vocabulary'] = 'news_client_tags'; + /* Filter criterion: Content: Post date */ + $handler->display->display_options['filters']['created']['id'] = 'created'; + $handler->display->display_options['filters']['created']['table'] = 'node'; + $handler->display->display_options['filters']['created']['field'] = 'created'; + $handler->display->display_options['filters']['created']['operator'] = '<='; + $handler->display->display_options['filters']['created']['value']['value'] = 'now'; + $handler->display->display_options['filters']['created']['value']['type'] = 'offset'; $handler->display->display_options['pane_category']['name'] = 'News Article Listings'; $handler->display->display_options['pane_category']['weight'] = '0'; $handler->display->display_options['allow']['use_pager'] = 0; @@ -307,6 +321,13 @@ function wcm_news_client_display_views_default_views() { ); $handler->display->display_options['filters']['news_client_tags_tid']['type'] = 'select'; $handler->display->display_options['filters']['news_client_tags_tid']['vocabulary'] = 'news_client_tags'; + /* Filter criterion: Content: Post date */ + $handler->display->display_options['filters']['created']['id'] = 'created'; + $handler->display->display_options['filters']['created']['table'] = 'node'; + $handler->display->display_options['filters']['created']['field'] = 'created'; + $handler->display->display_options['filters']['created']['operator'] = '<='; + $handler->display->display_options['filters']['created']['value']['value'] = 'now'; + $handler->display->display_options['filters']['created']['value']['type'] = 'offset'; $handler->display->display_options['pane_category']['name'] = 'News Article Listings'; $handler->display->display_options['pane_category']['weight'] = '0'; $handler->display->display_options['allow']['use_pager'] = 0; @@ -419,6 +440,13 @@ function wcm_news_client_display_views_default_views() { ); $handler->display->display_options['filters']['news_client_tags_tid']['type'] = 'select'; $handler->display->display_options['filters']['news_client_tags_tid']['vocabulary'] = 'news_client_tags'; + /* Filter criterion: Content: Post date */ + $handler->display->display_options['filters']['created']['id'] = 'created'; + $handler->display->display_options['filters']['created']['table'] = 'node'; + $handler->display->display_options['filters']['created']['field'] = 'created'; + $handler->display->display_options['filters']['created']['operator'] = '<='; + $handler->display->display_options['filters']['created']['value']['value'] = 'now'; + $handler->display->display_options['filters']['created']['value']['type'] = 'offset'; $handler->display->display_options['pane_category']['name'] = 'News Article Listings'; $handler->display->display_options['pane_category']['weight'] = '0'; $handler->display->display_options['allow']['use_pager'] = 'use_pager'; diff --git a/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.features_overrides.inc b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.features_overrides.inc index a7a93d27..6afa9e5c 100644 --- a/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.features_overrides.inc +++ b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.features_overrides.inc @@ -13,6 +13,37 @@ function wcm_panels_settings_features_override_default_overrides() { // Exported overrides for: field_instance $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|module"] = 'media'; + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|allowed_schemes"] = array( + 'private' => 0, + 'public' => 0, + 'vimeo' => 0, + 'youtube' => 0, + ); + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|allowed_types"] = array( + 'audio' => 0, + 'document' => 0, + 'image' => 0, + 'video' => 0, + ); + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|browser_plugins"] = array( + 'media_default--media_browser_1' => 0, + 'media_default--media_browser_my_files' => 0, + 'media_internet' => 0, + 'upload' => 0, + ); + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_crop_info"] = 1; + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_default_crop_area"] = 1; + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_enable"] = 0; + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_inline_crop"] = 0; + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_instant_crop"] = FALSE; + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_instant_preview"] = 1; + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_keyboard"] = 1; + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_maximize_default_crop_area"] = 0; + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_require_cropping"] = array(); + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_styles_list"] = array(); + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_styles_mode"] = 'include'; + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_thumblist"] = 0; + $overrides["field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|type"] = 'media_generic'; $overrides["field_instance.fieldable_panels_pane-image-field_basic_image_image.display|default|settings|image_style"] = 'image_style_full'; $overrides["field_instance.fieldable_panels_pane-image-field_basic_image_image.ds_extras_field_template"] = ''; $overrides["field_instance.fieldable_panels_pane-image-field_basic_image_image.settings|file_directory"] = ''; diff --git a/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.inc b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.inc index 25edb088..b42915d0 100644 --- a/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.inc +++ b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.features.inc @@ -19,6 +19,37 @@ function wcm_panels_settings_ctools_plugin_api($module = NULL, $api = NULL) { function wcm_panels_settings_field_default_field_instances_alter(&$data) { if (isset($data['fieldable_panels_pane-basic_file-field_basic_file_file'])) { $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['module'] = 'media'; /* WAS: 'file' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['allowed_schemes'] = array( + 'private' => 0, + 'public' => 0, + 'vimeo' => 0, + 'youtube' => 0, + ); /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['allowed_types'] = array( + 'audio' => 0, + 'document' => 0, + 'image' => 0, + 'video' => 0, + ); /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['browser_plugins'] = array( + 'media_default--media_browser_1' => 0, + 'media_default--media_browser_my_files' => 0, + 'media_internet' => 0, + 'upload' => 0, + ); /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_crop_info'] = 1; /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_default_crop_area'] = 1; /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_enable'] = 0; /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_inline_crop'] = 0; /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_instant_crop'] = FALSE; /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_instant_preview'] = 1; /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_keyboard'] = 1; /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_maximize_default_crop_area'] = 0; /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_require_cropping'] = array(); /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_styles_list'] = array(); /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_styles_mode'] = 'include'; /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['settings']['manualcrop_thumblist'] = 0; /* WAS: '' */ + $data['fieldable_panels_pane-basic_file-field_basic_file_file']['widget']['type'] = 'media_generic'; /* WAS: 'file_generic' */ } if (isset($data['fieldable_panels_pane-image-field_basic_image_image'])) { $data['fieldable_panels_pane-image-field_basic_image_image']['display']['default']['settings']['image_style'] = 'image_style_full'; /* WAS: 'panopoly_image_full' */ diff --git a/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.info b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.info index 550b3f93..6e16a68d 100644 --- a/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.info +++ b/profiles/wcm_base/modules/custom/wcm_panels_settings/wcm_panels_settings.info @@ -17,9 +17,26 @@ dependencies[] = panopoly_widgets dependencies[] = strongarm features[ctools][] = strongarm:strongarm:1 features[features_api][] = api:2 +features[features_override_items][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file features[features_override_items][] = field_instance.fieldable_panels_pane-image-field_basic_image_image features[features_override_items][] = page_manager_handlers.node_edit_panel_context features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|module +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|allowed_schemes +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|allowed_types +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|browser_plugins +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_crop_info +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_default_crop_area +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_enable +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_inline_crop +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_instant_crop +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_instant_preview +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_keyboard +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_maximize_default_crop_area +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_require_cropping +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_styles_list +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_styles_mode +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|manualcrop_thumblist +features[features_overrides][] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|type features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.display|default|settings|image_style features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.ds_extras_field_template features[features_overrides][] = field_instance.fieldable_panels_pane-image-field_basic_image_image.settings|file_directory @@ -64,3 +81,5 @@ features_exclude[dependencies][file_entity] = file_entity features_exclude[dependencies][link] = link features_exclude[dependencies][ocio_field_bases] = ocio_field_bases features_exclude[features_overrides][file_display.image__preview__file_field_image.settings|image_style] = file_display.image__preview__file_field_image.settings|image_style +features_exclude[features_overrides][field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.ds_extras_field_template] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.ds_extras_field_template +features_exclude[features_overrides][field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|progress_indicator] = field_instance.fieldable_panels_pane-basic_file-field_basic_file_file.widget|settings|progress_indicator diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt index d30009fc..fabea289 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.51, 2018-02-22 +------------------- +- No changes since last release. + 7.x-1.50, 2018-02-15 ------------------- - No changes since last release. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info index 5104601c..2adefc75 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_admin/panopoly_admin.info @@ -37,9 +37,9 @@ features[page_manager_pages][] = panopoly_admin_layout_library features[page_manager_pages][] = panopoly_admin_page_library features[page_manager_pages][] = panopoly_admin_pane_library -; Information added by Drupal.org packaging script on 2018-02-15 -version = "7.x-1.50" +; Information added by Drupal.org packaging script on 2018-02-22 +version = "7.x-1.51" core = "7.x" project = "panopoly_admin" -datestamp = "1518716424" +datestamp = "1519310599" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt index b5a7ee07..96c114e4 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_core/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.51, 2018-02-22 +------------------- +- No changes since last release. + 7.x-1.50, 2018-02-15 ------------------- - Update to Entity API 1.9. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info index 83c87ee1..d7a6ef81 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_core/panopoly_core.info @@ -82,9 +82,9 @@ features_exclude[variable][panelizer_taxonomy_term:panopoly_categories_allowed_t features_exclude[variable][panelizer_defaults_taxonomy_term_panopoly_categories] = panelizer_defaults_taxonomy_term_panopoly_categories features_exclude[variable][pathauto_taxonomy_term_panopoly_categories_pattern] = pathauto_taxonomy_term_panopoly_categories_pattern -; Information added by Drupal.org packaging script on 2018-02-15 -version = "7.x-1.50" +; Information added by Drupal.org packaging script on 2018-02-22 +version = "7.x-1.51" core = "7.x" project = "panopoly_core" -datestamp = "1518716438" +datestamp = "1519310616" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt index 4601a648..eae3b935 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.51, 2018-02-22 +------------------- +- No changes since last release. + 7.x-1.50, 2018-02-15 ------------------- - Validation for reusable FPP's "Admin Title" doesn't fire except when uploading diff --git a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info index 0f69ecf3..083508f5 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_magic/panopoly_magic.info @@ -15,9 +15,9 @@ stylesheets[all][] = css/panopoly-modal.css features[features_api][] = api:2 files[] = plugins/views/panopoly_magic_plugin_display_panel_pane.inc -; Information added by Drupal.org packaging script on 2018-02-15 -version = "7.x-1.50" +; Information added by Drupal.org packaging script on 2018-02-22 +version = "7.x-1.51" core = "7.x" project = "panopoly_magic" -datestamp = "1518716473" +datestamp = "1519310668" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt index 20b4b1d7..7a1402f8 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.51, 2018-02-22 +------------------- +- No changes since last release. + 7.x-1.50, 2018-02-15 ------------------- - No changes since last release. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info index 873e10d5..4fe4bdc3 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_pages/panopoly_pages.info @@ -81,9 +81,9 @@ features_exclude[variable][pathauto_node_panopoly_landing_page_pattern] = pathau features_exclude[variable][pathauto_node_panopoly_page_pattern] = pathauto_node_panopoly_page_pattern features_exclude[variable][pathauto_taxonomy_term_panopoly_categories_pattern] = pathauto_taxonomy_term_panopoly_categories_pattern -; Information added by Drupal.org packaging script on 2018-02-15 -version = "7.x-1.50" +; Information added by Drupal.org packaging script on 2018-02-22 +version = "7.x-1.51" core = "7.x" project = "panopoly_pages" -datestamp = "1518716485" +datestamp = "1519310687" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt index 7d87a36c..fe327d3f 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_search/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.51, 2018-02-22 +------------------- +- No changes since last release. + 7.x-1.50, 2018-02-15 ------------------- - No changes since last release. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info index aaf770a8..a9401cbe 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_search/panopoly_search.info @@ -54,9 +54,9 @@ features[variable][] = search_cron_limit features[views_view][] = panopoly_database_search features[views_view][] = panopoly_search -; Information added by Drupal.org packaging script on 2018-02-15 -version = "7.x-1.50" +; Information added by Drupal.org packaging script on 2018-02-22 +version = "7.x-1.51" core = "7.x" project = "panopoly_search" -datestamp = "1518716498" +datestamp = "1519310710" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt index dfe79645..2386a975 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_test/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.51, 2018-02-22 +------------------- +- No changes since last release. + 7.x-1.50, 2018-02-15 ------------------- - No changes since last release. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info index b7a318c8..f3d1ade1 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_test/panopoly_test.info @@ -99,9 +99,9 @@ features_exclude[dependencies][panopoly_pages] = panopoly_pages features_exclude[dependencies][panelizer] = panelizer hidden = 1 -; Information added by Drupal.org packaging script on 2018-02-15 -version = "7.x-1.50" +; Information added by Drupal.org packaging script on 2018-02-22 +version = "7.x-1.51" core = "7.x" project = "panopoly_test" -datestamp = "1518716516" +datestamp = "1519310733" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt index 816dd57b..13502b40 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.51, 2018-02-22 +------------------- +- No changes since last release. + 7.x-1.50, 2018-02-15 ------------------- - No changes since last release. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info index 2130f018..a8d62a19 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_theme/panopoly_theme.info @@ -11,9 +11,9 @@ stylesheets[all][] = css/panopoly-accordian.css stylesheets[all][] = css/panopoly-layouts.css features[features_api][] = api:2 -; Information added by Drupal.org packaging script on 2018-02-15 -version = "7.x-1.50" +; Information added by Drupal.org packaging script on 2018-02-22 +version = "7.x-1.51" core = "7.x" project = "panopoly_theme" -datestamp = "1518716534" +datestamp = "1519310753" diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt index 341b3dcd..96f63ca0 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt +++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/CHANGELOG.txt @@ -1,3 +1,7 @@ +7.x-1.51, 2018-02-22 +------------------- +- No changes since last release. + 7.x-1.50, 2018-02-15 ------------------- - No changes since last release. diff --git a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info index 651e633c..5748555e 100644 --- a/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info +++ b/profiles/wcm_base/modules/panopoly/panopoly_widgets/panopoly_widgets.info @@ -125,9 +125,9 @@ features[linkit_profiles][] = content_fields features[views_view][] = panopoly_widgets_general_content features_exclude[dependencies][linkit] = linkit -; Information added by Drupal.org packaging script on 2018-02-15 -version = "7.x-1.50" +; Information added by Drupal.org packaging script on 2018-02-22 +version = "7.x-1.51" core = "7.x" project = "panopoly_widgets" -datestamp = "1518716566" +datestamp = "1519310799" diff --git a/profiles/wcm_base/themes/wcm_omega/js/wcm-omega-accordion.behaviors.js b/profiles/wcm_base/themes/wcm_omega/js/wcm-omega-accordion.behaviors.js index 7db5bb96..05fba5ac 100644 --- a/profiles/wcm_base/themes/wcm_omega/js/wcm-omega-accordion.behaviors.js +++ b/profiles/wcm_base/themes/wcm_omega/js/wcm-omega-accordion.behaviors.js @@ -2,38 +2,41 @@ /** * Generates accesible accordions */ + Drupal.behaviors.wcmOmegaAccordion = { attach: function(context, settings) { if ($.fn.accordion) { // WYSIWYG accordions - $('.ui-accordion').accordion({ - headersSelector: '> .ui-accordion-header', - panelsSelector: '> .accordion-item', - }); + $('.ui-accordion').once(function(){ + if (!$(this).closest('.accordion-processed').length) { + $(this).accordion({ + headersSelector: '> .ui-accordion-header', + panelsSelector: '> .accordion-item', + }); + } + }).addClass('accordion-processed'); // Views accordions - $('.views-accordion').each(function() { - $(this).accordion({ - headersSelector: '.views-accordion-header', - panelsSelector: '.views-accordion-grouped-row', - }); + $('.views-accordion').once().accordion({ + headersSelector: '.views-accordion-header', + panelsSelector: '.views-accordion-grouped-row', }); // Views nested accordions, level 1 - $('.views-nested-accordion').accordion({ + $('.views-nested-accordion').once().accordion({ headersSelector: 'h3', panelsSelector: '.view-grouping', }); // Views nested accordions, level 2 - $('.accordion-panel .view-grouping-content').accordion({ + $('.accordion-panel .view-grouping-content').once().accordion({ headersSelector: 'h4', panelsSelector: '.views-accordion-grouped-row', }); //login page accordion - $('.page-user-login .user-login').accordion({ + $('.page-user-login .user-login').once().accordion({ headersSelector: 'h2', panelsSelector: '.login-box.accordion', }); diff --git a/profiles/wcm_base/themes/wcm_omega/js/wcm-omega-menu.behaviors.js b/profiles/wcm_base/themes/wcm_omega/js/wcm-omega-menu.behaviors.js index c5198ff7..cbc40806 100644 --- a/profiles/wcm_base/themes/wcm_omega/js/wcm-omega-menu.behaviors.js +++ b/profiles/wcm_base/themes/wcm_omega/js/wcm-omega-menu.behaviors.js @@ -227,7 +227,7 @@ function hideHoverSearchBox_do() { // Handles the actual hiding, without any logical operations. - searchBox.stop(true, true).fadeOut('fast') + searchBox.stop(true, true).fadeOut('fast'); toggleButton.attr('aria-expanded', 'false').removeClass('fa-search-minus'); } } diff --git a/profiles/wcm_base/themes/wcm_omega/js/wcm-omega.behaviors.js b/profiles/wcm_base/themes/wcm_omega/js/wcm-omega.behaviors.js index fbe86f98..3ccea8e4 100644 --- a/profiles/wcm_base/themes/wcm_omega/js/wcm-omega.behaviors.js +++ b/profiles/wcm_base/themes/wcm_omega/js/wcm-omega.behaviors.js @@ -18,14 +18,14 @@ window.location.href = '#error-message'; } } - } + }; // Hide webform required field asterisks from screen readers Drupal.behaviors.webformRequired = { attach: function (context, settings) { $('.webform-component span.form-required').attr('aria-hidden', 'true'); } - } + }; /** * CKEditor improperly sets the heading scope on tables with headers set on BOTH the @@ -41,7 +41,7 @@ } }); } - } + }; Drupal.behaviors.slideshowSwipe = { attach: function (context, settings) { @@ -73,7 +73,7 @@ }); } } - } + }; Drupal.behaviors.wcmOmegaAnchorScroll = { attach: function (context, settings) { @@ -131,7 +131,7 @@ } }); } - } + }; /*** MatchHeight support ***/ Drupal.behaviors.wcmOmegaMatchHeights = { @@ -217,7 +217,6 @@ }); } }); - } }; @@ -231,7 +230,7 @@ } } - } + }; /*** detects if text panels pane has only a title and adds class of "title-only" ***/ @@ -284,7 +283,7 @@ } } - } + }; /*** adjustments for ocio_calendar ***/ @@ -307,7 +306,7 @@ } //end if calendar entry node } - } + }; })(jQuery); diff --git a/profiles/wcm_base/wcm_base.make b/profiles/wcm_base/wcm_base.make index 3febeb5f..01a3953c 100644 --- a/profiles/wcm_base/wcm_base.make +++ b/profiles/wcm_base/wcm_base.make @@ -35,7 +35,7 @@ projects[draggableviews][version] = 2.x-dev projects[draggableviews][subdir] = contrib projects[draggableviews][patch][2734155] = http://drupal.org/files/issues/draggableviews-n2734155-11.patch -projects[ds][version] = 2.14 +projects[ds][version] = 2.15 projects[ds][subdir] = contrib projects[features][version] = 2.10 @@ -462,31 +462,31 @@ libraries[ocio_modernizr][download][branch] = 7.x-1.x ; The Panopoly Foundation -projects[panopoly_core][version] = 1.50 +projects[panopoly_core][version] = 1.51 projects[panopoly_core][subdir] = panopoly -projects[panopoly_theme][version] = 1.50 +projects[panopoly_theme][version] = 1.51 projects[panopoly_theme][subdir] = panopoly -projects[panopoly_magic][version] = 1.50 +projects[panopoly_magic][version] = 1.51 projects[panopoly_magic][subdir] = panopoly -projects[panopoly_widgets][version] = 1.50 +projects[panopoly_widgets][version] = 1.51 projects[panopoly_widgets][subdir] = panopoly -projects[panopoly_admin][version] = 1.50 +projects[panopoly_admin][version] = 1.51 projects[panopoly_admin][subdir] = panopoly ; The Panopoly Toolset -projects[panopoly_pages][version] = 1.50 +projects[panopoly_pages][version] = 1.51 projects[panopoly_pages][subdir] = panopoly -projects[panopoly_search][version] = 1.50 +projects[panopoly_search][version] = 1.51 projects[panopoly_search][subdir] = panopoly ; For running the automated tests. -projects[panopoly_test][version] = 1.50 +projects[panopoly_test][version] = 1.51 projects[panopoly_test][subdir] = panopoly -- GitLab