Unverified Commit 1598f3e5 authored by Alex Pott's avatar Alex Pott
Browse files

Issue #2881212 by Eli-T, huzooka, lauriii: Formatting guidelines toggle script... 

Issue #2881212 by Eli-T, huzooka, lauriii: Formatting guidelines toggle script relies on Classy selectors
parent ca0ac736

core/modules/filter/css/filter.admin.css

deleted100644 → 0
+0 −81
Original line number Diff line number Diff line 


/**

 * @file

 * Admin styling for the Filter module.

 */



/**

 * Filter information under field.

 */

.text-format-wrapper > .form-item {

  margin-bottom: 0;

}



.filter-wrapper {

  overflow: hidden;

  margin: 0;

  padding: 0.5em 0.666em;

  border: 1px solid #ccc;

  border-top: 0;

}

.filter-wrapper .form-item {

  margin: 0;

}

.filter-wrapper .form-item label {

  display: inline;

}



.filter-help {

  float: right; /* LTR */

}

[dir="rtl"] .filter-help {

  float: left;

}

.filter-guidelines .filter-guidelines-item {

  margin-top: 1em;

}

.filter-help p {

  margin: 0;

}

.filter-help a {

  position: relative;

  margin: 0 20px 0 0; /* LTR */

}

[dir="rtl"] .filter-help a {

  margin: 0 0 0 20px;

}

.filter-help a:after {

  position: absolute;

  top: 0;

  right: -20px; /* LTR */

  display: block;

  width: 16px;

  height: 16px;

  content: "";

  background: transparent url(../../../misc/help.png);

}

[dir="rtl"] .filter-help a:after {

  right: auto;

  left: -20px;

}



.text-format-wrapper .description {

  margin-top: 0.5em;

}

.tips {

  margin-top: 0;

  margin-bottom: 0;

  padding-top: 0;

  padding-bottom: 0;

  font-size: 0.9em;

}



/**

 * Improve filter tips position.

 */

.tips {

  padding-left: 0; /* LTR */

}

[dir="rtl"] .tips {

  padding-right: 0;

}

core/modules/filter/filter.es6.js

+6 −6
Original line number Diff line number Diff line
@@ -18,20 +18,20 @@ 
        const $this = $(event.target);

        const value = $this.val();

        $this

          .closest('.filter-wrapper')

          .find('.filter-guidelines-item')

          .closest('.js-filter-wrapper')

          .find('[data-drupal-format-id]')

          .hide()

          .filter(`.filter-guidelines-${value}`)

          .filter(`[data-drupal-format-id="${value}"]`)

          .show();

      }



      $(context)

        .find('.filter-guidelines')

        .find('.js-filter-guidelines')

        .once('filter-guidelines')

        .find(':header')

        .hide()

        .closest('.filter-wrapper')

        .find('select.filter-list')

        .closest('.js-filter-wrapper')

        .find('select.js-filter-list')

        .on('change.filterGuidelines', updateFilterGuidelines)

        // Need to trigger the namespaced event to avoid triggering formUpdated

        // when initializing the select.

core/modules/filter/filter.js

+2 −2
Original line number Diff line number Diff line
@@ -11,10 +11,10 @@ 
      function updateFilterGuidelines(event) {

        var $this = $(event.target);

        var value = $this.val();

        $this.closest('.filter-wrapper').find('.filter-guidelines-item').hide().filter('.filter-guidelines-' + value).show();

        $this.closest('.js-filter-wrapper').find('[data-drupal-format-id]').hide().filter('[data-drupal-format-id="' + value + '"]').show();

      }



      $(context).find('.filter-guidelines').once('filter-guidelines').find(':header').hide().closest('.filter-wrapper').find('select.filter-list').on('change.filterGuidelines', updateFilterGuidelines).trigger('change.filterGuidelines');

      $(context).find('.js-filter-guidelines').once('filter-guidelines').find(':header').hide().closest('.js-filter-wrapper').find('select.js-filter-list').on('change.filterGuidelines', updateFilterGuidelines).trigger('change.filterGuidelines');

    }

  };

})(jQuery, Drupal);
 
 No newline at end of file

core/modules/filter/filter.libraries.yml

+0 −7
Original line number Diff line number Diff line
@@ -2,9 +2,6 @@ drupal.filter.admin: 
  version: VERSION

  js:

    filter.admin.js: {}

  css:

    theme:

      css/filter.admin.css: {}

  dependencies:

    - core/jquery

    - core/drupal
@@ -24,10 +21,6 @@ drupal.filter: 
  version: VERSION

  js:

    filter.js: {}

  css:

    theme:

      # @todo Misnomer: Does not contain administrative styles.

      css/filter.admin.css: {}

  dependencies:

    - core/jquery

    - core/drupal

core/modules/filter/filter.module

+3 −0
Original line number Diff line number Diff line
@@ -377,6 +377,9 @@ function template_preprocess_filter_guidelines(&$variables) { 
    '#theme' => 'filter_tips',

    '#tips' => _filter_tips($format->id(), FALSE),

  ];



  // Add format id for filter.es6.js.

  $variables['attributes']['data-drupal-format-id'] = $format->id();

}



/**