Changeset 3410:e2e04005053c for plugins/dcCKEditor/js/ckeditor/ckeditor.js

Timestamp:

11/18/16 18:11:18 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Update CKEditor from 4.5.11 to 4.6.0, update dotclear skin (copy of new 4.6 default skin)

File:

• plugins/dcCKEditor/js/ckeditor/ckeditor.js (modified) (54 diffs)

plugins/dcCKEditor/js/ckeditor/ckeditor.js

@@ -47 +47 @@
                // for each release and generated by the releaser.
                // (Base 36 value of each component of YYMMDDHH - 4 chars total - e.g. 87bm == 08071122)
-               timestamp: 'G889',
+               timestamp: 'GAIF',
 
                /**
@@ -54 +54 @@
                 *        alert( CKEDITOR.version ); // e.g. 'CKEditor 3.4.1'
                 */
-               version: '4.5.11',
+               version: '4.6.0',
 
                /**
@@ -2656 +2656 @@
                }
                return false;
+          },
+
+          /**
+           * Converts a keystroke to its string representation. Returns an object with two fields:
+           *
+           * * `display` – A string that should be used for visible labels.
+           * For Mac devices it uses `⌥` for `ALT`, `⇧` for `SHIFT` and `⌘` for `COMMAND`.
+           * * `aria` – A string that should be used for ARIA descriptions.
+           * It does not use special characters such as `⌥`, `⇧` or `⌘`.
+           *
+           *        var lang = editor.lang.common.keyboard;
+           *        var shortcut = CKEDITOR.tools.keystrokeToString( lang, CKEDITOR.CTRL + 88 );
+           *        console.log( shortcut.display ); // 'CTRL + X', on Mac '⌘ + X'.
+           *        console.log( shortcut.aria ); // 'CTRL + X', on Mac 'COMMAND + X'.
+           *
+           * @since 4.6.0
+           * @param {Object} lang A language object with the key name translation.
+           * @param {Number} keystroke The keystroke to convert.
+           * @returns {{display: String, aria: String}}
+           */
+          keystrokeToString: function( lang, keystroke ) {
+               var special = keystroke & 0xFF0000,
+                    key = keystroke & 0x00FFFF,
+                    isMac = CKEDITOR.env.mac,
+                    CTRL = 17,
+                    CMD = 224,
+                    ALT = 18,
+                    SHIFT = 16,
+                    display = [],
+                    aria = [];
+
+
+               if ( special & CKEDITOR.CTRL ) {
+                    display.push( isMac ? '⌘' : lang[ CTRL ] );
+                    aria.push( isMac ? lang[ CMD ] : lang[ CTRL ] );
+               }
+
+               if ( special & CKEDITOR.ALT ) {
+                    display.push( isMac ? '⌥' : lang[ ALT ] );
+                    aria.push( lang[ ALT ] );
+               }
+
+               if ( special & CKEDITOR.SHIFT ) {
+                    display.push( isMac ? '⇧' : lang[ SHIFT ] );
+                    aria.push( lang[ SHIFT ] );
+               }
+
+               if ( key ) {
+                    if ( lang[ key ] ) {
+                         display.push( lang[ key ] );
+                         aria.push( lang[ key ] );
+                    } else {
+                         display.push( String.fromCharCode( key ) );
+                         aria.push( String.fromCharCode( key ) );
+                    }
+               }
+
+               return {
+                    display: display.join( '+' ),
+                    aria: aria.join( '+' )
+               };
           },
 
@@ -10649 +10710 @@
           /**
            * Looks for elements matching the `query` selector within a range.
-           * 
+           *
            * @since 4.5.11
            * @private
@@ -10770 +10831 @@
 CKEDITOR.POSITION_AFTER_END = 4;
 
+/**
+ * @readonly
+ * @member CKEDITOR
+ * @property {Number} [=1]
+ */
 CKEDITOR.ENLARGE_ELEMENT = 1;
+
+/**
+ * @readonly
+ * @member CKEDITOR
+ * @property {Number} [=2]
+ */
 CKEDITOR.ENLARGE_BLOCK_CONTENTS = 2;
+
+/**
+ * @readonly
+ * @member CKEDITOR
+ * @property {Number} [=3]
+ */
 CKEDITOR.ENLARGE_LIST_ITEM_CONTENTS = 3;
+
+/**
+ * @readonly
+ * @member CKEDITOR
+ * @property {Number} [=4]
+ */
 CKEDITOR.ENLARGE_INLINE = 4;
 
@@ -14179 +14263 @@
            *
            * @param {CKEDITOR.htmlParser.element} element
-           * @param {String} styleName Name of the style that will be converted.
-           * @param {String} [attrName=styleName] Name of the attribute into which the style will be converted.
+           * @param {String} styleName The name of the style that will be converted.
+           * @param {String} [attrName=styleName] The name of the attribute into which the style will be converted.
            */
           lengthToAttribute: function( element, styleName, attrName ) {
@@ -14200 +14284 @@
 
           /**
-           * Converts the `align` attribute to the `float` style if not set. Attribute
+           * Converts the `align` attribute to the `float` style if not set. The attribute
            * is always removed.
            *
@@ -14218 +14302 @@
           /**
            * Converts the `float` style to the `align` attribute if not set.
-           * Style is always removed.
+           * The style is always removed.
            *
            * @param {CKEDITOR.htmlParser.element} element
@@ -14234 +14318 @@
 
           /**
+           * Converts the shorthand form of the `border` style to seperate styles.
+           *
+           * @param {CKEDITOR.htmlParser.element} element
+           */
+          splitBorderShorthand: function( element ) {
+               if ( !element.styles.border ) {
+                    return;
+               }
+
+               var widths = element.styles.border.match( /([\.\d]+\w+)/g ) || [ '0px' ];
+               switch ( widths.length ) {
+                    case 1:
+                         element.styles[ 'border-width' ] = widths[0];
+                         break;
+                    case 2:
+                         mapStyles( [ 0, 1, 0, 1 ] );
+                         break;
+                    case 3:
+                         mapStyles( [ 0, 1, 2, 1 ] );
+                         break;
+                    case 4:
+                         mapStyles( [ 0, 1, 2, 3 ] );
+                         break;
+               }
+
+               element.styles[ 'border-style' ] = element.styles[ 'border-style' ] ||
+                    ( element.styles.border.match( /(none|hidden|dotted|dashed|solid|double|groove|ridge|inset|outset|initial|inherit)/ ) || [] )[ 0 ];
+               if ( !element.styles[ 'border-style' ] )
+                    delete element.styles[ 'border-style' ];
+
+               delete element.styles.border;
+
+               function mapStyles( map ) {
+                    element.styles['border-top-width'] = widths[ map[0] ];
+                    element.styles['border-right-width'] = widths[ map[1] ];
+                    element.styles['border-bottom-width'] = widths[ map[2] ];
+                    element.styles['border-left-width'] = widths[ map[3] ];
+               }
+          },
+
+          listTypeToStyle: function( element ) {
+               if ( element.attributes.type ) {
+                    switch ( element.attributes.type ) {
+                         case 'a':
+                              element.styles[ 'list-style-type' ] = 'lower-alpha';
+                              break;
+                         case 'A':
+                              element.styles[ 'list-style-type' ] = 'upper-alpha';
+                              break;
+                         case 'i':
+                              element.styles[ 'list-style-type' ] = 'lower-roman';
+                              break;
+                         case 'I':
+                              element.styles[ 'list-style-type' ] = 'upper-roman';
+                              break;
+                         case '1':
+                              element.styles[ 'list-style-type' ] = 'decimal';
+                              break;
+                         default:
+                              element.styles[ 'list-style-type' ] = element.attributes.type;
+                    }
+               }
+          },
+
+          /**
+           * Converts the shorthand form of the `margin` style to seperate styles.
+           *
+           * @param {CKEDITOR.htmlParser.element} element
+           */
+          splitMarginShorthand: function( element ) {
+               if ( !element.styles.margin ) {
+                    return;
+               }
+
+               var widths = element.styles.margin.match( /(\-?[\.\d]+\w+)/g ) || [ '0px' ];
+               switch ( widths.length ) {
+                    case 1:
+                         element.styles.margin = widths[0];
+                         break;
+                    case 2:
+                         mapStyles( [ 0, 1, 0, 1 ] );
+                         break;
+                    case 3:
+                         mapStyles( [ 0, 1, 2, 1 ] );
+                         break;
+                    case 4:
+                         mapStyles( [ 0, 1, 2, 3 ] );
+                         break;
+               }
+
+               delete element.styles.margin;
+
+               function mapStyles( map ) {
+                    element.styles['margin-top'] = widths[ map[0] ];
+                    element.styles['margin-right'] = widths[ map[1] ];
+                    element.styles['margin-bottom'] = widths[ map[2] ];
+                    element.styles['margin-left'] = widths[ map[3] ];
+               }
+          },
+
+          /**
            * Checks whether an element matches a given {@link CKEDITOR.style}.
            * The element can be a "superset" of a style, e.g. it may have
@@ -14244 +14429 @@
 
           /**
-           * Transforms element to given form.
+           * Transforms an element to a given form.
            *
            * Form may be a:
            *
            *   * {@link CKEDITOR.style},
-           *   * string – the new name of an element.
+           *   * string – the new name of the element.
            *
            * @param {CKEDITOR.htmlParser.element} el
@@ -15014 +15199 @@
                'en-au': 1, 'en-ca': 1, 'en-gb': 1, en: 1, eo: 1, es: 1, et: 1, eu: 1, fa: 1, fi: 1, fo: 1,
                'fr-ca': 1, fr: 1, gl: 1, gu: 1, he: 1, hi: 1, hr: 1, hu: 1, id: 1, is: 1, it: 1, ja: 1, ka: 1,
-               km: 1, ko: 1, ku: 1, lt: 1, lv: 1, mk: 1, mn: 1, ms: 1, nb: 1, nl: 1, no: 1, pl: 1, 'pt-br': 1,
+               km: 1, ko: 1, ku: 1, lt: 1, lv: 1, mk: 1, mn: 1, ms: 1, nb: 1, nl: 1, no: 1, oc: 1, pl: 1, 'pt-br': 1,
                pt: 1, ro: 1, ru: 1, si: 1, sk: 1, sl: 1, sq: 1, 'sr-latn': 1, sr: 1, sv: 1, th: 1, tr: 1, tt: 1, ug: 1,
                uk: 1, vi: 1, 'zh-cn': 1, zh: 1
@@ -17159 +17344 @@
 
           /**
+           * Returns the keystroke that is assigned to a specified {@link CKEDITOR.command}. If no keystroke is assigned,
+           * it returns null.
+           *
+           * @since 4.6.0
+           * @param {CKEDITOR.command} command
+           * @returns {Number} The keystroke assigned to the provided command or null if there is no keystroke.
+           */
+          getCommandKeystroke: function( command ) {
+               var commandName = command.name,
+                    keystrokes = this.keystrokeHandler.keystrokes,
+                    key;
+
+               // Some commands have a fake keystroke - for example CUT/COPY/PASTE commands are handled natively.
+               if ( command.fakeKeystroke ) {
+                    return command.fakeKeystroke;
+               }
+
+               for ( key in keystrokes ) {
+                    if ( keystrokes.hasOwnProperty( key ) && keystrokes[ key ] == commandName ) {
+                         return key;
+                    }
+               }
+
+               return null;
+          },
+
+          /**
            * Shorthand for {@link CKEDITOR.filter#addFeature}.
            *
@@ -17642 +17854 @@
  *
  * @event destroy
+ * @param {CKEDITOR.editor} editor This editor instance.
+ */
+
+/**
+ * Event fired when the {@link #method-destroy} method is called,
+ * but before destroying the editor.
+ *
+ * @event beforeDestroy
  * @param {CKEDITOR.editor} editor This editor instance.
  */
@@ -20705 +20925 @@
 
 /**
- * Object presentation of CSS style declaration text.
+ * Object presentation of the CSS style declaration text.
  *
  * @class
@@ -21068 +21288 @@
            * @since 4.3
            * @param {Number} index Index at which the element will be split — `0` means the beginning,
-           * `1` after first child node, etc.
+           * `1` after the first child node, etc.
            * @returns {CKEDITOR.htmlParser.element} The new element following this one.
            */
@@ -21089 +21309 @@
 
                return clone;
+          },
+
+          /**
+           * Searches through the current node children to find nodes matching the `criteria`.
+           *
+           * @param {String/Function} criteria Tag name or evaluator function.
+           * @param {Boolean} [recursive=false]
+           * @returns {CKEDITOR.htmlParser.node[]}
+           */
+          find: function( criteria, recursive ) {
+               if ( recursive === undefined ) {
+                    recursive = false;
+               }
+
+               var ret = [],
+                    i;
+
+               for  ( i = 0; i < this.children.length; i++ ) {
+                    var curChild = this.children[ i ];
+
+                    if ( typeof criteria == 'function' && criteria( curChild ) ) {
+                         ret.push( curChild );
+                    } else if ( typeof criteria == 'string' && curChild.name === criteria ) {
+                         ret.push( curChild );
+                    }
+
+                    if ( recursive && curChild.find ) {
+                         ret = ret.concat( curChild.find( criteria, recursive ) );
+                    }
+               }
+
+               return ret;
           },
 
@@ -23391 +23643 @@
       * @method editable
       * @member CKEDITOR.editor
-      * @param {CKEDITOR.dom.element/CKEDITOR.editable} elementOrEditable The
+      * @param {CKEDITOR.dom.element/CKEDITOR.editable} [elementOrEditable] The
       * DOM element to become the editable or a {@link CKEDITOR.editable} object.
       */
@@ -34645 +34897 @@
 
      function showCover( editor ) {
-          var win = CKEDITOR.document.getWindow();
-          var config = editor.config,
-               backgroundColorStyle = config.dialog_backgroundCoverColor || 'white',
+          var win = CKEDITOR.document.getWindow(),
+               config = editor.config,
+               skinName = ( CKEDITOR.skinName || editor.config.skin ),
+               backgroundColorStyle = config.dialog_backgroundCoverColor || ( skinName == 'moono-lisa' ? 'black' : 'white' ),
                backgroundCoverOpacity = config.dialog_backgroundCoverOpacity,
                baseFloatZIndex = config.baseFloatZIndex,
@@ -37134 +37387 @@
                     canUndo: type == 'cut', // We can't undo copy to clipboard.
                     startDisabled: true,
+                    fakeKeystroke: type == 'cut' ? CKEDITOR.CTRL + 88 /*X*/ :  CKEDITOR.CTRL + 67 /*C*/,
                     exec: function() {
                          // Attempts to execute the Cut and Copy operations.
@@ -37168 +37422 @@
                     canUndo: false,
                     async: true,
-
+                    fakeKeystroke: CKEDITOR.CTRL + 86 /*V*/,
                     exec: function( editor, data ) {
                          var cmd = this,
@@ -39208 +39462 @@
           ' role="button"' +
           ' aria-labelledby="{id}_label"' +
+          ' aria-describedby="{id}_description"' +
           ' aria-haspopup="{hasArrow}"' +
           ' aria-disabled="{ariaDisabled}"';
@@ -39231 +39486 @@
      template += '>&nbsp;</span>' +
           '<span id="{id}_label" class="cke_button_label cke_button__{name}_label" aria-hidden="false">{label}</span>' +
+          '<span id="{id}_description" class="cke_button_label" aria-hidden="false">{ariaShortcut}</span>' +
           '{arrowHtml}' +
           '</a>';
@@ -39333 +39589 @@
                     command = this.command,
                     // Get the command name.
-                    clickFn;
+                    clickFn,
+                    keystroke,
+                    shortcut;
 
                this._.editor = editor;
@@ -39434 +39692 @@
                }
 
-               if ( !command )
+               if ( !command ) {
                     stateName += 'off';
+               } else {
+                    keystroke = editor.getCommandKeystroke( command );
+
+                    if ( keystroke ) {
+                         shortcut = CKEDITOR.tools.keystrokeToString( editor.lang.common.keyboard, keystroke );
+                    }
+               }
 
                var name = this.name || this.command,
@@ -39454 +39719 @@
                     state: stateName,
                     ariaDisabled: stateName == 'disabled' ? 'true' : 'false',
-                    title: this.title,
+                    title: this.title + ( shortcut ? ' (' + shortcut.display + ')' : '' ),
+                    ariaShortcut: shortcut ? editor.lang.common.keyboardShortcut + ' ' + shortcut.aria : '',
                     titleJs: env.gecko && !env.hc ? '' : ( this.title || '' ).replace( "'", '' ),
                     hasArrow: this.hasArrow ? 'true' : 'false',
@@ -40732 +40998 @@
 
           if ( !CKEDITOR.env.hc ) {
-               addButton( 'TextColor', 'fore', lang.textColorTitle, 10 );
+               addButton( 'TextColor', 'fore', lang.textColorTitle, 10, {
+                    contentTransformations: [
+                         [
+                              {
+                                   element: 'font',
+                                   check: 'span{color}',
+                                   left: function( element ) {
+                                        return !!element.attributes.color;
+                                   },
+                                   right: function( element ) {
+                                        element.name = 'span';
+
+                                        element.attributes.color && ( element.styles.color = element.attributes.color );
+                                        delete element.attributes.color;
+                                   }
+                              }
+                         ]
+                    ]
+               } );
                addButton( 'BGColor', 'back', lang.bgColorTitle, 20 );
           }
 
-          function addButton( name, type, title, order ) {
+          function addButton( name, type, title, order, options ) {
                var style = new CKEDITOR.style( config[ 'colorButton_' + type + 'Style' ] ),
                     colorBoxId = CKEDITOR.tools.getNextId() + '_colorBox';
+
+               options = options || {};
 
                editor.ui.add( name, CKEDITOR.UI_PANELBUTTON, {
@@ -40748 +41034 @@
                     allowedContent: style,
                     requiredContent: style,
+                    contentTransformations: options.contentTransformations,
 
                     panel: {
@@ -41254 +41541 @@
                     requiredContent: 'div',
                     contextSensitive: true,
+                    contentTransformations: [
+                         [ 'div: alignmentToStyle' ]
+                    ],
                     refresh: function( editor, path ) {
                          var context = editor.config.div_wrapTable ? path.root : path.blockLimit;
@@ -44930 +45220 @@
                     };
 
+                    this.contentTransformations = [
+                         [ 'div: splitMarginShorthand' ],
+                         [ 'h1: splitMarginShorthand' ],
+                         [ 'h2: splitMarginShorthand' ],
+                         [ 'h3: splitMarginShorthand' ],
+                         [ 'h4: splitMarginShorthand' ],
+                         [ 'h5: splitMarginShorthand' ],
+                         [ 'h6: splitMarginShorthand' ],
+                         [ 'ol: splitMarginShorthand' ],
+                         [ 'p: splitMarginShorthand' ],
+                         [ 'pre: splitMarginShorthand' ],
+                         [ 'ul: splitMarginShorthand' ]
+                    ];
+
                     if ( this.enterBr )
                          this.allowedContent.div = true;
@@ -45665 +45969 @@
 
                if ( CKEDITOR.dialog.isTabEnabled( editor, 'link', 'advanced' ) )
-                    allowed = allowed.replace( ']', ',accesskey,charset,dir,id,lang,name,rel,tabindex,title,type]{*}(*)' );
+                    allowed = allowed.replace( ']', ',accesskey,charset,dir,id,lang,name,rel,tabindex,title,type,download]{*}(*)' );
                if ( CKEDITOR.dialog.isTabEnabled( editor, 'link', 'target' ) )
                     allowed = allowed.replace( ']', ',target,onclick]' );
@@ -46140 +46444 @@
                     }
 
+                    var download = element.getAttribute( 'download' );
+                    if ( download !== null ) {
+                         retval.download = true;
+                    }
+
                     var advanced = {};
 
@@ -46279 +46588 @@
                }
 
+               // Force download attribute.
+               if ( data.download ) {
+                    set.download = '';
+               }
+
                // Advanced attributes.
                if ( data.advanced ) {
@@ -46300 +46614 @@
                     onclick: 1,
                     'data-cke-pa-onclick': 1,
-                    'data-cke-saved-name': 1
+                    'data-cke-saved-name': 1,
+                    'download': 1
                };
 
@@ -47625 +47940 @@
           ' title="{title}"' +
           ' tabindex="-1"' +
-          '_cke_focus=1' +
+          ' _cke_focus=1' +
           ' hidefocus="true"' +
           ' role="{role}"' +
+          ' aria-label="{label}"' +
+          ' aria-describedby="{id}_description"' +
           ' aria-haspopup="{hasPopup}"' +
           ' aria-disabled="{disabled}"' +
@@ -47651 +47968 @@
 
      menuItemSource +=
+                    //'' +
                     '<span class="cke_menubutton_inner">' +
                          '<span class="cke_menubutton_icon">' +
@@ -47658 +47976 @@
                               '{label}' +
                          '</span>' +
+                         '{shortcutHtml}' +
                          '{arrowHtml}' +
                     '</span>' +
-               '</a></span>';
+               '</a><span id="{id}_description" class="cke_voice_label" aria-hidden="false">{ariaShortcut}</span></span>';
 
      var menuArrowSource = '<span class="cke_menuarrow">' +
@@ -47666 +47985 @@
                '</span>';
 
+     var menuShortcutSource = '<span class="cke_menubutton_label cke_menubutton_shortcut">' +
+                    '{shortcut}' +
+               '</span>';
+
      var menuItemTpl = CKEDITOR.addTemplate( 'menuItem', menuItemSource ),
-          menuArrowTpl = CKEDITOR.addTemplate( 'menuArrow', menuArrowSource );
+          menuArrowTpl = CKEDITOR.addTemplate( 'menuArrow', menuArrowSource ),
+          menuShortcutTpl = CKEDITOR.addTemplate( 'menuShortcut', menuShortcutSource );
 
      /**
@@ -48002 +48326 @@
                     var id = menu.id + String( index ),
                          state = ( typeof this.state == 'undefined' ) ? CKEDITOR.TRISTATE_OFF : this.state,
-                         ariaChecked = '';
+                         ariaChecked = '',
+                         editor = this.editor,
+                         keystroke,
+                         command,
+                         shortcut;
 
                     var stateName = state == CKEDITOR.TRISTATE_ON ? 'on' : state == CKEDITOR.TRISTATE_DISABLED ? 'disabled' : 'off';
@@ -48017 +48345 @@
                     if ( this.icon && !( /\./ ).test( this.icon ) )
                          iconName = this.icon;
+
+                    if ( this.command ) {
+                         command = editor.getCommand( this.command );
+                         keystroke = editor.getCommandKeystroke( command );
+
+                         if ( keystroke ) {
+                              shortcut = CKEDITOR.tools.keystrokeToString( editor.lang.common.keyboard, keystroke );
+                         }
+                    }
 
                     var params = {
@@ -48027 +48364 @@
                          hasPopup: hasSubMenu ? 'true' : 'false',
                          disabled: state == CKEDITOR.TRISTATE_DISABLED,
-                         title: this.label,
+                         title: this.label + ( shortcut ? ' (' + shortcut.display + ')' : '' ),
+                         ariaShortcut: shortcut ? editor.lang.common.keyboardShortcut + ' ' + shortcut.aria : '',
                          href: 'javascript:void(\'' + ( this.label || '' ).replace( "'" + '' ) + '\')', // jshint ignore:line
                          hoverFn: menu._.itemOverFn,
@@ -48034 +48372 @@
                          index: index,
                          iconStyle: CKEDITOR.skin.getIconStyle( iconName, ( this.editor.lang.dir == 'rtl' ), iconName == this.icon ? null : this.icon, this.iconOffset ),
+                         shortcutHtml: shortcut ? menuShortcutTpl.output( { shortcut: shortcut.display } ) : '',
                          arrowHtml: hasSubMenu ? menuArrowTpl.output( { label: arrowLabel } ) : '',
                          role: this.role ? this.role : 'menuitem',
@@ -48261 +48600 @@
                def = new CKEDITOR.dialogCommand( 'numberedListStyle', {
                     requiredContent: 'ol',
-                    allowedContent: 'ol{list-style-type}[start]'
+                    allowedContent: 'ol{list-style-type}[start]; li{list-style-type}[value]',
+                    contentTransformations: [
+                         [ 'ol: listTypeToStyle' ]
+                    ]
                } );
                cmd = editor.addCommand( 'numberedListStyle', def );
@@ -48269 +48611 @@
                def = new CKEDITOR.dialogCommand( 'bulletedListStyle', {
                     requiredContent: 'ul',
-                    allowedContent: 'ul{list-style-type}'
+                    allowedContent: 'ul{list-style-type}',
+                    contentTransformations: [
+                         [ 'ul: listTypeToStyle' ]
+                    ]
                } );
                cmd = editor.addCommand( 'bulletedListStyle', def );
@@ -50423 +50768 @@
 
 ( function() {
+     /* global confirm */
+
      CKEDITOR.plugins.add( 'pastefromword', {
           requires: 'clipboard',
@@ -50474 +50821 @@
                } );
 
-               // Features bring by this command beside the normal process:
+               // Features brought by this command beside the normal process:
                // 1. No more bothering of user about the clean-up.
-               // 2. Perform the clean-up even if content is not from MS-Word.
-               // (e.g. from a MS-Word similar application.)
+               // 2. Perform the clean-up even if content is not from Microsoft Word.
+               // (e.g. from a Microsoft Word similar application.)
                // 3. Listen with high priority (3), so clean up is done before content
                // type sniffing (priority = 6).
                editor.on( 'paste', function( evt ) {
                     var data = evt.data,
-                         mswordHtml = data.dataValue;
-
-                    // MS-WORD format sniffing.
-                    if ( mswordHtml && ( forceFromWord || ( /(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument)/ ).test( mswordHtml ) ) ) {
-                         // Do not apply paste filter to data filtered by the Word filter (#13093).
-                         data.dontFilter = true;
-
-                         // If filter rules aren't loaded then cancel 'paste' event,
-                         // load them and when they'll get loaded fire new paste event
-                         // for which data will be filtered in second execution of
-                         // this listener.
-                         var isLazyLoad = loadFilterRules( editor, path, function() {
-                              // Event continuation with the original data.
-                              if ( isLazyLoad )
-                                   editor.fire( 'paste', data );
-                              else if ( !editor.config.pasteFromWordPromptCleanup || ( forceFromWord || confirm( editor.lang.pastefromword.confirmCleanup ) ) ) // jshint ignore:line
-                                   data.dataValue = CKEDITOR.cleanWord( mswordHtml, editor );
-
-                              // Reset forceFromWord.
-                              forceFromWord = 0;
-                         } );
-
-                         // The cleanup rules are to be loaded, we should just cancel
-                         // this event.
-                         isLazyLoad && evt.cancel();
-                    }
+                         mswordHtml = data.dataValue,
+                         wordRegexp = /(class=\"?Mso|style=\"[^\"]*\bmso\-|w:WordDocument|<o:\w+>|<\/font>)/,
+                         pfwEvtData = { dataValue: mswordHtml };
+
+                    if ( !mswordHtml || !( forceFromWord || wordRegexp.test( mswordHtml ) ) ) {
+                         return;
+                    }
+
+                    // PFW might still get prevented, if it's not forced.
+                    if ( editor.fire( 'pasteFromWord', pfwEvtData ) === false && !forceFromWord ) {
+                         return;
+                    }
+
+                    // Do not apply paste filter to data filtered by the Word filter (#13093).
+                    data.dontFilter = true;
+
+                    // If filter rules aren't loaded then cancel 'paste' event,
+                    // load them and when they'll get loaded fire new paste event
+                    // for which data will be filtered in second execution of
+                    // this listener.
+                    var isLazyLoad = loadFilterRules( editor, path, function() {
+                         // Event continuation with the original data.
+                         if ( isLazyLoad ) {
+                              editor.fire( 'paste', data );
+                         } else if ( !editor.config.pasteFromWordPromptCleanup || ( forceFromWord || confirm( editor.lang.pastefromword.confirmCleanup ) ) ) {
+                              pfwEvtData.dataValue = CKEDITOR.cleanWord( pfwEvtData.dataValue, editor );
+
+                              editor.fire( 'afterPasteFromWord', pfwEvtData );
+
+                              data.dataValue = pfwEvtData.dataValue;
+                         }
+
+                         // Reset forceFromWord.
+                         forceFromWord = 0;
+                    } );
+
+                    // The cleanup rules are to be loaded, we should just cancel
+                    // this event.
+                    isLazyLoad && evt.cancel();
                }, null, null, 3 );
           }
@@ -50535 +50895 @@
 
 /**
- * Whether to prompt the user about the clean up of content being pasted from MS Word.
+ * Whether to prompt the user about the clean up of content being pasted from Microsoft Word.
  *
  *        config.pasteFromWordPromptCleanup = true;
@@ -50545 +50905 @@
 
 /**
- * The file that provides the MS Word cleanup function for pasting operations.
+ * The file that provides the Microsoft Word cleanup function for pasting operations.
  *
  * **Note:** This is a global configuration shared by all editor instances present
- * in the page.
- *
- *        // Load from 'pastefromword' plugin 'filter' sub folder (custom.js file) using path relative to CKEditor installation folder.
+ * on the page.
+ *
+ *        // Load from the 'pastefromword' plugin 'filter' sub folder (custom.js file) using a path relative to the CKEditor installation folder.
  *        CKEDITOR.config.pasteFromWordCleanupFile = 'plugins/pastefromword/filter/custom.js';
  *
- *        // Load from 'pastefromword' plugin 'filter' sub folder (custom.js file) using full path (including CKEditor installation folder).
+ *        // Load from the 'pastefromword' plugin 'filter' sub folder (custom.js file) using a full path (including the CKEditor installation folder).
  *        CKEDITOR.config.pasteFromWordCleanupFile = '/ckeditor/plugins/pastefromword/filter/custom.js';
  *
- *        // Load custom.js file from 'customFilerts' folder (located in server's root) using full URL.
- *        CKEDITOR.config.pasteFromWordCleanupFile = 'http://my.example.com/customFilerts/custom.js';
+ *        // Load custom.js file from the 'customFilters' folder (located in server's root) using the full URL.
+ *        CKEDITOR.config.pasteFromWordCleanupFile = 'http://my.example.com/customFilters/custom.js';
  *
  * @since 3.1
@@ -50564 +50924 @@
  */
 
+/**
+ * Fired when the pasted content was recognized as Microsoft Word content.
+ *
+ * This event is cancellable. If canceled, it will prevent Paste from Word processing.
+ *
+ * @since 4.6.0
+ * @event pasteFromWord
+ * @param data
+ * @param {String} data.dataValue Pasted content. Changes to this property will affect the pasted content.
+ * @member CKEDITOR.editor
+ */
+
+/**
+ * Fired after the Paste form Word filters have been applied.
+ *
+ * @since 4.6.0
+ * @event afterPasteFromWord
+ * @param data
+ * @param {String} data.dataValue Pasted content after processing. Changes to this property will affect the pasted content.
+ * @member CKEDITOR.editor
+ */
 /**
  * Copyright (c) 2003-2016, CKSource - Frederico Knabben. All rights reserved.
@@ -51348 +51729 @@
                          var styleDefinition = stylesDefinitions[ i ];
 
-                         if ( editor.blockless && ( styleDefinition.element in CKEDITOR.dtd.$block ) )
+                         if ( editor.blockless && ( styleDefinition.element in CKEDITOR.dtd.$block ) ||
+                              ( typeof styleDefinition.type == 'string' && !CKEDITOR.style.customHandlers[ styleDefinition.type ] ) ) {
+
                               continue;
+                         }
 
                          styleName = styleDefinition.name;
@@ -51834 +52218 @@
                requiredContent: 'table',
                contentTransformations: [
-                    [ 'table{width}: sizeToStyle', 'table[width]: sizeToAttribute' ]
+                    [ 'table{width}: sizeToStyle', 'table[width]: sizeToAttribute' ],
+                    [ 'td: splitBorderShorthand' ],
+                    [ {
+                         element: 'table',
+                         right: function( element ) {
+                              if ( element.styles ) {
+                                   if ( element.styles.border && element.styles.border.match( /solid/ ) ) {
+                                        element.attributes.border = 1;
+                                   }
+                                   if ( element.styles[ 'border-collapse' ] == 'collapse' ) {
+                                        element.attributes.cellspacing = 0;
+                                   }
+                              }
+                         }
+                    } ]
                ]
           } ) );
@@ -52581 +52979 @@
                addCmd( 'cellProperties', new CKEDITOR.dialogCommand( 'cellProperties', createDef( {
                     allowedContent: 'td th{width,height,border-color,background-color,white-space,vertical-align,text-align}[colspan,rowspan]',
-                    requiredContent: 'table'
+                    requiredContent: 'table',
+                    contentTransformations: [
+                         [ {
+                              element: 'td',
+                              left: function( element ) {
+                                   return element.styles.background && element.styles.background.match( /^(#[a-fA-F0-9]{3,6}|rgb\([\d, ]+\)|\w+)$/ );
+                              },
+                              right: function( element ) {
+                                   element.styles[ 'background-color' ] = element.styles.background;
+                              }
+                         } ]
+                    ]
                } ) ) );
                CKEDITOR.dialog.add( 'cellProperties', this.path + 'dialogs/tableCell.js' );
@@ -52994 +53403 @@
  *        config.templates_files = [
  *             '/editor_templates/site_default.js',
- *             'http://www.example.com/user_templates.js
+ *             'http://www.example.com/user_templates.js'
  *        ];
  *
@@ -53206 +53615 @@
 
                     var toolbars = editor.toolbox.toolbars,
-                         toolbar = getToolbarConfig( editor );
-
-                    for ( var r = 0; r < toolbar.length; r++ ) {
+                         toolbar = getToolbarConfig( editor ),
+                         toolbarLength = toolbar.length;
+
+                    for ( var r = 0; r < toolbarLength; r++ ) {
                          var toolbarId,
                               toolbarObj = 0,
                               toolbarName,
                               row = toolbar[ r ],
+                              lastToolbarInRow = row !== '/' && ( toolbar[ r + 1 ] === '/' || r == toolbarLength - 1 ),
                               items;
 
@@ -53260 +53671 @@
 
                                         // Output the toolbar opener.
-                                        output.push( '<span id="', toolbarId, '" class="cke_toolbar"', ( toolbarName ? ' aria-labelledby="' + toolbarId + '_label"' : '' ), ' role="toolbar">' );
+                                        output.push( '<span id="', toolbarId, '" class="cke_toolbar' + ( lastToolbarInRow ? ' cke_toolbar_last"' : '"' ),
+                                             ( toolbarName ? ' aria-labelledby="' + toolbarId + '_label"' : '' ), ' role="toolbar">' );
 
                                         // If a toolbar name is available, send the voice label.