Fixed node types being used instead of dom-globals

smfukaya · Mar 7, 2019 · 5f29bed · 5f29bed
1 parent 33a817b
commit 5f29bed
Show file tree

Hide file tree

Showing 78 changed files with 178 additions and 100 deletions.
diff --git a/src/core/demo/ts/demo/AnnotationsDemo.ts b/src/core/demo/ts/demo/AnnotationsDemo.ts
@@ -1,4 +1,4 @@
-import { prompt, document } from '@ephox/dom-globals';
+import { console, document, prompt } from '@ephox/dom-globals';
 import { Editor } from 'tinymce/core/api/Editor';
 
 declare let tinymce: any;

diff --git a/src/core/demo/ts/demo/ContentEditableFalseDemo.ts b/src/core/demo/ts/demo/ContentEditableFalseDemo.ts
@@ -1,4 +1,5 @@
 // tslint:disable:no-console
+import { console } from '@ephox/dom-globals';
 import { Editor } from 'tinymce/core/api/Editor';
 
 declare const window: any;

diff --git a/src/core/demo/ts/demo/FullDemo.ts b/src/core/demo/ts/demo/FullDemo.ts
@@ -1,3 +1,4 @@
+import { console } from '@ephox/dom-globals';
 import { Merger } from '@ephox/katamari';
 import { Element } from '@ephox/sugar';
 

diff --git a/src/core/main/ts/api/Main.ts b/src/core/main/ts/api/Main.ts
@@ -7,6 +7,7 @@
 
 import Tinymce from './Tinymce';
 
+declare const module: any;
 declare const window: any;
 
 const exportToModuleLoaders = (tinymce) => {

diff --git a/src/core/main/ts/api/dom/ScriptLoader.ts b/src/core/main/ts/api/dom/ScriptLoader.ts
@@ -5,9 +5,9 @@
  * For commercial licenses see https://www.tiny.cloud/
  */
 
+import { console, document } from '@ephox/dom-globals';
 import DOMUtils from './DOMUtils';
 import Tools from '../util/Tools';
-import { document } from '@ephox/dom-globals';
 
 /*globals console*/
 

diff --git a/src/core/main/ts/api/util/Delay.ts b/src/core/main/ts/api/util/Delay.ts
@@ -6,7 +6,7 @@
  */
 
 import Promise from './Promise';
-import { window, document } from '@ephox/dom-globals';
+import { clearInterval, clearTimeout, document, setInterval, setTimeout, window } from '@ephox/dom-globals';
 
 /**
  * Utility class for working with delayed actions like setTimeout.

diff --git a/src/core/main/ts/api/util/Promise.ts b/src/core/main/ts/api/util/Promise.ts
@@ -11,6 +11,8 @@
  * Promise polyfill under MIT license: https://github.com/taylorhakes/promise-polyfill
  */
 
+import { setImmediate, setTimeout } from '@ephox/dom-globals';
+
 declare const window: any;
 
 const promise = function () {

diff --git a/src/core/main/ts/api/util/XHR.ts b/src/core/main/ts/api/util/XHR.ts
@@ -6,6 +6,7 @@
  */
 
 import { XMLHttpRequest } from '@ephox/sand';
+import Delay from './Delay';
 import Observable from './Observable';
 import Tools from './Tools';
 
@@ -50,7 +51,7 @@ const XHR: any = {
 
         xhr = null;
       } else {
-        setTimeout(ready, 10);
+        Delay.setTimeout(ready, 10);
       }
     };
 
@@ -97,7 +98,7 @@ const XHR: any = {
       }
 
       // Wait for response, onReadyStateChange can not be used since it leaks memory in IE
-      setTimeout(ready, 10);
+      Delay.setTimeout(ready, 10);
     }
   }
 };

diff --git a/src/core/main/ts/caret/FakeCaret.ts b/src/core/main/ts/caret/FakeCaret.ts
@@ -5,15 +5,15 @@
  * For commercial licenses see https://www.tiny.cloud/
  */
 
+import { Element, Range, HTMLElement, ClientRect, Node } from '@ephox/dom-globals';
+import { Cell, Option } from '@ephox/katamari';
+import { PlatformDetection } from '@ephox/sand';
 import * as CaretContainer from './CaretContainer';
 import CaretContainerRemove from './CaretContainerRemove';
 import DomQuery from '../api/dom/DomQuery';
 import NodeType from '../dom/NodeType';
 import * as GeomClientRect from '../geom/ClientRect';
 import Delay from '../api/util/Delay';
-import { Cell, Option } from '@ephox/katamari';
-import { Element, Range, HTMLElement, ClientRect, Node } from '@ephox/dom-globals';
-import { PlatformDetection } from '@ephox/sand';
 
 export interface FakeCaret {
   show: (before: boolean, element: Element) => Range;
@@ -162,7 +162,7 @@ export const FakeCaret = (root: HTMLElement, isBlock: (node: Node) => boolean, h
       lastVisualCaret.set(Option.none());
     });
 
-    clearInterval(cursorInterval);
+    Delay.clearInterval(cursorInterval);
   };
 
   const startBlink = () => {

diff --git a/src/core/test/ts/browser/EditorUploadTest.ts b/src/core/test/ts/browser/EditorUploadTest.ts
@@ -1,16 +1,15 @@
 import { Pipeline, Step } from '@ephox/agar';
+import { UnitTest } from '@ephox/bedrock';
+import { document } from '@ephox/dom-globals';
 import { Arr, Fun } from '@ephox/katamari';
 import { LegacyUnit, TinyLoader } from '@ephox/mcagar';
 import DOMUtils from 'tinymce/core/api/dom/DOMUtils';
 import Env from 'tinymce/core/api/Env';
 import Conversions from 'tinymce/core/file/Conversions';
 import Theme from 'tinymce/themes/silver/Theme';
-import { UnitTest } from '@ephox/bedrock';
-import { document } from '@ephox/dom-globals';
+import Delay from 'tinymce/core/api/util/Delay';
 
-UnitTest.asynctest('browser.tinymce.core.EditorUploadTest', function () {
-  const success = arguments[arguments.length - 2];
-  const failure = arguments[arguments.length - 1];
+UnitTest.asynctest('browser.tinymce.core.EditorUploadTest', (success, failure) => {
   const suite = LegacyUnit.createSuite();
 
   Theme();
@@ -204,7 +203,7 @@ UnitTest.asynctest('browser.tinymce.core.EditorUploadTest', function () {
     editor.settings.images_upload_handler = function (data, success) {
       uploadCount++;
 
-      setTimeout(function () {
+      Delay.setTimeout(function () {
         success('myimage.png');
       }, 0);
     };
@@ -234,7 +233,7 @@ UnitTest.asynctest('browser.tinymce.core.EditorUploadTest', function () {
     editor.settings.images_upload_handler = function (data, success, failure) {
       uploadCount++;
 
-      setTimeout(function () {
+      Delay.setTimeout(function () {
         failure('Error');
       }, 0);
     };

diff --git a/src/core/test/ts/browser/caret/LineReaderTest.ts b/src/core/test/ts/browser/caret/LineReaderTest.ts
@@ -1,11 +1,12 @@
 import { Assertions, Chain, GeneralSteps, Logger, Pipeline } from '@ephox/agar';
+import { UnitTest } from '@ephox/bedrock';
+import { console } from '@ephox/dom-globals';
+import { Arr, Fun, Option } from '@ephox/katamari';
+import { PlatformDetection } from '@ephox/sand';
 import { Hierarchy, Element } from '@ephox/sugar';
 import { CaretPosition } from 'tinymce/core/caret/CaretPosition';
 import { getPositionsUntilPreviousLine, LineInfo, getPositionsUntilNextLine, getPositionsAbove, getPositionsBelow, isAtFirstLine, isAtLastLine, findClosestHorizontalPosition, BreakType } from 'tinymce/core/caret/LineReader';
 import ViewBlock from '../../module/test/ViewBlock';
-import { UnitTest } from '@ephox/bedrock';
-import { Arr, Fun, Option } from '@ephox/katamari';
-import { PlatformDetection } from '@ephox/sand';
 
 UnitTest.asynctest('browser.tinymce.core.caret.LineReader', (success, failure) => {
   const viewBlock = ViewBlock();

diff --git a/src/core/test/ts/browser/init/EditorInitializationTest.ts b/src/core/test/ts/browser/init/EditorInitializationTest.ts
@@ -1,14 +1,14 @@
 import { Assertions, GeneralSteps, Logger, Pipeline, Step, ApproxStructure } from '@ephox/agar';
+import { UnitTest } from '@ephox/bedrock';
+import { console, document, window } from '@ephox/dom-globals';
 import { Arr } from '@ephox/katamari';
 import { LegacyUnit } from '@ephox/mcagar';
 import { Element, Attr, SelectorFilter } from '@ephox/sugar';
 import EditorManager from 'tinymce/core/api/EditorManager';
 import Env from 'tinymce/core/api/Env';
-import ViewBlock from '../../module/test/ViewBlock';
 import Tools from 'tinymce/core/api/util/Tools';
 import Theme from 'tinymce/themes/silver/Theme';
-import { UnitTest } from '@ephox/bedrock';
-import { window, document } from '@ephox/dom-globals';
+import ViewBlock from '../../module/test/ViewBlock';
 
 UnitTest.asynctest('browser.tinymce.core.init.EditorInitializationTest', function (success, failure) {
   const suite = LegacyUnit.createSuite();

diff --git a/src/plugins/autosave/main/ts/core/Storage.ts b/src/plugins/autosave/main/ts/core/Storage.ts
@@ -5,12 +5,13 @@
  * For commercial licenses see https://www.tiny.cloud/
  */
 
+import { Cell } from '@ephox/katamari';
+import { Editor } from 'tinymce/core/api/Editor';
+import Delay from 'tinymce/core/api/util/Delay';
 import LocalStorage from 'tinymce/core/api/util/LocalStorage';
 import Tools from 'tinymce/core/api/util/Tools';
 import * as Events from '../api/Events';
 import * as Settings from '../api/Settings';
-import { Editor } from 'tinymce/core/api/Editor';
-import { Cell } from '@ephox/katamari';
 
 const isEmpty = (editor: Editor, html?: string) => {
   const forcedRootBlockName = editor.settings.forced_root_block;
@@ -67,7 +68,7 @@ const startStoreDraft = (editor: Editor, started: Cell<boolean>) => {
   const interval = Settings.getAutoSaveInterval(editor);
 
   if (!started.get()) {
-    setInterval(() => {
+    Delay.setInterval(() => {
       if (!editor.removed) {
         storeDraft(editor);
       }

diff --git a/src/plugins/colorpicker/main/ts/Plugin.ts b/src/plugins/colorpicker/main/ts/Plugin.ts
@@ -5,6 +5,7 @@
  * For commercial licenses see https://www.tiny.cloud/
  */
 
+import { console } from '@ephox/dom-globals';
 import PluginManager from 'tinymce/core/api/PluginManager';
 
 PluginManager.add('colorpicker', function () {

diff --git a/src/plugins/contextmenu/main/ts/Plugin.ts b/src/plugins/contextmenu/main/ts/Plugin.ts
@@ -5,6 +5,7 @@
  * For commercial licenses see https://www.tiny.cloud/
  */
 
+import { console } from '@ephox/dom-globals';
 import PluginManager from 'tinymce/core/api/PluginManager';
 
 PluginManager.add('contextmenu', function () {

diff --git a/src/plugins/emoticons/main/ts/core/EmojiDatabase.ts b/src/plugins/emoticons/main/ts/core/EmojiDatabase.ts
@@ -5,10 +5,12 @@
  * For commercial licenses see https://www.tiny.cloud/
  */
 
+import { console } from '@ephox/dom-globals';
 import { Cell, Global, Obj, Option, Result, Merger } from '@ephox/katamari';
 import ScriptLoader from 'tinymce/core/api/dom/ScriptLoader';
 import Promise from 'tinymce/core/api/util/Promise';
 import { Editor } from 'tinymce/core/api/Editor';
+import Delay from 'tinymce/core/api/util/Delay';
 import Settings from 'tinymce/plugins/emoticons/api/Settings';
 
 const ALL_CATEGORY = 'All';
@@ -135,15 +137,15 @@ const initDatabase = (editor: Editor, databaseUrl: string): EmojiDatabase => {
     } else {
       return new Promise((resolve, reject) => {
         let numRetries = 3;
-        const interval = setInterval(() => {
+        const interval = Delay.setInterval(() => {
           if (hasLoaded()) {
-            clearInterval(interval);
+            Delay.clearInterval(interval);
             resolve(true);
           } else {
             numRetries--;
             if (numRetries < 0) {
               console.log('Could not load emojis from url: ' + databaseUrl);
-              clearInterval(interval);
+              Delay.clearInterval(interval);
               reject(false);
             }
           }

diff --git a/src/plugins/image/demo/ts/demo/Demo.ts b/src/plugins/image/demo/ts/demo/Demo.ts
@@ -1,3 +1,6 @@
+import { console } from '@ephox/dom-globals';
+import Delay from 'tinymce/core/api/util/Delay';
+
 declare let tinymce: any;
 
 tinymce.init({
@@ -21,7 +24,7 @@ tinymce.init({
   },
   images_upload_handler: (blobInfo, success, failure, progress) => {
     console.log(blobInfo);
-    setTimeout(function () {
+    Delay.setTimeout(function () {
       success('https://www.google.com/logos/google.jpg');
     }, 5000);
   },

diff --git a/src/plugins/image/test/ts/browser/ImageResizeTest.ts b/src/plugins/image/test/ts/browser/ImageResizeTest.ts
@@ -1,5 +1,6 @@
 import { Chain, Guard, Log, Mouse, Pipeline, UiFinder } from '@ephox/agar';
 import { UnitTest } from '@ephox/bedrock';
+import { console } from '@ephox/dom-globals';
 import { TinyLoader, TinyUi } from '@ephox/mcagar';
 import ImagePlugin from 'tinymce/plugins/image/Plugin';
 import SilverTheme from 'tinymce/themes/silver/Theme';

diff --git a/src/plugins/imagetools/demo/ts/demo/Demo.ts b/src/plugins/imagetools/demo/ts/demo/Demo.ts
@@ -1,5 +1,7 @@
 // tslint:disable:no-console
 
+import { console } from '@ephox/dom-globals';
+import Delay from 'tinymce/core/api/util/Delay';
 import DomQuery from 'tinymce/core/api/dom/DomQuery';
 
 declare let tinymce: any;
@@ -46,7 +48,7 @@ tinymce.init({
     console.log('blob upload [started]', 'id:', data.id(), 'filename:', data.filename());
     progress(0);
 
-    setTimeout(function () {
+    Delay.setTimeout(function () {
       console.log('blob upload [ended]', data.id());
       success(data.id() + '.png');
       progress(100);

diff --git a/src/plugins/imagetools/main/ts/core/Actions.ts b/src/plugins/imagetools/main/ts/core/Actions.ts
@@ -122,7 +122,7 @@ const startTimedUpload = function (editor: Editor, imageUploadTimerState) {
 };
 
 const cancelTimedUpload = function (imageUploadTimerState) {
-  clearTimeout(imageUploadTimerState.get());
+  Delay.clearTimeout(imageUploadTimerState.get());
 };
 
 const updateSelectedImage = function (editor: Editor, ir, uploadImmediately, imageUploadTimerState, selectedImage, size?) {

diff --git a/src/plugins/imagetools/test/ts/browser/SequenceTest.ts b/src/plugins/imagetools/test/ts/browser/SequenceTest.ts
@@ -1,5 +1,6 @@
 import { Pipeline, Log } from '@ephox/agar';
 import { UnitTest } from '@ephox/bedrock';
+import { console } from '@ephox/dom-globals';
 import { TinyApis, TinyLoader } from '@ephox/mcagar';
 
 import Plugin from 'tinymce/plugins/imagetools/Plugin';

diff --git a/src/plugins/importcss/test/ts/browser/ImportCssGroupsPluginTest.ts b/src/plugins/importcss/test/ts/browser/ImportCssGroupsPluginTest.ts
@@ -1,6 +1,6 @@
 import { GeneralSteps, Log, Pipeline, Step, Keys, Keyboard, Assertions } from '@ephox/agar';
 import { UnitTest } from '@ephox/bedrock';
-import { document } from '@ephox/dom-globals';
+import { console, document } from '@ephox/dom-globals';
 import { Arr } from '@ephox/katamari';
 import { TinyLoader, TinyUi } from '@ephox/mcagar';
 import { Element } from '@ephox/sugar';

diff --git a/src/plugins/link/main/ts/ui/DialogConfirms.ts b/src/plugins/link/main/ts/ui/DialogConfirms.ts
@@ -5,6 +5,7 @@
  * For commercial licenses see https://www.tiny.cloud/
  */
 
+import { console } from '@ephox/dom-globals';
 import { Future, Option, Options } from '@ephox/katamari';
 import Delay from 'tinymce/core/api/util/Delay';
 import { Editor } from 'tinymce/core/api/Editor';

diff --git a/src/plugins/link/test/ts/browser/DialogSectionsTest.ts b/src/plugins/link/test/ts/browser/DialogSectionsTest.ts
@@ -1,8 +1,8 @@
-import '../../../../../themes/silver/main/ts/Theme';
+import 'tinymce/themes/silver/Theme';
 
 import { GeneralSteps, Pipeline, UiFinder, Log } from '@ephox/agar';
 import { UnitTest } from '@ephox/bedrock';
-import { document } from '@ephox/dom-globals';
+import { console, document } from '@ephox/dom-globals';
 import { Arr, Option } from '@ephox/katamari';
 import { TinyApis, TinyDom, TinyLoader } from '@ephox/mcagar';
 import LinkPlugin from 'tinymce/plugins/link/Plugin';

diff --git a/src/plugins/media/test/ts/browser/IframeNodeTest.ts b/src/plugins/media/test/ts/browser/IframeNodeTest.ts
@@ -1,10 +1,11 @@
 import { Pipeline, UiFinder, Chain, Assertions, ApproxStructure, Log } from '@ephox/agar';
 import { UnitTest } from '@ephox/bedrock';
 import { TinyApis, TinyLoader } from '@ephox/mcagar';
+import { Element } from '@ephox/sugar';
 
+import Delay from 'tinymce/core/api/util/Delay';
 import Plugin from 'tinymce/plugins/media/Plugin';
 import Theme from 'tinymce/themes/silver/Theme';
-import { Element } from '@ephox/sugar';
 
 UnitTest.asynctest('browser.core.IframeNodeTest', function (success, failure) {
   Plugin();
@@ -90,7 +91,7 @@ UnitTest.asynctest('browser.core.IframeNodeTest', function (success, failure) {
     toolbar: 'media',
     theme: 'silver',
     media_url_resolver (data, resolve) {
-      setTimeout(function () {
+      Delay.setTimeout(function () {
         resolve({
           html: '<span id="fake">' + data.url + '</span>'
         });

diff --git a/src/plugins/media/test/ts/browser/SubmitTest.ts b/src/plugins/media/test/ts/browser/SubmitTest.ts
@@ -2,6 +2,7 @@ import { GeneralSteps, Pipeline, Logger, Log } from '@ephox/agar';
 import { UnitTest } from '@ephox/bedrock';
 import { TinyApis, TinyLoader, TinyUi } from '@ephox/mcagar';
 
+import Delay from 'tinymce/core/api/util/Delay';
 import Plugin from 'tinymce/plugins/media/Plugin';
 import Theme from 'tinymce/themes/silver/Theme';
 
@@ -41,7 +42,7 @@ UnitTest.asynctest('browser.core.SubmitTest', function (success, failure) {
     toolbar: 'media',
     theme: 'silver',
     media_url_resolver (data, resolve) {
-      setTimeout(function () {
+      Delay.setTimeout(function () {
         resolve({
           html: '<span id="fake">' + data.url + '</span>'
         });

diff --git a/src/plugins/paste/demo/ts/demo/Demo.ts b/src/plugins/paste/demo/ts/demo/Demo.ts
@@ -1,4 +1,5 @@
 // tslint:disable:no-console
+import { console } from '@ephox/dom-globals';
 
 declare let tinymce: any;