浏览代码

Merge branch 't/ckeditor5/84'

Piotrek Koszuliński 9 年之前
父节点
当前提交
1a8e5b419a
共有 31 个文件被更改,包括 41 次插入38 次删除
  1. 4 4
      packages/ckeditor5-engine/src/treecontroller/model-converter-builder.js
  2. 2 0
      packages/ckeditor5-engine/tests/_utils-tests/view.js
  3. 2 5
      packages/ckeditor5-engine/tests/_utils/view.js
  4. 2 0
      packages/ckeditor5-engine/tests/dataprocessor/basichtmlwriter.js
  5. 3 1
      packages/ckeditor5-engine/tests/dataprocessor/htmldataprocessor.js
  6. 1 1
      packages/ckeditor5-engine/tests/treeview/attributeelement.js
  7. 1 1
      packages/ckeditor5-engine/tests/treeview/containerelement.js
  8. 1 1
      packages/ckeditor5-engine/tests/treeview/document/document.js
  9. 1 1
      packages/ckeditor5-engine/tests/treeview/document/integration.js
  10. 1 1
      packages/ckeditor5-engine/tests/treeview/document/jumpoverinlinefiller.js
  11. 1 1
      packages/ckeditor5-engine/tests/treeview/domconverter/binding.js
  12. 1 1
      packages/ckeditor5-engine/tests/treeview/domconverter/dom-to-view.js
  13. 1 1
      packages/ckeditor5-engine/tests/treeview/domconverter/view-to-dom.js
  14. 2 2
      packages/ckeditor5-engine/tests/treeview/filler.js
  15. 1 1
      packages/ckeditor5-engine/tests/treeview/observer/domeventdata.js
  16. 1 1
      packages/ckeditor5-engine/tests/treeview/observer/domeventobserver.js
  17. 1 1
      packages/ckeditor5-engine/tests/treeview/observer/focusobserver.js
  18. 1 1
      packages/ckeditor5-engine/tests/treeview/observer/keyobserver.js
  19. 1 1
      packages/ckeditor5-engine/tests/treeview/observer/mutationobserver.js
  20. 1 1
      packages/ckeditor5-engine/tests/treeview/observer/selectionobserver.js
  21. 1 1
      packages/ckeditor5-engine/tests/treeview/position.js
  22. 1 1
      packages/ckeditor5-engine/tests/treeview/renderer.js
  23. 1 1
      packages/ckeditor5-engine/tests/treeview/writer/breakattributes.js
  24. 1 1
      packages/ckeditor5-engine/tests/treeview/writer/breakrange.js
  25. 1 1
      packages/ckeditor5-engine/tests/treeview/writer/insert.js
  26. 1 1
      packages/ckeditor5-engine/tests/treeview/writer/mergeattributes.js
  27. 1 1
      packages/ckeditor5-engine/tests/treeview/writer/remove.js
  28. 1 1
      packages/ckeditor5-engine/tests/treeview/writer/unwrap.js
  29. 1 1
      packages/ckeditor5-engine/tests/treeview/writer/wrap.js
  30. 2 2
      packages/ckeditor5-engine/tests/treeview/writer/wrapposition.js
  31. 1 1
      packages/ckeditor5-engine/tests/treeview/writer/writer.js

+ 4 - 4
packages/ckeditor5-engine/src/treecontroller/model-converter-builder.js

@@ -11,12 +11,12 @@ import {
 	removeAttribute,
 	wrap,
 	unwrap
-} from '/ckeditor5/engine/treecontroller/model-to-view-converters.js';
+} from './model-to-view-converters.js';
 
-import { convertSelectionAttribute } from '/ckeditor5/engine/treecontroller/model-selection-to-view-converters.js';
+import { convertSelectionAttribute } from './model-selection-to-view-converters.js';
 
-import ViewAttributeElement from '/ckeditor5/engine/treeview/attributeelement.js';
-import ViewContainerElement from '/ckeditor5/engine/treeview/containerelement.js';
+import ViewAttributeElement from '../treeview/attributeelement.js';
+import ViewContainerElement from '../treeview/containerelement.js';
 
 /**
  * Provides chainable, high-level API to easily build basic model-to-view converters that are appended to given

+ 2 - 0
packages/ckeditor5-engine/tests/_utils-tests/view.js

@@ -5,6 +5,8 @@
 
 'use strict';
 
+/* bender-tags: browser-only */
+
 import { parse, stringify, getData, setData }from '/tests/engine/_utils/view.js';
 import DocumentFragment from '/ckeditor5/engine/treeview/documentfragment.js';
 import Position from '/ckeditor5/engine/treeview/position.js';

+ 2 - 5
packages/ckeditor5-engine/tests/_utils/view.js

@@ -15,9 +15,6 @@ import AttributeElement from '/ckeditor5/engine/treeview/attributeelement.js';
 import ContainerElement from '/ckeditor5/engine/treeview/containerelement.js';
 import ViewText from '/ckeditor5/engine/treeview/text.js';
 
-const DomDocumentFragment = window.DocumentFragment;
-const DomElement = window.Element;
-
 const ELEMENT_RANGE_START_TOKEN = '[';
 const ELEMENT_RANGE_END_TOKEN = ']';
 const TEXT_RANGE_START_TOKEN = '{';
@@ -501,9 +498,9 @@ class ViewParser {
 	 * @returns {engine.treeView.Node|engine.treeView.DocumentFragment}
 	 */
 	_walkDom( domNode, rootElement = null ) {
-		const isDomElement = domNode instanceof DomElement;
+		const isDomElement = domNode instanceof window.Element;
 
-		if ( isDomElement || domNode instanceof DomDocumentFragment ) {
+		if ( isDomElement || domNode instanceof window.DocumentFragment ) {
 			const children = domNode.childNodes;
 			const length = children.length;
 

+ 2 - 0
packages/ckeditor5-engine/tests/dataprocessor/basichtmlwriter.js

@@ -3,6 +3,8 @@
  * For licensing, see LICENSE.md.
  */
 
+/* bender-tags: browser-only */
+
 'use strict';
 
 import BasicHtmlWriter from '/ckeditor5/engine/dataprocessor/basichtmlwriter.js';

+ 3 - 1
packages/ckeditor5-engine/tests/dataprocessor/htmldataprocessor.js

@@ -3,10 +3,12 @@
  * For licensing, see LICENSE.md.
  */
 
+/* bender-tags: browser-only */
+
 'use strict';
 
 import HtmlDataProcessor from '/ckeditor5/engine/dataprocessor/htmldataprocessor.js';
-import xssTemplates from '_utils/xsstemplates.js';
+import xssTemplates from './_utils/xsstemplates.js';
 
 describe( 'HtmlDataProcessor', () => {
 	const dataProcessor = new HtmlDataProcessor();

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/attributeelement.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/containerelement.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/document/document.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/document/integration.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/document/jumpoverinlinefiller.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/domconverter/binding.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview, domconverter */
+/* bender-tags: treeview, domconverter, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/domconverter/dom-to-view.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview, domconverter */
+/* bender-tags: treeview, domconverter, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/domconverter/view-to-dom.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview, domconverter */
+/* bender-tags: treeview, domconverter, browser-only */
 
 'use strict';
 

+ 2 - 2
packages/ckeditor5-engine/tests/treeview/filler.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 
@@ -131,4 +131,4 @@ describe( 'filler', () => {
 			expect( isBlockFiller( document.createTextNode( INLINE_FILLER ), NBSP_FILLER ) ).to.be.false;
 		} );
 	} );
-} );
+} );

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/observer/domeventdata.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/observer/domeventobserver.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/observer/focusobserver.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/observer/keyobserver.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/observer/mutationobserver.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/observer/selectionobserver.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/position.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/renderer.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/writer/breakattributes.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/writer/breakrange.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/writer/insert.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/writer/mergeattributes.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/writer/remove.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/writer/unwrap.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/writer/wrap.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 

+ 2 - 2
packages/ckeditor5-engine/tests/treeview/writer/wrapposition.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';
 
@@ -112,4 +112,4 @@ describe( 'wrapPosition', () => {
 			'<container:p><attribute:b:1>foobar{}</attribute:b:1></container:p>'
 		);
 	} );
-} );
+} );

+ 1 - 1
packages/ckeditor5-engine/tests/treeview/writer/writer.js

@@ -3,7 +3,7 @@
  * For licensing, see LICENSE.md.
  */
 
-/* bender-tags: treeview */
+/* bender-tags: treeview, browser-only */
 
 'use strict';