X-Git-Url: http://www.aleph1.co.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=web%2Fcore%2Fmodules%2Fckeditor%2Fjs%2Fviews%2FAuralView.js;fp=web%2Fcore%2Fmodules%2Fckeditor%2Fjs%2Fviews%2FAuralView.js;h=665e655f1f853fcda1fa74024d990f34feb0ed4b;hb=9917807b03b64faf00f6a1f29dcb6eafc454efa5;hp=0659eb2061c99fd7b50f64be6a63b022c0e8f71e;hpb=aea91e65e895364e460983b890e295aa5d5540a5;p=yaffs-website

diff --git a/web/core/modules/ckeditor/js/views/AuralView.js b/web/core/modules/ckeditor/js/views/AuralView.js
index 0659eb206..665e655f1 100644
--- a/web/core/modules/ckeditor/js/views/AuralView.js
+++ b/web/core/modules/ckeditor/js/views/AuralView.js
@@ -1,18 +1,12 @@
 /**
- * @file
- * A Backbone View that provides the aural view of CKEditor toolbar
- * configuration.
- */
+* DO NOT EDIT THIS FILE.
+* See the following change record for more information,
+* https://www.drupal.org/node/2815083
+* @preserve
+**/
 
 (function (Drupal, Backbone, $) {
-
-  'use strict';
-
-  Drupal.ckeditor.AuralView = Backbone.View.extend(/** @lends Drupal.ckeditor.AuralView# */{
-
-    /**
-     * @type {object}
-     */
+  Drupal.ckeditor.AuralView = Backbone.View.extend({
     events: {
       'click .ckeditor-buttons a': 'announceButtonHelp',
       'click .ckeditor-multiple-buttons a': 'announceSeparatorHelp',
@@ -21,52 +15,23 @@
       'focus .ckeditor-toolbar-group': 'onFocus'
     },
 
-    /**
-     * Backbone View for CKEditor toolbar configuration; aural UX (output only).
-     *
-     * @constructs
-     *
-     * @augments Backbone.View
-     */
-    initialize: function () {
-      // Announce the button and group positions when the model is no longer
-      // dirty.
+    initialize: function initialize() {
       this.listenTo(this.model, 'change:isDirty', this.announceMove);
     },
-
-    /**
-     * Calls announce on buttons and groups when their position is changed.
-     *
-     * @param {Drupal.ckeditor.ConfigurationModel} model
-     *   The ckeditor configuration model.
-     * @param {bool} isDirty
-     *   A model attribute that indicates if the changed toolbar configuration
-     *   has been stored or not.
-     */
-    announceMove: function (model, isDirty) {
-      // Announce the position of a button or group after the model has been
-      // updated.
+    announceMove: function announceMove(model, isDirty) {
       if (!isDirty) {
         var item = document.activeElement || null;
         if (item) {
           var $item = $(item);
           if ($item.hasClass('ckeditor-toolbar-group')) {
             this.announceButtonGroupPosition($item);
-          }
-          else if ($item.parent().hasClass('ckeditor-button')) {
+          } else if ($item.parent().hasClass('ckeditor-button')) {
             this.announceButtonPosition($item.parent());
           }
         }
       }
     },
-
-    /**
-     * Handles the focus event of elements in the active and available toolbars.
-     *
-     * @param {jQuery.Event} event
-     *   The focus event that was triggered.
-     */
-    onFocus: function (event) {
+    onFocus: function onFocus(event) {
       event.stopPropagation();
 
       var $originalTarget = $(event.target);
@@ -74,19 +39,11 @@
       var $parent = $currentTarget.parent();
       if ($parent.hasClass('ckeditor-button') || $parent.hasClass('ckeditor-button-separator')) {
         this.announceButtonPosition($currentTarget.parent());
-      }
-      else if ($originalTarget.attr('role') !== 'button' && $currentTarget.hasClass('ckeditor-toolbar-group')) {
+      } else if ($originalTarget.attr('role') !== 'button' && $currentTarget.hasClass('ckeditor-toolbar-group')) {
         this.announceButtonGroupPosition($currentTarget);
       }
     },
-
-    /**
-     * Announces the current position of a button group.
-     *
-     * @param {jQuery} $group
-     *   A jQuery set that contains an li element that wraps a group of buttons.
-     */
-    announceButtonGroupPosition: function ($group) {
+    announceButtonGroupPosition: function announceButtonGroupPosition($group) {
       var $groups = $group.parent().children();
       var $row = $group.closest('.ckeditor-row');
       var $rows = $row.parent().children();
@@ -101,22 +58,14 @@
         '@row': row,
         '@rowCount': rowCount
       });
-      // If this position is the first in the last row then tell the user that
-      // pressing the down arrow key will create a new row.
+
       if (position === 1 && row === rowCount) {
         text += '\n';
         text += Drupal.t('Press the down arrow key to create a new row.');
       }
       Drupal.announce(text, 'assertive');
     },
-
-    /**
-     * Announces current button position.
-     *
-     * @param {jQuery} $button
-     *   A jQuery set that contains an li element that wraps a button.
-     */
-    announceButtonPosition: function ($button) {
+    announceButtonPosition: function announceButtonPosition($button) {
       var $row = $button.closest('.ckeditor-row');
       var $rows = $row.parent().children();
       var $buttons = $button.closest('.ckeditor-buttons').children();
@@ -128,12 +77,10 @@
       var positionCount = $buttons.length;
       var row = $rows.index($row) + 1;
       var rowCount = $rows.not('.placeholder').length;
-      // The name of the button separator is 'button separator' and its type
-      // is 'separator', so we do not want to print the type of this item,
-      // otherwise the UA will speak 'button separator separator'.
-      var type = ($button.attr('data-drupal-ckeditor-type') === 'separator') ? '' : Drupal.t('button');
-      var text;
-      // The button is located in the available button set.
+
+      var type = $button.attr('data-drupal-ckeditor-type') === 'separator' ? '' : Drupal.t('button');
+      var text = void 0;
+
       if ($button.closest('.ckeditor-toolbar-disabled').length > 0) {
         text = Drupal.t('@name @type.', {
           '@name': $button.children().attr('aria-label'),
@@ -142,45 +89,34 @@
         text += '\n' + Drupal.t('Press the down arrow key to activate.');
 
         Drupal.announce(text, 'assertive');
-      }
-      // The button is in the active toolbar.
-      else if ($group.not('.placeholder').length === 1) {
-        text = Drupal.t('@name @type in position @position of @positionCount in @groupName button group in row @row of @rowCount.', {
-          '@name': $button.children().attr('aria-label'),
-          '@type': type,
-          '@position': position,
-          '@positionCount': positionCount,
-          '@groupName': $group.attr('data-drupal-ckeditor-toolbar-group-name'),
-          '@row': row,
-          '@rowCount': rowCount
-        });
-        // If this position is the first in the last row then tell the user that
-        // pressing the down arrow key will create a new row.
-        if (groupPosition === 1 && position === 1 && row === rowCount) {
-          text += '\n';
-          text += Drupal.t('Press the down arrow key to create a new button group in a new row.');
-        }
-        // If this position is the last one in this row then tell the user that
-        // moving the button to the next group will create a new group.
-        if (groupPosition === groupPositionCount && position === positionCount) {
-          text += '\n';
-          text += Drupal.t('This is the last group. Move the button forward to create a new group.');
+      } else if ($group.not('.placeholder').length === 1) {
+          text = Drupal.t('@name @type in position @position of @positionCount in @groupName button group in row @row of @rowCount.', {
+            '@name': $button.children().attr('aria-label'),
+            '@type': type,
+            '@position': position,
+            '@positionCount': positionCount,
+            '@groupName': $group.attr('data-drupal-ckeditor-toolbar-group-name'),
+            '@row': row,
+            '@rowCount': rowCount
+          });
+
+          if (groupPosition === 1 && position === 1 && row === rowCount) {
+            text += '\n';
+            text += Drupal.t('Press the down arrow key to create a new button group in a new row.');
+          }
+
+          if (groupPosition === groupPositionCount && position === positionCount) {
+            text += '\n';
+            text += Drupal.t('This is the last group. Move the button forward to create a new group.');
+          }
+          Drupal.announce(text, 'assertive');
         }
-        Drupal.announce(text, 'assertive');
-      }
     },
-
-    /**
-     * Provides help information when a button is clicked.
-     *
-     * @param {jQuery.Event} event
-     *   The click event for the button click.
-     */
-    announceButtonHelp: function (event) {
+    announceButtonHelp: function announceButtonHelp(event) {
       var $link = $(event.currentTarget);
       var $button = $link.parent();
       var enabled = $button.closest('.ckeditor-toolbar-active').length > 0;
-      var message;
+      var message = void 0;
 
       if (enabled) {
         message = Drupal.t('The "@name" button is currently enabled.', {
@@ -188,8 +124,7 @@
         });
         message += '\n' + Drupal.t('Use the keyboard arrow keys to change the position of this button.');
         message += '\n' + Drupal.t('Press the up arrow key on the top row to disable the button.');
-      }
-      else {
+      } else {
         message = Drupal.t('The "@name" button is currently disabled.', {
           '@name': $link.attr('aria-label')
         });
@@ -198,26 +133,18 @@
       Drupal.announce(message);
       event.preventDefault();
     },
-
-    /**
-     * Provides help information when a separator is clicked.
-     *
-     * @param {jQuery.Event} event
-     *   The click event for the separator click.
-     */
-    announceSeparatorHelp: function (event) {
+    announceSeparatorHelp: function announceSeparatorHelp(event) {
       var $link = $(event.currentTarget);
       var $button = $link.parent();
       var enabled = $button.closest('.ckeditor-toolbar-active').length > 0;
-      var message;
+      var message = void 0;
 
       if (enabled) {
         message = Drupal.t('This @name is currently enabled.', {
           '@name': $link.attr('aria-label')
         });
         message += '\n' + Drupal.t('Use the keyboard arrow keys to change the position of this separator.');
-      }
-      else {
+      } else {
         message = Drupal.t('Separators are used to visually split individual buttons.');
         message += '\n' + Drupal.t('This @name is currently disabled.', {
           '@name': $link.attr('aria-label')
@@ -229,5 +156,4 @@
       event.preventDefault();
     }
   });
-
-})(Drupal, Backbone, jQuery);
+})(Drupal, Backbone, jQuery);
\ No newline at end of file