diff --git a/plugins/pastefromlibreoffice/plugin.js b/plugins/pastefromlibreoffice/plugin.js index 107ebe995c2..3498119f033 100644 --- a/plugins/pastefromlibreoffice/plugin.js +++ b/plugins/pastefromlibreoffice/plugin.js @@ -15,9 +15,9 @@ isSupportedEnvironment: function() { var isSafari = CKEDITOR.env.webkit && !CKEDITOR.env.chrome, - isOldIE = CKEDITOR.env.ie && CKEDITOR.env.version < 11; + isIE = CKEDITOR.env.ie && CKEDITOR.env.version <= 11; - return !isSafari && !isOldIE; + return !isSafari && !isIE; }, init: function( editor ) { @@ -48,8 +48,7 @@ generatorName = CKEDITOR.plugins.pastetools.getContentGeneratorName( textHtml ); - // The filter will be run also for a regular content, as there is no way to detect apropriate source under IE11 and Safari. - return generatorName ? generatorName === 'libreoffice' : true; + return generatorName === 'libreoffice'; }, handle: function( evt, next ) { diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Basic_styles/libreoffice6/expected_safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Basic_styles/libreoffice6/expected_safari.html deleted file mode 100644 index 1f48e222138..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Basic_styles/libreoffice6/expected_safari.html +++ /dev/null @@ -1,91 +0,0 @@ -

- - - - - - Basic inline styles - - - - - -

-

- - - - - - bold - - - - - -

-

- - - - - - italic - - - - - -

-

- - - - - - underline - - - - - -

-

- - - - - - strikethrough - - - - - -

-

- - - - - - superscript - - - - - -

-

- - - - - - subscript - - - - - -

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Basic_styles/libreoffice6/ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Basic_styles/libreoffice6/ie11.html deleted file mode 100644 index 3fb1cc7c32f..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Basic_styles/libreoffice6/ie11.html +++ /dev/null @@ -1,9 +0,0 @@ -

- Basic inline styles

-

bold

-

italic

-

underline

-

- strikethrough

-

superscript

-

subscript

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Basic_styles/libreoffice6/safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Basic_styles/libreoffice6/safari.html deleted file mode 100644 index 97feb32c0ce..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Basic_styles/libreoffice6/safari.html +++ /dev/null @@ -1 +0,0 @@ -

Basic inline styles

bold

italic

underline

strikethrough

superscript

subscript

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font/libreoffice6/expected_safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font/libreoffice6/expected_safari.html deleted file mode 100644 index cb48db46bf7..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font/libreoffice6/expected_safari.html +++ /dev/null @@ -1,27 +0,0 @@ -

- - - - - - Different font sizes: 6, 8, 10, 12, 16, 24, 32, 48, 80 - - - - - -

- -

- - - - - - Different font face: courier new,verdana,times new roman,arial. - - - - - -

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font/libreoffice6/ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font/libreoffice6/ie11.html deleted file mode 100644 index ace61ec8d36..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font/libreoffice6/ie11.html +++ /dev/null @@ -1,9 +0,0 @@ -

- Different font sizes: 6, - 8, 10, - 12, 16, 24, - 32, 48, - 80

-

Different font face: - Courier New, Verdana, - Times New Roman, Arial.

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font/libreoffice6/safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font/libreoffice6/safari.html deleted file mode 100644 index 25c262de165..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font/libreoffice6/safari.html +++ /dev/null @@ -1,19 +0,0 @@ -

- Different font sizes:  - 6,8,  - 10, 12,  - 16,  - 24,32,  - 48,80 -

-

- Different font face:Courier New,  - Verdana,Times New Roman,  - Arial. -

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font_color/libreoffice6/expected_safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font_color/libreoffice6/expected_safari.html deleted file mode 100644 index 865ebb6f0ad..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font_color/libreoffice6/expected_safari.html +++ /dev/null @@ -1,47 +0,0 @@ -

- - - - - - - Background color - - - - - - -

-

- - - - - - - Font color - - - - - - -

-

- - - - - - - - Mixed background and font color - - - - - - - -

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font_color/libreoffice6/ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font_color/libreoffice6/ie11.html deleted file mode 100644 index ab8d52e6c8d..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font_color/libreoffice6/ie11.html +++ /dev/null @@ -1,6 +0,0 @@ -

- Background color

-

Font - color

-

Mixed - background and font color

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font_color/libreoffice6/safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font_color/libreoffice6/safari.html deleted file mode 100644 index 90e684494ce..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Font_color/libreoffice6/safari.html +++ /dev/null @@ -1 +0,0 @@ -

Background color

Font color

Mixed background and font color

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Link/libreoffice6/expected_safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Link/libreoffice6/expected_safari.html deleted file mode 100644 index 999ad570266..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Link/libreoffice6/expected_safari.html +++ /dev/null @@ -1,13 +0,0 @@ -

- - - - - - Simple text link. - - - - - -

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Link/libreoffice6/ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Link/libreoffice6/ie11.html deleted file mode 100644 index 40f64f4cb66..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Link/libreoffice6/ie11.html +++ /dev/null @@ -1,2 +0,0 @@ -

- Simple text link.

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Link/libreoffice6/safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Link/libreoffice6/safari.html deleted file mode 100644 index 1218b73bbd5..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Link/libreoffice6/safari.html +++ /dev/null @@ -1 +0,0 @@ -

Simple text link.

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Lists/libreoffice6/expected_safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Lists/libreoffice6/expected_safari.html deleted file mode 100644 index d29c49797aa..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Lists/libreoffice6/expected_safari.html +++ /dev/null @@ -1,153 +0,0 @@ -

- - - - - - Ordered list: - - - - - -

-
    -
  1. -

    list 1

    -
      -
    1. -

      list 1.1

      -
      2. -
    2. -

      list 1.2

      - -
        -
      1. -

        list 1.2.1

        -
        2. -
      2. -

        list 1.2.2

        -
        3. -
      -
      3. -
    -
    2. -
  2. -

    list 2

    - -
      -
    1. -

      list 2.1

      -
      2. -
    2. -

      list 2.2

      -
      3. -
    -
    3. -
  3. -

    list 3

    -
    4. -
  4. -

    list 4

    - -
      -
    1. -

      list 4.1

      - -
        -
      1. -

        list 4.1.1

        - -
          -
        1. -

          list 4.1.1.1

          -
          2. -
        -
        2. -
      2. -

        list 4.1.2

        -
        3. -
      -
      2. -
    2. -

      list 4.2

      -
      3. -
    -
    5. -
- -


- -

- - - - - - Unordered list: - - - - - -

- - diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Lists/libreoffice6/ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Lists/libreoffice6/ie11.html deleted file mode 100644 index 02fdb37ec5b..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Lists/libreoffice6/ie11.html +++ /dev/null @@ -1,62 +0,0 @@ -

- Ordered list:

-
    -

  1. list 1

    -
      -

    1. list 1.1

      -

    2. list 1.2

      -
        -

      1. list 1.2.1

        -

      2. list 1.2.2

        -
      -
    -

  2. list 2

    -
      -

    1. list 2.1

      -

    2. list 2.2

      -
    -

  3. list 3

    -

  4. list 4

    -
      -

    1. list 4.1

      -
        -

      1. list 4.1.1

        -
          -

        1. list 4.1.1.1

          -
        -

      2. list 4.1.2

        -
      -

    2. list 4.2

      -
    -
-


- -

-

Unordered list:

- diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Lists/libreoffice6/safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Lists/libreoffice6/safari.html deleted file mode 100644 index 10ca812c9d3..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Lists/libreoffice6/safari.html +++ /dev/null @@ -1 +0,0 @@ -

Ordered list:

  1. list 1

    1. list 1.1

    2. list 1.2

      1. list 1.2.1

      2. list 1.2.2

  2. list 2

    1. list 2.1

    2. list 2.2

  3. list 3

  4. list 4

    1. list 4.1

      1. list 4.1.1

        1. list 4.1.1.1

      2. list 4.1.2

    2. list 4.2


Unordered list:

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Mixed_list/libreoffice6/expected_safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Mixed_list/libreoffice6/expected_safari.html deleted file mode 100644 index 68d66aef008..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Mixed_list/libreoffice6/expected_safari.html +++ /dev/null @@ -1,71 +0,0 @@ -

- - - - - - mixed list: - - - - - -

- diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Mixed_list/libreoffice6/ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Mixed_list/libreoffice6/ie11.html deleted file mode 100644 index 92fa445e6c2..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Mixed_list/libreoffice6/ie11.html +++ /dev/null @@ -1,32 +0,0 @@ -

- Mixed list:

- -
    -
      -

    1. 111

      -

    2. 222

      -

    3. 333

      -
    -
- -
    -
      -
        -
          -

        1. 111

          -

        2. 222

          -
        -
      -
    -
diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Mixed_list/libreoffice6/safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Mixed_list/libreoffice6/safari.html deleted file mode 100644 index a8a45f3f4ff..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Mixed_list/libreoffice6/safari.html +++ /dev/null @@ -1,77 +0,0 @@ -

- Mixed list:

- -
    -
      -
    1. -

      - 111

      -
      2. -
    2. -

      - 222

      -
      3. -
    3. -

      - 333

      -
      4. -
    -
- -
    -
      -
        -
          -
        1. -

          - 111

          -
          2. -
        2. -

          - 222

          -
          3. -
        -
      -
    -
diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Page_break/libreoffice6/expected_safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Page_break/libreoffice6/expected_safari.html deleted file mode 100644 index fa33105b686..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Page_break/libreoffice6/expected_safari.html +++ /dev/null @@ -1,123 +0,0 @@ -

- - - - - - page 1 par 1 - - - - - -

-

- - - - - - page 1 par 2 - - - - - -

-

- - - - - - page 1 par 3 - - - - - -

-
-

- - - - - - - page 2 par 1 - - - - - - -

-

- - - - - - page 2 par 2 - - - - - -

-

- - - - - - page 2 par 3 - - - - - -

-
-

- - - - - - - page 3 par 1 - - - - - - -

-

- - - - - - page 3 par 2 - - - - - -

-

- - - - - - page 3 par 3 - - - - - -

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Page_break/libreoffice6/ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Page_break/libreoffice6/ie11.html deleted file mode 100644 index cd68c4e1f91..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Page_break/libreoffice6/ie11.html +++ /dev/null @@ -1,12 +0,0 @@ -

- Page 1 par 1

-

Page 1 par 2

-

Page 1 par 3

-

- Page 2 par 1

-

Page 2 par 2

-

Page 2 par 3

-

- Page 3 par 1

-

Page 3 par 2

-

Page 3 par 3

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Page_break/libreoffice6/safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Page_break/libreoffice6/safari.html deleted file mode 100644 index ac19925e22d..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Page_break/libreoffice6/safari.html +++ /dev/null @@ -1,27 +0,0 @@ -

- Page 1 par 1

-

- Page 1 par 2

-

- Page 1 par 3

-

- Page 2 par 1

-

- Page 2 par 2

-

- Page 2 par 3

-

- Page 3 par 1

-

- Page 3 par 2

-

- Page 3 par 3

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Paragraph_format/libreoffice6/expected_safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Paragraph_format/libreoffice6/expected_safari.html deleted file mode 100644 index ea63b9352a5..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Paragraph_format/libreoffice6/expected_safari.html +++ /dev/null @@ -1,133 +0,0 @@ -

- - - - - - - - heading 1 - - - - - - - -

-

- - - - - - - - heading 2 - - - - - - - -

-

- - - - - - - - heading 3 - - - - - - - -

-

- - - - - - - - heading 4 - - - - - - - -

-
- - - - - - - - heading 5 - - - - - - - -
-
- - - - - - - - heading 6 - - - - - - - -
-

- - - - - - regular paragraph - - - - - -

-
block quote
-
-	
-		
-			
-				
-					
-						
-							
-								formatted block
-							
-						
-					
-				
-			
-		
-	
-
diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Paragraph_format/libreoffice6/ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Paragraph_format/libreoffice6/ie11.html deleted file mode 100644 index 4a3f9df5343..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Paragraph_format/libreoffice6/ie11.html +++ /dev/null @@ -1,10 +0,0 @@ -

- Heading 1

-

Heading 2

-

Heading 3

-

Heading 4

-
Heading 5
-
Heading 6
-

Regular Paragraph

-
Block Quote
- 
Formatted block
diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Paragraph_format/libreoffice6/safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Paragraph_format/libreoffice6/safari.html deleted file mode 100644 index d4fc954c0b2..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Paragraph_format/libreoffice6/safari.html +++ /dev/null @@ -1,26 +0,0 @@ -

- Heading 1

-

- Heading 2

-

- Heading 3

-

- Heading 4

-
- Heading 5
-
- Heading 6
-

- Regular Paragraph

-
- Block Quote
-
Formatted block
diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Simple_text/libreoffice6/expected_safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Simple_text/libreoffice6/expected_safari.html deleted file mode 100644 index bc10c5afe99..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Simple_text/libreoffice6/expected_safari.html +++ /dev/null @@ -1,13 +0,0 @@ -

- - - - - - Simple text - - - - - -

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Simple_text/libreoffice6/ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Simple_text/libreoffice6/ie11.html deleted file mode 100644 index 96c8971437a..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Simple_text/libreoffice6/ie11.html +++ /dev/null @@ -1,2 +0,0 @@ -

- Simple text

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Simple_text/libreoffice6/safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Simple_text/libreoffice6/safari.html deleted file mode 100644 index 5d9aec2d78e..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Simple_text/libreoffice6/safari.html +++ /dev/null @@ -1 +0,0 @@ -

Simple text

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/expected_ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/expected_ie11.html deleted file mode 100644 index 361752e96e2..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/expected_ie11.html +++ /dev/null @@ -1,38 +0,0 @@ -

-
-

- - - - - - - - - - - - - -
-

foo

- 		-

- - - bar - - -

- 		-

baz

-
-

111

- 		-

222

- 		-

333

-
-

-
-

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/expected_safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/expected_safari.html deleted file mode 100644 index 24dcc6c08c4..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/expected_safari.html +++ /dev/null @@ -1,52 +0,0 @@ -

-
- - - - - - - - - - - - - -
-

- foo -

- 		-

- - - - bar - - - -

- 		-

- baz -

-
-

- 111 -

- 		-

- 222 -

- 		-

- 333 -

-
-

-
-

-

-
-

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/ie11.html deleted file mode 100644 index f3af08a1a31..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/ie11.html +++ /dev/null @@ -1,37 +0,0 @@ -

-
- -

- - - - - - - - - - - - - - - - - -

- foo

-

- bar

-

- baz

-

- 111

-

- 222

-

- 333

-
-


- -

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/safari.html deleted file mode 100644 index a6079ac9b83..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Table_background/libreoffice6/safari.html +++ /dev/null @@ -1,56 +0,0 @@ -
- - - - - - - - - - - - - - - - - - -
-

- foo

- 		-

- bar -

- 		-

- baz

-
-

- 111

- 		-

- 222

- 		-

- 333

-
-

-


diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Text_align/libreoffice6/expected_safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Text_align/libreoffice6/expected_safari.html deleted file mode 100644 index 7cf127beab9..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Text_align/libreoffice6/expected_safari.html +++ /dev/null @@ -1,65 +0,0 @@ -

- - - - - - text with no alignment. - - - - - -

-

- - - - - - text align: right - - - - - -

-

- - - - - - text align: center - - - - - -

-

- - - - - - text align: left - - - - - -

-

- - - - - - text align: justify - - - - - -

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Text_align/libreoffice6/ie11.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Text_align/libreoffice6/ie11.html deleted file mode 100644 index ee1a9f45c92..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Text_align/libreoffice6/ie11.html +++ /dev/null @@ -1,10 +0,0 @@ -

- Text with no alignment.

-

Text - align: right

-

Text - align: center

-

Text - align: left

-

Text - align: justify

diff --git a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Text_align/libreoffice6/safari.html b/tests/plugins/pastefromlibreoffice/generated/_fixtures/Text_align/libreoffice6/safari.html deleted file mode 100644 index 57ef7a3e362..00000000000 --- a/tests/plugins/pastefromlibreoffice/generated/_fixtures/Text_align/libreoffice6/safari.html +++ /dev/null @@ -1,15 +0,0 @@ -

- Text with no alignment.

-

- Text align: right

-

- Text align: center

-

- Text align: left

-

- Text align: justify

diff --git a/tests/plugins/pastefromlibreoffice/generated/generic.js b/tests/plugins/pastefromlibreoffice/generated/generic.js index f33f425f73b..7b410284577 100644 --- a/tests/plugins/pastefromlibreoffice/generated/generic.js +++ b/tests/plugins/pastefromlibreoffice/generated/generic.js @@ -16,28 +16,13 @@ }; var isSafari = CKEDITOR.env.webkit && !CKEDITOR.env.chrome, - isOldIE = CKEDITOR.env.ie && CKEDITOR.env.version < 11, - isIE11 = CKEDITOR.env.ie && CKEDITOR.env.version === 11, - // IE 11 does not support logical CSS properties. - customFilters = isIE11 ? [ - new CKEDITOR.htmlParser.filter( { - attributes: { - style: function( attribute ) { - if ( attribute.indexOf( 'text-align:start' ) !== -1 ) { - return false; - } - } - } - } ) - ] : []; + isIE = CKEDITOR.env.ie && CKEDITOR.env.version <= 11; bender.test( createTestSuite( { browsers: [ 'chrome', 'firefox', 'edge', // v18 - 'ie11', - 'safari' ], wordVersions: [ 'libreoffice6' @@ -55,18 +40,6 @@ Paragraph_format: true, Page_break: true }, - testData: { - _should: { - // IE 11 generates borders differently than everyone else. - ignore: { - 'test Table_background libreoffice6 chrome': isIE11, - 'test Table_background libreoffice6 edge': isIE11, - 'test Table_background libreoffice6 firefox': isIE11, - 'test Table_background libreoffice6 safari': isIE11 - } - } - }, - ignoreAll: isSafari || isOldIE || bender.tools.env.mobile, - customFilters: customFilters + ignoreAll: isSafari || isIE || bender.tools.env.mobile } ) ); } )(); diff --git a/tests/plugins/pastefromlibreoffice/generated/genericwithword.js b/tests/plugins/pastefromlibreoffice/generated/genericwithword.js index c3a813af818..2745aeb3aa4 100644 --- a/tests/plugins/pastefromlibreoffice/generated/genericwithword.js +++ b/tests/plugins/pastefromlibreoffice/generated/genericwithword.js @@ -16,28 +16,13 @@ }; var isSafari = CKEDITOR.env.webkit && !CKEDITOR.env.chrome, - isOldIE = CKEDITOR.env.ie && CKEDITOR.env.version < 11, - isIE11 = CKEDITOR.env.ie && CKEDITOR.env.version === 11, - // IE 11 does not support logical CSS properties. - customFilters = isIE11 ? [ - new CKEDITOR.htmlParser.filter( { - attributes: { - style: function( attribute ) { - if ( attribute.indexOf( 'text-align:start' ) !== -1 ) { - return false; - } - } - } - } ) - ] : []; + isIE = CKEDITOR.env.ie && CKEDITOR.env.version <= 11; bender.test( createTestSuite( { browsers: [ 'chrome', 'firefox', 'edge', // v18 - 'ie11', - 'safari' ], wordVersions: [ 'libreoffice6' @@ -55,18 +40,6 @@ Paragraph_format: true, Page_break: true }, - testData: { - _should: { - // IE 11 generates borders differently than everyone else. - ignore: { - 'test Table_background libreoffice6 chrome': isIE11, - 'test Table_background libreoffice6 edge': isIE11, - 'test Table_background libreoffice6 firefox': isIE11, - 'test Table_background libreoffice6 safari': isIE11 - } - } - }, - ignoreAll: isSafari || isOldIE || bender.tools.env.mobile, - customFilters: customFilters + ignoreAll: isSafari || isIE || bender.tools.env.mobile } ) ); } )();