8
0
Oskar Wrobel 9 лет назад
Родитель
Сommit
58bc411dbd
6 измененных файлов с 15 добавлено и 14 удалено
  1. 2 2
      ckeditor.js
  2. 2 2
      src/command/command.js
  3. 2 2
      src/editable.js
  4. 2 2
      src/editablecollection.js
  5. 5 4
      src/editor.js
  6. 2 2
      src/plugin.js

+ 2 - 2
ckeditor.js

@@ -11,7 +11,7 @@ import Config from './ckeditor5/utils/config.js';
 import CKEditorError from './ckeditor5/utils/ckeditorerror.js';
 import CKEditorError from './ckeditor5/utils/ckeditorerror.js';
 import isArrayLike from './ckeditor5/utils/lib/lodash/isArrayLike.js';
 import isArrayLike from './ckeditor5/utils/lib/lodash/isArrayLike.js';
 import clone from './ckeditor5/utils/lib/lodash/clone.js';
 import clone from './ckeditor5/utils/lib/lodash/clone.js';
-import utils from './ckeditor5/utils/utils.js';
+import uid from './ckeditor5/utils/uid.js';
 
 
 /**
 /**
  * This is the API entry point. The entire CKEditor code runs under this object.
  * This is the API entry point. The entire CKEditor code runs under this object.
@@ -124,5 +124,5 @@ function getEditorElementName( element ) {
 		return element.dataset.editable;
 		return element.dataset.editable;
 	}
 	}
 
 
-	return 'editable' + utils.uid();
+	return 'editable' + uid();
 }
 }

+ 2 - 2
src/command/command.js

@@ -6,7 +6,7 @@
 'use strict';
 'use strict';
 
 
 import ObservableMixin from '../utils/observablemixin.js';
 import ObservableMixin from '../utils/observablemixin.js';
-import utils from '../utils/utils.js';
+import mix from '../utils/mix.js';
 
 
 /**
 /**
  * The base class for CKEditor commands.
  * The base class for CKEditor commands.
@@ -129,7 +129,7 @@ function disableCallback( evt, data ) {
 	data.isEnabled = false;
 	data.isEnabled = false;
 }
 }
 
 
-utils.mix( Command, ObservableMixin );
+mix( Command, ObservableMixin );
 
 
 /**
 /**
  * Fired whenever command has to have its {@link ckeditor5.command.Command#isEnabled} property refreshed. Every feature,
  * Fired whenever command has to have its {@link ckeditor5.command.Command#isEnabled} property refreshed. Every feature,

+ 2 - 2
src/editable.js

@@ -5,7 +5,7 @@
 
 
 'use strict';
 'use strict';
 
 
-import utils from './utils/utils.js';
+import mix from './utils/mix.js';
 import ObservableMixin from './utils/observablemixin.js';
 import ObservableMixin from './utils/observablemixin.js';
 import FocusObserver from './engine/treeview/observer/focusobserver.js';
 import FocusObserver from './engine/treeview/observer/focusobserver.js';
 
 
@@ -109,4 +109,4 @@ export default class Editable {
 	}
 	}
 }
 }
 
 
-utils.mix( Editable, ObservableMixin );
+mix( Editable, ObservableMixin );

+ 2 - 2
src/editablecollection.js

@@ -5,7 +5,7 @@
 
 
 'use strict';
 'use strict';
 
 
-import utils from './utils/utils.js';
+import mix from './utils/mix.js';
 import Collection from './utils/collection.js';
 import Collection from './utils/collection.js';
 import ObservableMixin from './utils/observablemixin.js';
 import ObservableMixin from './utils/observablemixin.js';
 
 
@@ -57,4 +57,4 @@ export default class EditableCollection extends Collection {
 	}
 	}
 }
 }
 
 
-utils.mix( EditableCollection, ObservableMixin );
+mix( EditableCollection, ObservableMixin );

+ 5 - 4
src/editor.js

@@ -12,7 +12,8 @@ import EditableCollection from './editablecollection.js';
 import CKEditorError from './utils/ckeditorerror.js';
 import CKEditorError from './utils/ckeditorerror.js';
 import Locale from './utils/locale.js';
 import Locale from './utils/locale.js';
 import isArray from './utils/lib/lodash/isArray.js';
 import isArray from './utils/lib/lodash/isArray.js';
-import utils from './utils/utils.js';
+import nth from './utils/nth.js';
+import mix from './utils/mix.js';
 
 
 /**
 /**
  * Represents a single editor instance.
  * Represents a single editor instance.
@@ -144,7 +145,7 @@ export default class Editor {
 			return null;
 			return null;
 		}
 		}
 
 
-		return utils.nth( 0, this.elements )[ 1 ];
+		return nth( 0, this.elements )[ 1 ];
 	}
 	}
 
 
 	/**
 	/**
@@ -158,7 +159,7 @@ export default class Editor {
 			return null;
 			return null;
 		}
 		}
 
 
-		return utils.nth( 0, this.elements )[ 0 ];
+		return nth( 0, this.elements )[ 0 ];
 	}
 	}
 
 
 	/**
 	/**
@@ -335,7 +336,7 @@ export default class Editor {
 	}
 	}
 }
 }
 
 
-utils.mix( Editor, ObservableMixin );
+mix( Editor, ObservableMixin );
 
 
 /**
 /**
  * Fired when this editor instance is destroyed. The editor at this point is not usable and this event should be used to
  * Fired when this editor instance is destroyed. The editor at this point is not usable and this event should be used to

+ 2 - 2
src/plugin.js

@@ -6,7 +6,7 @@
 'use strict';
 'use strict';
 
 
 import ObservableMixin from './utils/observablemixin.js';
 import ObservableMixin from './utils/observablemixin.js';
-import utils from './utils/utils.js';
+import mix from './utils/mix.js';
 
 
 /**
 /**
  * The base class for CKEditor plugin classes.
  * The base class for CKEditor plugin classes.
@@ -58,4 +58,4 @@ export default class Plugin {
 	destroy() {}
 	destroy() {}
 }
 }
 
 
-utils.mix( Plugin, ObservableMixin );
+mix( Plugin, ObservableMixin );